extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-24 17:04:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Template: relabeled Pixelegg template/theme to "Standard", and mobile theme for desktop to "Compact"

Browse Source
This commit is contained in:
Ralf Becker 2016-07-04 11:47:15 +02:00
parent 9a1742d749
commit 035593f8a6
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
api/src/Framework.php
View File

@ -979,6 +979,11 @@ abstract class Framework extends Framework\Extra
function list_themes() function list_themes()
{ {
$list = array(); $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'))) if (($dh = @opendir(EGW_SERVER_ROOT.$this->template_dir.'/css')))
{ {
while (($file = readdir($dh))) while (($file = readdir($dh)))
@ -986,7 +991,7 @@ abstract class Framework extends Framework\Extra
if (preg_match('/'."\.css$".'/i', $file)) if (preg_match('/'."\.css$".'/i', $file))
{ {
list($name) = explode('.',$file); list($name) = explode('.',$file);
$list[$name] = $name; if (!isset($list[$name])) $list[$name] = ucfirst ($name);
} }
} }
closedir($dh); closedir($dh);

3
pixelegg/css/mobile.css
View File

@ -3280,9 +3280,6 @@ body > div#egw_message {
#egw_fw_footer a { #egw_fw_footer a {
color: #696969; color: #696969;
} }
#egw_fw_footer a:last-child:after {
content: " + Layout: pixelegg";
}
#egw_fw_footer:hover { #egw_fw_footer:hover {
opacity: 0.1; opacity: 0.1;
transition: opacity 0.5s ease-out; transition: opacity 0.5s ease-out;

3
pixelegg/css/pixelegg.css
View File

@ -3269,9 +3269,6 @@ body > div#egw_message {
#egw_fw_footer a { #egw_fw_footer a {
color: #696969; color: #696969;
} }
#egw_fw_footer a:last-child:after {
content: " + Layout: pixelegg";
}
#egw_fw_footer:hover { #egw_fw_footer:hover {
opacity: 0.1; opacity: 0.1;
transition: opacity 0.5s ease-out; transition: opacity 0.5s ease-out;

2
pixelegg/less/layout_footer.less
View File

@ -31,8 +31,6 @@
color: @gray_50; color: @gray_50;
a {color: @gray_60;} a {color: @gray_60;}
a:last-child:after {content: " + Layout: pixelegg";}
} }

3
pixelegg/mobile/fw_mobile.css
View File

@ -3291,9 +3291,6 @@ body > div#egw_message {
#egw_fw_footer a { #egw_fw_footer a {
color: #696969; color: #696969;
} }
#egw_fw_footer a:last-child:after {
content: " + Layout: pixelegg";
}
#egw_fw_footer:hover { #egw_fw_footer:hover {
opacity: 0.1; opacity: 0.1;
transition: opacity 0.5s ease-out; transition: opacity 0.5s ease-out;

8
pixelegg/setup/setup.inc.php
View File

@ -10,7 +10,7 @@
*/ */
$GLOBALS['egw_info']['template']['pixelegg']['name'] = 'pixelegg'; $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']['version'] = '16.1';
$GLOBALS['egw_info']['template']['pixelegg']['author'] = array( $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']['description'] = "Pixelegg is the new EGroupware 14.1 template using jQuery.";
$GLOBALS['egw_info']['template']['pixelegg']['windowed'] = true; $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 // Dependencies for this template to work
$GLOBALS['egw_info']['template']['pixelegg']['depends'][] = array( $GLOBALS['egw_info']['template']['pixelegg']['depends'][] = array(
'appname' => 'api', 'appname' => 'api',