Changeset 19217

Timestamp:

Nov 29, 2012, 1:47:34 PM (11 years ago)

Author:

cljosse

Message:

[style] Gally-cuise fix compatibility with 2.4 (gally-grum-dark-II)

Location:

extensions/gally/gally-cuise

Files:

• admin/admin.inc.php (modified) (2 diffs)
• conf/default.conf (modified) (4 diffs)
• css/cuise_theme.css.php (deleted)
• css/theme.css (modified) (1 diff)
• icon/admin (deleted)
• icon/mimetypes (deleted)
• js/theme.js (modified) (3 diffs)
• local_head.tpl (modified) (1 diff)
• theme.css.php (added)
• themeconf.inc.php (modified) (2 diffs)

extensions/gally/gally-cuise/admin/admin.inc.php

@@ -1 +1 @@
 <?php
 /* -----------------------------------------------------------------------------
-  Theme      : Gally/Cuise
-  Author     : Grum + cljosse
+  Theme      : Gally/Grum dark II
+  Author     : Grum
     email    : grum@piwigo.org
-    website  : http://cl.josse.free.fr/Galerie
+    website  : http://photos.grum.fr
 
     << May the Little SpaceFrog be with you ! >>
@@ -13 +13 @@
 include_once(PHPWG_THEMES_PATH.'gally-default/admin/GallyDefault.class.inc.php');
 
-$interface = new GallyDefault("Gally/cuise", "", PHPWG_THEMES_PATH.'gally-cuise/conf');
+$interface = new GallyDefault("Gally/Grum dark II", "", PHPWG_THEMES_PATH.'gally-grum-dark-II/conf');
 
 ?>

extensions/gally/gally-cuise/conf/default.conf

@@ -1 +1 @@
 # ------------------------------------------------------------------------------
-# GRUM:CUISE
+# GRUM:DARK-II
 # Theme for Piwigo
 # ------------------------------------------------------------------------------
-# file: gally-cuise/conf/default.conf
-# file release: 1.3.0
+# file: gally-grum-dark-II/conf/default.conf
+# file release: 1.5.0
 # ------------------------------------------------------------------------------
 # author: grum at piwigo.org
 # << May the Little SpaceFrog be with you >>
 # ------------------------------------------------------------------------------
-# Cuise for themes "Gally"
+# Grum dark II for themes "Gally"
 #
 # see the gally-default/release_notes.txt file for more informations
@@ -17 +17 @@
 # To modify theses default options, you can make a "local.conf" file with new
 # declaration of parameters
-# Local files must be localized in the /local/themes/gally-cuise/conf
+# Local files must be localized in the /local/themes/gally-grum-dark-II/conf
 # directory
 #
@@ -233 +233 @@
 #
 # please note that under MSIE, the "auto" option don't work as well as other browser
-menuWidth = "190"
+menuWidth = "auto"
 
 # The 'menuMaxWidth' option is used when the 'menuWidth' option is set to "auto"
@@ -244 +244 @@
 # 'menuMSIEMaxWidth' option you can force a maximum width only for this browser
 # This option is not used when the 'menuAnimated' option is set to "noswitch"
-menuMaxWidth = 190
-menuMSIEMaxWidth = 190
+menuMaxWidth = 0
+menuMSIEMaxWidth = 350
 
 # -- 1.3.0 --

extensions/gally/gally-cuise/css/theme.css

@@ -1 +1 @@
 /* -----------------------------------------------------------------------------
-  CUISE
+  GRUM:DARK-II
   A Gally's theme for Piwigo
   ------------------------------------------------------------------------------
-  file: gally-cuise/css/theme.css
+  file: gally/grum-dark II/theme.css
   file version: 1.5.0
   ------------------------------------------------------------------------------
-  author: grum at grum.fr + cljosse 
+  author: grum at grum.fr
   << May the Little SpaceFrog be with you >>
   ------------------------------------------------------------------------------
-  cuise for template "Gally"
+  Grum-dark II for template "Gally"
 ----------------------------------------------------------------------------- */
 

extensions/gally/gally-cuise/js/theme.js

@@ -21 +21 @@
   {
     gallyCuise = new GallyCuise();
-  }
+ 
+  
+    jQuery('a.pwg-state-default').each(function (i) {
+      obj = this;
+
+
+      jQuery(obj).addClass("button").removeClass('pwg-state-default').removeClass('pwg-button');
+      html = jQuery(obj).html();
+      if (html.indexOf("url(") > 0) {
+
+        id = this.id;
+        jQuery(this).css({
+         backgroundPosition:"-588px +28px"  
+         
+         });
+        htmls = html.split("url(");
+        htmls = htmls[1].split(")");
+        html = "<img src=" + htmls[0] + " class='pwg-button img_button'   />";
+ 
+      }else if (html.indexOf("map") > 0) {
+      html="";
+      jQuery(this).css({
+         backgroundPosition:"-588px -28px" ,
+         position:'relative' 
+        // bottom:'-10px',left:'-5px'
+         });
+      }
+
+      jQuery(obj).html(html);
+    });
+ }
 );
 
@@ -27 +57 @@
   function GallyCuise()
 {
-  function init()
-  {
+  function init() { 
+
+  
     // apply specific actions for categories pages
     if(jQuery('#theCategoryPage').length>0)
@@ -41 +72 @@
     }
     setTipPosition_Menu();
+    win_height = jQuery("#thumbContents").height();
+    if (!win_height)
+      win_height = jQuery("#theImage").height();
+
   }
 

extensions/gally/gally-cuise/local_head.tpl

@@ +1 @@
+
+{php} 
+global $themeconf,$mytheme;
+$mytheme = 'themes/'.$themeconf['name'].'/';
+$mycss="theme.css.php";
+  {/php}
+<!-- gally-cuise **LOCAL** >HEADER> {php} echo  $mytheme.$mycss ;  {/php} -->
+ <link rel="stylesheet" href="{php} echo  $mytheme.$mycss ;  {/php}"  type="text/css" /> 
 <!-- **LOCAL** >HEADER> -->
- <style type="text/css">
-{php}  
-include('themes/gally-cuise/css/cuise_theme.css.php');
-{/php}
-</style>
-<!-- **LOCAL** >HEADER> -->

extensions/gally/gally-cuise/themeconf.inc.php

@@ -1 +1 @@
 <?php
 /*
-Theme Name: Gally/cuise
+Theme Name: Gally/Cuise
 Version: 2.0.7
 Description: Cuise theme
@@ -9 +9 @@
 */
 
+
+global $themeconf ;
+ 
+
 $themeconf = array(
   'name' => 'gally-cuise',
-  'theme' => 'gally-cuise',
+  'theme_dir' => 'gally-cuise',
+  'img_dir' => 'themes/gally-cuise/images',
+
   'parent' => 'gally-default',
   'icon_dir' => 'themes/gally-cuise/icon',
-  'mime_icon_dir' => 'themes/gally-cuise/icon/mimetypes/',
- 'local_head'           => 'local_head.tpl',
+
+  'admin_icon_dir' => 'themes/default/icon/admin',
+  'mime_icon_dir' => 'themes/default/icon/mimetypes/',
+  'local_head' => 'local_head.tpl',
+  'load_parent_local_head' => true,
 );
+
 ?>