Changeset 30783

Timestamp:

Dec 19, 2014, 7:15:58 AM (9 years ago)

Author:

SergeD

Message:

version 1.1.19 - please refer to changelog for more details

Location:

extensions/greydragon

Files:

• admin/admin.inc.php (modified) (1 diff)
• changelog.txt (modified) (1 diff)
• css/styles.css (modified) (3 diffs)
• include/greydragon.class.php (modified) (5 diffs)
• js/theme.menu.js (modified) (1 diff)
• maintain.class.php (added)
• obsolete.list (added)
• template/header.tpl (modified) (2 diffs)
• themeconf.inc.php (modified) (1 diff)

extensions/greydragon/admin/admin.inc.php

@@ -38 +38 @@
   conf_update_param('greydragon', pwg_db_real_escape_string($conf['greydragon']));
 
-  if ($themeCore->getOption('p_lowertext') == "on"):
-    $css  = "/* Theme dynamic settings. Do not modify */\n"
-          . "html, body, input, select, textarea, file { text-transform: lowercase; }\n\n";
-  else:
-    $css = "";
-  endif;
-  $temp = $themeCore->getOption('p_customcss');
-  if ($temp):
-    $css .= "/* Custom CSS. Do not modify */\n" . $temp;
-  endif;
-
-  $fileName = $themeroot . 'css/custom.css';
-  if ($css):
-    $handle = fopen($fileName, "w");
-    if ($handle):
-      fwrite($handle, $css);
-      fclose($handle);
-    endif;
-  else:
-    @unlink($fileName);
-  endif;
+  $themeCore->prepareCustomCSS();
 
   pwg_set_session_var( 'purge_template', 1 );

extensions/greydragon/changelog.txt

@@ -18 +18 @@
 
 === Changelog ===
+version 1.1.19
++ custom.css location moved to local/greydragon/ to comply with PWG guidelines. File should be automatically created when theme is updated.
+  Please make sure that migration is successful as it may require adjustment of "local" Folder permissions in some cases
+- Fix issue when Static menu would cause misalignment of the content in 3rd party plugins
+- Adjust min height of the content with Static menu to better fit the screen
+- Fixed issue when using SEO friendly URLs would cause logo not being visible in sub pages
+
 version 1.0.18
 - Added check for custom.css being present on new installations to prevent SMARTY error

extensions/greydragon/css/styles.css

@@ -116 +116 @@
 /* Static */
 #menubar.static { background: none !important; bottom: auto; }
+body.static-menu .contentWithMenu, body.static-menu #the_page .contentWithMenu { margin-left: 200px; amargin-left: 0; }
+body.static-menu .contentWithMenu .titrePage { margin-left: -194px; }
+body.static-menu #mbCategories { margin-bottom: 1em; }
+
+/*
 body.static-menu .contentWithMenu ul.thumbnails,
 body.static-menu .contentWithMenu ul.thumbnailCategories,
@@ -122 +127 @@
 body.static-menu .contentWithMenu form.filter,
 body.static-menu .contentWithMenu .category_search_results { padding-left: 200px; margin-left: 0; }
+
 body.static-menu .contentWithMenu .titrePage { padding-left: 6px; }
 body.static-menu .contentWithMenu .calendarCalBar { margin-left: 210px; }
+*/
 
 /* Static header bottom */
@@ -306 +313 @@
 
 .content .additional_info { margin-top: 0.4em; margin-bottom: 0.4em; padding: .5em 1em; }
-body.static-menu .contentWithMenu .additional_info { margin-left: 204px; }
 #theImage .imageComment { margin: 1em 1em 0.4em 1em; padding: .5em 1em; }
 

extensions/greydragon/include/greydragon.class.php

@@ -3 +3 @@
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 
-define('GDTHEME_VERSION', '1.0.18');
+define('GDTHEME_VERSION', '1.1.19');
 
 define("QUOTES_NONE",   FALSE);
@@ -17 +17 @@
   private $themeConfig;
   private $themeConfigMin;
+  private $dir;
+  private $cssfile;
 
   public static function Instance($ver = '') {
@@ -26 +28 @@
 
   private function __construct($ver = ''){
+    $this->dir  = PHPWG_ROOT_PATH . PWG_LOCAL_DIR . 'greydragon/';
+
     self::loadConfig($ver);
   }
@@ -288 +292 @@
   public function getHeader() {
     $content = "";
+    $root_base = get_root_url();
+    if ($root_base):
+    else:
+      $root_base = '/';
+    endif;
+
     if ($this->hasOption('p_logo_path')):
-      $content .= '<a title="Home" id="g-logo" href="' . PHPWG_ROOT_PATH . '"><img alt="Home" src="' . PHPWG_ROOT_PATH . $this->getOption('p_logo_path') . '"></a>';
+      $content .= '<a title="Home" id="g-logo" href="' . $root_base . '"><img alt="Home" src="' . $root_base . $this->getOption('p_logo_path') . '"></a>';
     endif;
     if ($this->hasOption('p_header')):
-      $content .= '<a title="Home" id="g-header-text" href="' . PHPWG_ROOT_PATH . '">' . $this->getOption('p_header') . '</a>';
+      $content .= '<a title="Home" id="g-header-text" href="' . $root_base . '">' . $this->getOption('p_header') . '</a>';
     elseif ($this->hasOption('page_banner', TRUE)):
-      $content .= '<a title="Home" id="g-header-text" href="' . PHPWG_ROOT_PATH . '">' . $this->getOption('page_banner', TRUE) . '</a>';
+      $content .= '<a title="Home" id="g-header-text" href="' . $root_base . '">' . $this->getOption('page_banner', TRUE) . '</a>';
     endif;                                                                                                              
 
@@ -300 +310 @@
   }
 
+  public function prepareCustomCSS() {
+
+    $this->cssfile = dirname(dirname(dirname(dirname(__FILE__)))) . '/' . PWG_LOCAL_DIR . 'greydragon/custom.css';
+
+    if ($this->getOption('p_lowertext') == "on"):
+      $css  = "/* Theme dynamic settings. Do not modify */\n"
+            . "html, body, input, select, textarea, file { text-transform: lowercase; }\n\n";
+    else:
+      $css = "";
+    endif;
+    $temp = $this->getOption('p_customcss');
+    if ($temp):
+      $css .= "/* Custom CSS. Do not modify */\n" . $temp;
+    endif;
+
+    // create a local directory
+    if (!file_exists($this->dir)):
+      mkdir($this->dir, 0755);
+    endif;
+
+    if ($css):
+      $handle = fopen($this->cssfile, "w");
+      if ($handle):
+        fwrite($handle, $css);
+        fclose($handle);
+      endif;
+    else:
+      @unlink($this->cssfile);
+    endif;
+  }
+
+  public function deleteCustomCSS() {
+
+    // delete local folder
+    foreach (scandir($this->dir) as $file):
+      if ($file == '.' or $file == '..') continue;
+      unlink($this->dir . $file);
+    endforeach;
+    rmdir($this->dir);
+  }
+
 }
 

extensions/greydragon/js/theme.menu.js

@@ -42 +42 @@
     if (p_main_menu == 'static') { 
       var mh = jQuery('#menubar').height();
-      jQuery('.contentWithMenu').css("min-height", mh + 20);
+      jQuery('.contentWithMenu').css("min-height", mh + 30);
       jQuery('#menubar').css("display", "block"); 
       return; 

extensions/greydragon/template/header.tpl

@@ -34 +34 @@
 {if isset($U_UP)          }<link rel="up" title="{'Thumbnails'|@translate}" href="{$U_UP}" >{/if}
 {assign var=root value="themes/greydragon/css"}
+{assign var=local value="local/greydragon"}
 {assign var=colorpack value=$root|cat:"/colorpack/"|cat:$greydragon.p_colorpack|cat:"/styles.css"}
 {combine_css path="themes/greydragon/css/bootstrap.min.css" order=-100}
@@ -39 +40 @@
 {combine_css path="$colorpack" order=101}
 {if count($greydragon.p_customcss) > 0 || $greydragon.p_lowertext == "on"}
-  {if $root|cat:"/custom.css"|file_exists}
-  {combine_css path="themes/greydragon/css/custom.css" order=101}
+  {if $local|cat:"/custom.css"|file_exists}
+  {combine_css path="local/greydragon/custom.css" order=101}
   {/if}
 {/if}

extensions/greydragon/themeconf.inc.php

@@ -2 +2 @@
 /*
 Theme Name: GreyDragon
-Version: 1.0.18
+Version: 1.1.19
 Description: GreyDragon Theme
 Theme URI: http://piwigo.org/ext/extension_view.php?eid=775