From 035593f8a69ecdd8b0d009c4988e47fcaa2155e8 Mon Sep 17 00:00:00 2001
From: Ralf Becker <RalfBecker@outdoor-training.de>
Date: Mon, 4 Jul 2016 11:47:15 +0200
Subject: [PATCH] * Template: relabeled Pixelegg template/theme to "Standard",
 and mobile theme for desktop to "Compact"

---
 api/src/Framework.php            | 7 ++++++-
 pixelegg/css/mobile.css          | 3 ---
 pixelegg/css/pixelegg.css        | 3 ---
 pixelegg/less/layout_footer.less | 2 --
 pixelegg/mobile/fw_mobile.css    | 3 ---
 pixelegg/setup/setup.inc.php     | 8 +++++++-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/api/src/Framework.php b/api/src/Framework.php
index 88bc42e397..8fe679fec5 100644
--- a/api/src/Framework.php
+++ b/api/src/Framework.php
@@ -979,6 +979,11 @@ abstract class Framework extends Framework\Extra
 	function list_themes()
 	{
 		$list = array();
+		if (file_exists($file=EGW_SERVER_ROOT.$this->template_dir.'/setup/setup.inc.php') &&
+			(include $file) && isset($GLOBALS['egw_info']['template'][$this->template]['themes']))
+		{
+			$list = $GLOBALS['egw_info']['template'][$this->template]['themes'];
+		}
 		if (($dh = @opendir(EGW_SERVER_ROOT.$this->template_dir.'/css')))
 		{
 			while (($file = readdir($dh)))
@@ -986,7 +991,7 @@ abstract class Framework extends Framework\Extra
 				if (preg_match('/'."\.css$".'/i', $file))
 				{
 					list($name) = explode('.',$file);
-					$list[$name] = $name;
+					if (!isset($list[$name])) $list[$name] = ucfirst ($name);
 				}
 			}
 			closedir($dh);
diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css
index 481c2efbf7..1fa56e5b38 100644
--- a/pixelegg/css/mobile.css
+++ b/pixelegg/css/mobile.css
@@ -3280,9 +3280,6 @@ body > div#egw_message {
 #egw_fw_footer a {
   color: #696969;
 }
-#egw_fw_footer a:last-child:after {
-  content: " + Layout: pixelegg";
-}
 #egw_fw_footer:hover {
   opacity: 0.1;
   transition: opacity 0.5s ease-out;
diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css
index 9975637c13..8d57a3d77b 100644
--- a/pixelegg/css/pixelegg.css
+++ b/pixelegg/css/pixelegg.css
@@ -3269,9 +3269,6 @@ body > div#egw_message {
 #egw_fw_footer a {
   color: #696969;
 }
-#egw_fw_footer a:last-child:after {
-  content: " + Layout: pixelegg";
-}
 #egw_fw_footer:hover {
   opacity: 0.1;
   transition: opacity 0.5s ease-out;
diff --git a/pixelegg/less/layout_footer.less b/pixelegg/less/layout_footer.less
index 9d378c6754..e01b92345f 100644
--- a/pixelegg/less/layout_footer.less
+++ b/pixelegg/less/layout_footer.less
@@ -31,8 +31,6 @@
 	color: @gray_50;
 
 	a {color: @gray_60;}
-
-	a:last-child:after {content: " + Layout: pixelegg";}
 }
 
 
diff --git a/pixelegg/mobile/fw_mobile.css b/pixelegg/mobile/fw_mobile.css
index 905bbce7b7..bd04cbeaef 100644
--- a/pixelegg/mobile/fw_mobile.css
+++ b/pixelegg/mobile/fw_mobile.css
@@ -3291,9 +3291,6 @@ body > div#egw_message {
 #egw_fw_footer a {
   color: #696969;
 }
-#egw_fw_footer a:last-child:after {
-  content: " + Layout: pixelegg";
-}
 #egw_fw_footer:hover {
   opacity: 0.1;
   transition: opacity 0.5s ease-out;
diff --git a/pixelegg/setup/setup.inc.php b/pixelegg/setup/setup.inc.php
index 1c3a3a1252..676976b221 100755
--- a/pixelegg/setup/setup.inc.php
+++ b/pixelegg/setup/setup.inc.php
@@ -10,7 +10,7 @@
  */
 
 $GLOBALS['egw_info']['template']['pixelegg']['name']      = 'pixelegg';
-$GLOBALS['egw_info']['template']['pixelegg']['title']     = 'Pixelegg';
+$GLOBALS['egw_info']['template']['pixelegg']['title']     = 'Standard';
 $GLOBALS['egw_info']['template']['pixelegg']['version']   = '16.1';
 
 $GLOBALS['egw_info']['template']['pixelegg']['author'] = array(
@@ -25,6 +25,12 @@ $GLOBALS['egw_info']['template']['pixelegg']['maintainer'] = array(
 $GLOBALS['egw_info']['template']['pixelegg']['description'] = "Pixelegg is the new EGroupware 14.1 template using jQuery.";
 $GLOBALS['egw_info']['template']['pixelegg']['windowed'] = true;
 
+// specify (different) labels for default themes
+$GLOBALS['egw_info']['template']['pixelegg']['themes'] = array(
+	'pixelegg' => 'Standard',
+	'mobile'   => 'Compact',
+);
+
 // Dependencies for this template to work
 $GLOBALS['egw_info']['template']['pixelegg']['depends'][] = array(
 	'appname' => 'api',