Changeset 5446

Timestamp:

03/29/10 15:30:02 (3 years ago)

Author:

patdenice

Message:

feature 1502: Allow to have configuration page for each theme.css.
About string for theme has to be saved in language theme directory (about.html)

Location:

trunk

Files:

• about.php (modified) (1 diff)
• admin/include/themes.class.php (modified) (5 diffs)
• admin/theme.php (added)
• admin/themes/default/default-layout.css (modified) (1 diff)
• admin/themes/default/template/themes_installed.tpl (modified) (4 diffs)
• include/template.class.php (modified) (2 diffs)

trunk/about.php

@@ -39 +39 @@
 include(PHPWG_ROOT_PATH.'include/page_header.php');
 
-/**
- * set in ./local/language/en_UK.lang.php (maybe to create)
- * for example for clear theme:
-  $lang['Theme: clear'] = 'This is the clear theme based on yoga template. '.
-  ' A standard template/theme of PhpWebgallery.';
- *
- * Don't forget php tags !!!
- *
- * Another way is to code it thru the theme itself in ./themeconf.inc.php
- */
-@include(PHPWG_ROOT_PATH.'template/'.$user['template'].
-  '/theme/'.$user['theme'].'/themeconf.inc.php');
-
-$template->set_filenames(
-  array(
-    'about'=>'about.tpl',
-    )
-  );
-if ( isset($lang['Theme: '.$user['theme']]) )
-{
-  $template->assign(
-    'THEME_ABOUT',l10n('Theme: '.$user['theme'])
-    );
-}
+$template->set_filename('about', 'about.tpl');
 
 $template->assign('ABOUT_MESSAGE', load_language('about.html','', array('return'=>true)) );
+
+$theme_about = load_language('about.html', PHPWG_THEMES_PATH.$user['theme'].'/', array('return' => true));
+if ( $theme_about !== false )
+{
+  $template->assign('THEME_ABOUT', $theme_about);
+}
 
 $template->pparse('about');

trunk/admin/include/themes.class.php

@@ -71 +71 @@
     }
 
+    $file_to_include = PHPWG_THEMES_PATH.'/'.$theme_id.'/admin/maintain.inc.php';
+
     $errors = array();
 
@@ -101 +103 @@
           break;
         }
-        
-        $query = "
+
+        if (file_exists($file_to_include))
+        {
+          include($file_to_include);
+          if (function_exists('theme_activate'))
+          {
+            theme_activate($theme_id, $this->fs_themes[$theme_id]['version'], $errors);
+          }
+        }
+
+        if (empty($errors))
+        {
+          $query = "
 INSERT INTO ".THEMES_TABLE."
   SET id = '".$theme_id."'
@@ -108 +121 @@
     , name = '".$this->fs_themes[$theme_id]['name']."'
 ;";
-        pwg_query($query);
+          pwg_query($query);
+        }
         break;
 
@@ -151 +165 @@
           $this->set_default_theme($new_theme);
         }
-        
+
+        if (file_exists($file_to_include))
+        {
+          include($file_to_include);
+          if (function_exists('theme_deactivate'))
+          {
+            theme_deactivate($theme_id);
+          }
+        }
+
         $query = "
 DELETE
@@ -375 +398 @@
               ;
           }
-          
+
+          $admin_file = $path.'/admin/admin.inc.php';
+          if (file_exists($admin_file))
+          {
+            $theme['admin_uri'] = get_root_url().'admin.php?page=theme&theme='.$file;
+          }
+
           // IMPORTANT SECURITY !
           $theme = array_map('htmlspecialchars', $theme);

trunk/admin/themes/default/default-layout.css

@@ -750 +750 @@
 }
 
-.themeBox {display:inline-block; text-align:center; height:180px; background-color:#eee; margin:5px; -moz-border-radius:5px;}
+.themeBox {display:inline-table; text-align:center; height:192px; background-color:#eee; margin:5px; -moz-border-radius:5px; overflow:hidden; }
 
 .themeBox IMG {border:1px solid white; margin:0 15px;}
 .themeName {font-size:1.1em; margin:5px 0;}
-.themeActions {margin:5px 0; font-size:12px;}
+.themeActions {display: table-row; font-size:12px; height: 43px; }
+.themeActions DIV {display: table-cell; vertical-align: middle; line-height:18px; }
 .themeActions A {}
 

trunk/admin/themes/default/template/themes_installed.tpl

@@ -14 +14 @@
     <div class="themeShot"><img src="{$theme.screenshot}"></div>
     <div class="themeActions">
-
+      <div>
 {if $theme.deactivable}
       <a href="{$deactivate_baseurl}{$theme.id}" title="{'Forbid this theme to users'|@translate}">{'Deactivate'|@translate}</a>
@@ -24 +24 @@
       | <a href="{$set_default_baseurl}{$theme.id}" title="{'Set as default theme for unregistered and new users'|@translate}">{'Default'|@translate}</a>
 {/if}
+{if isset($theme.admin_uri)}
+      <br><a href="{$theme.admin_uri}" title="{'Configuration'|@translate}">{'Configuration'|@translate}</a>
+{/if}
+      </div>
     </div> <!-- themeActions -->
   </div>
@@ -40 +44 @@
     <div class="themeShot"><img src="{$theme.screenshot}"></div>
     <div class="themeActions">
-
+      <div>
   {if $theme.activable}
       <a href="{$activate_baseurl}{$theme.id}" title="{'Make this theme available to users'|@translate}">{'Activate'|@translate}</a>
@@ -54 +58 @@
       <span title="{$theme.delete_tooltip}">{'Delete'|@translate}</span>
   {/if}
-
+      </div>
     </div>
     

trunk/include/template.class.php

@@ -95 +95 @@
     $this->set_template_dir($root.'/'.$theme.'/'.$path);
 
-    include($root.'/'.$theme.'/themeconf.inc.php');
+    $themeconf = $this->load_themeconf($root.'/'.$theme);
 
     if (isset($themeconf['parent']) and $themeconf['parent'] != $theme)
@@ -574 +574 @@
     return $source;
   }
+
+  function load_themeconf($dir)
+  {
+    global $themeconfs, $conf, $page;
+
+    $dir = realpath($dir);
+    if (!isset($themeconfs[$dir]))
+    {
+      $themeconf = array();
+      include($dir.'/themeconf.inc.php');
+      // Put themeconf in cache
+      $themeconfs[$dir] = $themeconf;
+    }
+    return $themeconfs[$dir];
+  }
 }