Move all warning text in L10n + frio: make warning closable

diff --git a/mod/admin.php b/mod/admin.php
index 76baa9f1358de83d4998feef075aac0febaab1bf..f22bb7be02d1ce257f83d4d1d0ffcdbbc4780d0b 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -1493,7 +1493,7 @@ function admin_page_site(App $a)
                '$worker_title' => L10n::t('Worker'),
                '$relay_title' => L10n::t('Message Relay'),
                '$relocate' => L10n::t('Relocate Instance'),
-               '$relocate_warning' => L10n::t('Advanced function. Could make this server unreachable.'),
+               '$relocate_warning' => L10n::t('Warning! Advanced function. Could make this server unreachable.'),
                '$baseurl' => System::baseUrl(true),
                // name, label, value, help string, extra data...
                '$sitename'             => ['sitename', L10n::t("Site name"), Config::get('config', 'sitename'),''],

diff --git a/view/templates/admin/site.tpl b/view/templates/admin/site.tpl
index 3e89b2086605381f9c502d4ab351162ceaa940c3..abf7835e0615cf855d0987798022af55ccaeb69f 100644 (file)
--- a/view/templates/admin/site.tpl
+++ b/view/templates/admin/site.tpl
@@ -171,7 +171,7 @@
        <form action="{{$baseurl}}/admin/site" method="post">
        <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
        <h3>{{$relocate}}</h3>
-       <b>Warning! {{$relocate_warning}}</b>
+       <b>{{$relocate_warning}}</b>
        {{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="{{$relocate_button|escape:'html'}}" /></div>

diff --git a/view/theme/frio/templates/admin/site.tpl b/view/theme/frio/templates/admin/site.tpl
index be25d0f900ca62deb2c528eaece57a6b2696e4f2..0cb2f62520a0758e545433a3a0ee2b7839a7001f 100644 (file)
--- a/view/theme/frio/templates/admin/site.tpl
+++ b/view/theme/frio/templates/admin/site.tpl
@@ -351,8 +351,9 @@
                        </h4>
                </div>
                <div id="admin-settings-relocate-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-relocate">
-                       <div class="alert alert-danger">
-                               <b>WARNING!</b> {{$relocate_warning}}
+                       <div class="alert alert-danger alert-dismissible">
+                               <a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
+                               <b>{{$relocate_warning}}</b>
                        </div>
                        {{* separate form for relocate... *}}
                        <form action="{{$baseurl}}/admin/site" method="post">