holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change Pixelegg template to no longer depend on jdots

Browse Source
This commit is contained in:
Ralf Becker 2016-05-02 14:19:34 +00:00
parent 57f8a9a8eb
commit 1cda6e6cb4
7 changed files with 1127 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Gruntfile.js
View File

@ -286,7 +286,6 @@ module.exports = function (grunt) {
"api\/templates\/default\/etemplate2.css", "api\/templates\/default\/etemplate2.css",
"pixelegg\/css\/pixelegg.css", "pixelegg\/css\/pixelegg.css",
"api\/templates\/default\/print.css", "api\/templates\/default\/print.css",
"jdots\/print.css",
"pixelegg\/print.css" "pixelegg\/print.css"
], ],
"pixelegg\/css\/mobile.min.css": [ "pixelegg\/css\/mobile.min.css": [
@ -302,7 +301,6 @@ module.exports = function (grunt) {
"api\/templates\/default\/etemplate2.css", "api\/templates\/default\/etemplate2.css",
"pixelegg\/css\/mobile.css", "pixelegg\/css\/mobile.css",
"api\/templates\/default\/print.css", "api\/templates\/default\/print.css",
"jdots\/print.css",
"pixelegg\/print.css" "pixelegg\/print.css"
], ],
"pixelegg\/mobile\/fw_mobile.min.css": [ "pixelegg\/mobile\/fw_mobile.min.css": [
@ -318,7 +316,6 @@ module.exports = function (grunt) {
"api\/templates\/default\/etemplate2.css", "api\/templates\/default\/etemplate2.css",
"pixelegg\/mobile\/fw_mobile.css", "pixelegg\/mobile\/fw_mobile.css",
"api\/templates\/default\/print.css", "api\/templates\/default\/print.css",
"jdots\/print.css",
"pixelegg\/print.css" "pixelegg\/print.css"
] ]
} }

5
api/src/Framework.php
View File

@ -14,9 +14,6 @@
namespace EGroupware\Api; namespace EGroupware\Api;
// import not yet ported non-namespaced classes
use jdots_framework;
/** /**
* Framework: virtual base class for all template sets * Framework: virtual base class for all template sets
* *
@ -210,7 +207,7 @@ abstract class Framework extends Framework\Extra
{ {
throw new Exception\AssertionFailed(__METHOD__."('".htmlspecialchars($url)."') can NOT redirect, output already started at $file line $line!"); throw new Exception\AssertionFailed(__METHOD__."('".htmlspecialchars($url)."') can NOT redirect, output already started at $file line $line!");
} }
if ($GLOBALS['egw']->framework instanceof jdots_framework && !empty($link_app)) if ($GLOBALS['egw']->framework instanceof Framework\Ajax && !empty($link_app))
{ {
self::set_extra('egw', 'redirect', array($url, $link_app)); self::set_extra('egw', 'redirect', array($url, $link_app));
$GLOBALS['egw']->framework->render(''); $GLOBALS['egw']->framework->render('');

1024
api/src/Framework/Ajax.php Executable file
View File

File diff suppressed because it is too large Load Diff

4
pixelegg/inc/class.pixelegg_framework.inc.php
View File

@ -18,7 +18,7 @@ use EGroupware\Api;
/** /**
* Stylite Pixelegg template * Stylite Pixelegg template
*/ */
class pixelegg_framework extends jdots_framework class pixelegg_framework extends Api\Framework\Ajax
{ {
/** /**
* Appname used for everything but JS includes, which we re-use from jdots * Appname used for everything but JS includes, which we re-use from jdots
@ -29,8 +29,6 @@ class pixelegg_framework extends jdots_framework
*/ */
const JS_INCLUDE_APP = 'pixelegg'; const JS_INCLUDE_APP = 'pixelegg';
/** /**
* Enable to use this template sets login.tpl for login page * Enable to use this template sets login.tpl for login page
*/ */

78
pixelegg/print.css
View File

@ -8,15 +8,81 @@
* @author Nathan Gray <ng@stylite.de> * @author Nathan Gray <ng@stylite.de>
* @version $Id$ * @version $Id$
*/ */
/**
/*@import url("../jdots/print.css");*/ * Stylite: jdots template: CSS for printing
*
* @link http://www.stylite.de
* @package jdots
* @author Andreas Stöckel <as@stylite.de>
* @author Ralf Becker <rb@stylite.de>
* @author Nathan Gray <ng@stylite.de>
* @version $Id$
*/
/*@import url("/api/templates/default/print.css");*/
/**
* Changes for jDots
*/
@media print {
@page {
margin: 1cm;
}
html,
body {
width: auto !important;
height: auto !important;
}
#egw_fw_sidebar,
#egw_fw_topmenu,
.egw_fw_ui_tabs_header,
#egw_fw_topmenu_slide,
#egw_fw_print,
#egw_fw_logout,
#divAppboxHeader {
display: none;
width: 0px;
}
#egw_fw_main,
#egw_fw_tabs {
margin: 0px !important;
float: none !important;
width: auto !important;
}
#egw_fw_basecontainer {
position: inherit;
width: auto;
}
.egw_fw_ui_tab_content {
position: relative;
float: none;
width: auto !important;
}
#egw_fw_main .egw_fw_ui_tab_content > div {
width: auto !important;
}
.egw_fw_ui_tab_content,
.egw_fw_ui_tab_content div.egw_fw_content_browser_div {
height: auto !important;
overflow-y: hidden;
position: relative;
padding: 0px;
border: none;
}
.egw_fw_ui_app_header_container {
border: none;
}
body {
background: white;
}
}
/* @media print */
/** /**
* Changes for Pixelegg * Changes for Pixelegg
*/ */
@media print { @media print {
#egw_fw_topmenu_addons, #egw_fw_header, #egw_fw_footer { #egw_fw_topmenu_addons,
#egw_fw_header,
#egw_fw_footer {
display: none; display: none;
} }
} /* @media print */ }
/* @media print */

22
pixelegg/print.less Normal file
View File

@ -0,0 +1,22 @@
/**
* Pixelegg template: CSS for printing
*
* @link http://www.stylite.de
* @package jdots
* @author Andreas Stöckel <as@stylite.de>
* @author Ralf Becker <rb@stylite.de>
* @author Nathan Gray <ng@stylite.de>
* @version $Id$
*/
@import (less) "../jdots/print.css";
/**
* Changes for Pixelegg
*/
@media print {
#egw_fw_topmenu_addons, #egw_fw_header, #egw_fw_footer {
display: none;
}
} /* @media print */

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

@ -11,7 +11,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'] = 'Pixelegg';
$GLOBALS['egw_info']['template']['pixelegg']['version'] = '14.1'; $GLOBALS['egw_info']['template']['pixelegg']['version'] = '16.1';
$GLOBALS['egw_info']['template']['pixelegg']['author'] = array( $GLOBALS['egw_info']['template']['pixelegg']['author'] = array(
array('name' => 'Stylite AG', 'url' => 'http://www.stylite.de/'), array('name' => 'Stylite AG', 'url' => 'http://www.stylite.de/'),
@ -22,12 +22,11 @@ $GLOBALS['egw_info']['template']['pixelegg']['icon'] = "pixelegg/images/logo.png
$GLOBALS['egw_info']['template']['pixelegg']['maintainer'] = array( $GLOBALS['egw_info']['template']['pixelegg']['maintainer'] = array(
array('name' => 'Stylite AG', 'url' => 'http://www.stylite.de/') array('name' => 'Stylite AG', 'url' => 'http://www.stylite.de/')
); );
$GLOBALS['egw_info']['template']['pixelegg']['description'] = "Pixelegg is the new EGroupware 14.1 template based on Stylite 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;
/* 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' => 'jdots', 'appname' => 'api',
'versions' => Array('14.1') 'versions' => Array('16.1')
); );