diff options
Diffstat (limited to 'modules/gallery')
| -rw-r--r-- | modules/gallery/css/l10n_client.css | 2 | ||||
| -rw-r--r-- | modules/gallery/helpers/gallery_menu.php | 6 | ||||
| -rw-r--r-- | modules/gallery/tests/xss_data.txt | 23 | ||||
| -rw-r--r-- | modules/gallery/views/admin_theme_details.html.php | 2 | ||||
| -rw-r--r-- | modules/gallery/views/admin_themes.html.php | 2 | ||||
| -rw-r--r-- | modules/gallery/views/l10n_client.html.php | 4 |
6 files changed, 19 insertions, 20 deletions
diff --git a/modules/gallery/css/l10n_client.css b/modules/gallery/css/l10n_client.css index dd8d5c5d..bab1d0ed 100644 --- a/modules/gallery/css/l10n_client.css +++ b/modules/gallery/css/l10n_client.css @@ -159,6 +159,8 @@ how it wants to round. */ #l10n-client-string-editor .source .source-text { line-height:1.5em; background:#eee; + font-family: monospace; + text-align: left; height:16em; margin:1em; padding:1em; overflow:auto; direction: ltr; diff --git a/modules/gallery/helpers/gallery_menu.php b/modules/gallery/helpers/gallery_menu.php index 854086c1..9729a868 100644 --- a/modules/gallery/helpers/gallery_menu.php +++ b/modules/gallery/helpers/gallery_menu.php @@ -100,12 +100,6 @@ class gallery_menu_Core { ->url("#") ->css_class("gFullSizeLink")); } - $menu - ->append(Menu::factory("link") - ->id("album") - ->label(t("Return to album")) - ->url($theme->item()->parent()->url("show={$theme->item->id}")) - ->css_id("gAlbumLink")); } static function admin($menu, $theme) { diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt index e3dbb188..b71262df 100644 --- a/modules/gallery/tests/xss_data.txt +++ b/modules/gallery/tests/xss_data.txt @@ -283,8 +283,11 @@ modules/image_block/views/image_block_block.html.php 4 DIRTY $item->th modules/info/views/info_block.html.php 6 $item->title modules/info/views/info_block.html.php 11 $item->description modules/info/views/info_block.html.php 17 $item->name -modules/info/views/info_block.html.php 23 DIRTY $item->captured -modules/info/views/info_block.html.php 29 $item->owner->name +modules/info/views/info_block.html.php 25 DIRTY $parent->id +modules/info/views/info_block.html.php 25 DIRTY $item->id +modules/info/views/info_block.html.php 26 $parent->title +modules/info/views/info_block.html.php 34 DIRTY $item->captured +modules/info/views/info_block.html.php 40 $item->owner->name modules/notification/views/comment_published.html.php 4 $subject modules/notification/views/comment_published.html.php 7 $subject modules/notification/views/comment_published.html.php 11 $comment->text @@ -339,9 +342,9 @@ modules/organize/views/organize_thumb_grid.html.php 7 DIRTY $child->i modules/organize/views/organize_thumb_grid.html.php 8 DIRTY $child->id modules/organize/views/organize_thumb_grid.html.php 8 DIRTY $item_class modules/organize/views/organize_thumb_grid.html.php 9 DIRTY $child->thumb_img(array("class" => "gThumbnail"), $thumbsize, true) -modules/recaptcha/views/admin_recaptcha.html.php 5 DIRTY $form->get_key_url -modules/recaptcha/views/admin_recaptcha.html.php 8 DIRTY $form -modules/recaptcha/views/admin_recaptcha.html.php 21 DIRTY $public_key +modules/recaptcha/views/admin_recaptcha.html.php 6 DIRTY $form->get_key_url +modules/recaptcha/views/admin_recaptcha.html.php 10 DIRTY $form +modules/recaptcha/views/admin_recaptcha.html.php 23 DIRTY $public_key modules/recaptcha/views/form_recaptcha.html.php 7 DIRTY $public_key modules/rss/views/comment.mrss.php 9 $title modules/rss/views/comment.mrss.php 10 DIRTY $link @@ -470,11 +473,11 @@ modules/user/views/admin_users_group.html.php 22 DIRTY $user->id modules/user/views/admin_users_group.html.php 22 DIRTY $group->id modules/user/views/admin_users_group.html.php 25 $user->name modules/user/views/admin_users_group.html.php 25 $group->name -modules/user/views/login.html.php 11 DIRTY $user->id -modules/user/views/login.html.php 14 $user->full_name -modules/user/views/login.html.php 14 $user->name -modules/user/views/login.html.php 14 $user->full_name -modules/user/views/login.html.php 15 DIRTY $csrf +modules/user/views/login.html.php 12 DIRTY $user->id +modules/user/views/login.html.php 15 $user->full_name +modules/user/views/login.html.php 15 $user->name +modules/user/views/login.html.php 15 $user->full_name +modules/user/views/login.html.php 18 DIRTY $csrf modules/user/views/login_ajax.html.php 37 DIRTY $form modules/user/views/reset_password.html.php 9 $user->full_name modules/user/views/reset_password.html.php 9 $user->full_name diff --git a/modules/gallery/views/admin_theme_details.html.php b/modules/gallery/views/admin_theme_details.html.php index eb450b16..f093b70b 100644 --- a/modules/gallery/views/admin_theme_details.html.php +++ b/modules/gallery/views/admin_theme_details.html.php @@ -1,6 +1,6 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> <div id="gAdminThemeDetails"> - <h1> <?= t("Theme Details") ?> </h1> + <h1> <?= t("Theme Options") ?> </h1> <?= $form ?> </div> diff --git a/modules/gallery/views/admin_themes.html.php b/modules/gallery/views/admin_themes.html.php index f85bce70..dc13a6a0 100644 --- a/modules/gallery/views/admin_themes.html.php +++ b/modules/gallery/views/admin_themes.html.php @@ -7,7 +7,7 @@ } </script> -<h1> <?= t("Theme Administration") ?> </h1> +<h1> <?= t("Theme Choice") ?> </h1> <p> <?= t("Gallery allows you to choose a theme for browsing your Gallery, as well as a special theme for the administration interface. Click a theme to preview and activate it.") ?> </p> diff --git a/modules/gallery/views/l10n_client.html.php b/modules/gallery/views/l10n_client.html.php index faa6e939..2e53f48f 100644 --- a/modules/gallery/views/l10n_client.html.php +++ b/modules/gallery/views/l10n_client.html.php @@ -16,7 +16,7 @@ [other] - <?= $string["source"]["other"] ?> <? else: ?> <?= $string["source"] ?> - <? endif; ?> + <? endif; ?> </li> <? endforeach; ?> </ul> @@ -25,7 +25,7 @@ </div> <div id="l10n-client-string-editor"> <div class="source"> - <pre class="source-text"></pre> + <p class="source-text"></p> </div> <div class="translation"> <form method="post" action="<?= url::site("l10n_client/save") ?>" id="gL10nClientSaveForm"> |