diff --git a/3.0/themes/pear4gallery3/admin/controllers/admin_theme_options.php b/3.0/themes/pear4gallery3/admin/controllers/admin_theme_options.php index 7746cdb8..0befe51b 100644 --- a/3.0/themes/pear4gallery3/admin/controllers/admin_theme_options.php +++ b/3.0/themes/pear4gallery3/admin/controllers/admin_theme_options.php @@ -77,11 +77,14 @@ class Admin_Theme_Options_Controller extends Admin_Controller { $group = $form->group("edit_theme")->label(t("General Settings")); $group->input("favicon") - ->label(t("URL (or relative path) to your favicon.ico")) + ->label(t("URL (relative path) to your favicon.ico")) ->value(module::get_var("gallery", "favicon_url")); $group->input("appletouchicon") - ->label(t("URL (or relative path) to your apple-touch-icon.png")) + ->label(t("URL (relative path) to apple-touch-icon.png")) ->value(module::get_var("gallery", "appletouchicon_url")); + $group->input("logo_path") + ->label(t("URL (relative path) to custom logo")) + ->value(module::get_var("gallery", "logo_path")); $group->input("slideshow_time") ->label(t("Slideshow timeout (in ms)")) ->value(module::get_var("th_pear4gallery3", "slideshow_time", "5000")); @@ -89,6 +92,9 @@ class Admin_Theme_Options_Controller extends Admin_Controller { /* Advanced Options - General ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ $group = $form->group("edit_theme_adv_main")->label(t("Advanced Options - General")); + $group->checkbox("hide_item_count") + ->label(t("Hide Album Count")) + ->checked(module::get_var("th_pear4gallery3", "hide_item_count")); $group->checkbox("hide_logo") ->label(t("Hide Bottom Pear Logo")) ->checked(module::get_var("th_pear4gallery3", "hide_logo")); @@ -108,11 +114,14 @@ class Admin_Theme_Options_Controller extends Admin_Controller { ->checked(module::get_var("th_pear4gallery3", "show_breadcrumbs")); $group->dropdown("sidebar_view") ->label(t("Show Sidebar mode")) - ->options(array("hidden" => t("Hidden (Default)"), "static" => t("Always visible"), "toggle" => t("Toggleable"))) + ->options(array("hidden" => t("Hidden (Default)"), "static" => t("Always visible"), "toggle" => t("Hover"), "button" => t("Togglable via button"))) ->selected(module::get_var("th_pear4gallery3", "sidebar_view")); $group->input("ga_code") ->label(t("Google analytics code.")) ->value(module::get_var("th_pear4gallery3", "ga_code")); + $group->input("skimm_lim") + ->label(t("Limit amount of thumbs in album skimming")) + ->value(module::get_var("th_pear4gallery3", "skimm_lim", "50")); /* Advanced Options - Mosaic page ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ @@ -155,6 +164,7 @@ class Admin_Theme_Options_Controller extends Admin_Controller { $group->checkbox("build_resize")->label(t("Mark all Image Resizes for Rebuild"))->checked(false); $group->checkbox("build_thumbs")->label(t("Mark all Thumbnails for Rebuild"))->checked(false); $group->checkbox("build_exif")->label(t("Mark Exif Info data for reload"))->checked(false); + $iptccheck = module::is_active("iptc") and module::info("iptc"); if ($iptccheck): $group->checkbox("build_iptc")->label(t("Mark IPTC Info data for reload"))->checked(false); endif; @@ -208,6 +218,7 @@ class Admin_Theme_Options_Controller extends Admin_Controller { } protected function legacy() { + module::clear_var("th_pear4gallery3", "hide_item_count"); module::clear_var("th_pear4gallery3", "hide_logo"); module::clear_var("th_pear4gallery3", "mainmenu_view"); module::clear_var("th_pear4gallery3", "show_guest_menu"); @@ -216,6 +227,7 @@ class Admin_Theme_Options_Controller extends Admin_Controller { module::clear_var("th_pear4gallery3", "show_sidebar"); module::clear_var("th_pear4gallery3", "sidebar_view"); module::clear_var("th_pear4gallery3", "ga_code"); + module::clear_var("th_pear4gallery3", "skimm_lim"); module::clear_var("th_pear4gallery3", "mosaic_effect"); } @@ -259,12 +271,6 @@ class Admin_Theme_Options_Controller extends Admin_Controller { endif; $purge_cache = $form->maintenance->purge_cache->value; - $thumb_descmode_a = $form->edit_theme_adv_thumb->thumb_descmode_a->value; - $thumb_descmode = $form->edit_theme_adv_thumb->thumb_descmode->value; - $thumb_metamode = $form->edit_theme_adv_thumb->thumb_metamode->value; - $photo_descmode = $form->edit_theme_adv_photo->photo_descmode->value; - $photo_popupbox = $form->edit_theme_adv_photo->photo_popupbox->value; - if ($build_resize): graphics::remove_rule("gallery", "resize", "gallery_graphics::resize"); graphics::add_rule("gallery", "resize", "gallery_graphics::resize", @@ -291,12 +297,13 @@ class Admin_Theme_Options_Controller extends Admin_Controller { module::set_var("gallery", "page_size", 50); module::set_var("gallery", "favicon_url", $form->edit_theme->favicon->value); module::set_var("gallery", "appletouchicon_url", $form->edit_theme->appletouchicon->value); + module::set_var("gallery", "logo_path", $form->edit_theme->logo_path->value); - $this->save_item_state("logo_path", $form->edit_theme->logo_path->value, $form->edit_theme->logo_path->value); $this->save_item_state("slideshow_time", $form->edit_theme->slideshow_time->value != 5000, filter_var($form->edit_theme->slideshow_time->value, FILTER_VALIDATE_INT, array('options' => array('default' => 5000, 'min_range' => 1000)))); // * Advanced Options - General ****************************************** + $this->save_item_state("hide_item_count", $form->edit_theme_adv_main->hide_item_count->value, TRUE); $this->save_item_state("hide_logo", $form->edit_theme_adv_main->hide_logo->value, TRUE); $this->save_item_state("mainmenu_view", $form->edit_theme_adv_main->mainmenu_view->value != "grid", $form->edit_theme_adv_main->mainmenu_view->value); $this->save_item_state("show_guest_menu",$form->edit_theme_adv_main->show_guest_menu->value, TRUE); @@ -304,6 +311,7 @@ class Admin_Theme_Options_Controller extends Admin_Controller { $this->save_item_state("show_breadcrumbs",$form->edit_theme_adv_main->show_breadcrumbs->value, TRUE); $this->save_item_state("sidebar_view",$form->edit_theme_adv_main->sidebar_view->value != "hidden", $form->edit_theme_adv_main->sidebar_view->value); $this->save_item_state("ga_code", $form->edit_theme_adv_main->ga_code->value, $form->edit_theme_adv_main->ga_code->value); + $this->save_item_state("skimm_lim", $form->edit_theme_adv_main->skimm_lim->value != 50, $form->edit_theme_adv_main->skimm_lim->value); // * Advanced Options - Photo page *************************************** $this->save_item_state("mosaic_effect", $form->edit_theme_adv_mosaic->mosaic_effect->value != "blind", $form->edit_theme_adv_mosaic->mosaic_effect->value); @@ -316,10 +324,6 @@ class Admin_Theme_Options_Controller extends Admin_Controller { module::event("theme_edit_form_completed", $form); - if ($_priorratio != $thumb_ratio): - message::warning(t("Thumb aspect ratio has been changed. Consider rebuilding thumbs if needed.")); - endif; - message::success(t("Updated theme details")); if ($build_exif): diff --git a/3.0/themes/pear4gallery3/admin/views/admin_include.html.php b/3.0/themes/pear4gallery3/admin/views/admin_include.html.php index 8d818bb7..7d02b05c 100644 --- a/3.0/themes/pear4gallery3/admin/views/admin_include.html.php +++ b/3.0/themes/pear4gallery3/admin/views/admin_include.html.php @@ -39,9 +39,9 @@ #gd-admin p.g-error { padding-left: 30px; border: none; margin-bottom: 0; background-image: none; } #g-content { padding: 0 1em; width: 97%; font-size: 1em; } -#g-content form ul li input { display: inline; float: left; margin-right: 0.8em; } -#g-content form ul li select { display: inline; float: left; margin-right: 0.8em; width: 50.6%; padding: 0 0 0 .2em; } -#g-content form ul li input[type='text'] { width: 50%; } +#g-content form ul li input { display: inline; float: left; margin-right: 0.8em; } +#g-content form ul li select { display: inline; float: left; margin-right: 0.8em; width: 35%; padding: 0 0 0 .2em; } +#g-content form ul li input[type='text'] { width: 35%; } #g-content form ul li textarea { height: 6em; } #g-content form input[type="submit"] { border: #5b86ab 2px solid; padding: 0.3em; color: #fff; background: url(/themes/greydragon/images/button-grad-vs.png) #5580a6 repeat-x left top; } #g-content form input[type="submit"]:hover, @@ -50,7 +50,7 @@ input.ui-state-hover { background-image: url(/themes/greydragon/images/button-gr - - - -
-
- -
-
- -
-
- -
+
+ + +
-
- - album_bottom() ?> -paginator() ?> diff --git a/3.0/themes/pear4gallery3/views/dynamic.html.php b/3.0/themes/pear4gallery3/views/dynamic.html.php index a8a4d362..7f3b9c40 100644 --- a/3.0/themes/pear4gallery3/views/dynamic.html.php +++ b/3.0/themes/pear4gallery3/views/dynamic.html.php @@ -1,29 +1,6 @@ -
-
- dynamic_top() ?> -
-

-
- - +dynamic_top() ?> + + dynamic_bottom() ?> -paginator() ?> diff --git a/3.0/themes/pear4gallery3/views/exif_dialog.html.php b/3.0/themes/pear4gallery3/views/exif_dialog.html.php index 7c845a06..32d3fae0 100644 --- a/3.0/themes/pear4gallery3/views/exif_dialog.html.php +++ b/3.0/themes/pear4gallery3/views/exif_dialog.html.php @@ -4,7 +4,7 @@ .g-odd { background: #333; } .g-even { background: #222; } -

+

diff --git a/3.0/themes/pear4gallery3/views/facebook_comment.html.php b/3.0/themes/pear4gallery3/views/facebook_comment.html.php new file mode 100644 index 00000000..1558d68c --- /dev/null +++ b/3.0/themes/pear4gallery3/views/facebook_comment.html.php @@ -0,0 +1,16 @@ + +
+
+ + +
+ + diff --git a/3.0/themes/pear4gallery3/views/hoverView.html.php b/3.0/themes/pear4gallery3/views/hoverView.html.php index b38ad8f7..eb1f59c5 100644 --- a/3.0/themes/pear4gallery3/views/hoverView.html.php +++ b/3.0/themes/pear4gallery3/views/hoverView.html.php @@ -3,21 +3,21 @@
- -
+
-
-
-
-
- - -
- -
-
+
+
+ +
+
+ +
+
+
+ + +
+
diff --git a/3.0/themes/pear4gallery3/views/page.html.php b/3.0/themes/pear4gallery3/views/page.html.php index c0170162..7891aad9 100644 --- a/3.0/themes/pear4gallery3/views/page.html.php +++ b/3.0/themes/pear4gallery3/views/page.html.php @@ -1,14 +1,18 @@ +page_subtype == "photo"): foreach (end($parents)->viewable()->children() as $i => $child) if(!($child->is_album() || $child->is_movie())) - if($child->url() == $_SERVER['REQUEST_URI']): - $page_size = module::get_var("gallery","page_size"); ?> - - - - - + if($child->url() == $_SERVER['REQUEST_URI']) { + header("HTTP/1.1 302 Found"); + header("Location: ".end($parents)->url()."#img=$i&viewMode=detail&redirected=true"); + die(0); + }?> @@ -49,9 +53,11 @@ script("json2-min.js") ?> - script("jquery-1.6.2.min.js") ?> + script("jquery-1.7.1.min.js") ?> script("jquery.form.js") ?> - script("jquery-ui-1.8.16.custom.min.js") ?> + script("jquery-ui-1.8.17.custom.min.js") ?> + script("jquery.endless-scroll.js") ?> + script("jquery.getscrollbarwidth.js") ?> script("gallery.common.js") ?> diff --git a/3.0/themes/pear4gallery3/views/search.html.php b/3.0/themes/pear4gallery3/views/search.html.php new file mode 100644 index 00000000..3436a00c --- /dev/null +++ b/3.0/themes/pear4gallery3/views/search.html.php @@ -0,0 +1,48 @@ + + +" id="g-search-form" class="g-short-form"> +
+ + + + +
+ + +
+

+ + + + paginator() ?> + + +

+ %term", array("term" => $q)) ?> +

+ + +
diff --git a/3.0/themes/pear4gallery3/views/thumbs.html.php b/3.0/themes/pear4gallery3/views/thumbs.html.php new file mode 100644 index 00000000..716ad657 --- /dev/null +++ b/3.0/themes/pear4gallery3/views/thumbs.html.php @@ -0,0 +1,73 @@ + +paginator() ?> + + + $child): ?> + 50) break; ?> + + is_album()): ?> + url()."/'+getAlbumHash(skimimg);"; ?> + + + is_photo()): ?> + + is_movie()): ?> + url()."';"; ?> + + + + + + + admin || access::can("add", $item)): ?> + id") ?> +
  • Add some.", + array("attrs" => html::mark_clean("href=\"$addurl\" class=\"g-dialog-link\""))) ?>
  • + +
  • + +