From 6f23208ff68d4a8bf2fc20b1fcad6b5e636fb584 Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <nukeawhale@gmail.com>
Date: Fri, 30 Aug 2013 19:01:36 +0200
Subject: conditionally load in stylesheets for owncloud 6 to fix layout
 problems, fix #320

---
 CHANGELOG          |  1 +
 css/owncloud6.css  | 19 +++++++++++++++++++
 templates/main.php |  9 +++++++++
 3 files changed, 29 insertions(+)
 create mode 100644 css/owncloud6.css

diff --git a/CHANGELOG b/CHANGELOG
index 2c63b8418..7ab264e5b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@ owncloud-news (1.401)
 * Possible backwards incompatible change by using the link provided by simplepie instead of the user for the url hash. This prevents duplication of the feed when adding a slightly different feed url which points to the same feed and allows a speedup from O(n) to O(1) for article enhanchers
 * Add an option route for the API which handles the CORS headers to allow webapplications to access the API
 * Also allow youtube and vimeo embeds that start with // and https:// instead of only allowing http
+* ownCloud 6 compability fixes
 
 owncloud-news (1.206)
 * Also handle URLErrors in updater script that are thrown when the domain of a feed is not found
diff --git a/css/owncloud6.css b/css/owncloud6.css
new file mode 100644
index 000000000..14ba3d1cb
--- /dev/null
+++ b/css/owncloud6.css
@@ -0,0 +1,19 @@
+#app-navigation .utils {
+	top: 7px;
+}
+
+#app-navigation .add-new input,
+#app-navigation .add-new select {
+	width: 170px;
+}
+
+#app-navigation .ui-draggable-dragging {
+	width: 299px;
+}
+
+#app-navigation .progress-icon, 
+#app-navigation .problem-icon {
+	width: 299px;
+	line-height: 44px;
+}
+
diff --git a/templates/main.php b/templates/main.php
index 35c8e31a5..ab70caddf 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -18,6 +18,15 @@
 \OCP\Util::addStyle('news', 'settings');
 \OCP\Util::addStyle('news', 'showall');
 
+// stylesheets for different OC versions
+$version = \OCP\Util::getVersion();
+
+// owncloud 6
+if($version[0] > 5 || ($version[0] >= 5 && $version[1] >= 80)) {
+	\OCP\Util::addStyle('news', 'owncloud6');
+}
+
+
 ?>
 
 <div id="app" ng-app="News" ng-cloak>
-- 
cgit v1.2.3