diff options
Diffstat (limited to 'modules/gallery/views')
| -rw-r--r-- | modules/gallery/views/admin_advanced_settings.html.php | 6 | ||||
| -rw-r--r-- | modules/gallery/views/admin_maintenance.html.php | 10 | ||||
| -rw-r--r-- | modules/gallery/views/in_place_edit.html.php | 6 | ||||
| -rw-r--r-- | modules/gallery/views/user_profile.html.php | 7 |
4 files changed, 22 insertions, 7 deletions
diff --git a/modules/gallery/views/admin_advanced_settings.html.php b/modules/gallery/views/admin_advanced_settings.html.php index 2d4b11a1..1f7d2f64 100644 --- a/modules/gallery/views/admin_advanced_settings.html.php +++ b/modules/gallery/views/admin_advanced_settings.html.php @@ -25,10 +25,10 @@ <a href="<?= url::site("admin/advanced_settings/edit/$var->module_name/" . html::clean($var->name)) ?>" class="g-dialog-link" title="<?= t("Edit %var (%module_name)", array("var" => $var->name, "module_name" => $var->module_name))->for_html_attr() ?>"> - <? if (isset($var->value)): ?> - <?= html::clean($var->value) ?> - <? else: ?> + <? if (!isset($var->value) || $var->value === ""): ?> <i> <?= t("empty") ?> </i> + <? else: ?> + <?= html::clean($var->value) ?> <? endif ?> </a> </td> diff --git a/modules/gallery/views/admin_maintenance.html.php b/modules/gallery/views/admin_maintenance.html.php index ac597715..19375670 100644 --- a/modules/gallery/views/admin_maintenance.html.php +++ b/modules/gallery/views/admin_maintenance.html.php @@ -29,16 +29,22 @@ <?= $task->description ?> </td> <td> - <a href="<?= url::site("admin/maintenance/start/$task->callback?csrf=$csrf") ?>" + <? foreach ($task_buttons as $button): ?> + <a href="<?= "{$button->url}/$task->callback?csrf=$csrf" ?>" class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all"> - <?= t("run") ?> + <?= html::clean($button->text) ?> </a> + <? endforeach ?> </td> </tr> <? endforeach ?> </table> </div> + <? foreach ($task_maintenance_content as $content): ?> + <?= html::purify($content) ?> + <? endforeach ?> + <? if ($running_tasks->count()): ?> <div id="g-running-tasks"> <h2> <?= t("Running tasks") ?> </h2> diff --git a/modules/gallery/views/in_place_edit.html.php b/modules/gallery/views/in_place_edit.html.php index 05a16ad4..2d6cbe90 100644 --- a/modules/gallery/views/in_place_edit.html.php +++ b/modules/gallery/views/in_place_edit.html.php @@ -9,7 +9,13 @@ <?= form::submit(array("class" => "submit ui-state-default"), t("Save")) ?> </li> <li><a href="#" class="g-cancel"><?= t("Cancel") ?></a></li> + <? if (!empty($errors["input"])): ?> + <li> + <p id="g-in-place-edit-message" class="g-error"><?= $errors["input"] ?></p> + </li> + <? endif ?> </ul> </form> + diff --git a/modules/gallery/views/user_profile.html.php b/modules/gallery/views/user_profile.html.php index f35f8c3f..78e1c579 100644 --- a/modules/gallery/views/user_profile.html.php +++ b/modules/gallery/views/user_profile.html.php @@ -57,13 +57,16 @@ </a> <? endif ?> <? if ($editable): ?> - <a class="g-button ui-icon-right ui-state-default ui-corner-all g-dialog-link" href="<?= url::site("form/edit/users/{$user->id}") ?>"> + <a class="g-button ui-icon-right ui-state-default ui-corner-all g-dialog-link" href="<?= url::site("form/edit/users/{$user->id}") ?>"> <?= t("Edit") ?> </a> + <a class="g-button ui-icon-right ui-state-default ui-corner-all g-dialog-link" href="<?= url::site("users/form_change_password/{$user->id}") ?>"> + <?= t("Change password") ?> + </a> <? endif ?> <a id="g-profile-return" class="g-button ui-icon-right ui-state-default ui-corner-all" href="#"> <?= t("Return") ?> </a> </div> -</div>
\ No newline at end of file +</div> |