From 6e538e9bbdfd4577b0aa2ec9d890491bb6c01cc5 Mon Sep 17 00:00:00 2001 From: Stian Lund Date: Mon, 25 Mar 2024 17:08:25 +0100 Subject: [PATCH] Dos2Unix --- .../css/admin_tag_cloud_html5.css | 32 +- .../tag_cloud_html5/css/tag_cloud_html5.css | 212 +++++------ .../helpers/tag_cloud_html5_installer.php | 354 ++++++++--------- .../libraries/MY_Form_Input.php | 114 +++--- modules/arrow_nav/helpers/arrow_nav_theme.php | 48 +-- modules/greydragon/changelog.txt | 20 +- modules/greydragon/css/gd_common.css | 118 +++--- modules/greydragon/module.info | 18 +- .../views/gd_admin_include.html.php | 360 +++++++++--------- modules/image_fit/helpers/image_fit_theme.php | 74 ++-- .../controllers/admin_reset_count.php | 148 +++---- .../controllers/admin_reset_counts.php | 140 +++---- .../helpers/reset_counts_event.php | 122 +++--- .../helpers/reset_counts_installer.php | 56 +-- .../views/admin_reset_count.html.php | 10 +- .../views/admin_reset_counts.html.php | 12 +- modules/treeview/module.info | 14 +- 17 files changed, 926 insertions(+), 926 deletions(-) diff --git a/modules/.not-used/tag_cloud_html5/css/admin_tag_cloud_html5.css b/modules/.not-used/tag_cloud_html5/css/admin_tag_cloud_html5.css index e87717f..87869fa 100755 --- a/modules/.not-used/tag_cloud_html5/css/admin_tag_cloud_html5.css +++ b/modules/.not-used/tag_cloud_html5/css/admin_tag_cloud_html5.css @@ -1,17 +1,17 @@ -#g-content fieldset { - display: block; -} -#g-content fieldset.g-tag-cloud-html5-admin-form-top { - width: 80%; - clear: both; -} -#g-content fieldset.g-tag-cloud-html5-admin-form-left { - width: 45%; - float: left; - clear: left; - margin-right: 2% -} -#g-content fieldset.g-tag-cloud-html5-admin-form-right { - width: 45%; - clear: right; +#g-content fieldset { + display: block; +} +#g-content fieldset.g-tag-cloud-html5-admin-form-top { + width: 80%; + clear: both; +} +#g-content fieldset.g-tag-cloud-html5-admin-form-left { + width: 45%; + float: left; + clear: left; + margin-right: 2% +} +#g-content fieldset.g-tag-cloud-html5-admin-form-right { + width: 45%; + clear: right; } \ No newline at end of file diff --git a/modules/.not-used/tag_cloud_html5/css/tag_cloud_html5.css b/modules/.not-used/tag_cloud_html5/css/tag_cloud_html5.css index bf20ce8..a3d8633 100755 --- a/modules/.not-used/tag_cloud_html5/css/tag_cloud_html5.css +++ b/modules/.not-used/tag_cloud_html5/css/tag_cloud_html5.css @@ -1,106 +1,106 @@ -/* Tag cloud - sidebar ~~~~~~~~~~~~~~~~~~~~~~~ */ - -/* comment out this first block to make the inline tags appear if the cloud doesn't load */ -#g-tag-cloud-html5-tags { - display: none; -} - -#g-tag-cloud-html5-tags ul { - text-align: justify; -} - -#g-tag-cloud-html5-tags ul li { - display: inline; - text-align: justify; -} - -#g-tag-cloud-html5-tags ul li a { - text-decoration: none; -} - -#g-tag-cloud-html5-tags ul li span { - display: none; -} - -#g-tag-cloud-html5-page ul li a:hover { - text-decoration: underline; -} - -/* Tag cloud - whole cloud page ~~~~~~~~~~~~~~~~~~~~~~~ */ - -#g-tag-cloud-html5-page-canvas { - display: block; - margin: 0 auto; -} - -#g-tag-cloud-html5-page-tags ul { - font-size: 1.2em; - text-align: justify; -} - -#g-tag-cloud-html5-page-tags ul li { - display: inline; - line-height: 1.5em; - text-align: justify; -} - -#g-tag-cloud-html5-page-tags ul li a { - text-decoration: none; -} - -#g-tag-cloud-html5-page-tags ul li span { - display: none; -} - -#g-tag-cloud-html5-page-tags ul li.size0 a { - color: #9cf; - font-size: 70%; - font-weight: 100; -} - -#g-tag-cloud-html5-page-tags ul li.size1 a { - color: #9cf; - font-size: 80%; - font-weight: 100; -} - -#g-tag-cloud-html5-page-tags ul li.size2 a { - color: #69f; - font-size: 90%; - font-weight: 300; -} - -#g-tag-cloud-html5-page-tags ul li.size3 a { - color: #69c; - font-size: 100%; - font-weight: 500; -} - -#g-tag-cloud-html5-page-tags ul li.size4 a { - color: #369; - font-size: 110%; - font-weight: 700; -} - -#g-tag-cloud-html5-page-tags ul li.size5 a { - color: #0e2b52; - font-size: 120%; - font-weight: 900; -} - -#g-tag-cloud-html5-page-tags ul li.size6 a { - color: #0e2b52; - font-size: 130%; - font-weight: 900; -} - -#g-tag-cloud-html5-page-tags ul li.size7 a { - color: #0e2b52; - font-size: 140%; - font-weight: 900; -} - -#g-tag-cloud-html5-page-tags ul li a:hover { - color: #f30; - text-decoration: underline; -} +/* Tag cloud - sidebar ~~~~~~~~~~~~~~~~~~~~~~~ */ + +/* comment out this first block to make the inline tags appear if the cloud doesn't load */ +#g-tag-cloud-html5-tags { + display: none; +} + +#g-tag-cloud-html5-tags ul { + text-align: justify; +} + +#g-tag-cloud-html5-tags ul li { + display: inline; + text-align: justify; +} + +#g-tag-cloud-html5-tags ul li a { + text-decoration: none; +} + +#g-tag-cloud-html5-tags ul li span { + display: none; +} + +#g-tag-cloud-html5-page ul li a:hover { + text-decoration: underline; +} + +/* Tag cloud - whole cloud page ~~~~~~~~~~~~~~~~~~~~~~~ */ + +#g-tag-cloud-html5-page-canvas { + display: block; + margin: 0 auto; +} + +#g-tag-cloud-html5-page-tags ul { + font-size: 1.2em; + text-align: justify; +} + +#g-tag-cloud-html5-page-tags ul li { + display: inline; + line-height: 1.5em; + text-align: justify; +} + +#g-tag-cloud-html5-page-tags ul li a { + text-decoration: none; +} + +#g-tag-cloud-html5-page-tags ul li span { + display: none; +} + +#g-tag-cloud-html5-page-tags ul li.size0 a { + color: #9cf; + font-size: 70%; + font-weight: 100; +} + +#g-tag-cloud-html5-page-tags ul li.size1 a { + color: #9cf; + font-size: 80%; + font-weight: 100; +} + +#g-tag-cloud-html5-page-tags ul li.size2 a { + color: #69f; + font-size: 90%; + font-weight: 300; +} + +#g-tag-cloud-html5-page-tags ul li.size3 a { + color: #69c; + font-size: 100%; + font-weight: 500; +} + +#g-tag-cloud-html5-page-tags ul li.size4 a { + color: #369; + font-size: 110%; + font-weight: 700; +} + +#g-tag-cloud-html5-page-tags ul li.size5 a { + color: #0e2b52; + font-size: 120%; + font-weight: 900; +} + +#g-tag-cloud-html5-page-tags ul li.size6 a { + color: #0e2b52; + font-size: 130%; + font-weight: 900; +} + +#g-tag-cloud-html5-page-tags ul li.size7 a { + color: #0e2b52; + font-size: 140%; + font-weight: 900; +} + +#g-tag-cloud-html5-page-tags ul li a:hover { + color: #f30; + text-decoration: underline; +} diff --git a/modules/.not-used/tag_cloud_html5/helpers/tag_cloud_html5_installer.php b/modules/.not-used/tag_cloud_html5/helpers/tag_cloud_html5_installer.php index 4b2914d..9d843d6 100755 --- a/modules/.not-used/tag_cloud_html5/helpers/tag_cloud_html5_installer.php +++ b/modules/.not-used/tag_cloud_html5/helpers/tag_cloud_html5_installer.php @@ -1,177 +1,177 @@ - 0.05, - "deadZone" => 0.25, - "initial" => array(0.8,-0.3), - "initialDecel" => true, - "zoom" => 1.25, - "depth" => 0.5, - "outlineMethod" => "colour", - "outlineOffset" => 8, - "outlineColour" => "#eeeeee", - "textColour" => "", - "textFont" => "", - "textHeight" => 12, - "frontSelect" => true, - "wheelZoom" => false, - "shape" => "sphere", - "lock" => "", - "stretchX" => 1.0, - "stretchY" => 1.0, - "decel" => 0.92, - "physModel" => true, - "maxInputZone" => 0.25, - "minSpeed" => 0.002 - ))); - - module::set_var("tag_cloud_html5", "options_wholecloud", json_encode(array( - "maxSpeed" => 0.05, - "deadZone" => 0.25, - "initial" => array(0.8,-0.3), - "initialDecel" => true, - "zoom" => 1.25, - "depth" => 0.5, - "outlineMethod" => "colour", - "outlineOffset" => 8, - "outlineColour" => "#eeeeee", - "textColour" => "", - "textFont" => "", - "textHeight" => 13, - "frontSelect" => true, - "wheelZoom" => false, - "shape" => "sphere", - "lock" => "", - "stretchX" => 1.0, - "stretchY" => 1.0, - "decel" => 0.92, - "physModel" => true, - "maxInputZone" => 0.15, - "minSpeed" => 0.002 - ))); - - module::set_version("tag_cloud_html5", 7); - } - - static function upgrade() { - if (is_null(module::get_var("tag_cloud_html5", "options_sidebar")) || - is_null(module::get_var("tag_cloud_html5", "options_wholecloud")) || - (module::get_version("tag_cloud_html5") < 1) ) { - - module::install("tag_cloud_html5"); - } - if (module::get_version("tag_cloud_html5") < 2) { - // added wheelZoom, which is not accessible from admin menu - $options = json_decode(module::get_var("tag_cloud_html5", "options_sidebar"),true); - $options["wheelZoom"] = false; - module::set_var("tag_cloud_html5", "options_sidebar", json_encode($options)); - - $options = json_decode(module::get_var("tag_cloud_html5", "options_wholecloud"),true); - $options["wheelZoom"] = false; - module::set_var("tag_cloud_html5", "options_wholecloud", json_encode($options)); - } - if (module::get_version("tag_cloud_html5") < 3) { - // added deadZone, initial, and initialDecel - - module::set_var("tag_cloud_html5", "show_add_tag_form", true); - - $options = json_decode(module::get_var("tag_cloud_html5", "options_sidebar"),true); - $options["deadZone"] = 0.25; - $options["initial"] = array(0.8,-0.3); - $options["initialDecel"] = true; - module::set_var("tag_cloud_html5", "options_sidebar", json_encode($options)); - - $options = json_decode(module::get_var("tag_cloud_html5", "options_wholecloud"),true); - $options["deadZone"] = 0.25; - $options["initial"] = array(0.8,-0.3); - $options["initialDecel"] = true; - module::set_var("tag_cloud_html5", "options_wholecloud", json_encode($options)); - } - if (module::get_version("tag_cloud_html5") < 4) { - // added height_sidebar, then scaled back zoom and textHeight for consistency - module::set_var("tag_cloud_html5", "height_sidebar", 0.8); - - $options = json_decode(module::get_var("tag_cloud_html5", "options_sidebar"),true); - $options["zoom"] = $options["zoom"] / 0.8; - $options["textHeight"] = $options["textHeight"] * 0.8; - module::set_var("tag_cloud_html5", "options_sidebar", json_encode($options)); - } - if (module::get_version("tag_cloud_html5") < 5) { - // added lots of options that are on admin menu - // added physModel, lock, and initialDecel as options not on admin menu - // (previously initialDecel was on menu, so reset here) - - module::set_var("tag_cloud_html5", "width_sidebar", 1.00); - module::set_var("tag_cloud_html5", "width_wholecloud", 0.95); - module::set_var("tag_cloud_html5", "height_wholecloud", 0.75); - - $options = json_decode(module::get_var("tag_cloud_html5", "options_sidebar"),true); - $options["deadZone"] = $options["deadZone"]; - $options["shape"] = "sphere"; - $options["lock"] = ""; - $options["stretchX"] = 1.0; - $options["stretchY"] = 1.0; - $options["decel"] = 0.92; - $options["physModel"] = true; - $options["maxInputZone"] = 0.25; - $options["minSpeed"] = 0.002; - $options["initialDecel"] = true; - module::set_var("tag_cloud_html5", "options_sidebar", json_encode($options)); - - $options = json_decode(module::get_var("tag_cloud_html5", "options_wholecloud"),true); - $options["deadZone"] = $options["deadZone"]; - $options["shape"] = "sphere"; - $options["lock"] = ""; - $options["stretchX"] = 1.0; - $options["stretchY"] = 1.0; - $options["decel"] = 0.92; - $options["physModel"] = true; - $options["maxInputZone"] = 0.15; - $options["minSpeed"] = 0.002; - $options["initialDecel"] = true; - module::set_var("tag_cloud_html5", "options_wholecloud", json_encode($options)); - } - // note: there are no variable changes for v6 and v7 upgrades - module::set_version("tag_cloud_html5", 7); - } - - static function uninstall() { - module::clear_all_vars("tag_cloud_html5"); - } - -} + 0.05, + "deadZone" => 0.25, + "initial" => array(0.8,-0.3), + "initialDecel" => true, + "zoom" => 1.25, + "depth" => 0.5, + "outlineMethod" => "colour", + "outlineOffset" => 8, + "outlineColour" => "#eeeeee", + "textColour" => "", + "textFont" => "", + "textHeight" => 12, + "frontSelect" => true, + "wheelZoom" => false, + "shape" => "sphere", + "lock" => "", + "stretchX" => 1.0, + "stretchY" => 1.0, + "decel" => 0.92, + "physModel" => true, + "maxInputZone" => 0.25, + "minSpeed" => 0.002 + ))); + + module::set_var("tag_cloud_html5", "options_wholecloud", json_encode(array( + "maxSpeed" => 0.05, + "deadZone" => 0.25, + "initial" => array(0.8,-0.3), + "initialDecel" => true, + "zoom" => 1.25, + "depth" => 0.5, + "outlineMethod" => "colour", + "outlineOffset" => 8, + "outlineColour" => "#eeeeee", + "textColour" => "", + "textFont" => "", + "textHeight" => 13, + "frontSelect" => true, + "wheelZoom" => false, + "shape" => "sphere", + "lock" => "", + "stretchX" => 1.0, + "stretchY" => 1.0, + "decel" => 0.92, + "physModel" => true, + "maxInputZone" => 0.15, + "minSpeed" => 0.002 + ))); + + module::set_version("tag_cloud_html5", 7); + } + + static function upgrade() { + if (is_null(module::get_var("tag_cloud_html5", "options_sidebar")) || + is_null(module::get_var("tag_cloud_html5", "options_wholecloud")) || + (module::get_version("tag_cloud_html5") < 1) ) { + + module::install("tag_cloud_html5"); + } + if (module::get_version("tag_cloud_html5") < 2) { + // added wheelZoom, which is not accessible from admin menu + $options = json_decode(module::get_var("tag_cloud_html5", "options_sidebar"),true); + $options["wheelZoom"] = false; + module::set_var("tag_cloud_html5", "options_sidebar", json_encode($options)); + + $options = json_decode(module::get_var("tag_cloud_html5", "options_wholecloud"),true); + $options["wheelZoom"] = false; + module::set_var("tag_cloud_html5", "options_wholecloud", json_encode($options)); + } + if (module::get_version("tag_cloud_html5") < 3) { + // added deadZone, initial, and initialDecel + + module::set_var("tag_cloud_html5", "show_add_tag_form", true); + + $options = json_decode(module::get_var("tag_cloud_html5", "options_sidebar"),true); + $options["deadZone"] = 0.25; + $options["initial"] = array(0.8,-0.3); + $options["initialDecel"] = true; + module::set_var("tag_cloud_html5", "options_sidebar", json_encode($options)); + + $options = json_decode(module::get_var("tag_cloud_html5", "options_wholecloud"),true); + $options["deadZone"] = 0.25; + $options["initial"] = array(0.8,-0.3); + $options["initialDecel"] = true; + module::set_var("tag_cloud_html5", "options_wholecloud", json_encode($options)); + } + if (module::get_version("tag_cloud_html5") < 4) { + // added height_sidebar, then scaled back zoom and textHeight for consistency + module::set_var("tag_cloud_html5", "height_sidebar", 0.8); + + $options = json_decode(module::get_var("tag_cloud_html5", "options_sidebar"),true); + $options["zoom"] = $options["zoom"] / 0.8; + $options["textHeight"] = $options["textHeight"] * 0.8; + module::set_var("tag_cloud_html5", "options_sidebar", json_encode($options)); + } + if (module::get_version("tag_cloud_html5") < 5) { + // added lots of options that are on admin menu + // added physModel, lock, and initialDecel as options not on admin menu + // (previously initialDecel was on menu, so reset here) + + module::set_var("tag_cloud_html5", "width_sidebar", 1.00); + module::set_var("tag_cloud_html5", "width_wholecloud", 0.95); + module::set_var("tag_cloud_html5", "height_wholecloud", 0.75); + + $options = json_decode(module::get_var("tag_cloud_html5", "options_sidebar"),true); + $options["deadZone"] = $options["deadZone"]; + $options["shape"] = "sphere"; + $options["lock"] = ""; + $options["stretchX"] = 1.0; + $options["stretchY"] = 1.0; + $options["decel"] = 0.92; + $options["physModel"] = true; + $options["maxInputZone"] = 0.25; + $options["minSpeed"] = 0.002; + $options["initialDecel"] = true; + module::set_var("tag_cloud_html5", "options_sidebar", json_encode($options)); + + $options = json_decode(module::get_var("tag_cloud_html5", "options_wholecloud"),true); + $options["deadZone"] = $options["deadZone"]; + $options["shape"] = "sphere"; + $options["lock"] = ""; + $options["stretchX"] = 1.0; + $options["stretchY"] = 1.0; + $options["decel"] = 0.92; + $options["physModel"] = true; + $options["maxInputZone"] = 0.15; + $options["minSpeed"] = 0.002; + $options["initialDecel"] = true; + module::set_var("tag_cloud_html5", "options_wholecloud", json_encode($options)); + } + // note: there are no variable changes for v6 and v7 upgrades + module::set_version("tag_cloud_html5", 7); + } + + static function uninstall() { + module::clear_all_vars("tag_cloud_html5"); + } + +} diff --git a/modules/.not-used/tag_cloud_html5/libraries/MY_Form_Input.php b/modules/.not-used/tag_cloud_html5/libraries/MY_Form_Input.php index c191dcc..e67eab2 100755 --- a/modules/.not-used/tag_cloud_html5/libraries/MY_Form_Input.php +++ b/modules/.not-used/tag_cloud_html5/libraries/MY_Form_Input.php @@ -1,58 +1,58 @@ -value)) { - if (!is_null($min) && ($this->value < $min)) { - // below min - $this->errors['numrange'] = true; - $this->error_messages['numrange'] = t('Value is below minimum of').' '.$min; - } elseif (!is_null($max) && ($this->value > $max)) { - // above max - $this->errors['numrange'] = true; - $this->error_messages['numrange'] = t('Value is above maximum of').' '.$max;; - } - } else { - // not numeric - $this->errors['numrange'] = true; - $this->error_messages['numrange'] = t('Value is not numeric'); - } - } - - /** - * Custom validation rule: color - * returns no error if string is formatted as #hhhhhh OR if string is empty - * to exclude the empty case, add "required" as another rule - */ - protected function rule_color() { - if (preg_match("/^#[0-9A-Fa-f]{6}$|^$/", $this->value) == 0) { - $this->errors['color'] = true; - $this->error_messages['color'] = t('Color is not in #hhhhhh format'); - } - } +value)) { + if (!is_null($min) && ($this->value < $min)) { + // below min + $this->errors['numrange'] = true; + $this->error_messages['numrange'] = t('Value is below minimum of').' '.$min; + } elseif (!is_null($max) && ($this->value > $max)) { + // above max + $this->errors['numrange'] = true; + $this->error_messages['numrange'] = t('Value is above maximum of').' '.$max;; + } + } else { + // not numeric + $this->errors['numrange'] = true; + $this->error_messages['numrange'] = t('Value is not numeric'); + } + } + + /** + * Custom validation rule: color + * returns no error if string is formatted as #hhhhhh OR if string is empty + * to exclude the empty case, add "required" as another rule + */ + protected function rule_color() { + if (preg_match("/^#[0-9A-Fa-f]{6}$|^$/", $this->value) == 0) { + $this->errors['color'] = true; + $this->error_messages['color'] = t('Color is not in #hhhhhh format'); + } + } } \ No newline at end of file diff --git a/modules/arrow_nav/helpers/arrow_nav_theme.php b/modules/arrow_nav/helpers/arrow_nav_theme.php index 930a27c..23e028a 100755 --- a/modules/arrow_nav/helpers/arrow_nav_theme.php +++ b/modules/arrow_nav/helpers/arrow_nav_theme.php @@ -1,24 +1,24 @@ -script("arrow_nav.js"); - } -} +script("arrow_nav.js"); + } +} diff --git a/modules/greydragon/changelog.txt b/modules/greydragon/changelog.txt index ae8baf9..9dc1616 100755 --- a/modules/greydragon/changelog.txt +++ b/modules/greydragon/changelog.txt @@ -1,11 +1,11 @@ -GreyDragon Shared Module Changelog - -version 1.3: -- Added check to detect situation when CURL is not installed to disable Auto Update feature -- Improved CURL logic to properly handle redirects - -version 1.2: -- Fixed issue with some installations not taking relative path for CSS - -version 1.1: +GreyDragon Shared Module Changelog + +version 1.3: +- Added check to detect situation when CURL is not installed to disable Auto Update feature +- Improved CURL logic to properly handle redirects + +version 1.2: +- Fixed issue with some installations not taking relative path for CSS + +version 1.1: - Initial release \ No newline at end of file diff --git a/modules/greydragon/css/gd_common.css b/modules/greydragon/css/gd_common.css index 32b780b..d5c9d72 100755 --- a/modules/greydragon/css/gd_common.css +++ b/modules/greydragon/css/gd_common.css @@ -1,59 +1,59 @@ -/** - * Gallery 3 Grey Dragon Common Module - * Copyright (C) 2012 Serguei Dosyukov - * - * CSS rules for admin section - */ - -body { min-width: 1200px; } - -#g-content { font-size: 1em; margin-bottom: 0; width: auto; padding-left: 1em; padding-right: 1em; } -#g-content ul { margin-bottom: 0; } - -#g-content h3 { color: #d54e21; border-bottom: #a2bdbf 1px solid; margin-top: 0.3em; margin-bottom: 0.3em; } -#g-content p { color: #333; } -#g-content table { margin-bottom: 0; } - -#g-content input { display: inline; float: left; margin-right: 0.8em; color: #555555; border: 1px solid #ccc; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; } -#g-content textarea { height: 6em; color: #555555; border: 1px solid #ccc; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; } -#g-content select { display: inline; float: left; margin-right: 0.8em; width: 50.6%; color: #555555; border: 1px solid #ccc; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; } - -#g-content input[type='checkbox'] { border: none; } -#g-content input[type='text'] { width: 50%; } - -#g-content input.submit { display: inline-block; min-width: 100px; padding: 4px 10px 4px; font-size: 13px; line-height: 18px; color:#333333; text-align: center; text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); background-color: #fafafa; background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6)); background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6); background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); background-repeat: no-repeat; filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0); border: 1px solid #ccc; border-bottom-color: #bbb; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05); -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05); cursor: pointer; *margin-left: .3em; } -#g-content input.submit:first-child { *margin-left: 0; } -#g-content input.submit:hover { color: #333333; text-decoration: none; background-color: #e6e6e6; background-position: 0 -15px; -webkit-transition: background-position 0.1s linear; -moz-transition: background-position 0.1s linear; -ms-transition: background-position 0.1s linear; -o-transition: background-position 0.1s linear; transition: background-position 0.1s linear; } - -#g-content input.g-error { padding-left: 30px; border: none; } -#g-content input.g-success { background-color: transparent; } -#g-content input.g-warning { background-color: transparent; border: none; } - -#g-content p.g-error { padding-left: 30px; border: none; margin-bottom: 0; background-image: none; } - -#gd-admin-header { padding: 7px 0; margin: 4px 0 0 0; background-color: #fbfbfb; background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5); background-image:- ms-linear-gradient(top, #ffffff, #f5f5f5); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5)); background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5); background-image: -o-linear-gradient(top, #ffffff, #f5f5f5); background-image: linear-gradient(top, #ffffff, #f5f5f5); background-repeat: repeat-x; filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0); border: 1px solid #ddd; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: inset 0 1px 0 #ffffff; -moz-box-shadow: inset 0 1px 0 #ffffff; box-shadow: inset 0 1px 0 #ffffff; display: inline-block; width: 100%; } -#gd-admin-header .divider{padding:0 5px;color:#999999;} -#gd-admin-header .active a{color:#333333;} - -#gd-admin-version, -#gd-admin-version-2 { margin-top: 4px; padding: 7px 14px; background-color: rgb(217, 237, 247); border: 1px solid #bce8f1; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: inset 0 1px 0 #ffffff; -moz-box-shadow: inset 0 1px 0 #ffffff; box-shadow: inset 0 1px 0 #ffffff; } - -#gd-admin-title { float: left; padding-left: 10px; color: #333v42; font-weight: bold; font-size: 1.4em; text-shadow: #deeefa 0 1px 0; display: inline-block; } -#gd-admin-hlinks { float: right; padding-right: 10px; } -#gd-admin-hlinks li { list-style-type: none; float: left; color: #618299; display: inline; text-shadow: 0 1px 0 #ffffff; } -#gd-admin-hlinks a { line-height: 1.6em; } -#gd-admin-hlinks a[disabled="disabled"], #gd-admin-hlinks a[disabled="disabled"]:hover { text-decoration: none; cursor: default; } - -#g-autoupdate-config { display: none; border: 1px solid #ddd; border-top: none; width: 45%; height: 2.5em; margin-left: 54%; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: inset 0 1px 0 #ffffff; -moz-box-shadow: inset 0 1px 0 #ffffff; box-shadow: inset 0 1px 0 #ffffff; } -#g-autoupdate-config.visible { min-height: 30px; display: inline-block; } -#g-autoupdate-config ul { float: right; margin: 6px 10px;} -#g-autoupdate-config li { float: left; display: inline; line-height: 1.5em; } - -#g-admin-container { margin-top: 14px; font-size: 0.9em; line-height: 1.6em; } -#g-admin-container .column1 { float: left; width: 53%; min-width: 610px; } -#g-admin-container .column2 { float: right; width: 46%; min-width: 529px; } - -#g-admin-container fieldset { position: relative; border-top-left-radius: 0.4em; border-top-right-radius: 0.4em; overflow: hidden; } -#g-admin-container legend { position: absolute; left: 0; width: 100%; padding: 0.4em 0.8em; background: url(../images/blue-grad.png) #d5e6f2 repeat-x left top; border-bottom: #dfdfdf 1px solid; } -#g-admin-container fieldset ul { margin-top: 34px; } - +/** + * Gallery 3 Grey Dragon Common Module + * Copyright (C) 2012 Serguei Dosyukov + * + * CSS rules for admin section + */ + +body { min-width: 1200px; } + +#g-content { font-size: 1em; margin-bottom: 0; width: auto; padding-left: 1em; padding-right: 1em; } +#g-content ul { margin-bottom: 0; } + +#g-content h3 { color: #d54e21; border-bottom: #a2bdbf 1px solid; margin-top: 0.3em; margin-bottom: 0.3em; } +#g-content p { color: #333; } +#g-content table { margin-bottom: 0; } + +#g-content input { display: inline; float: left; margin-right: 0.8em; color: #555555; border: 1px solid #ccc; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; } +#g-content textarea { height: 6em; color: #555555; border: 1px solid #ccc; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; } +#g-content select { display: inline; float: left; margin-right: 0.8em; width: 50.6%; color: #555555; border: 1px solid #ccc; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; } + +#g-content input[type='checkbox'] { border: none; } +#g-content input[type='text'] { width: 50%; } + +#g-content input.submit { display: inline-block; min-width: 100px; padding: 4px 10px 4px; font-size: 13px; line-height: 18px; color:#333333; text-align: center; text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); background-color: #fafafa; background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6)); background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6); background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); background-repeat: no-repeat; filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0); border: 1px solid #ccc; border-bottom-color: #bbb; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05); -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05); cursor: pointer; *margin-left: .3em; } +#g-content input.submit:first-child { *margin-left: 0; } +#g-content input.submit:hover { color: #333333; text-decoration: none; background-color: #e6e6e6; background-position: 0 -15px; -webkit-transition: background-position 0.1s linear; -moz-transition: background-position 0.1s linear; -ms-transition: background-position 0.1s linear; -o-transition: background-position 0.1s linear; transition: background-position 0.1s linear; } + +#g-content input.g-error { padding-left: 30px; border: none; } +#g-content input.g-success { background-color: transparent; } +#g-content input.g-warning { background-color: transparent; border: none; } + +#g-content p.g-error { padding-left: 30px; border: none; margin-bottom: 0; background-image: none; } + +#gd-admin-header { padding: 7px 0; margin: 4px 0 0 0; background-color: #fbfbfb; background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5); background-image:- ms-linear-gradient(top, #ffffff, #f5f5f5); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5)); background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5); background-image: -o-linear-gradient(top, #ffffff, #f5f5f5); background-image: linear-gradient(top, #ffffff, #f5f5f5); background-repeat: repeat-x; filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0); border: 1px solid #ddd; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: inset 0 1px 0 #ffffff; -moz-box-shadow: inset 0 1px 0 #ffffff; box-shadow: inset 0 1px 0 #ffffff; display: inline-block; width: 100%; } +#gd-admin-header .divider{padding:0 5px;color:#999999;} +#gd-admin-header .active a{color:#333333;} + +#gd-admin-version, +#gd-admin-version-2 { margin-top: 4px; padding: 7px 14px; background-color: rgb(217, 237, 247); border: 1px solid #bce8f1; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: inset 0 1px 0 #ffffff; -moz-box-shadow: inset 0 1px 0 #ffffff; box-shadow: inset 0 1px 0 #ffffff; } + +#gd-admin-title { float: left; padding-left: 10px; color: #333v42; font-weight: bold; font-size: 1.4em; text-shadow: #deeefa 0 1px 0; display: inline-block; } +#gd-admin-hlinks { float: right; padding-right: 10px; } +#gd-admin-hlinks li { list-style-type: none; float: left; color: #618299; display: inline; text-shadow: 0 1px 0 #ffffff; } +#gd-admin-hlinks a { line-height: 1.6em; } +#gd-admin-hlinks a[disabled="disabled"], #gd-admin-hlinks a[disabled="disabled"]:hover { text-decoration: none; cursor: default; } + +#g-autoupdate-config { display: none; border: 1px solid #ddd; border-top: none; width: 45%; height: 2.5em; margin-left: 54%; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: inset 0 1px 0 #ffffff; -moz-box-shadow: inset 0 1px 0 #ffffff; box-shadow: inset 0 1px 0 #ffffff; } +#g-autoupdate-config.visible { min-height: 30px; display: inline-block; } +#g-autoupdate-config ul { float: right; margin: 6px 10px;} +#g-autoupdate-config li { float: left; display: inline; line-height: 1.5em; } + +#g-admin-container { margin-top: 14px; font-size: 0.9em; line-height: 1.6em; } +#g-admin-container .column1 { float: left; width: 53%; min-width: 610px; } +#g-admin-container .column2 { float: right; width: 46%; min-width: 529px; } + +#g-admin-container fieldset { position: relative; border-top-left-radius: 0.4em; border-top-right-radius: 0.4em; overflow: hidden; } +#g-admin-container legend { position: absolute; left: 0; width: 100%; padding: 0.4em 0.8em; background: url(../images/blue-grad.png) #d5e6f2 repeat-x left top; border-bottom: #dfdfdf 1px solid; } +#g-admin-container fieldset ul { margin-top: 34px; } + diff --git a/modules/greydragon/module.info b/modules/greydragon/module.info index 4a65e8c..4e4c314 100755 --- a/modules/greydragon/module.info +++ b/modules/greydragon/module.info @@ -1,9 +1,9 @@ -name = "GreyDragon Shared" -description = "Shared content for modules from GreyDragon. Need to be activated.
Version 1.3 | By Serguei Dosyukov" -version = 13 -author_name = "Serguei Dosyukov" -author_url = "http://blog.dragonsoft.us/gallery-3/" -info_url = "" -discuss_url = "" - - +name = "GreyDragon Shared" +description = "Shared content for modules from GreyDragon. Need to be activated.
Version 1.3 | By Serguei Dosyukov" +version = 13 +author_name = "Serguei Dosyukov" +author_url = "http://blog.dragonsoft.us/gallery-3/" +info_url = "" +discuss_url = "" + + diff --git a/modules/greydragon/views/gd_admin_include.html.php b/modules/greydragon/views/gd_admin_include.html.php index 73962cb..a7f7212 100755 --- a/modules/greydragon/views/gd_admin_include.html.php +++ b/modules/greydragon/views/gd_admin_include.html.php @@ -1,180 +1,180 @@ - - - - - -id == $downloadid): - $newversion = $json->version; - if ($json->version > $version): - return $json->version; - else: - return 0; - endif; - else: - return -1; - endif; - } catch (Exception $e) { - return -1; - } -} - -if ($is_module): - $admin_info = new ArrayObject(parse_ini_file(MODPATH . $name . "/module.info"), ArrayObject::ARRAY_AS_PROPS); - $version = number_format($admin_info->version / 10, 1, '.', ''); - $lastupdate = module::get_var($name, "last_update", time()); - $checkInDays = module::get_var($name, "auto_delay", 30); -else: - $admin_info = new ArrayObject(parse_ini_file(THEMEPATH . $name . "/theme.info"), ArrayObject::ARRAY_AS_PROPS); - $version = $admin_info->version; - $lastupdate = module::get_var("th_" . $name, "last_update", time()); - $checkInDays = module::get_var("th_" . $name, "auto_delay", 30); -endif; - -if (isCurlInstalled() && ($checkInDays > 0) && ((time() - $lastupdate) > ($checkInDays * 24 * 60 * 60))): // Check version every N days - $admin_info2 = new ArrayObject(parse_ini_file(MODPATH . "greydragon/module.info"), ArrayObject::ARRAY_AS_PROPS); - $version2 = number_format($admin_info2->version / 10, 1, '.', ''); - - $versionCheck = checkVersionInfo($downloadid, $version); - $versionCheck2 = checkVersionInfo(15, $version2); - - if (($versionCheck == 0) && ($versionCheck2 == 0)): - if ($is_module): - module::set_var($name, "last_update", time()); - else: - module::set_var("th_" . $name, "last_update", time()); - endif; - endif; -else: - $versionCheck = 0; - $versionCheck2 = 0; -endif; -?> - -
-
name) ?> -
- -
-
- -
- - -
:
- - -
- - - -
' . t("here") . ' ' . t("for more info.") ?>
- -
- -
- -
-
- -
- - - -
+ + + + + +id == $downloadid): + $newversion = $json->version; + if ($json->version > $version): + return $json->version; + else: + return 0; + endif; + else: + return -1; + endif; + } catch (Exception $e) { + return -1; + } +} + +if ($is_module): + $admin_info = new ArrayObject(parse_ini_file(MODPATH . $name . "/module.info"), ArrayObject::ARRAY_AS_PROPS); + $version = number_format($admin_info->version / 10, 1, '.', ''); + $lastupdate = module::get_var($name, "last_update", time()); + $checkInDays = module::get_var($name, "auto_delay", 30); +else: + $admin_info = new ArrayObject(parse_ini_file(THEMEPATH . $name . "/theme.info"), ArrayObject::ARRAY_AS_PROPS); + $version = $admin_info->version; + $lastupdate = module::get_var("th_" . $name, "last_update", time()); + $checkInDays = module::get_var("th_" . $name, "auto_delay", 30); +endif; + +if (isCurlInstalled() && ($checkInDays > 0) && ((time() - $lastupdate) > ($checkInDays * 24 * 60 * 60))): // Check version every N days + $admin_info2 = new ArrayObject(parse_ini_file(MODPATH . "greydragon/module.info"), ArrayObject::ARRAY_AS_PROPS); + $version2 = number_format($admin_info2->version / 10, 1, '.', ''); + + $versionCheck = checkVersionInfo($downloadid, $version); + $versionCheck2 = checkVersionInfo(15, $version2); + + if (($versionCheck == 0) && ($versionCheck2 == 0)): + if ($is_module): + module::set_var($name, "last_update", time()); + else: + module::set_var("th_" . $name, "last_update", time()); + endif; + endif; +else: + $versionCheck = 0; + $versionCheck2 = 0; +endif; +?> + +
+
name) ?> -
+ +
+
+ +
+ + +
:
+ + +
+ + + +
' . t("here") . ' ' . t("for more info.") ?>
+ +
+ +
+ +
+
+ +
+ + + +
diff --git a/modules/image_fit/helpers/image_fit_theme.php b/modules/image_fit/helpers/image_fit_theme.php index 49e2c55..fba6e4f 100755 --- a/modules/image_fit/helpers/image_fit_theme.php +++ b/modules/image_fit/helpers/image_fit_theme.php @@ -1,37 +1,37 @@ -page_subtype == "photo") { - return $theme->script("jquery.imagefit.js"); - } - } - static function page_bottom($theme) { - $fit_code = " - - - "; - return $fit_code; - } -} +page_subtype == "photo") { + return $theme->script("jquery.imagefit.js"); + } + } + static function page_bottom($theme) { + $fit_code = " + + + "; + return $fit_code; + } +} diff --git a/modules/reset_counts/controllers/admin_reset_count.php b/modules/reset_counts/controllers/admin_reset_count.php index 07569b8..973c135 100755 --- a/modules/reset_counts/controllers/admin_reset_count.php +++ b/modules/reset_counts/controllers/admin_reset_count.php @@ -1,75 +1,75 @@ -get("item_id"); - print $this->_get_view($item_id); - } - - public function handler() { - $item_id = Input::instance()->get("item_id"); - access::verify_csrf(); - $form = $this->_get_form(); - if ($form->validate()) { - $reset_count = $form->reset->reset_count->value; - $item = ORM::factory("item", $item_id); - $count = $form->reset->count->value; - if ($reset_count): - db::build() - ->update("items") - ->set("view_count", $count) - ->where("id", "=", $item_id) - ->execute(); - message::success(t('The view count has been updated. Return to item.', - array("url" => html::mark_clean(url::site("items/$item_id"))))); - endif; - url::redirect("admin/reset_count?item_id=$item_id"); - } - print $this->_get_view($form); - } - - private function _get_view($item_id) { - $v = new Admin_View("admin.html"); - $v->content = new View("admin_reset_count.html"); - $v->content->form = empty($form) ? $this->_get_form($item_id) : $form; - return $v; - } - - private function _get_form() { - $item_id = Input::instance()->get("item_id"); - $item = ORM::factory("item", $item_id); - $form = new Forge("admin/reset_count/handler?item_id=$item_id", "", "post", array("id" => "g-admin-form")); - - $group = $form->group("reset") - ->label(t('Reset count')); - $group->input("item_id")->label(t("Item to be changed:")) - ->value($item->title)->disabled(true); - $group->input("count")->label(t("new count for this item:")) - ->value("") - ->rules("required") - ->rules("valid_numeric|length[1,5]"); - $group->checkbox("reset_count")->label(t("Check to reset the item count for this item.")) - ->checked(false); - - $group->submit("submit")->value(t("Commit changes")); - - return $form; - } +get("item_id"); + print $this->_get_view($item_id); + } + + public function handler() { + $item_id = Input::instance()->get("item_id"); + access::verify_csrf(); + $form = $this->_get_form(); + if ($form->validate()) { + $reset_count = $form->reset->reset_count->value; + $item = ORM::factory("item", $item_id); + $count = $form->reset->count->value; + if ($reset_count): + db::build() + ->update("items") + ->set("view_count", $count) + ->where("id", "=", $item_id) + ->execute(); + message::success(t('The view count has been updated. Return to item.', + array("url" => html::mark_clean(url::site("items/$item_id"))))); + endif; + url::redirect("admin/reset_count?item_id=$item_id"); + } + print $this->_get_view($form); + } + + private function _get_view($item_id) { + $v = new Admin_View("admin.html"); + $v->content = new View("admin_reset_count.html"); + $v->content->form = empty($form) ? $this->_get_form($item_id) : $form; + return $v; + } + + private function _get_form() { + $item_id = Input::instance()->get("item_id"); + $item = ORM::factory("item", $item_id); + $form = new Forge("admin/reset_count/handler?item_id=$item_id", "", "post", array("id" => "g-admin-form")); + + $group = $form->group("reset") + ->label(t('Reset count')); + $group->input("item_id")->label(t("Item to be changed:")) + ->value($item->title)->disabled(true); + $group->input("count")->label(t("new count for this item:")) + ->value("") + ->rules("required") + ->rules("valid_numeric|length[1,5]"); + $group->checkbox("reset_count")->label(t("Check to reset the item count for this item.")) + ->checked(false); + + $group->submit("submit")->value(t("Commit changes")); + + return $form; + } } \ No newline at end of file diff --git a/modules/reset_counts/controllers/admin_reset_counts.php b/modules/reset_counts/controllers/admin_reset_counts.php index c41a4f1..9b7f31d 100755 --- a/modules/reset_counts/controllers/admin_reset_counts.php +++ b/modules/reset_counts/controllers/admin_reset_counts.php @@ -1,71 +1,71 @@ -get("album_id"); - print $this->_get_view($album_id); - } - - public function handler() { - $album_id = Input::instance()->get("album_id"); - access::verify_csrf(); - $form = $this->_get_form(); - if ($form->validate()) { - $reset_counts = $form->reset->reset_counts->value; - $item = ORM::factory("item", $album_id); - if ($reset_counts): - db::build() - ->update("items") - ->set("view_count", 0) - ->where("left_ptr", ">=", $item->left_ptr) - ->where("right_ptr", "<=", $item->right_ptr) - ->execute(); - message::success(t('The view counts have been updated. Return to album.', - array("url" => html::mark_clean(url::site("items/$album_id"))))); - endif; - url::redirect("admin/reset_counts?album_id=$album_id"); - } - print $this->_get_view($form); - } - - private function _get_view($album_id) { - $v = new Admin_View("admin.html"); - $v->content = new View("admin_reset_counts.html"); - $v->content->form = empty($form) ? $this->_get_form($album_id) : $form; - return $v; - } - - private function _get_form() { - $album_id = Input::instance()->get("album_id"); - $album = ORM::factory("item", $album_id); - $form = new Forge("admin/reset_counts/handler?album_id=$album_id", "", "post", array("id" => "g-admin-form")); - - $group = $form->group("reset") - ->label(t('Reset counts')); - $group->input("album_id")->label(t("Items in this album will be changed:")) - ->value($album->title)->disabled(true); - $group->checkbox("reset_counts")->label(t("Check to reset the item counts in this album.")) - ->checked(false); - - $group->submit("submit")->value(t("Commit changes")); - - return $form; - } +get("album_id"); + print $this->_get_view($album_id); + } + + public function handler() { + $album_id = Input::instance()->get("album_id"); + access::verify_csrf(); + $form = $this->_get_form(); + if ($form->validate()) { + $reset_counts = $form->reset->reset_counts->value; + $item = ORM::factory("item", $album_id); + if ($reset_counts): + db::build() + ->update("items") + ->set("view_count", 0) + ->where("left_ptr", ">=", $item->left_ptr) + ->where("right_ptr", "<=", $item->right_ptr) + ->execute(); + message::success(t('The view counts have been updated. Return to album.', + array("url" => html::mark_clean(url::site("items/$album_id"))))); + endif; + url::redirect("admin/reset_counts?album_id=$album_id"); + } + print $this->_get_view($form); + } + + private function _get_view($album_id) { + $v = new Admin_View("admin.html"); + $v->content = new View("admin_reset_counts.html"); + $v->content->form = empty($form) ? $this->_get_form($album_id) : $form; + return $v; + } + + private function _get_form() { + $album_id = Input::instance()->get("album_id"); + $album = ORM::factory("item", $album_id); + $form = new Forge("admin/reset_counts/handler?album_id=$album_id", "", "post", array("id" => "g-admin-form")); + + $group = $form->group("reset") + ->label(t('Reset counts')); + $group->input("album_id")->label(t("Items in this album will be changed:")) + ->value($album->title)->disabled(true); + $group->checkbox("reset_counts")->label(t("Check to reset the item counts in this album.")) + ->checked(false); + + $group->submit("submit")->value(t("Commit changes")); + + return $form; + } } \ No newline at end of file diff --git a/modules/reset_counts/helpers/reset_counts_event.php b/modules/reset_counts/helpers/reset_counts_event.php index 66a3af2..50b1939 100755 --- a/modules/reset_counts/helpers/reset_counts_event.php +++ b/modules/reset_counts/helpers/reset_counts_event.php @@ -1,62 +1,62 @@ -item(); - $user = identity::active_user(); - if ($item && $item->is_album() && $user->admin) { - $menu->get("options_menu") - ->append(Menu::factory("link") - ->id("reset") - ->label(t("Reset item counts")) - ->css_id("g-menu-reset-link") - ->url(url::site("admin/reset_counts?album_id={$item->id}"))); - } - if ($item && ($item->is_photo() || $item->is_movie()) && $user->admin) { - $menu->get("options_menu") - ->append(Menu::factory("link") - ->id("reset") - ->label(t("Reset item count")) - ->css_id("g-menu-reset-link") - ->url(url::site("admin/reset_count?item_id={$item->id}"))); - } - } - - static function context_menu($menu, $theme, $item) { - $user = identity::active_user(); - if ($user->admin) { - if ($item->is_album()) { - $menu->get("options_menu") - ->append(Menu::factory("link") - ->id("reset") - ->label(t("Reset album only count")) - ->css_class("ui-icon-refresh") - ->url(url::site("admin/reset_count?item_id={$item->id}"))); - } else { - $menu->get("options_menu") - ->append(Menu::factory("link") - ->id("reset") - ->label(t("Reset count")) - ->css_class("ui-icon-refresh") - ->url(url::site("admin/reset_count?item_id={$item->id}"))); - } - } - } +item(); + $user = identity::active_user(); + if ($item && $item->is_album() && $user->admin) { + $menu->get("options_menu") + ->append(Menu::factory("link") + ->id("reset") + ->label(t("Reset item counts")) + ->css_id("g-menu-reset-link") + ->url(url::site("admin/reset_counts?album_id={$item->id}"))); + } + if ($item && ($item->is_photo() || $item->is_movie()) && $user->admin) { + $menu->get("options_menu") + ->append(Menu::factory("link") + ->id("reset") + ->label(t("Reset item count")) + ->css_id("g-menu-reset-link") + ->url(url::site("admin/reset_count?item_id={$item->id}"))); + } + } + + static function context_menu($menu, $theme, $item) { + $user = identity::active_user(); + if ($user->admin) { + if ($item->is_album()) { + $menu->get("options_menu") + ->append(Menu::factory("link") + ->id("reset") + ->label(t("Reset album only count")) + ->css_class("ui-icon-refresh") + ->url(url::site("admin/reset_count?item_id={$item->id}"))); + } else { + $menu->get("options_menu") + ->append(Menu::factory("link") + ->id("reset") + ->label(t("Reset count")) + ->css_class("ui-icon-refresh") + ->url(url::site("admin/reset_count?item_id={$item->id}"))); + } + } + } } \ No newline at end of file diff --git a/modules/reset_counts/helpers/reset_counts_installer.php b/modules/reset_counts/helpers/reset_counts_installer.php index b510da5..39ec141 100755 --- a/modules/reset_counts/helpers/reset_counts_installer.php +++ b/modules/reset_counts/helpers/reset_counts_installer.php @@ -1,28 +1,28 @@ - -
-

- -
+ +
+

+ +
diff --git a/modules/reset_counts/views/admin_reset_counts.html.php b/modules/reset_counts/views/admin_reset_counts.html.php index 12edf83..3a940b9 100755 --- a/modules/reset_counts/views/admin_reset_counts.html.php +++ b/modules/reset_counts/views/admin_reset_counts.html.php @@ -1,6 +1,6 @@ - -
-

-

- -
+ +
+

+

+ +
diff --git a/modules/treeview/module.info b/modules/treeview/module.info index a07d843..c42913e 100755 --- a/modules/treeview/module.info +++ b/modules/treeview/module.info @@ -1,7 +1,7 @@ -name = "Tree View Page" -description = "Displays links to all albums in the gallery on a seperate page." -version = 4 -author_name = "itzling" -author_url = "http://codex.galleryproject.org/User:Itzling" -info_url = "http://codex.galleryproject.org/Gallery3:Modules:treeview" -discuss_url = "http://galleryproject.org/node/112461" +name = "Tree View Page" +description = "Displays links to all albums in the gallery on a seperate page." +version = 4 +author_name = "itzling" +author_url = "http://codex.galleryproject.org/User:Itzling" +info_url = "http://codex.galleryproject.org/Gallery3:Modules:treeview" +discuss_url = "http://galleryproject.org/node/112461"