diff options
| author | Andy Staudacher <andy.st@gmail.com> | 2010-02-02 13:41:50 -0800 |
|---|---|---|
| committer | Andy Staudacher <andy.st@gmail.com> | 2010-02-02 13:41:50 -0800 |
| commit | 31aaf7555f51dd80cf1e97fd3c20a1c245cbf61b (patch) | |
| tree | 594ca1cebbe5b8b58b4c50cb3c88487574dba712 /modules/gallery/views | |
| parent | be5f38adea89bdb95be359aea3d97615b6b530a3 (diff) | |
| parent | 3c3671cff25f28e21a702b1f665a6baa282d045f (diff) | |
Merge commit 'upstream/master'
Diffstat (limited to 'modules/gallery/views')
| -rw-r--r-- | modules/gallery/views/admin_advanced_settings.html.php | 6 | ||||
| -rw-r--r-- | modules/gallery/views/in_place_edit.html.php | 6 |
2 files changed, 9 insertions, 3 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/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> + |