Update UX for Storage administration

diff --git a/src/Module/Admin/Storage.php b/src/Module/Admin/Storage.php
index c74259c6e5a079457fc515827847fd5ce9b7e9bd..a8f0b592509767379e1836f3f2197963f5345a1a 100644 (file)
--- a/src/Module/Admin/Storage.php
+++ b/src/Module/Admin/Storage.php
@@ -116,6 +116,7 @@ class Storage extends BaseAdmin
                                'name'   => $name,
                                'prefix' => $storage_form_prefix,
                                'form'   => $storage_form,
+                               'active' => $name === $current_storage_backend::getName(),
                        ];
                }
 
@@ -125,8 +126,10 @@ class Storage extends BaseAdmin
                        '$title'                 => DI::l10n()->t('Administration'),
                        '$page'                  => DI::l10n()->t('Storage'),
                        '$save'                  => DI::l10n()->t('Save'),
-                       '$save_set'              => DI::l10n()->t('Save & Activate'),
-                       '$clear'                 => DI::l10n()->t('Clear'),
+                       '$save_activate'         => DI::l10n()->t('Save & Activate'),
+                       '$activate'              => DI::l10n()->t('Activate'),
+                       '$save_reload'           => DI::l10n()->t('Save & Reload'),
+                       '$noconfig'              => DI::l10n()->t('This backend doesn\'t have custom settings'),
                        '$baseurl'               => DI::baseUrl()->get(true),
                        '$form_security_token'   => self::getFormSecurityToken("admin_storage"),
                        '$storagebackend'        => $current_storage_backend,

diff --git a/view/templates/admin/storage.tpl b/view/templates/admin/storage.tpl
index bfe6511bf0697a36ddbd8374f7c186f497b1bec0..299ec8db4667c9606c90a3d637b678bc3b7c6092 100644 (file)
--- a/view/templates/admin/storage.tpl
+++ b/view/templates/admin/storage.tpl
@@ -9,14 +9,24 @@
        <form action="{{$baseurl}}/admin/storage/{{$storage.prefix}}" method="post">
                <input type='hidden' name='form_security_token' value="{{$form_security_token}}">
                <h3>{{$storage.name}}</h3>
-               {{foreach from=$storage.form item=$field}}
-               {{include file=$field.field field=$field}}
-               {{/foreach}}
+               {{if $storage.form}}
+                       {{foreach from=$storage.form item=$field}}
+                               {{include file=$field.field field=$field}}
+                       {{/foreach}}
+               {{else}}
+                       {{$noconfig}}
+               {{/if}}
 
                {{if $storage.form}}
-               <div class="submit"><input type="submit" name="submit_save" value="{{$save}}" /></div>
+               <input type="submit" name="submit_save" value="{{$save}}"/>
+               {{if $storage.active}}
+               <input type="submit" name="submit_save_set" value="{{$save_reload}}"/>
+               {{else}}
+               <input type="submit" name="submit_save_set" value="{{$save_activate}}"/>
+               {{/if}}
+               {{else}}
+               <br /><input type="submit" name="submit_save_set" {{if $storage.active}}disabled="disabled"{{/if}} value="{{$activate}}"/>
                {{/if}}
-               <div class="submit"><input type="submit" name="submit_save_set" value="{{$save_set}}" /></div>
        </form>
                {{/foreach}}
 

diff --git a/view/theme/frio/templates/admin/storage.tpl b/view/theme/frio/templates/admin/storage.tpl
index 0827c06acf49dfd5e65a041f85e84529b1b74bf2..7607a08485beddd4829c5d2f2e63ee5b5d9b190d 100644 (file)
--- a/view/theme/frio/templates/admin/storage.tpl
+++ b/view/theme/frio/templates/admin/storage.tpl
@@ -22,15 +22,25 @@
                        </div>
                        <div id="admin-settings-{{$storage.prefix}}-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-{{$storage.prefix}}">
                                <div class="panel-body">
-                                       {{foreach from=$storage.form item=$field}}
-                                       {{include file=$field.field field=$field}}
-                                       {{/foreach}}
+                                       {{if $storage.form}}
+                                               {{foreach from=$storage.form item=$field}}
+                                                       {{include file=$field.field field=$field}}
+                                               {{/foreach}}
+                                       {{else}}
+                                                {{$noconfig}}
+                                       {{/if}}
                                </div>
                                <div class="panel-footer">
                                        {{if $storage.form}}
                                        <input type="submit" name="submit_save" class="btn btn-primary" value="{{$save}}"/>
+                                               {{if $storage.active}}
+                                       <input type="submit" name="submit_save_set" class="btn btn-primary" value="{{$save_reload}}"/>
+                                               {{else}}
+                                       <input type="submit" name="submit_save_set" class="btn btn-primary" value="{{$save_activate}}"/>
+                                               {{/if}}
+                                       {{else}}
+                                       <input type="submit" name="submit_save_set" class="btn btn-primary" {{if $storage.active}}disabled="disabled"{{/if}} value="{{$activate}}"/>
                                        {{/if}}
-                                       <input type="submit" name="submit_save_set" class="btn btn-primary" value="{{$save_set}}"/>
                                </div>
                        </div>
                </div>