diff options
| -rw-r--r-- | .htaccess | 38 | ||||
| -rw-r--r-- | application/config/config.php | 2 | ||||
| -rw-r--r-- | modules/comment/views/admin_comments.html.php | 2 | ||||
| -rw-r--r-- | modules/digibug/helpers/digibug_menu.php | 18 | ||||
| -rw-r--r-- | modules/digibug/js/digibug.js | 4 | ||||
| -rw-r--r-- | modules/gallery/helpers/MY_url.php | 2 | ||||
| -rw-r--r-- | modules/gallery/helpers/graphics.php | 2 | ||||
| -rw-r--r-- | modules/gallery/helpers/movie.php | 2 | ||||
| -rw-r--r-- | modules/server_add/views/admin_server_add.html.php | 8 | ||||
| -rw-r--r-- | themes/default/css/screen.css | 185 | ||||
| -rw-r--r-- | themes/default/images/ico-print.png | bin | 0 -> 4411 bytes |
11 files changed, 120 insertions, 143 deletions
@@ -1,8 +1,34 @@ <IfModule mod_php5.c> - php_value short_open_tag 1 - php_value magic_quotes_gpc 0 - php_value register_globals 0 - php_value session.auto_start 0 - php_value upload_max_filesize 20M - php_value post_max_size 100M + php_value short_open_tag 1 + php_value magic_quotes_gpc 0 + php_value magic_quotes_sybase 0 + php_value magic_quotes_runtime 0 + php_value register_globals 0 + php_value session.auto_start 0 + php_value upload_max_filesize 20M + php_value post_max_size 100M </IfModule> + +# You can use mod_rewrite to enable short urls in Gallery 3 (which +# gets rid of the "index.php" from your urls). To do this, you must +# uncomment the block below that starts with <IfModule> and ends with +# </IfModule> then properly configure the RewriteBase line in the +# block below. You just need to change RewriteBase line to match your +# Gallery 3 URL. Here are some examples: +# +# Gallery3 URL RewriteBase line +# ============= ==================== +# http://example.com/gallery3 RewriteBase /gallery3 +# http://example.com/~bob/photos RewriteBase /~bob/photos +# http://gallery3.example.com/ RewriteBase / +# +# Then just use your Gallery 3 without the index.php in the url. +# +# <IfModule mod_rewrite.c> +# RewriteEngine On +# RewriteBase / +# RewriteCond %{REQUEST_FILENAME} !-f +# RewriteCond %{REQUEST_FILENAME} !-d +# RewriteRule ^(.*)$ index.php?kohana_uri=$1 [QSA,PT,L] +# RewriteRule ^$ index.php?kohana_uri=$1 [QSA,PT,L] +# </IfModule> diff --git a/application/config/config.php b/application/config/config.php index 2d66d1c0..e88958ed 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -54,7 +54,7 @@ $config["site_protocol"] = ""; * * This can be removed by using URL rewriting. */ -$config["index_page"] = "index.php"; +$config["index_page"] = isset($_GET["kohana_uri"]) ? "" : "index.php"; /** * Fake file extension that will be added to all generated URLs. Example: .html diff --git a/modules/comment/views/admin_comments.html.php b/modules/comment/views/admin_comments.html.php index e749fde0..86585c65 100644 --- a/modules/comment/views/admin_comments.html.php +++ b/modules/comment/views/admin_comments.html.php @@ -163,6 +163,7 @@ </a> </li> <? endif ?> + <!-- <li> <a href="javascript:reply(<?=$comment->id?>)" class="gButtonLink ui-state-default ui-icon-left"> @@ -177,6 +178,7 @@ <?= t("Edit") ?> </a> </li> + --> <li> <a href="javascript:set_state('deleted',<?=$comment->id?>)" class="gButtonLink ui-state-default ui-icon-left"> diff --git a/modules/digibug/helpers/digibug_menu.php b/modules/digibug/helpers/digibug_menu.php index 1ff0f6bf..6c466031 100644 --- a/modules/digibug/helpers/digibug_menu.php +++ b/modules/digibug/helpers/digibug_menu.php @@ -27,17 +27,13 @@ class digibug_menu { } static function photo($menu, $theme) { - } - - static function site($menu, $theme) { $item = $theme->item(); - - if ($item && access::can("edit", $item)) { - $options_menu = $menu->get("options_menu") - ->append(Menu::factory("dialog") - ->id("digibug") - ->label(t("Peform Digibug Processing")) - ->url(url::site("digibug/index/$item->id"))); - } + $csrf = access::csrf_token(); + $menu + ->append(Menu::factory("link") + ->id("digibug") + ->label(t("Print with Digibug")) + ->url(url::site("digibug/print_photo/{$item->id}?csrf={$csrf}")) + ->css_id("gDigibugLink")); } } diff --git a/modules/digibug/js/digibug.js b/modules/digibug/js/digibug.js index e9e8933e..837c8f7f 100644 --- a/modules/digibug/js/digibug.js +++ b/modules/digibug/js/digibug.js @@ -3,6 +3,10 @@ $(document).ready(function() { e.preventDefault(); queue_print(e); }); + $("#gDigibugLink").click(function(e) { + e.preventDefault(); + return queue_print(e); + }); }); function popUp(url, options) { diff --git a/modules/gallery/helpers/MY_url.php b/modules/gallery/helpers/MY_url.php index 7bee70ca..c4967c52 100644 --- a/modules/gallery/helpers/MY_url.php +++ b/modules/gallery/helpers/MY_url.php @@ -58,7 +58,7 @@ class url extends url_Core { * Return the item that the uri is referencing */ static function get_item_from_uri($uri) { - $current_uri = html_entity_decode($uri); + $current_uri = html_entity_decode($uri, ENT_QUOTES); $item = ORM::factory("item")->where("relative_path_cache", $current_uri)->find(); if (!$item->loaded) { // It's possible that the relative path cache for the item we're looking for is out of date, diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php index 3f3317ae..71b8ddd8 100644 --- a/modules/gallery/helpers/graphics.php +++ b/modules/gallery/helpers/graphics.php @@ -331,7 +331,7 @@ class graphics_Core { if (!isset($gd["GD Version"])) { $gd["GD Version"] = false; } - putenv("PATH=" . getenv("PATH") . ":/usr/local/bin"); + putenv("PATH=" . getenv("PATH") . ":/usr/local/bin:/opt/local/bin"); return array("gd" => $gd, "imagemagick" => $exec ? dirname(exec("which convert")) : false, "graphicsmagick" => $exec ? dirname(exec("which gm")) : false); diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php index 28c15d81..fcf1cc54 100644 --- a/modules/gallery/helpers/movie.php +++ b/modules/gallery/helpers/movie.php @@ -145,7 +145,7 @@ class movie_Core { static function find_ffmpeg() { if (!$ffmpeg_path = module::get_var("gallery", "ffmpeg_path")) { - putenv("PATH=" . getenv("PATH") . ":/usr/local/bin"); + putenv("PATH=" . getenv("PATH") . ":/usr/local/bin:/opt/local/bin"); if (function_exists("exec")) { $ffmpeg_path = exec("which ffmpeg"); } diff --git a/modules/server_add/views/admin_server_add.html.php b/modules/server_add/views/admin_server_add.html.php index 6f87c512..588a9fca 100644 --- a/modules/server_add/views/admin_server_add.html.php +++ b/modules/server_add/views/admin_server_add.html.php @@ -4,7 +4,10 @@ <?= t("Add From Server Admininstration") ?> </h2> <div id="gAuthorizedPath"> - <span><?= t("Authorized Paths") ?></span> + <h3><?= t("Authorized Paths") ?></h3> + <ul id="gMessage"<? if (!empty($paths)): ?> style="display: none;"<? endif ?>> + <li class="gInfo"><?= t("No Authorized image source paths defined yet") ?></li> + </ul> <ul id="gPathList"> <? foreach ($paths as $id => $path): ?> <li class="ui-icon-left"> @@ -17,9 +20,6 @@ </li> <? endforeach ?> </ul> - <div id="gNoAuthorizedPaths" <? if (!empty($paths)): ?>style="display:none"<? endif ?>> - <span class="gWarning"><?= t("No Authorized image source paths defined") ?></span> - </div> </div> <?= $form ?> </div> diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css index a450356c..c7918fc0 100644 --- a/themes/default/css/screen.css +++ b/themes/default/css/screen.css @@ -12,16 +12,13 @@ * 6) Navigation and menus * 7) Browser hacks * 8) jQuery and jQuery UI + * 9) Right-to-left language styles */ /** ******************************************************************* * 1) Basic HTML elements **********************************************************************/ -.rtl { - direction: rtl; -} - body, html { background-color: #ccc; font-family: 'Lucida Grande', 'Lucida Sans', Arial, sans-serif; @@ -31,17 +28,11 @@ p { margin-bottom: 1em; } -strong { - font-weight: bold; -} - em { font-style: oblique; } -/* Headings ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ - -h1, h2, h3, h4, h5 { +h1, h2, h3, h4, h5, strong, th { font-weight: bold; } @@ -53,6 +44,10 @@ h1 { margin-bottom: 1em; } +#gProgress h1 { + font-size: 1.1em; +} + h2 { font-size: 1.4em; } @@ -71,7 +66,8 @@ a, .gMenu a, #gDialog a, .gButtonLink, -.gButtonLink:hover { +.gButtonLink:hover, +.gButtonLink:active { color: #5382BF !important; text-decoration: none; -moz-outline-style: none; @@ -92,11 +88,12 @@ a:hover, margin: .3em 1em; } -#gForgotPasswordLink, .rtl #gDialog .gCancel { +#gForgotPasswordLink { float: right; + font-size: .9em; } -#gDialog .gCancel, .rtl #gForgotPasswordLink { +#gDialog .gCancel { float: left; } @@ -115,15 +112,6 @@ th { text-align: left; } -.rtl caption, -.rtl th { - text-align: right; -} - -th { - font-weight: bold; -} - th, td { border: none; @@ -152,7 +140,9 @@ legend { #gHeader legend, #gSidebar legend, -#gContent #gSearchForm legend { +#gContent #gSearchForm legend, +input[type="hidden"], +.gShortForm label { display: none; } @@ -174,10 +164,6 @@ textarea { color: #333; } -input[type="hidden"] { - display: none; -} - textarea { width: 100%; height: 12em; @@ -205,10 +191,6 @@ form ul ul li { float: left; } -.rtl form ul ul li { - float: right; -} - input, select, textarea { @@ -224,11 +206,6 @@ input[type="reset"] { float: left; } -.rtl input[type="submit"], -.rtl input[type="reset"] { - float: right; -} - /* Form validation ~~~~~~~~~~~~~~~~~~~~~~~ */ .gValidationRule { @@ -385,14 +362,6 @@ form .gError, padding: .4em 0; } -.rtl .gShortForm li { - float: right; -} - -.gShortForm label { - display: none; -} - .gShortForm input[type="text"] { color: #666; padding: .3em .6em; @@ -453,21 +422,12 @@ form .gError, margin: -4px 10px 0 0; } -.rtl #gHeader #gLogo { - float: right; -} - #gHeader #gQuickSearchForm { clear: right; float: right; margin: 1em 0; } -.rtl #gHeader #gQuickSearchForm { - clear: left; - float: left; -} - #gHeader #gQuickSearchForm input[type='text'] { width: 17em; } @@ -481,14 +441,6 @@ form .gError, padding-left: 1em; } -/* Album/Photo information ~~~~~~~~~~~~~~~ */ - -#gContent #gInfo { -} - -#gContent #gInfo .gDescription { -} - /* Album content ~~~~~~~~~~~~~~~~~~~~~~~~~ */ #gContent #gAlbumGrid { @@ -508,11 +460,6 @@ form .gError, width: 213px; } - -.rtl #gContent #gAlbumGrid .gItem { - float: right; -} - #gContent #gAlbumGrid .gItem h2 { margin: 5px 0; } @@ -618,10 +565,6 @@ form .gError, float: right; } -.rtl #gHeader #gLoginMenu { - float: left; -} - /* Site Menu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ #gSiteMenu { @@ -630,10 +573,6 @@ form .gError, padding: 0 20px 0 0; } -.rtl #gSiteMenu { - float: right; -} - #gSiteMenu ul { margin-bottom: 0; } @@ -665,6 +604,10 @@ form .gError, background-image: url('../images/ico-view-comments.png'); } +#gViewMenu #gDigibugLink { + background-image: url('../images/ico-print.png'); +} + /* Breadcrumbs ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ .gBreadcrumbs { @@ -681,10 +624,6 @@ form .gError, padding: 10px 6px 10px 16px !important; } -.rtl .gBreadcrumbs li { - float: right; -} - .gBreadcrumbs li.root { background: transparent; } @@ -785,10 +724,6 @@ form .gError, width: 30%; } -.rtl .gPager li { - float: right; -} - .gPager .gInfo { text-align: center; width: 40%; @@ -852,17 +787,9 @@ form .gError, } #gDialog { - font-family: inherit; - font-size: inherit; text-align: left; } -.rtl #gDialog { - font-family: inherit; - font-size: inherit; - text-align: right; -} - #gDialog li { padding-left: 0; } @@ -904,10 +831,6 @@ form .gError, float: left; } -.rtl .gButtonSet li { - float: right; -} - .gButtonSet .gButtonLink { margin: 0; } @@ -917,19 +840,11 @@ form .gError, margin-right: .2em; } -.rtl .ui-icon-left .ui-icon { - float: right; -} - .ui-icon-right .ui-icon { float: right; margin-left: .2em; } -.rtl .ui-icon-right .ui-icon { - float: left; -} - .ui-icon-rotate-ccw { background-position: -192px -64px; } @@ -949,6 +864,7 @@ form .gError, } /* Server Add */ + .gCheckboxTree input { display: inline; } @@ -987,7 +903,7 @@ form .gError, font-size: 1em; padding: 0; margin: 0; - border-top-width: 0px; + border-top-width: 0; } #gServerAdd p { @@ -998,10 +914,10 @@ form .gError, padding: 10px 6px 10px 16px; } - /* Permissions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -#gPermissions .gDenied, #gPermissions .gAllowed { +#gPermissions .gDenied, +#gPermissions .gAllowed { text-align: center; vertical-align: middle; } @@ -1012,22 +928,18 @@ form .gError, background-color: #cfc; } - /*************** STUFF THAT NEEDS A HOME ****************/ -#gProgress h1 { - font-size: 1.1em; -} .gProgressBar { height: 1em; width: 100%; - margin-top: 0.5em; + margin-top: .5em; display: inline-block; } #gAddPhotos p { - margin: 0px; - padding: 0px; + margin: 0; + padding: 0; } #gAddPhotosCanvas { @@ -1091,13 +1003,50 @@ form .gError, margin-bottom: 10px; } -#gAdminG2ImportNotes p, #gAdminG2ImportDetails .gInfo p { - padding: 0px; - margin: 0px; +#gAdminG2ImportNotes p, +#gAdminG2ImportDetails .gInfo p { + padding: 0; + margin: 0; } -#gAdminG2ImportNotes ul li, #gAdminG2Import .gInfo ul li { - padding-left: 0px; +#gAdminG2ImportNotes ul li, +#gAdminG2Import .gInfo ul li { + padding-left: 0; margin-left: 20px; list-style-type: disc; } + +/* Right to left styles ~~~~~~~~~~~~~~~~~~~~ */ + +.rtl { + direction: rtl; +} + +.rtl caption, +.rtl th, +.rtl #gDialog { + text-align: right; +} + +.rtl #gHeader #gQuickSearchForm, +.rtl #gForgotPasswordLink, +.rtl #gHeader #gLoginMenu, +.rtl .ui-icon-right .ui-icon { + clear: left; + float: left; +} + +.rtl #gDialog .gCancel, +.rtl form ul ul li, +.rtl input[type="submit"], +.rtl input[type="reset"], +.rtl .gShortForm li, +.rtl #gHeader #gLogo, +.rtl #gContent #gAlbumGrid .gItem, +.rtl #gSiteMenu, +.rtl .gBreadcrumbs li, +.rtl .gPager li, +.rtl .gButtonSet li, +.rtl .ui-icon-left .ui-icon { + float: right; +}
\ No newline at end of file diff --git a/themes/default/images/ico-print.png b/themes/default/images/ico-print.png Binary files differnew file mode 100644 index 00000000..087e6694 --- /dev/null +++ b/themes/default/images/ico-print.png |
