moved all the images into the templates dir so that they can be changed as well

phpgwapi/phpgw.inc.php

@@ -191,7 +191,7 @@
 
       $sep = filesystem_separator();
       $template_root = $phpgw_info["server"]["server_root"] . $sep . $phpgw_info["flags"]["currentapp"]
-   	               . $sep . "templates" . $sep . $phpgw_info["server"]["default_tplset"];
+   	               . $sep . "templates" . $sep . $phpgw_info["server"]["template_set"];
       if (is_dir($template_root)) {          
          $this->template = new Template($template_root);
       }

phpgwapi/phpgw_common.inc.php

@@ -172,7 +172,7 @@
     {
        global $phpgw_info;
        $output_text = '<table border="0" cellspacing="0" cellpadding="0"><tr>';
-       $ir = $phpgw_info["server"]["webserver_url"] . "/images";
+       $ir = $phpgw_info["server"]["images_dir"];
 
        if ($fontsize) {
           $fs  = '<font size="' . $fontsize . '">';
@@ -275,10 +275,9 @@
           if ($phpgw_info["user"]["preferences"]["common"]["navbar_format"] != "text") {
              if ($appname != "home" && $appname != "logout" && $appname != "print") {
                 $output_text .= "<img src=\"" . $phpgw_info["server"]["webserver_url"] 
-                              . "/" . $appname . "/images" . "/navbar.gif\" border=0 alt=\"" . lang($description) . "\">";
+                              . "/" . $appname . "/templates/".$phpgw_info["server"]["template_set"]."/images" . "/navbar.gif\" border=0 alt=\"" . lang($description) . "\">";
           	} else {
-       	      $output_text .= "<img src=\"" . $phpgw_info["server"]["webserver_url"] 
-                    	       . "/images/$appname.gif\" border=0 alt=\"" . lang($description) . "\">";
+       	      $output_text .= "<img src=\"" . $phpgw_info["server"]["images_dir"]."/$appname.gif\" border=0 alt=\"" . lang($description) . "\">";
           	}
           }
 
@@ -444,7 +443,7 @@
        if ($phpgw_info["user"]["lastpasswd_change"] == 0) {
           echo "<br><center>" . lang("You are required to change your password "
  	       . "during your first login");
- 	       echo "<br> Click this image on the navbar: <img src=\"".$phpgw_info["server"]["webserver_url"]."/preferences/images/navbar.gif\">";
+ 	       echo "<br> Click this image on the navbar: <img src=\"".$phpgw_info["server"]["webserver_url"]."/preferences/templates/".$phpgw_info["server"]["template_set"]."/images/navbar.gif\">";
  	       echo "</center>";
        } else if ($phpgw_info["user"]["lastpasswd_change"] < time() - (86400*30)) {
    	    echo "<br><CENTER>" . lang("it has been more then x days since you "
@@ -986,6 +985,4 @@
            }
        }
     }
-
-
   }

phpgwapi/phpgw_info.inc.php

@@ -27,12 +27,12 @@
 	  echo "!!! PLEASE CORRECT THIS SITUATION !!!";
   }
 
-  if (empty($phpgw_info["server"]["default_tplset"])){
-    $phpgw_info["server"]["default_tplset"] = "default";
+  if (empty($phpgw_info["server"]["template_set"])){
+    $phpgw_info["server"]["template_set"] = "default";
   }
 
   if (empty($phpgw_info["server"]["template_dir"])){
-    $phpgw_info["server"]["template_dir"] = $phpgw_info["server"]["api_dir"]."/templates/".$phpgw_info["server"]["default_tplset"];
+    $phpgw_info["server"]["template_dir"] = $phpgw_info["server"]["api_dir"]."/templates/".$phpgw_info["server"]["template_set"];
   }
 
   if (!isset($phpgw_domain)) { // make them fix their header
@@ -93,14 +93,16 @@
   function phpgw_fillarray()
   {
     global $phpgw, $phpgw_info, $cd, $colspan;
-    $phpgw_info["server"]["images_dir"]   = $phpgw_info["server"]["webserver_url"] . "/images";
+    if (!isset($phpgw_info["server"]["images_dir"])){
+      $phpgw_info["server"]["images_dir"]   = $phpgw_info["server"]["webserver_url"] . "/phpgwapi/templates/".$phpgw_info["server"]["template_set"]."/images";
+    }
     $phpgw_info["server"]["template_dir"] = $phpgw_info["server"]["api_dir"] . "/templates/"
-                                          . $phpgw_info["server"]["default_tplset"];
+                                          . $phpgw_info["server"]["template_set"];
   
     $phpgw_info["server"]["app_root"]   = $phpgw_info["server"]["server_root"]."/".$phpgw_info["flags"]["currentapp"];
     $phpgw_info["server"]["app_inc"]    = $phpgw_info["server"]["app_root"]."/inc";
-    $phpgw_info["server"]["app_images"] = $phpgw_info["server"]["webserver_url"]."/".$phpgw_info["flags"]["currentapp"]."/images";
-    $phpgw_info["server"]["app_tpl"]    = $phpgw_info["server"]["app_root"]."/templates/".$phpgw_info["server"]["default_tplset"];
+    $phpgw_info["server"]["app_images"] = $phpgw_info["server"]["webserver_url"]."/".$phpgw_info["flags"]["currentapp"]."/templates/".$phpgw_info["server"]["template_set"]."/images";
+    $phpgw_info["server"]["app_tpl"]    = $phpgw_info["server"]["app_root"]."/templates/".$phpgw_info["server"]["template_set"];
   
     /* ********This sets the user variables******** */
     $phpgw_info["user"]["private_dir"] = $phpgw_info["server"]["files_dir"] . "/users/"

setup/sql/common_default_records.inc.php

@@ -13,7 +13,7 @@
 
   function add_default_server_config(){
     global $db, $phpgw_info, $currentver;
-    $db->query("insert into config (config_name, config_value) values ('default_tplset', 'default')");
+    $db->query("insert into config (config_name, config_value) values ('template_set', 'default')");
     $db->query("insert into config (config_name, config_value) values ('temp_dir', '/path/to/tmp')");
     $db->query("insert into config (config_name, config_value) values ('files_dir', '/path/to/dir/phpgroupware/files')");
     $db->query("insert into config (config_name, config_value) values ('encryptkey', 'change this phrase 2 something else')");
@@ -54,7 +54,7 @@
   if ($useglobalconfigsettings == "on"){
     if (is_file($basedir)){
       include ($phpgw_info["server"]["include_root"]."/globalconfig.inc.php");
-      $db->query("insert into config (config_name, config_value) values ('default_tplset', '".$phpgw_info["server"]["default_tplset"]."')");
+      $db->query("insert into config (config_name, config_value) values ('template_set', '".$phpgw_info["server"]["template_set"]."')");
       $db->query("insert into config (config_name, config_value) values ('temp_dir', '".$phpgw_info["server"]["temp_dir"]."')");
       $db->query("insert into config (config_name, config_value) values ('files_dir', '".$phpgw_info["server"]["files_dir"]."')");
       $db->query("insert into config (config_name, config_value) values ('encryptkey', '".$phpgw_info["server"]["encryptkey"]."')");

setup/sql/mysql_upgrade_prebeta.inc.php

@@ -137,7 +137,7 @@
     .")";
     $db->query($sql);  
 
-    $db->query("insert into config (config_name, config_value) values ('default_tplset', 'default')");
+    $db->query("insert into config (config_name, config_value) values ('template_set', 'default')");
     $db->query("insert into config (config_name, config_value) values ('temp_dir', '/path/to/tmp')");
     $db->query("insert into config (config_name, config_value) values ('files_dir', '/path/to/dir/phpgroupware/files')");
     $db->query("insert into config (config_name, config_value) values ('encryptkey', 'change this phrase 2 something else'");

setup/sql/pgsql_upgrade_prebeta.inc.php

@@ -127,7 +127,7 @@
     .")";
     $db->query($sql);  
 
-    $db->query("insert into config (config_name, config_value) values ('default_tplset', 'default')");
+    $db->query("insert into config (config_name, config_value) values ('template_set', 'default')");
     $db->query("insert into config (config_name, config_value) values ('temp_dir', '/path/to/tmp')");
     $db->query("insert into config (config_name, config_value) values ('files_dir', '/path/to/dir/phpgroupware/files')");
     $db->query("insert into config (config_name, config_value) values ('encryptkey', 'change this phrase 2 something else'");