From 93fe78b8ba64886c5fe20b0f93dfd594bd5b3a30 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Wed, 28 Oct 2015 14:03:25 +0000
Subject: [PATCH] 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

---
 phpgwapi/js/jsapi/app_base.js                | 8 +++++---
 phpgwapi/templates/idots/css/traditional.css | 2 ++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/phpgwapi/js/jsapi/app_base.js b/phpgwapi/js/jsapi/app_base.js
index 34e3862c4b..a0db959ae9 100644
--- a/phpgwapi/js/jsapi/app_base.js
+++ b/phpgwapi/js/jsapi/app_base.js
@@ -115,6 +115,9 @@ var AppJS = Class.extend(
 				this._init_sidebox(sidebox);
 			}
 		}
+		
+		// Initialize egw tutorial sidebox
+		this.egwTutorial_init();
 	},
 
 	/**
@@ -149,8 +152,7 @@ var AppJS = Class.extend(
 		// Highlights the favorite based on initial list state
 		this.highlight_favorite();
 
-		// Initialize egw tutorial sidebox
-		this.egwTutorial_init();
+		
 	},
 
 	/**
@@ -1015,7 +1017,7 @@ var AppJS = Class.extend(
 
 		// 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');
diff --git a/phpgwapi/templates/idots/css/traditional.css b/phpgwapi/templates/idots/css/traditional.css
index e7f8eb3beb..1ab0e53615 100755
--- a/phpgwapi/templates/idots/css/traditional.css
+++ b/phpgwapi/templates/idots/css/traditional.css
@@ -3,6 +3,8 @@
 	allowed attributes: font-family,font-size,color,font-weight
 */
 
+/*@import url("../../default/def_tutorials.css");*/
+
 body
 {
 	overflow-x: hidden;