From c1e9413b2aa0aa9c7da31acfaa661a0e855d66ad Mon Sep 17 00:00:00 2001 From: rWatcher Date: Wed, 27 Jun 2012 19:19:36 -0400 Subject: [PATCH] Remove unnecessary theme files. --- .../GreyDragon 3.1.0/views/calpage.html.php | 298 ------------------ .../GreyDragon 3.1.0/views/paginator.html.php | 210 ------------ .../GreyDragon 3.1.0/views/photo.html.php | 122 ------- .../views/tag_albums_album.html.php | 239 -------------- .../clean_canvas 1.0.7/views/calpage.html.php | 204 ------------ 5 files changed, 1073 deletions(-) delete mode 100644 3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.1.0/views/calpage.html.php delete mode 100644 3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.1.0/views/paginator.html.php delete mode 100644 3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.1.0/views/photo.html.php delete mode 100644 3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.1.0/views/tag_albums_album.html.php delete mode 100644 3.0/modules/tag_albums/-- Theme Files/clean_canvas 1.0.7/views/calpage.html.php diff --git a/3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.1.0/views/calpage.html.php b/3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.1.0/views/calpage.html.php deleted file mode 100644 index d385a514..00000000 --- a/3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.1.0/views/calpage.html.php +++ /dev/null @@ -1,298 +0,0 @@ - - -load_sessioninfo(); ?> - -html_attributes() ?> xml:lang="en" lang="en" is_rtl)? "dir=rtl" : null; ?> > -item(); - if (($theme->enable_pagecache) and (isset($item))): - // Page will expire in 60 seconds - header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 60).'GMT'); - header("Cache-Control: public"); - header("Cache-Control: post-check=3600, pre-check=43200", false); - header("Content-Type: text/html; charset=UTF-8"); - header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); - endif; -?> - - - -start_combining("script,css") ?> - - - -item()): ?> -bb2html($theme->item()->title, 2); ?> -tag()): ?> - $theme->bb2html($theme->tag()->name, 2))) ?> - -bb2html(item::root()->title, 2); ?> - - -<?= $_title ?> -disable_seosupport): ?> - - - - - - - - - " /> - -allow_root_page): ?> -: ; action-uri=url(); ?>?root=yes; icon-uri=favicon.ico" /> -: ; action-uri=url(); ?>?root=no; icon-uri=favicon.ico" /> - -: ; action-uri=url(); ?>; icon-uri=favicon.ico" /> - -admin): ?> - -: ; action-uri=; icon-uri=favicon.ico" /> - - - -appletouchicon): ?> - - -script("json2-min.js") ?> -script("jquery.js") ?> -script("jquery.form.js") ?> -script("jquery-ui.js") ?> -script("gallery.common.js") ?> - - -script("gallery.ajax.js"); ?> -script("gallery.dialog.js"); ?> - - -page_subtype == "photo"): ?> -script("jquery.scrollTo.js"); ?> -page_subtype == "movie"): ?> -script("flowplayer.js") ?> - - -head() ?> - - -theme_js_inject(); ?> -theme_css_inject(); ?> -get_combined("css"); // LOOKING FOR YOUR CSS? It's all been combined into the link ?> -custom_css_inject(TRUE); ?> -get_combined("script") // LOOKING FOR YOUR JAVASCRIPT? It's all been combined into the link ?> - - -thumb_inpage): ?> - - - -item()): - $item = $theme->item(); - else: - $item = item::root(); - endif; ?> -body_attributes() ?>show_root_page)? ' id="g-rootpage"' : null; ?> get_bodyclass(); ?>> -
-
-page_top() ?> -site_status() ?> -guest) or ($theme->show_guest_menu)) and ($theme->mainmenu_position == "bar")): ?> - -
- site_menu($theme->item() ? "#g-item-id-{$theme->item()->id}" : "") ?> -
- -
-header_top() ?> -viewmode != "mini"): ?> - -bb2html($header_text, 1) ?> - - - - -guest) or ($theme->show_guest_menu)) and ($theme->mainmenu_position != "bar")): ?> -
- site_menu($theme->item() ? "#g-item-id-{$theme->item()->id}" : "") ?> -
- - -messages() ?> -header_bottom() ?> - -loginmenu_position == "header"): ?> -user_menu() ?> - - - - - - - -breadcrumb_menu($theme, null); ?> - -breadcrumb_menu($theme, $parents); ?> - - - - - breadcrumb_menu function. - $breadcrumb_content = ""; - if ($this->breadcrumbs_position == "hide"): - else: - $limit_title_length = module::get_var("gallery", "visible_title_length", 999); - - $breadcrumb_content .= ''; - endif; - - print $breadcrumb_content; -?> - - - -custom_header(); ?> -
-page_subtype != "login") and ($theme->page_subtype != "reauthenticate") and ($theme->sidebarvisible == "top")): ?> -
- -
- -
-
-show_root_page): ?> - sidebar_menu($item->url()) ?> -
"> - - album_menu() ?> - - photo_menu() ?> - - movie_menu() ?> - - tag_menu() ?> - -
- -sidebarvisible): - case "left": - echo '
'; - $closediv = TRUE; - break; - case "none": - case "top": - case "bottom": - if (($theme->thumb_inpage) and ($page_subtype == "photo")): - echo '
'; - $closediv = TRUE; - else: - $closediv = FALSE; - endif; - break; - default: - echo '
'; - $closediv = TRUE; - break; - endswitch; ?> -page_subtype != "login") and ($theme->page_subtype != "reauthenticate")): ?> -sidebarvisible == "none") or ($theme->sidebarvisible == "bottom") or ($theme->sidebarvisible == "top")): ?> -thumb_inpage) and ($page_subtype == "photo")): ?> -

 

'; ?> -get_block_html("thumbnav"); ?> - - - - - -" : null; ?> - -sidebarvisible): - case "left": - echo '
'; - break; - case "none": - case "top": - case "bottom": - if (($theme->thumb_inpage) and ($page_subtype == "photo")): - echo '
'; - else: - echo '
'; - endif; - break; - default: - echo '
'; - break; - endswitch; - - if ($theme->show_root_page): - echo new View("rootpage.html"); - else: - echo $content; - endif; ?> -
-
-
-page_subtype != "login") and ($theme->page_subtype != "reauthenticate") and ($theme->sidebarvisible == "bottom")): ?> -
- -
- - -page_bottom() ?> - - diff --git a/3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.1.0/views/paginator.html.php b/3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.1.0/views/paginator.html.php deleted file mode 100644 index 0a85b414..00000000 --- a/3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.1.0/views/paginator.html.php +++ /dev/null @@ -1,210 +0,0 @@ - - - -id . "/" . $tag_id . "/" . $album_id . "/" . urlencode($siblings[$i-1]->name)); - } elseif ($page_type == "") { - } - endfor; - else: - // End rWatcher Mod. - - switch ($page_type) { - case "collection": - if (isset($item)): - $parent = $item->parent(); - endif; - $current_page = $page; - $total_pages = $max_pages; - // Prepare page url list - for ($i = 1; $i <= $total_pages; $i++): - $_pagelist[$i] = url::site(url::merge(array("page" => $i))); - endfor; - break; - case "item": - if (isset($item)): - $parent = $item->parent(); - endif; - $current_page = $position; - $total_pages = $total; - if (isset($parent)): - $siblings = $parent->children(); - for ($i = 1; $i <= $total; $i++): - $_pagelist[$i] = $siblings[$i-1]->url(); - endfor; - endif; - break; - default: - $current_page = 1; - $total_pages = 1; - $_pagelist[1] = url::site(); - break; - } - -// rWatcher Mod - endif; -// End rWatcher Mod. - - if ($total_pages <= 1): - $pagination_msg = " "; - else: - $pagination_msg = t("Page:") . ' '; - if ($total_pages < 13): - for ($i = 1; $i <= $total_pages; $i++): - if ($i == $current_page): - $pagination_msg .= '' . t($i) . ''; - else: - $pagination_msg .= '' . t($i) . ''; - endif; - if ($i < $total_pages): - $pagination_msg .= '·'; - endif; - endfor; - elseif ($current_page < 9): - for ($i = 1; $i <= 10; $i++): - if ($i == $current_page): - $pagination_msg .= '' . t($i) . ''; - else: - $pagination_msg .= '' . t($i) . ''; - endif; - if ($i < 10): - $pagination_msg .= '·'; - endif; - endfor; - - $pagination_msg .= '…'; - $pagination_msg .= '' . t($total_pages - 1) . ''; - $pagination_msg .= '·'; - $pagination_msg .= '' . t($total_pages) . ''; - - elseif ($current_page > $total_pages - 8): - $pagination_msg .= '' . t(1) . ''; - $pagination_msg .= '·'; - $pagination_msg .= '' . t(2) . ''; - $pagination_msg .= '…'; - - for ($i = $total_pages - 9; $i <= $total_pages; $i++): - if ($i == $current_page): - $pagination_msg .= '' . t($i) . ''; - else: - $pagination_msg .= '' . t($i) . ''; - endif; - if ($i < $total_pages): - $pagination_msg .= '·'; - endif; - endfor; - - else: - $pagination_msg .= '' . t(1) . ''; - $pagination_msg .= '·'; - $pagination_msg .= '' . t(2) . ''; - $pagination_msg .= '…'; - - for ($i = $current_page - 5; $i <= $current_page + 5; $i++): - if ($i == $current_page): - $pagination_msg .= '' . t($i) . ''; - else: - $pagination_msg .= '' . t($i) . ''; - endif; - if ($i < $current_page + 5): - $pagination_msg .= '·'; - endif; - endfor; - - $pagination_msg .= '…'; - $pagination_msg .= '' . t($total_pages - 1) . ''; - $pagination_msg .= '·'; - $pagination_msg .= '' . t($total_pages) . ''; - endif; - endif; -?> - - \ No newline at end of file diff --git a/3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.1.0/views/photo.html.php b/3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.1.0/views/photo.html.php deleted file mode 100644 index bfe20999..00000000 --- a/3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.1.0/views/photo.html.php +++ /dev/null @@ -1,122 +0,0 @@ - -desc_allowbbcode): - $_description = $theme->bb2html($item->description, 1); - else: - $_description = nl2br(html::purify($item->description)); - endif; - - if ($theme->is_photometa_visible): - $_description .= '
    ' . $theme->thumb_info($item) . '
'; - endif; - - switch ($theme->photo_popupbox): - case "preview": - $include_list = FALSE; - $include_single = TRUE; - break; - case "none": - $include_list = FALSE; - $include_single = FALSE; - break; - default: - $include_list = TRUE; - $include_single = TRUE; - break; - endswitch; -?> - -
- bb2html(html::purify($item->title), 1); ?> -
-

-
- add_paginator("top", FALSE); ?> - photo_top() ?> - photo_descmode == "top") and ($_description)): ?> -
- -
- resize_top($item) ?> - resize_width; -// rWatcher Modification. - //ORIGINAL LINE $siblings = $item->parent()->children(); - $siblings = ""; - if (isset($dynamic_siblings)) { - $siblings = $dynamic_siblings; - } else { - $siblings = $item->parent()->children(); - } -// End rWatcher Modification - ?> - -
- \n"; - $script .= " if (document.images) {\n"; - for ($i = 0; ($i <= count($siblings) - 1); $i++): - if ($siblings[$i]->rand_key == $item->rand_key): ?> - " title="bb2html(html::purify($item->title), 2) ?>" href="file_url() : $item->resize_url(); ?>"> - resize_img(array("id" => "g-photo-id-{$item->id}", "class" => "g-resize", "alt" => $_title)) ?> - - resize_url() . "\";\n"; - endif; - if ($i > 0): - $script .= " var image_preload_p = new Image();\n image_preload_p.src = \"" . $siblings[$i-1]->resize_url() . "\";\n"; - endif; - else: - if ($include_list): ?> - is_album()): ?> - file_url() : $siblings[$i]->resize_url(); ?>">  - - - - - \n"; ?> - photo_descmode): - case "overlay_top": - $_align = "g-align-top"; - break; - case "overlay_bottom": - $_align = "g-align-bottom"; - break; - default: - break; - endswitch; - endif; ?> - - -
- - -
- -
- resize_bottom($item) ?> -
- photo_descmode == "bottom") and ($_description)): ?> -
- - add_paginator("bottom", FALSE); ?> - photo_bottom() ?> -
- \ No newline at end of file diff --git a/3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.1.0/views/tag_albums_album.html.php b/3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.1.0/views/tag_albums_album.html.php deleted file mode 100644 index ac750319..00000000 --- a/3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.1.0/views/tag_albums_album.html.php +++ /dev/null @@ -1,239 +0,0 @@ - -album_top() was changed to $theme->dynamic_top(). - // $item->title and $item->description have been changed to $title and $description. - // - // The g-album-grid block was also taken from album.html.php. The section for uploading new photos to an empty album - // has been removed. Also, $theme->context_menu has been removed as well (it was crashing the page). -?> - -
- dynamic_top() ?> -

bb2html(html::purify($title), 1) ?>

-
- -add_paginator("top"); ?> - -album_descmode == "top") and ($description)): ?> -
bb2html(html::purify($description), 1) ?>
- - - -
-
-
-
- - -
-
    -disablephotopage) && (count($siblings) > count($children))): - $j = 0; - foreach ($siblings as $i => $sibling): - //if ($sibling->rand_key == $children[$j]->rand_key): - if ($sibling->id == $children[$j]->item_id): - //echo $theme->get_thumb_element($sibling, !$theme->hidecontextmenu); - echo rw_get_thumb_element($children[$j], $theme); - if ($j + 1 < count($children)): - $j++; - endif; - else: - echo $theme->get_thumb_link($sibling); - //echo rw_get_thumb_link($sibling, $theme); - endif; - endforeach; - else: - foreach ($children as $i => $child): - //echo $theme->get_thumb_element($child, !$theme->hidecontextmenu); - echo rw_get_thumb_element($child, $theme); - endforeach; - endif; - else: ?> -
    • - -
-
- -dynamic_bottom() ?> - -album_descmode == "bottom") and ($description)): ?> -
bb2html(html::purify($description), 1) ?>
- - -add_paginator("bottom"); ?> - -is_album()): - return ""; - endif; - - /* - if (access::can("view_full", $item)): - $direct_link = $item->file_url(); - else: - $direct_link = $item->resize_url(); - endif;*/ - $direct_link = $child->full_or_resize_url(); - - return ''; - } - - function rw_get_thumb_element($child, $theme) { - // This code is based on grey dragon's get_thumb_element function. - // Change all $item to $child - // Change all $this to $theme - $thumb_item = $child; - if ($theme->thumb_random): - if ($child->is_album() && ($rnd = item::random_query()->where("parent_id", "=", $child->id)->find()) && $rnd->loaded()): - $thumb_item = $rnd; - endif; - endif; - - $item_class = $child->is_album() ? "g-album" : "g-photo"; - $content = '
  • has_thumb()): - $is_portrait = ($thumb_item->thumb_height > $thumb_item->thumb_width); - $_shift = ""; - switch ($theme->thumb_imgalign): - case "center": - if (($theme->crop_factor == 1) and (!$is_portrait)): - $_shift = 'style="margin-top: ' . intval(($theme->_thumb_size_y - $thumb_item->thumb_height) / 2) . 'px;"'; - elseif ($theme->crop_factor > 0): - $_shift = 'style="margin-top: -' . intval(($thumb_item->thumb_height - $theme->_thumb_size_y) / 2) . 'px;"'; - endif; - break; - case "bottom": - if (($theme->crop_factor == 1) and (!$is_portrait)): - $_shift = 'style="margin-top: ' . intval($theme->_thumb_size_y - $thumb_item->thumb_height) . 'px;"'; - elseif ($theme->crop_factor > 0): - $_shift = 'style="margin-top: -' . intval($thumb_item->thumb_height - $theme->_thumb_size_y) . 'px;"'; - endif; - break; - case "fit": - break; - case "top": - default: - break; - endswitch; - else: - $is_portrait = FALSE; - $_shift = 'style="margin-top: 0px;"'; - endif; - - $content .= ($is_portrait)? " g-portrait" : " g-landscape"; - $content .= '">' . $theme->thumb_top($child); - - $content .= '
    '; - $thumb_content = '

    '; - - $use_direct_link = (($theme->disablephotopage) && (!$child->is_album())); - $class_name = "g-thumblink"; - if ($use_direct_link): - $class_name .= ' g-sb-preview" rel="g-preview'; - //if (access::can("view_full", $child)): - //$direct_link = $child->file_url(); - //else: - $direct_link = $child->full_or_resize_url(); - //endif; - else: - $direct_link = $child->url(); - endif; - - if ($use_direct_link && module::is_active("exif") && module::info("exif")): - $thumb_content .= 'id}") . '" title="' . t("Photo details")->for_html_attr() . '"> '; - endif; - - $thumb_content .= ''; - if ($thumb_item->has_thumb()): - if (($theme->crop_factor > 1) && ($theme->thumb_imgalign == "fit")): - if ($thumb_item->thumb_height > $theme->_thumb_size_y): - if ($is_portrait): - $_max = $theme->_thumb_size_y; - else: - $_max = intval($theme->_thumb_size_x * ($theme->_thumb_size_y / $thumb_item->thumb_height)); - endif; - else: - $_max = $theme->_thumb_size_x; - endif; - $_max = min($thumb_item->thumb_width, $_max); - $thumb_content .= $thumb_item->thumb_img(array(), $_max); - else: - $thumb_content .= $thumb_item->thumb_img(); - endif; - else: - $thumb_content .= 'No Image'; - endif; - $thumb_content .= '

    '; - - if (($theme->thumb_metamode != "hide") and ($_thumb_descmode == "overlay_bottom")): - $_thumb_metamode = "merged"; - else: - $_thumb_metamode = $theme->thumb_metamode; - endif; - - if (($_thumb_descmode == "overlay") or ($_thumb_descmode == "overlay_top") or ($_thumb_descmode == "overlay_bottom")): - $thumb_content .= '
      bb2html(html::purify($child->title), 2) . ''; - if ($_thumb_metamode == "merged"): - $thumb_content .= $theme->thumb_info($child); - endif; - $thumb_content .= '
    '; - endif; - - if (($_thumb_metamode == "default") and ($_thumb_descmode != "overlay_bottom")): - $thumb_content .= '
      ' . $theme->thumb_info($child) . '
    '; - endif; - - if ($_thumb_descmode == "bottom"): - $thumb_content .= '
      '; - $thumb_content .= '
    • ' . $theme->bb2html(html::purify($child->title), 2) . '
      • '; - if ($_thumb_metamode == "merged"): - $thumb_content .= $theme->thumb_info($item); - endif; - $thumb_content .= '
    '; - endif; - - /* - if ($addcontext): - $_text = $this->context_menu($item, "#g-item-id-{$item->id} .g-thumbnail"); - $thumb_content .= (stripos($_text, '
  • '))? $_text : null; - endif; - */ - try { - $view = new View("frame.html"); - $view->thumb_content = $thumb_content; - $content .= $view; - } catch (Exception $e) { - $content .= $thumb_content; - } - - $content .= '
    • '; - $content .= $theme->thumb_bottom($child); - $content .= ''; - - return $content; - //print $content; - // End of modified function code. - } -?> \ No newline at end of file diff --git a/3.0/modules/tag_albums/-- Theme Files/clean_canvas 1.0.7/views/calpage.html.php b/3.0/modules/tag_albums/-- Theme Files/clean_canvas 1.0.7/views/calpage.html.php deleted file mode 100644 index 9b4635ef..00000000 --- a/3.0/modules/tag_albums/-- Theme Files/clean_canvas 1.0.7/views/calpage.html.php +++ /dev/null @@ -1,204 +0,0 @@ - - -html_attributes() ?> xml:lang="en" lang="en"> - - - start_combining("script,css") ?> - - <? if ($page_title): ?> - <?= $page_title ?> - <? else: ?> - <? if ($theme->item()): ?> - <?= $theme->item()->title ?> - <? elseif ($theme->tag()): ?> - <?= t("Photos tagged with %tag_title", array("tag_title" => $theme->tag()->name)) ?> - <? else: /* Not an item, not a tag, no page_title specified. Help! */ ?> - <?= item::root()->title ?> - <? endif ?> - <? endif ?> - - " - type="image/x-icon" /> - - page_type == "collection"): ?> - - - - - - - - script("json2-min.js") ?> - script("jquery.js") ?> - script("jquery.form.js") ?> - script("jquery-ui.js") ?> - script("gallery.common.js") ?> - - - script("gallery.ajax.js") ?> - script("gallery.dialog.js") ?> - script("superfish/js/superfish.js") ?> - script("jquery.localscroll.js") ?> - - - page_subtype == "photo"): ?> - script("jquery.scrollTo.js") ?> - script("gallery.show_full_size.js") ?> - page_subtype == "movie"): ?> - script("flowplayer.js") ?> - - - head() ?> - - - script("ui.init.js") ?> - css("yui/reset-fonts-grids.css") ?> - css("superfish/css/superfish.css") ?> - - css("dark/themeroller/ui.base.css") ?> - css("dark/screen_colors.css") ?> - css("dark/screen_candy.css") ?> - - css("clean/themeroller/ui.base.css") ?> - css("clean/screen_colors.css") ?> - css("clean/screen_candy.css") ?> - - css("screen_layout_base.css") ?> - css("screen_fonts.css") ?> - - css("screen_layout_wide.css") ?> - - css("screen_layout_fixed.css") ?> - - - - - get_combined("script") ?> - - - get_combined("css") ?> - - - body_attributes() ?>> - page_top() ?> - -
    - -
    - - site_status() ?> -
    -
    - - - - - - user_menu() ?> - header_top() ?> -
    - - 1 ) { ?> - $display_name) { ?> - - - - installed_locales = array_merge(array("" => t("« none »")), $locales); ?> - selected = (string) locales::cookie_locale(); ?> - - -
    - - - - - header_bottom() ?> -
    - - - - - - - -
    -
    -
    -
    -
    - messages() ?> - -
    -
    -
    - item() && !empty($parents))): ?> - - -
    - page_subtype != "login"): ?> - - -
    -
    - -
    - page_bottom() ?> - -