Changeset 960 for trunk/include

Timestamp:

Dec 3, 2005, 6:33:38 PM (18 years ago)

Author:

chrisaga

Message:

improve template : split theme from template itself

rest of the job : template (yoga), themes (clear dark), and php to handle them

Location:

trunk/include

Files:

• . (modified) (1 prop)
• common.inc.php (modified) (1 diff)
• functions.inc.php (modified) (3 diffs)
• functions_html.inc.php (modified) (1 diff)
• template.php (modified) (1 diff)

trunk/include

@@ -1 +1 @@
 mysql.inc.php
+config_local.inc.php

@@ -1 +1 @@
 mysql.inc.php
+config_local.inc.php

trunk/include/common.inc.php

@@ -221 +221 @@
 }
 
+// include template/theme configuration
+list($user['template'], $user['theme']) = explode('/', $user['template']);
+// TODO : replace initial $user['template'] by $user['layout']
+
+include(PHPWG_ROOT_PATH.'template/'.$user['template'].'/theme/'.$user['theme'].'/themeconf.inc.php');
+
 // template instance
 $template = new Template(PHPWG_ROOT_PATH.'template/'.$user['template']);

trunk/include/functions.inc.php

@@ -534 +534 @@
 
 /**
- * returns available templates
+ * returns available templates/themes
  */
 function get_templates()
 {
-  return get_dirs(PHPWG_ROOT_PATH.'template');
+  return get_dirs(PHPWG_ROOT_PATH.'theme');
+}
+function get_themes()
+{
+  $themes = array();
+
+  foreach (get_dirs(PHPWG_ROOT_PATH.'template') as $template)
+  {
+    foreach (get_dirs(PHPWG_ROOT_PATH.'template/'.$template.'/theme') as $theme)
+    {
+      array_push($themes, $template.'/'.$theme);
+    }
+  }
+
+  return $themes;
 }
 
@@ -566 +580 @@
   else
   {
-    $src = PHPWG_ROOT_PATH;
-    $src.= 'template/'.$user['template'].'/mimetypes/';
+    $src = get_themeconf('mime_icon_dir');
     $src.= strtolower(get_extension($path)).'.png';
   }
@@ -727 +740 @@
   return isset($lang[$key]) ? $lang[$key] : $key;
 }
+
+/**
+ * returns the corresponding value from $themeconf if existing. Else, the key is
+ * returned
+ *
+ * @param string key
+ * @return string
+ */
+function get_themeconf($key)
+{
+  global $themeconf;
+
+  return $themeconf[$key];
+}
 ?>

trunk/include/functions_html.inc.php

@@ -44 +44 @@
   if ( $diff < $user['recent_period'] * $day_in_seconds )
   {
-    $icon_url = './template/'.$user['template'].'/theme/';
-    $icon_url.= 'recent.png';
+    $icon_url = get_themeconf('icon_dir').'/recent.png';
     $title .= $user['recent_period'];
     $title .=  '&nbsp;'.$lang['days'];

trunk/include/template.php

@@ -331 +331 @@
       // PWG specific : communication between template and $lang
       $code = preg_replace('/\{lang:([^}]+)\}/e', "l10n('$1')", $code);
+      // PWG specific : expand themeconf.inc.php variables
+      $code = preg_replace('/\{themeconf:([^}]+)\}/e', "get_themeconf('$1')", $code);
             
       // replace \ with \\ and then ' with \'.

@@ -1 +1 @@
 mysql.inc.php
+config_local.inc.php