Changeset 874

Timestamp:

03/13/09 18:53:39 (14 years ago)

Author:

bruno

bzr:base-revision:

svn-v4:b35155ea-a742-4b26-8089-0891bb790021:plugins/gallery/trunk:869

bzr:committer:

dsls <dsls@kissifrott>

bzr:mapping-version:

v4

bzr:repository-uuid:

b35155ea-a742-4b26-8089-0891bb790021

bzr:revision-id:

dsls@kissifrott-20090313164312-pmhf3cn7dk8y1adu

bzr:revno:

22

bzr:revprop:branch-nick:

gallery

bzr:root:

plugins/gallery/trunk

bzr:timestamp:

2009-03-13 17:43:12.414999962 +0100

bzr:user-agent:

bzr1.12+bzr-svn0.5.0

Message:

Added custom theme client-side support

Location:

plugins/gallery/trunk

Files:

• _public_tpl.php (modified) (2 diffs)
• _public_urlhandlers.php (modified) (2 diffs)
• class.dc.gallery.php (modified) (2 diffs)
• default-templates/gal_simple/gallery_item.html (modified) (1 diff)

plugins/gallery/trunk/_public_tpl.php

@@ -21 +21 @@
 $core->tpl->addValue('GalleryAttachmentThumbURL',array('tplGallery','GalleryAttachmentThumbURL'));
 $core->tpl->addValue('GalleryFeedURL',array('tplGallery','GalleryFeedURL'));
+$core->tpl->addValue('GalleryThemeParam',array('tplGallery','GalleryThemeParam'));
 
 /* Galleries items management */
@@ -270 +271 @@
      }
 
+     public static function GalleryThemeParam($attr)
+     {
+          global $_ctx;
+          $f = $GLOBALS['core']->tpl->getFilters($attr);
+          $querychar=($GLOBALS['core']->blog->settings->url_scan == 'path_info')?'?':'&';
+          return '<?php if (!is_null($_GET["theme"])): echo "'.
+               $querychar.'theme=".html::escapeHTML($_GET["theme"]);endif;?>';
+     }
+
      public static function GalleryItemMeta($attr)
      {

plugins/gallery/trunk/_public_urlhandlers.php

@@ -72 +72 @@
           $GLOBALS['_ctx']->gal_params = $gal_params;
           $GLOBALS['_ctx']->gallery_url = $GLOBALS['_ctx']->posts->post_url;
-          $GLOBALS['_ctx']->gallery_theme = $theme;
           $GLOBALS['_ctx']->comment_preview = new ArrayObject();
           $GLOBALS['_ctx']->comment_preview['content'] = '';
@@ -97 +96 @@
           $post_id = $GLOBALS['_ctx']->posts->post_id;
           $post_password = $GLOBALS['_ctx']->posts->post_password;
+          $wished=null;
+          if (isset($_GET['theme']))
+               $wished=html::escapeHTML($_GET['theme']);
           if ($themetoset) {
-               $theme = $GLOBALS['core']->gallery->getGalTheme($GLOBALS["_ctx"]->posts);
-               $GLOBALS['_ctx']->gallery_theme = $theme;
+               $theme = $GLOBALS['core']->gallery->getGalTheme($GLOBALS["_ctx"]->posts,'gal',$wished);
           } 
+
+          $GLOBALS['_ctx']->gallery_theme = $theme;
           
           

plugins/gallery/trunk/class.dc.gallery.php

@@ -89 +89 @@
      }
 
-     public function getGalTheme ($gal,$context='gal') {
+     /**
+      * getGalTheme
+      * 
+      * Retrieves gallery theme from gallery metadata
+      * Theme can be different according to context
+      * a wished theme can be specified, but it will be checked before
+      *
+      * @param record $gal the gallery record
+      * @param string $context context to fetch theme from (integ, gal) 
+      * @param string $wished wished theme (theme switcher, for instance)
+      * @access public
+      * @return string the gallery theme name
+      */
+     public function getGalTheme ($gal,$context='gal',$wished=null) {
+          if ($wished != null) {
+               if ($this->themeExists($wished))
+                    return $wished;
+          }
           $meta = $this->core->meta->getMetaArray($gal->post_meta);
           if ($context == 'gal') {
@@ -1214 +1231 @@
 
      /**
+      * themeExists
+      * 
+      * checks whether a gallery theme exists.
+      *
+      * @param string $theme the theme to check
+      * @access public
+      * @return boolean true if theme exits, false otherwise.
+      */
+     public function themeExists($theme) {
+          $galtheme=basename($theme);
+          if ($galtheme == "gal_feed")
+               return false;
+          $themes_dir = path::fullFromRoot($this->core->blog->settings->gallery_themes_path,DC_ROOT);
+          $theme_path = $themes_dir.'/gal_'.$galtheme;
+          return file_exists($theme_path) && is_dir($theme_path);
+     }
+
+     /**
       * fillGalleryContext 
       * 

plugins/gallery/trunk/default-templates/gal_simple/gallery_item.html

@@ -10 +10 @@
       <tpl:GalleryPagination>
 <p class="pagination">
-        <tpl:PaginationIf start="0"><a href="{{tpl:PaginationURL offset="-1"}}" class="next">&#171; {{tpl:lang previous images}}
+<tpl:PaginationIf start="0"><a href="{{tpl:PaginationURL offset="-1"}}{{tpl:GalleryThemeParam}}" class="next">&#171; {{tpl:lang previous images}}
         </a> - </tpl:PaginationIf>
         {{tpl:lang page}} {{tpl:PaginationCurrent}} {{tpl:lang of}} {{tpl:PaginationCounter}}
-        <tpl:PaginationIf end="0"> - <a href="{{tpl:PaginationURL offset="+1"}}" class="prev">
+     <tpl:PaginationIf end="0"> - <a href="{{tpl:PaginationURL offset="+1"}}{{tpl:GalleryThemeParam}}" class="prev">
         {{tpl:lang next images}} &#187;</a></tpl:PaginationIf>