diff options
| -rw-r--r-- | lib/gallery.common.css | 65 | ||||
| -rw-r--r-- | lib/images/ico-separator-rtl.gif | bin | 0 -> 106 bytes | |||
| -rw-r--r-- | lib/superfish/images/arrows-ffffff-rtl.png | bin | 0 -> 378 bytes | |||
| -rw-r--r-- | modules/gallery/css/gallery.css | 10 | ||||
| -rw-r--r-- | modules/gallery/tests/xss_data.txt | 36 | ||||
| -rw-r--r-- | modules/gallery/views/admin_sidebar.html.php | 8 | ||||
| -rw-r--r-- | modules/image_block/helpers/image_block_installer.php | 30 | ||||
| -rw-r--r-- | themes/wind/css/screen.css | 4 | ||||
| -rw-r--r-- | themes/wind/images/ico-view-slideshow-rtl.png | bin | 0 -> 1137 bytes |
9 files changed, 96 insertions, 57 deletions
diff --git a/lib/gallery.common.css b/lib/gallery.common.css index 16dd143c..860529cd 100644 --- a/lib/gallery.common.css +++ b/lib/gallery.common.css @@ -677,17 +677,20 @@ div#g-action-status { .rtl .g-left, .rtl .g-inline li, -.rtl .g-short-form li, -.rtl form ul ul li, -.rtl input[type="submit"], -.rtl input[type="reset"], .rtl #g-content #g-album-grid .g-item, .rtl .sf-menu li, .rtl .g-breadcrumbs li, .rtl .g-pager li, .rtl .g-buttonset li, .rtl .ui-icon-left .ui-icon, -.rtl input.checkbox { +.rtl .g-short-form li, +.rtl form ul ul li, +.rtl input[type="submit"], +.rtl input[type="reset"], +.rtl input.checkbox, +.rtl input[type=checkbox], +.rtl input.radio, +.rtl input[type=radio] { float: right; } @@ -705,11 +708,12 @@ div#g-action-status { } .rtl .g-breadcrumbs li { - background-position: right center; + background: transparent url('images/ico-separator-rtl.gif') no-repeat scroll right center; padding: 1em 18px 1em 8px; } .rtl .g-breadcrumbs .g-first { + background: none; padding-right: 0; } @@ -735,4 +739,53 @@ div#g-action-status { .rtl .sf-sub-indicator { left: .75em !important; right: auto; + background: url('superfish/images/arrows-ffffff-rtl.png') no-repeat -10px -100px; /* 8-bit indexed alpha png. IE6 gets solid image only */ +} +.rtl a > .sf-sub-indicator { /* give all except IE6 the correct values */ + top: .8em; + background-position: -10px -100px; /* use translucent arrow for modern browsers*/ +} +/* apply hovers to modern browsers */ +.rtl a:focus > .sf-sub-indicator, +.rtl a:hover > .sf-sub-indicator, +.rtl a:active > .sf-sub-indicator, +.rtl li:hover > a > .sf-sub-indicator, +.rtl li.sfHover > a > .sf-sub-indicator { + background-position: 0 -100px; /* arrow hovers for modern browsers*/ +} + +/* point right for anchors in subs */ +.rtl .sf-menu ul .sf-sub-indicator { background-position: 0 0; } +.rtl .sf-menu ul a > .sf-sub-indicator { background-position: -10px 0; } +/* apply hovers to modern browsers */ +.rtl .sf-menu ul a:focus > .sf-sub-indicator, +.rtl .sf-menu ul a:hover > .sf-sub-indicator, +.rtl .sf-menu ul a:active > .sf-sub-indicator, +.rtl .sf-menu ul li:hover > a > .sf-sub-indicator, +.rtl .sf-menu ul li.sfHover > a > .sf-sub-indicator { + background-position: 0 0; /* arrow hovers for modern browsers*/ +} + +.rtl .sf-menu li:hover ul, +.rtl .sf-menu li.sfHover ul { + right: 0; +} + +.rtl ul.sf-menu li li:hover ul, +.rtl ul.sf-menu li li.sfHover ul { + right: 12em; /* match ul width */ +} +.rtl ul.sf-menu li li li:hover ul, +.rtl ul.sf-menu li li li.sfHover ul { + right: 12em; /* match ul width */ +} + +/*** shadows for all but IE6 ***/ +.rtl .sf-shadow ul { + background: url('superfish/images/shadow.png') no-repeat bottom left; + padding: 0 0 9px 8px; + -moz-border-radius-bottomright: 17px; + -moz-border-radius-topleft: 17px; + -webkit-border-top-left-radius: 17px; + -webkit-border-bottom-right-radius: 17px; } diff --git a/lib/images/ico-separator-rtl.gif b/lib/images/ico-separator-rtl.gif Binary files differnew file mode 100644 index 00000000..d9061a46 --- /dev/null +++ b/lib/images/ico-separator-rtl.gif diff --git a/lib/superfish/images/arrows-ffffff-rtl.png b/lib/superfish/images/arrows-ffffff-rtl.png Binary files differnew file mode 100644 index 00000000..2fe14a36 --- /dev/null +++ b/lib/superfish/images/arrows-ffffff-rtl.png diff --git a/modules/gallery/css/gallery.css b/modules/gallery/css/gallery.css index 113f0e09..e06c4dd9 100644 --- a/modules/gallery/css/gallery.css +++ b/modules/gallery/css/gallery.css @@ -4,6 +4,7 @@ * Sheet organization: * 1) End-user * 2) Admin + * 3) Right to left language styles */ /** ******************************************************************* @@ -87,3 +88,12 @@ padding: .5em; margin-bottom: 1em; } + +/** ******************************************************************* + * 3) Right to left language styles + **********************************************************************/ + +.rtl #g-block-admin .g-left { + margin-left: 1em; + margin-right: 0; +}
\ No newline at end of file diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt index 9146ddb2..3eaa6561 100644 --- a/modules/gallery/tests/xss_data.txt +++ b/modules/gallery/tests/xss_data.txt @@ -119,7 +119,7 @@ modules/gallery/views/admin_themes.html.php 76 DIRTY $info- modules/gallery/views/admin_themes.html.php 78 DIRTY $info->description modules/gallery/views/admin_themes_preview.html.php 7 DIRTY_ATTR $url modules/gallery/views/in_place_edit.html.php 2 DIRTY form::open($action,array("method"=>"post","id"=>"g-in-place-edit-form","class"=>"g-short-form"),$hidden) -modules/gallery/views/in_place_edit.html.php 5 DIRTY form::input("input",$form["input"]," class='textbox'") +modules/gallery/views/in_place_edit.html.php 5 DIRTY form::input("input",$form["input"]," class=\"textbox\"") modules/gallery/views/in_place_edit.html.php 12 DIRTY form::close() modules/gallery/views/in_place_edit.html.php 14 DIRTY $errors["input"] modules/gallery/views/kohana_error_page.php 102 DIRTY $message @@ -203,10 +203,10 @@ modules/gallery/views/permissions_form.html.php 75 DIRTY_JS $item- modules/gallery/views/permissions_form.html.php 80 DIRTY_JS $group->id modules/gallery/views/permissions_form.html.php 80 DIRTY_JS $permission->id modules/gallery/views/permissions_form.html.php 80 DIRTY_JS $item->id -modules/gallery/views/simple_uploader.html.php 7 DIRTY_JS url::file("lib/uploadify/uploadify.swf") -modules/gallery/views/simple_uploader.html.php 8 DIRTY_JS url::site("simple_uploader/add_photo/{$item->id}") -modules/gallery/views/simple_uploader.html.php 15 DIRTY_JS url::file("lib/uploadify/cancel.png") -modules/gallery/views/simple_uploader.html.php 43 DIRTY_JS t("Completed") +modules/gallery/views/simple_uploader.html.php 20 DIRTY_JS url::file("lib/uploadify/uploadify.swf") +modules/gallery/views/simple_uploader.html.php 21 DIRTY_JS url::site("simple_uploader/add_photo/{$item->id}") +modules/gallery/views/simple_uploader.html.php 28 DIRTY_JS url::file("lib/uploadify/cancel.png") +modules/gallery/views/simple_uploader.html.php 56 DIRTY_JS t("Completed") modules/gallery/views/upgrader.html.php 57 DIRTY_ATTR $done?"muted":"" modules/gallery/views/upgrader.html.php 61 DIRTY_ATTR $done?"muted":"" modules/gallery/views/upgrader.html.php 69 DIRTY_ATTR $module->version==$module->code_version?"current":"upgradeable" @@ -232,15 +232,16 @@ modules/organize/views/organize_dialog.html.php 3 DIRTY_JS url::s modules/organize/views/organize_dialog.html.php 4 DIRTY_JS url::site("organize/rearrange/__TARGET_ID__/__BEFORE__?csrf=$csrf") modules/organize/views/organize_dialog.html.php 5 DIRTY_JS url::site("organize/sort_order/__ALBUM_ID__/__COL__/__DIR__?csrf=$csrf") modules/organize/views/organize_dialog.html.php 6 DIRTY_JS url::site("organize/tree/__ALBUM_ID__") -modules/organize/views/organize_dialog.html.php 20 DIRTY $album_tree -modules/organize/views/organize_dialog.html.php 27 DIRTY $micro_thumb_grid -modules/organize/views/organize_dialog.html.php 35 DIRTY form::dropdown(array("id"=>"g-organize-sort-column"),album::get_sort_order_options(),$album->sort_column) -modules/organize/views/organize_dialog.html.php 36 DIRTY form::dropdown(array("id"=>"g-organize-sort-order"),array("ASC"=>"Ascending","DESC"=>"Descending"),$album->sort_order) +modules/organize/views/organize_dialog.html.php 14 DIRTY $album_tree +modules/organize/views/organize_dialog.html.php 24 DIRTY $micro_thumb_grid +modules/organize/views/organize_dialog.html.php 32 DIRTY form::dropdown(array("id"=>"g-organize-sort-column"),album::get_sort_order_options(),$album->sort_column) +modules/organize/views/organize_dialog.html.php 33 DIRTY form::dropdown(array("id"=>"g-organize-sort-order"),array("ASC"=>"Ascending","DESC"=>"Descending"),$album->sort_order) modules/organize/views/organize_thumb_grid.html.php 3 DIRTY_ATTR $child->id modules/organize/views/organize_thumb_grid.html.php 4 DIRTY_ATTR $child->id modules/organize/views/organize_thumb_grid.html.php 5 DIRTY_ATTR $child->is_album()?"g-album":"g-photo" modules/organize/views/organize_thumb_grid.html.php 6 DIRTY $child->thumb_img(array("class"=>"g-thumbnail","ref"=>$child->id),90,true) -modules/organize/views/organize_thumb_grid.html.php 14 DIRTY_JS url::site("organize/album/$album->id/".($offset+25)) +modules/organize/views/organize_thumb_grid.html.php 7 DIRTY $child->is_album()?" class=\"ui-icon ui-icon-note\"":"" +modules/organize/views/organize_thumb_grid.html.php 15 DIRTY_JS url::site("organize/album/$album->id/".($offset+25)) modules/organize/views/organize_tree.html.php 2 DIRTY_ATTR access::can("edit",$album)?"":"g-view-only" modules/organize/views/organize_tree.html.php 3 DIRTY_ATTR $album->id modules/organize/views/organize_tree.html.php 6 DIRTY_ATTR $selected&&$album->id==$selected->id?"selected":"" @@ -248,7 +249,7 @@ modules/organize/views/organize_tree.html.php 7 DIRTY_ATTR $alb modules/organize/views/organize_tree.html.php 13 DIRTY View::factory("organize_tree.html",array("selected"=>$selected,"album"=>$child)); modules/organize/views/organize_tree.html.php 15 DIRTY_ATTR access::can("edit",$child)?"":"g-view-only" modules/organize/views/organize_tree.html.php 16 DIRTY_ATTR $child->id -modules/organize/views/organize_tree.html.php 19 DIRTY_ATTR $child->id +modules/organize/views/organize_tree.html.php 18 DIRTY_ATTR $child->id modules/recaptcha/views/admin_recaptcha.html.php 11 DIRTY $form modules/recaptcha/views/admin_recaptcha.html.php 23 DIRTY_JS $public_key modules/recaptcha/views/form_recaptcha.html.php 7 DIRTY_JS $public_key @@ -346,8 +347,9 @@ themes/wind/views/album.html.php 16 DIRTY_ATTR $chi themes/wind/views/album.html.php 16 DIRTY_ATTR $item_class themes/wind/views/album.html.php 18 DIRTY_JS $child->url() themes/wind/views/album.html.php 19 DIRTY $child->thumb_img(array("class"=>"g-thumbnail")) -themes/wind/views/album.html.php 23 DIRTY_JS $child->url() -themes/wind/views/album.html.php 41 DIRTY $theme->paginator() +themes/wind/views/album.html.php 23 DIRTY_ATTR $item_class +themes/wind/views/album.html.php 24 DIRTY_JS $child->url() +themes/wind/views/album.html.php 42 DIRTY $theme->paginator() themes/wind/views/block.html.php 3 DIRTY_ATTR $anchor themes/wind/views/block.html.php 5 DIRTY_ATTR $css_id themes/wind/views/block.html.php 6 DIRTY $title @@ -373,10 +375,10 @@ themes/wind/views/page.html.php 104 DIRTY_JS $paren themes/wind/views/page.html.php 120 DIRTY $content themes/wind/views/page.html.php 126 DIRTY newView("sidebar.html") themes/wind/views/page.html.php 133 DIRTY $footer_text -themes/wind/views/paginator.html.php 32 DIRTY_JS $first_page_url -themes/wind/views/paginator.html.php 41 DIRTY_JS $previous_page_url -themes/wind/views/paginator.html.php 69 DIRTY_JS $next_page_url -themes/wind/views/paginator.html.php 78 DIRTY_JS $last_page_url +themes/wind/views/paginator.html.php 33 DIRTY_JS $first_page_url +themes/wind/views/paginator.html.php 42 DIRTY_JS $previous_page_url +themes/wind/views/paginator.html.php 70 DIRTY_JS $next_page_url +themes/wind/views/paginator.html.php 79 DIRTY_JS $last_page_url themes/wind/views/photo.html.php 8 DIRTY_JS $theme->item()->width themes/wind/views/photo.html.php 8 DIRTY_JS $theme->item()->height themes/wind/views/photo.html.php 18 DIRTY $theme->paginator() diff --git a/modules/gallery/views/admin_sidebar.html.php b/modules/gallery/views/admin_sidebar.html.php index b394aa19..75499cb0 100644 --- a/modules/gallery/views/admin_sidebar.html.php +++ b/modules/gallery/views/admin_sidebar.html.php @@ -43,16 +43,16 @@ <div class="g-block-content"> <div id="g-site-blocks" ref="<?= url::site("admin/sidebar/update?csrf={$csrf}__ACTIVE__") ?>"> - <div class="g-admin-blocks-list"> - <div><h3><?= t("Available blocks") ?></h3></div> + <div class="g-admin-blocks-list g-left"> + <h3><?= t("Available blocks") ?></h3> <div> <ul id="g-available-blocks" class="g-sortable-blocks"> <?= $available ?> </ul> </div> </div> - <div class="g-admin-blocks-list"> - <div><h3><?= t("Active blocks") ?></h3></div> + <div class="g-admin-blocks-list g-left"> + <h3><?= t("Active blocks") ?></h3> <div> <ul id="g-active-blocks" class="g-sortable-blocks"> <?= $active ?> diff --git a/modules/image_block/helpers/image_block_installer.php b/modules/image_block/helpers/image_block_installer.php deleted file mode 100644 index 04a15619..00000000 --- a/modules/image_block/helpers/image_block_installer.php +++ /dev/null @@ -1,30 +0,0 @@ -<?php defined("SYSPATH") or die("No direct script access."); -/** - * Gallery - a web based photo album viewer and editor - * Copyright (C) 2000-2009 Bharat Mediratta - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or (at - * your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. - */ -class image_block_installer { - static function install() { - module::set_version("image_block", 2); - } - - static function upgrade($version) { - if ($version == 1) { - module::set_version("image_block", 2); - } - } -} diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css index 64120cef..12fa695d 100644 --- a/themes/wind/css/screen.css +++ b/themes/wind/css/screen.css @@ -443,3 +443,7 @@ td { left: auto; right: 150px; } + +.rtl #g-view-menu #g-slideshow-link { + background-image: url('../images/ico-view-slideshow-rtl.png'); +} diff --git a/themes/wind/images/ico-view-slideshow-rtl.png b/themes/wind/images/ico-view-slideshow-rtl.png Binary files differnew file mode 100644 index 00000000..5788b3c3 --- /dev/null +++ b/themes/wind/images/ico-view-slideshow-rtl.png |
