From ab1fc6ad533968ac7cb1d0506e989f549935b7aa Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Fri, 5 Jun 2009 19:47:11 -0700 Subject: Make theme page headers match the menu dropdowns. Internationalize the admin dashboard common title. --- modules/gallery/views/admin_theme_details.html.php | 2 +- modules/gallery/views/admin_themes.html.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'modules/gallery') 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 @@
-

+

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 @@ } -

+

-- cgit v1.2.3 From c5425f42a4a13f7f585ffe45c070a865cdef6077 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sat, 6 Jun 2009 00:35:30 -0600 Subject: Remove album view icon link, added album link to info module. This and breadcrumb should suffice. --- modules/gallery/helpers/gallery_menu.php | 6 ------ modules/info/views/info_block.html.php | 11 +++++++++++ themes/default/css/screen.css | 4 ---- themes/default/images/ico-view-album.png | Bin 345 -> 0 bytes 4 files changed, 11 insertions(+), 10 deletions(-) delete mode 100644 themes/default/images/ico-view-album.png (limited to 'modules/gallery') diff --git a/modules/gallery/helpers/gallery_menu.php b/modules/gallery/helpers/gallery_menu.php index 2a9e193b..97f0fd81 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/info/views/info_block.html.php b/modules/info/views/info_block.html.php index db664894..f8e5f35e 100644 --- a/modules/info/views/info_block.html.php +++ b/modules/info/views/info_block.html.php @@ -17,6 +17,17 @@ name) ?> + id != 1): ?> + parent(); ?> + + + + id}?show=$item->id") ?>"> + title) ?> + + + + captured): ?> diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css index 67bd7cc2..71711147 100644 --- a/themes/default/css/screen.css +++ b/themes/default/css/screen.css @@ -602,10 +602,6 @@ form .gError, width: 43px !important; } -#gViewMenu #gAlbumLink { - background-image: url('../images/ico-view-album.png'); -} - #gViewMenu #gHybridLink { background-image: url('../images/ico-view-hybrid.png'); } diff --git a/themes/default/images/ico-view-album.png b/themes/default/images/ico-view-album.png deleted file mode 100644 index 20b5af20..00000000 Binary files a/themes/default/images/ico-view-album.png and /dev/null differ -- cgit v1.2.3 From 4302406c96426cb0a037cff5d19bdf46df106331 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Sat, 6 Jun 2009 12:19:26 -0700 Subject: Fix formatting in l10n client source box so that it wraps. Otherwise long strings show up only on one line. --- modules/gallery/css/l10n_client.css | 2 ++ modules/gallery/views/l10n_client.html.php | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'modules/gallery') diff --git a/modules/gallery/css/l10n_client.css b/modules/gallery/css/l10n_client.css index 6616f511..8e668072 100644 --- a/modules/gallery/css/l10n_client.css +++ b/modules/gallery/css/l10n_client.css @@ -157,6 +157,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;} 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] - - + @@ -25,7 +25,7 @@
- 

+      

     

     

       
" id="gL10nClientSaveForm">
-- 
cgit v1.2.3


From bccaad92bb3b2ecc7c95e5eaf728b9be6e8a3b3a Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Sat, 6 Jun 2009 14:50:51 -0700
Subject: Update xss golden file

---
 modules/gallery/tests/xss_data.txt | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'modules/gallery')

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
-- 
cgit v1.2.3