Author: hnategh
New Revision: 54097
URL: http://svn.stylite.de/viewvc/egroupware?rev=54097&view=rev
Log:
Some fixes for tutorials:
- Fix tutorials not shown in idots
- Make sure def_tutorials css is loaded for all templates
- Invalidate the tutorials.xet for cache buster
Modified:
trunk/jdots/css/jdots.css
trunk/phpgwapi/js/jsapi/app_base.js
trunk/phpgwapi/templates/idots/css/traditional.css
Modified: trunk/jdots/css/jdots.css
URL: http://svn.stylite.de/viewvc/egroupware/trunk/jdots/css/jdots.css?rev=54097&r1=54096&r2=54097&view=diff
— trunk/jdots/css/jdots.css (original)
+++ trunk/jdots/css/jdots.css Wed Oct 28 15:03:25 2015
@@ -11,7 +11,6 @@
/* These imports processed by framework /
/@import url("…/…/phpgwapi/templates/idots/css/traditional.css");/
-/@import url("…/…/phpgwapi/templates/default/def_tutorials.css");/
/@import url("…/egw_fw.css");*/
/**
Modified: trunk/phpgwapi/js/jsapi/app_base.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/phpgwapi/js/jsapi/app_base.js?rev=54097&r1=54096&r2=54097&view=diff
— trunk/phpgwapi/js/jsapi/app_base.js (original)
+++ trunk/phpgwapi/js/jsapi/app_base.js Wed Oct 28 15:03:25 2015
@@ -115,6 +115,9 @@
this._init_sidebox(sidebox);
}
}
+
-
// Initialize egw tutorial sidebox -
this.egwTutorial_init();},
/**
@@ -149,8 +152,7 @@
// Highlights the favorite based on initial list state
this.highlight_favorite();
-
// Initialize egw tutorial sidebox -
this.egwTutorial_init();
-
},
/**
@@ -1015,7 +1017,7 @@// et2 object var etemplate = new etemplate2 (div, false);
-
var template = egw.webserverUrl+'/etemplate/templates/default/egw_tutorial.xet';
-
var template = egw.webserverUrl+'/etemplate/templates/default/egw_tutorial.xet?1'; this.egwTutorialGetData().then(function(_data){ var lang = egw.preference('lang');
Modified: trunk/phpgwapi/templates/idots/css/traditional.css
URL: http://svn.stylite.de/viewvc/egroupware/trunk/phpgwapi/templates/idots/css/traditional.css?rev=54097&r1=54096&r2=54097&view=diff
— trunk/phpgwapi/templates/idots/css/traditional.css (original)
+++ trunk/phpgwapi/templates/idots/css/traditional.css Wed Oct 28 15:03:25 2015
@@ -2,6 +2,8 @@
font styling
allowed attributes: font-family,font-size,color,font-weight
/
+
+/@import url("…/…/default/def_tutorials.css");*/
body
{
eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs