From 4f1538d87b1093d430523aeb717e375b2c8b1c92 Mon Sep 17 00:00:00 2001 From: Serguei Dosyukov Date: Thu, 3 Dec 2009 00:00:03 -0600 Subject: [PATCH] Grey Dragon Theme - version 1.5.8 --- .../admin/controllers/admin_theme_options.php | 146 ++++++++++++++++++ themes/greydragon/changelog.txt | 13 ++ themes/greydragon/css/screen.css | 6 +- themes/greydragon/images/logo.png | Bin 6027 -> 0 bytes themes/greydragon/theme.info | 2 +- themes/greydragon/views/album.html.php | 7 + themes/greydragon/views/dynamic.html.php | 6 + themes/greydragon/views/page.html.php | 68 +++++--- themes/greydragon/views/photo.html.php | 10 +- themes/greydragon/views/search.html.php | 11 +- 10 files changed, 234 insertions(+), 35 deletions(-) create mode 100644 themes/greydragon/admin/controllers/admin_theme_options.php delete mode 100644 themes/greydragon/images/logo.png diff --git a/themes/greydragon/admin/controllers/admin_theme_options.php b/themes/greydragon/admin/controllers/admin_theme_options.php new file mode 100644 index 00000000..ed4d0426 --- /dev/null +++ b/themes/greydragon/admin/controllers/admin_theme_options.php @@ -0,0 +1,146 @@ +"g-theme-options-form")); + + $group = $form->group("requirements")->label("Prerequisites checklist"); + $group->checkbox("shadowbox")->label(t("Shadowbox module")) + ->checked((module::is_active("shadowbox")))->disabled(true); + + $file = THEMEPATH . "greydragon/theme.info"; + $theme_info = new ArrayObject(parse_ini_file($file), ArrayObject::ARRAY_AS_PROPS); + + $group = $form->group("edit_theme")->label(t("Grey Dragon Theme") . " - " . t("v.") . $theme_info->version); + $group->input("row_count")->label(t("Rows per album page"))->id("g-page-size") + ->rules("required|valid_digit") + ->value(module::get_var("gallery", "page_size") / 3); + + $group->input("resize_size")->label(t("Resized image size (in pixels)"))->id("g-resize-size") + ->rules("required|valid_digit") + ->value(module::get_var("gallery", "resize_size")); + $group->checkbox("build_resize")->label(t("Mark to build all resizes (from Maintenace page)"))->id("g-build-resize")->value(false); + $group->checkbox("build_thumbs")->label(t("Mark to build all thumbnails (200x200) (from Maintenace page)"))->id("g-build-thumb")->value(false); + + $group->checkbox("photonav_top")->label(t("Show top photo navigator")) + ->checked(module::get_var("th_greydragon", "photonav_top")); + $group->checkbox("photonav_bottom")->label(t("Show bottom photo navigator")) + ->checked(module::get_var("th_greydragon", "photonav_bottom")); + + $group->dropdown("sidebar_allowed")->label(t("Allowed SideBar Positions")) + ->options(array("any" => t("Any"), "left" => t("Left"), "right" => t("Right"), "none" => t("None"))) + ->selected(module::get_var("th_greydragon", "sidebar_allowed")); + $group->dropdown("sidebar_visible")->label(t("Default SideBar Position")) + ->options(array("right" => t("Right"), "left" => t("Left"), "none" => t("None"))) + ->selected(module::get_var("th_greydragon", "sidebar_visible")); + + $group->input("header_text")->label(t("Header text"))->id("g-header-text") + ->value(module::get_var("gallery", "header_text")); + $group->input("footer_text")->label(t("Footer text"))->id("g-footer-text") + ->value(module::get_var("gallery", "footer_text")); + $group->checkbox("show_credits")->label(t("Show site credits"))->id("g-footer-text") + ->checked(module::get_var("gallery", "show_credits")); + + $group->input("copyright")->label(t("Copyright message to display on footer"))->id("g-theme-copyright") + ->value(module::get_var("th_greydragon", "copyright")); + $group->input("logo_path")->label(t("URL or path to alternate logo image"))->id("g-site-logo") + ->value(module::get_var("th_greydragon", "logo_path")); + + module::event("theme_edit_form", $form); + + $group = $form->group("buttons"); + $group->submit("")->value(t("Save")); + return $form; + } + + public function index() { + $view = new Admin_View("admin.html"); + $view->content = new View("admin_theme_options.html"); + $view->content->form = self::get_edit_form_admin(); + print $view; + } + + public function save() { + access::verify_csrf(); + + $form = self::get_edit_form_admin(); + if ($form->validate()) { + $edit_theme = $form->edit_theme; + + module::set_var("gallery", "page_size", $edit_theme->row_count->value * 3); + + $resize_size = $edit_theme->resize_size->value; + $thumb_size = 200; + $build_resize = $edit_theme->build_resize->value; + $build_thumbs = $edit_theme->build_thumbs->value; + + if (module::get_var("gallery", "resize_size") != $resize_size) { + module::set_var("gallery", "resize_size", $resize_size); + $build_resize = true; + } + if (module::get_var("gallery", "thumb_size") != $thumb_size) { + module::set_var("gallery", "thumb_size", $thumb_size); + } + + if ($build_resize) { + graphics::remove_rule("gallery", "resize", "gallery_graphics::resize"); + graphics::add_rule("gallery", "resize", "gallery_graphics::resize", + array("width" => $resize_size, "height" => $resize_size, "master" => Image::AUTO), 100); + } + + if ($build_thumbs) { + graphics::remove_rule("gallery", "thumb", "gallery_graphics::resize"); + graphics::add_rule("gallery", "thumb", "gallery_graphics::resize", + array("width" => 200, "height" => 200, "master" => Image::AUTO), 100); + } + + module::set_var("th_greydragon", "photonav_top", $edit_theme->photonav_top->value); + module::set_var("th_greydragon", "photonav_bottom", $edit_theme->photonav_bottom->value); + + $sidebar_allowed = $edit_theme->sidebar_allowed->value; + $sidebar_visible = $edit_theme->sidebar_visible->value; + + if ($sidebar_allowed == "none") { $sidebar_visible = "none"; } + if ($sidebar_allowed == "right") { $sidebar_visible = "right"; } + if ($sidebar_allowed == "left") { $sidebar_visible = "left"; } + + module::set_var("th_greydragon", "sidebar_allowed", $sidebar_allowed); + module::set_var("th_greydragon", "sidebar_visible", $sidebar_visible); + + module::set_var("gallery", "header_text", $edit_theme->header_text->value); + module::set_var("gallery", "footer_text", $edit_theme->footer_text->value); + module::set_var("gallery", "show_credits", $edit_theme->show_credits->value); + + module::set_var("th_greydragon", "copyright", $edit_theme->copyright->value); + module::set_var("th_greydragon", "logo_path", $edit_theme->logo_path->value); + + module::event("theme_edit_form_completed", $form); + + message::success(t("Updated theme details")); + url::redirect("admin/theme_options"); + } else { + $view = new Admin_View("admin.html"); + $view->content = $form; + print $view; + } + } +} + diff --git a/themes/greydragon/changelog.txt b/themes/greydragon/changelog.txt index 6db84369..f6750d23 100644 --- a/themes/greydragon/changelog.txt +++ b/themes/greydragon/changelog.txt @@ -1,5 +1,18 @@ Grey Dragon Theme Changelog +version 1.5.8 +- Finally admin module for theme is there. After theme installation, visit Appearance/Theme Options to configure the theme. + If you had older version of the theme, initial setup is also required. + The following settings are available: + - Rows per album page - theme uses 3 columns layout for pictures, therefore default page_size is computed in x3 increments + - Thumb size is restricted to 200 and therefore not available for administration + - Mark to build resizes/thumbs - allows force rebuilding of images + - Show/Hide top/bottom photo navigators + - Specify allowed and default sidebar position + - Administrator can now specify Copyright message to display in the footer + - Site logo is now default to Gallery 3 logo, but admin can provide a path to custom logo. +- Sidebar session cookie is set to expire in 365 days + version 1.5.7 - Status message has been moved into header as popup to prevent obstruction of the main view. jQuery is used to fade it out in 10 sec. diff --git a/themes/greydragon/css/screen.css b/themes/greydragon/css/screen.css index 86d28b45..974521a1 100644 --- a/themes/greydragon/css/screen.css +++ b/themes/greydragon/css/screen.css @@ -81,7 +81,7 @@ h5 { font-weight: bold; } /* Pagination ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -.g-paginator { display: inline-block; width: 100%; padding: 4px 0 6px 0; font-size: 80%; zoom: 1; } +.g-paginator { display: inline-block; width: 100%; padding: 4px 0 0 0; font-size: 80%; zoom: 1; } .g-paginator li { display: inline; float: left; margin-left: 0; zoom: 1; } .g-paginator a { padding: 0 0 0 2px; } @@ -91,7 +91,7 @@ h5 { font-weight: bold; } /* Album grid ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ .g-thumbcrop { overflow: hidden; position: relative; width: 200px; height: 150px; } -#g-album-grid { padding: 0px; width: 100%; } +#g-album-grid { padding: 6px 0 0 0; width: 100%; } #g-album-grid .g-item { position: relative; float: left; padding: 10px 9px 0px 9px; width: 30.5%; height: 190px; background: url('../images/image_thumb.gif') no-repeat; } #g-album-grid .g-item p { text-align: center; } #g-album-grid h2 { position: absolute; top: 164px; left: 12px; width: 150px; font: 100%/100% Arial, Helvetica, sans-serif; } @@ -119,7 +119,7 @@ h5 { font-weight: bold; } #g-info h1 { padding-bottom: 1px; border-bottom: 1px solid #888; } #g-info .g-description { display: none; } /* #g-info h1:hover .g-description { position: relative; z-index: 10; top: 10px; left: 0px; width: 90%; display: block; afloat: left; border: 1px solid #888; padding: 6px; }*/ -#g-photo { padding: 6px 0 0 6px; text-align: center; } +#g-photo { padding: 6px 0 6px 6px; text-align: center; } #g-albumheader h1 { padding-bottom: 1px; margin-bottom: 6px; border-bottom: 1px solid #888; } /* Footer section ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ diff --git a/themes/greydragon/images/logo.png b/themes/greydragon/images/logo.png deleted file mode 100644 index 2a06cd6ca5a7c3c745a47f9887b3997895fd6ed2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6027 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 ?>
description)? bb2html(html::purify($item->description), 1) : null; ?>
+ + paginator() ?> + +
    $child): ?> @@ -41,4 +45,7 @@
album_bottom() ?> + + paginator() ?> + diff --git a/themes/greydragon/views/dynamic.html.php b/themes/greydragon/views/dynamic.html.php index 6f7699dd..e136fd53 100644 --- a/themes/greydragon/views/dynamic.html.php +++ b/themes/greydragon/views/dynamic.html.php @@ -6,6 +6,10 @@

+ +paginator() ?> + +
    $child): ?>
  • "> @@ -26,4 +30,6 @@
dynamic_bottom() ?> + paginator() ?> + \ No newline at end of file diff --git a/themes/greydragon/views/page.html.php b/themes/greydragon/views/page.html.php index 50538660..d6e65b2d 100644 --- a/themes/greydragon/views/page.html.php +++ b/themes/greydragon/views/page.html.php @@ -5,16 +5,25 @@ - @@ -70,7 +79,9 @@ @@ -99,14 +110,22 @@
+
    - -
  • '; ?>">Sidebar Left"; ?>
    • - -
  • '; ?>">No Sidebar"; ?>
    • - -
  • '; ?>">Sidebar Right"; ?>
    • + + +
  • '; ?>">Sidebar Left"; ?>
    • + + + +
  • '; ?>">No Sidebar"; ?>
    • + + + +
  • '; ?>">Sidebar Right"; ?>
    • +
+
@@ -120,21 +139,21 @@
- + ' ?> - + ' ?> -page_subtype != "login") && ($sidebaralign != "full")): ?> +page_subtype != "login") && ($sidebarvisible != "none")): ?> -" : null ?> +" : null ?> - + ' ?> - + ' ?> ' ?> @@ -163,18 +182,17 @@ - page_bottom() ?> - - + + +// // <bgsound src="/music/collection.m3u"> -?> - - // // // diff --git a/themes/greydragon/views/photo.html.php b/themes/greydragon/views/photo.html.php index d79dbb56..d4256215 100644 --- a/themes/greydragon/views/photo.html.php +++ b/themes/greydragon/views/photo.html.php @@ -7,8 +7,9 @@

title) ?>

description), 1) ?>
- paginator() ?> - + +paginator() ?> +
resize_top($item) ?> @@ -22,7 +23,8 @@ resize_bottom($item) ?>
- paginator() ?> - + +paginator() ?> + photo_bottom() ?>
diff --git a/themes/greydragon/views/search.html.php b/themes/greydragon/views/search.html.php index c934c99a..d8045c7d 100644 --- a/themes/greydragon/views/search.html.php +++ b/themes/greydragon/views/search.html.php @@ -4,7 +4,11 @@

$q)) ?>

- pager() ?> + + +paginator() ?> + +
    @@ -19,7 +23,10 @@
- pager() ?> + + +paginator() ?> +