Merge pull request #5348 from astifter/use_h3_for_showing_contacts

Use h3 instead of h4 in contacts block

diff --git a/mod/admin.php b/mod/admin.php
index f12ec5e3b2578ecace5959d0ee1f503f9b15875d..4d4c065010b32ffdcbde7f8933222dd6f2dff1c3 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -1465,7 +1465,8 @@ function admin_page_site(App $a)
                '$relay_server_tags'    => ['relay_server_tags', L10n::t("Server tags"), Config::get('system','relay_server_tags'), L10n::t("Comma separated list of tags for the 'tags' subscription.")],
                '$relay_user_tags'      => ['relay_user_tags', L10n::t("Allow user tags"), Config::get('system', 'relay_user_tags', true), L10n::t("If enabled, the tags from the saved searches will used for the 'tags' subscription in addition to the 'relay_server_tags'.")],
 
-               '$form_security_token'  => get_form_security_token("admin_site")
+               '$form_security_token'  => get_form_security_token("admin_site"),
+               '$relocate_button'      => L10n::t('Start Relocation'),
        ]);
 }
 

diff --git a/mods/sample-nginx.config b/mods/sample-nginx.config
index 829bfc70af40c74f605c6b8e63fd758129be94b9..e4ce902515e4c858bc2ff09da3e81c1dd2f11af3 100644 (file)
--- a/mods/sample-nginx.config
+++ b/mods/sample-nginx.config
@@ -72,36 +72,37 @@ server {
   charset utf-8;
   root /var/www/friendica;
   access_log /var/log/nginx/friendica.log;
-    #Uncomment the following line to include a standard configuration file
-    #Note that the most specific rule wins and your standard configuration
-    #will therefore *add* to this file, but not override it.
+
+  # Uncomment the following line to include a standard configuration file Note
+  # that the most specific rule wins and your standard configuration will
+  # therefore *add* to this file, but not override it.
   #include standard.conf
+
   # allow uploads up to 20MB in size
   client_max_body_size 20m;
   client_body_buffer_size 128k;
 
   # rewrite to front controller as default rule
   location / {
-    if (!-e $request_filename) {
-      rewrite ^(.*)$ /index.php?pagename=$1;
-    }
+    try_file $uri /index.php?pagename=$uri&$args;
   }
 
   # make sure webfinger and other well known services aren't blocked
   # by denying dot files and rewrite request to the front controller
   location ^~ /.well-known/ {
     allow all;
-   if (!-e $request_filename) {
-     rewrite ^(.*)$ /index.php?pagename=$1;
-   }
+    try_files $uri /index.php?pagename=$uri&$args;
   }
 
   include mime.types;
 
-  # block these file types
-  location ~* \.(tpl|md|tgz|log|out)$ {
-    deny all;
-  }
+  # statically serve these file types when possible otherwise fall back to
+  # front controller allow browser to cache them added .htm for advanced source
+  # code editor library
+  #location ~* \.(jpg|jpeg|gif|png|ico|css|js|htm|html|ttf|woff|svg)$ {
+  #  expires 30d;
+  #  try_files $uri /index.php?pagename=$uri&$args;
+  #}
 
   # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
   # or a unix socket
@@ -128,6 +129,11 @@ server {
     fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
   }
 
+  # block these file types
+  location ~* \.(tpl|md|tgz|log|out)$ {
+    deny all;
+  }
+
   # deny access to all dot files
   location ~ /\. {
     deny all;

diff --git a/view/templates/admin/site.tpl b/view/templates/admin/site.tpl
index 31b3b68ca294ec7862bc7c34018681768ee180de..ad5f42e85fe7e899da59756ddb9e4a850b235e76 100644 (file)
--- a/view/templates/admin/site.tpl
+++ b/view/templates/admin/site.tpl
@@ -169,7 +169,7 @@
        <h3>{{$relocate}}</h3>
        {{include file="field_input.tpl" field=$relocate_url}}
        <input type="hidden" name="page_site" value="{{$submit|escape:'html'}}">
-       <div class="submit"><input type="submit" name="relocate" value="{{$submit|escape:'html'}}" /></div>
+       <div class="submit"><input type="submit" name="relocate" value="{{$relocate_button|escape:'html'}}" /></div>
        </form>
 
 </div>