Changeset 5446 for trunk/admin

Timestamp:

Mar 29, 2010, 3:30:02 PM (14 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/admin

Files:

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

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>