friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

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

This commit is contained in:
Jonny Tischbein 2018-11-25 08:32:05 +01:00
parent 38838173b1
commit 3af59eaba4
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/admin.php
View File

@ -1493,7 +1493,7 @@ function admin_page_site(App $a)
'$worker_title' => L10n::t('Worker'), '$worker_title' => L10n::t('Worker'),
'$relay_title' => L10n::t('Message Relay'), '$relay_title' => L10n::t('Message Relay'),
'$relocate' => L10n::t('Relocate Instance'), '$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), '$baseurl' => System::baseUrl(true),
// name, label, value, help string, extra data... // name, label, value, help string, extra data...
'$sitename' => ['sitename', L10n::t("Site name"), Config::get('config', 'sitename'),''], '$sitename' => ['sitename', L10n::t("Site name"), Config::get('config', 'sitename'),''],

2
view/templates/admin/site.tpl
View File

@ -171,7 +171,7 @@
<form action="{{$baseurl}}/admin/site" method="post"> <form action="{{$baseurl}}/admin/site" method="post">
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
<h3>{{$relocate}}</h3> <h3>{{$relocate}}</h3>
<b>Warning! {{$relocate_warning}}</b> <b>{{$relocate_warning}}</b>
{{include file="field_input.tpl" field=$relocate_url}} {{include file="field_input.tpl" field=$relocate_url}}
<input type="hidden" name="page_site" value="{{$submit|escape:'html'}}"> <input type="hidden" name="page_site" value="{{$submit|escape:'html'}}">
<div class="submit"><input type="submit" name="relocate" value="{{$relocate_button|escape:'html'}}" /></div> <div class="submit"><input type="submit" name="relocate" value="{{$relocate_button|escape:'html'}}" /></div>

5
view/theme/frio/templates/admin/site.tpl
View File

@ -351,8 +351,9 @@
</h4> </h4>
</div> </div>
<div id="admin-settings-relocate-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-relocate"> <div id="admin-settings-relocate-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-relocate">
<div class="alert alert-danger"> <div class="alert alert-danger alert-dismissible">
<b>WARNING!</b> {{$relocate_warning}} <a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
<b>{{$relocate_warning}}</b>
</div> </div>
{{* separate form for relocate... *}} {{* separate form for relocate... *}}
<form action="{{$baseurl}}/admin/site" method="post"> <form action="{{$baseurl}}/admin/site" method="post">