clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/2021.09-rc' into issue-10640-c

This commit is contained in:
Michael 2021-09-01 18:34:24 +00:00
parent c8d2c87af0 ce48e8cb5d
commit 58abaf5c53
5 changed files with 58 additions and 1648 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Module/Admin/Storage.php
View File

@ -129,6 +129,8 @@ class Storage extends BaseAdmin
return Renderer::replaceMacros($t, [ return Renderer::replaceMacros($t, [
'$title' => DI::l10n()->t('Administration'), '$title' => DI::l10n()->t('Administration'),
'$label_current' => DI::l10n()->t('Current Storage Backend'),
'$label_config' => DI::l10n()->t('Storage Configuration'),
'$page' => DI::l10n()->t('Storage'), '$page' => DI::l10n()->t('Storage'),
'$save' => DI::l10n()->t('Save'), '$save' => DI::l10n()->t('Save'),
'$save_activate' => DI::l10n()->t('Save & Activate'), '$save_activate' => DI::l10n()->t('Save & Activate'),

1694
view/lang/C/messages.po
View File

File diff suppressed because it is too large Load Diff

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

@ -72,7 +72,7 @@
{{else}} {{else}}
<div class='field checkbox' id='div_id_{{$diaspora_enabled.0}}'> <div class='field checkbox' id='div_id_{{$diaspora_enabled.0}}'>
<label for='id_{{$diaspora_enabled.0}}'>{{$diaspora_enabled.1}}</label> <label for='id_{{$diaspora_enabled.0}}'>{{$diaspora_enabled.1}}</label>
<span class="field_help" role="tooltip" id="id_{{diaspora_enabled.0}}">{{$diaspora_not_able}}</span> <span class="field_help" role="tooltip" id="id_{{$diaspora_enabled.0}}">{{$diaspora_not_able}}</span>
</div> </div>
{{/if}} {{/if}}
{{include file="field_input.tpl" field=$global_directory}} {{include file="field_input.tpl" field=$global_directory}}

4
view/templates/admin/storage.tpl
View File

@ -1,9 +1,9 @@
<div id='adminpage'> <div id='adminpage'>
<h1>{{$title}} - {{$page}}</h1> <h1>{{$title}} - {{$page}}</h1>
<h2>Current Storage Backend: <b>{{$storagebackend}}</b></h2> <h2>{{$label_current}}: <b>{{$storagebackend}}</b></h2>
<h2>Storage Configuration</h2> <h2>{{$label_config}}</h2>
{{foreach from=$availablestorageforms item=$storage}} {{foreach from=$availablestorageforms item=$storage}}
<form action="{{$baseurl}}/admin/storage/{{$storage.prefix}}" method="post"> <form action="{{$baseurl}}/admin/storage/{{$storage.prefix}}" method="post">

4
view/theme/frio/templates/admin/storage.tpl
View File

@ -4,10 +4,10 @@
<h1>{{$title}} - {{$page}}</h1> <h1>{{$title}} - {{$page}}</h1>
<div class="well well-lg"> <div class="well well-lg">
Current Storage Backend: <b>{{$storagebackend}}</b> {{$label_current}}: <b>{{$storagebackend}}</b>
</div> </div>
<h2>Storage Configuration</h2> <h2>{{$label_config}}</h2>
{{foreach from=$availablestorageforms item=$storage}} {{foreach from=$availablestorageforms item=$storage}}
<form action="{{$baseurl}}/admin/storage/{{$storage.prefix}}" method="post"> <form action="{{$baseurl}}/admin/storage/{{$storage.prefix}}" method="post">