Merge pull request #1583 from arkascha/master

Version 0.2.6: Some layout control fixes for app modes required for the final owncloud version 6.

5 files changed, 28 insertions, 8 deletions

diff --git a/fluxx_compensator/appinfo/info.xml b/fluxx_compensator/appinfo/info.xml
index ec39fa6c1..76b0f2cc8 100644
--- a/fluxx_compensator/appinfo/info.xml
+++ b/fluxx_compensator/appinfo/info.xml
@@ -22,7 +22,7 @@
 * If not, see <http://www.gnu.org/licenses/>.
 *
 -->
-
+.rightcontent
 <!--
   /**
   * @file appinfo/info.xml
@@ -40,7 +40,7 @@
 		Simply click the handler to hide/show the navigation panel. To move the handler to where you want it to be, just hold the handler and drag it.
 		The older amongst us will know where the name 'FluXX Compensator (Y)' comes from... ;-)
 	</description>
-	<version>0.2.5</version>
+	<version>0.2.6</version>
 	<licence>AGPL</licence>
 	<author>Christian Reiner</author>
 	<require>4.93</require>
diff --git a/fluxx_compensator/appinfo/version b/fluxx_compensator/appinfo/version
index 3a4036fb4..53a75d673 100644
--- a/fluxx_compensator/appinfo/version
+++ b/fluxx_compensator/appinfo/version
@@ -1 +1 @@
-0.2.5
+0.2.6
diff --git a/fluxx_compensator/css/dynamic-6.css b/fluxx_compensator/css/dynamic-6.css
index 9eaf2a970..88ca35e9f 100644
--- a/fluxx_compensator/css/dynamic-6.css
+++ b/fluxx_compensator/css/dynamic-6.css
@@ -70,7 +70,8 @@ html.fluxx-state-H-hidden #header {
 /* move stuff up to top when header is hidden */
 html.fluxx-state-H-hidden #navigation,
 html.fluxx-state-H-hidden #content-wrapper {
-	padding-top: 0;
+	top: -45px !important;
+/*	padding-top: 0; */
 }
 
 /* below some specific app dependent settings to compensate for exotic in-app styles */
@@ -84,12 +85,11 @@ html.fluxx-mode-bookmarks.fluxx-state-N-hidden #firstrun { left: 280px; }
 
 /* 'calendar' app */
 html.fluxx-mode-calendar { }
+html.fluxx-mode-calendar.fluxx-state-N-hidden #controls { padding-left: 0px; }
 
 /* 'contacts' app */
 html.fluxx-mode-contacts { }
-html.fluxx-mode-contacts.fluxx-state-N-hidden #contactsheader { left: 280px; }
-html.fluxx-mode-contacts.fluxx-state-H-hidden #groupsheader,
-html.fluxx-mode-contacts.fluxx-state-H-hidden #contactsheader { top: 0px; }
+html.fluxx-mode-contacts.fluxx-state-H-hidden #contactsHeader { top: 0px; }
 
 /* 'files' app */
 html.fluxx-mode-files { }
@@ -108,3 +108,9 @@ html.fluxx-mode-notes { }
 
 /* 'shorty' app */
 html.fluxx-mode-shorty { }
+
+/* 'tasks' app */
+html.fluxx-mode-tasks { }
+html.fluxx-mode-tasks.fluxx-state-N-hidden #tasks_list.rightcontent { width: 1664px !important; }
+html.fluxx-mode-tasks.fluxx-state-N-hidden #tasks_list.rightcontent { left: 256px; }
+html.fluxx-mode-tasks.fluxx-state-H-hidden #tasks_list.rightcontent { top: 44px; }
diff --git a/fluxx_compensator/doc/CHANGELOG b/fluxx_compensator/doc/CHANGELOG
index 6b1629945..d66f3afec 100644
--- a/fluxx_compensator/doc/CHANGELOG
+++ b/fluxx_compensator/doc/CHANGELOG
@@ -23,6 +23,10 @@
 
 Changelog:
 
+* Sun Dec 29 2013 Christian Reiner: version 0.2.6
+Some compatibility fixes for the final owncloud version 6:
+Layout control fixes for some app modes required by changed element layouts.
+Additional mode for the 'tasks' app. 
 * Mon Oct 28 2013 Christian Reiner: version 0.2.5
 Compatibility with owncloud version 6
 * Wed Sep 11 2013 Christian Reiner: version 0.2.4
diff --git a/fluxx_compensator/js/fluxx.js b/fluxx_compensator/js/fluxx.js
index 2d2d75b1b..30a566e8b 100644
--- a/fluxx_compensator/js/fluxx.js
+++ b/fluxx_compensator/js/fluxx.js
@@ -292,14 +292,24 @@ OC.FluXX={
 		// mark mode and active app as class of the html tag
 		// this acts like a 'switch' command inside the dynamically loaded css
 		var mode={
+			bookmarks:       'bookmarks',
 			bookmarks_index: 'bookmarks',
+			files:           'files',
 			files_index:     'files',
+			notes:           'notes',
 			notes_index:     'notes',
+			media:           'media',
 			media_index:     'media',
+			calendar:        'calendar',
 			calendar_index:  'calendar',
+			contacts:        'contacts',
 			contacts_index:  'contacts',
+			gallery:         'gallery',
 			gallery_index:   'gallery',
-			shorty_index:    'shorty'
+			shorty:          'shorty',
+			shorty_index:    'shorty',
+			tasks:           'tasks',
+			tasks_index:     'tasks'
 		};
 		var index=$('body nav #navigation #apps').find('li .active').parents('li').attr('data-id');
 		// mark current mode (active app) as class of the html element