version bump

8 files changed, 335 insertions, 6 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6828d0c63..6fac81aa2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
-owncloud-news (3.004)
+owncloud-news (3.101)
 * **Bugfix**: Fix remove YouTube autoplay on libxml versions < 2.6
+* **Enhancement**: Backport to stable7
 
 owncloud-news (3.003)
 * **Bugfix**: Correctly toggle title of star and keep unread icons
diff --git a/appinfo/app.json b/appinfo/app.json
index 7153c0ffb..78d2ad3fa 100644
--- a/appinfo/app.json
+++ b/appinfo/app.json
@@ -3,7 +3,7 @@
     "id": "news",
     "description": "ownCloud News App",
     "licence": "AGPL",
-    "version": "3.003",
+    "version": "3.101",
     "authors": [
         {
             "name": "Bernhard Posselt",
@@ -36,7 +36,7 @@
     "categories": ["Multimedia"],
     "dependencies": {
         "php": ">=5.4",
-        "owncloud": ">=7.8",
+        "owncloud": ">=7",
         "libs": {
             "curl": "*"
         }
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 4086ec162..2ecad8274 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -5,6 +5,6 @@
 	<description>An RSS/Atom feed reader. Requires ownCloud backgroundjobs or an updater script to be enabled to update your feeds. See the README.rst in the apps top directory</description>
 	<licence>AGPL</licence>
 	<author>Alessandro Cosentino, Bernhard Posselt, Jan-Christoph Borchardt. Powered by SimplePie (Ryan Parman, Geoffrey Sneddon, Ryan McCue and contributors).</author>
-	<version>3.003</version>
-	<require>7.8</require>
+	<version>3.101</version>
+	<require>7</require>
 </info>
diff --git a/appinfo/version b/appinfo/version
index abc5c234a..2280cdbb7 100644
--- a/appinfo/version
+++ b/appinfo/version
@@ -1 +1 @@
-3.003
\ No newline at end of file
+3.101
\ No newline at end of file
diff --git a/css/7.css b/css/7.css
new file mode 100644
index 000000000..c30090a8c
--- /dev/null
+++ b/css/7.css
@@ -0,0 +1,258 @@
+/**
+ * Backports for ownCloud 7
+ */
+#app-navigation .active.with-menu > a,
+#app-navigation .with-counter > a {
+    padding-right: 50px;
+}
+
+#app-navigation .active.with-menu.with-counter > a {
+    padding-right: 90px;
+}
+
+#app-navigation > .with-icon ul li > a,
+#app-navigation > .with-icon ul li.app-navigation-entry-loading > a {
+	padding-left: 68px;
+	background-position: 44px center;
+}
+
+#app-navigation li:hover > a,
+#app-navigation .selected,
+#app-navigation .selected a {
+	background-color: #ddd;
+}
+
+#app-navigation .with-icon a,
+#app-navigation .app-navigation-entry-loading a {
+	padding-left: 44px;
+	background-size: 16px 16px;
+	background-position: 14px center;
+	background-repeat: no-repeat;
+}
+
+#app-navigation .collapsible.open {
+	background-image: linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
+	background-image: -o-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
+	background-image: -moz-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
+	background-image: -webkit-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
+	background-image: -ms-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
+}
+
+#app-navigation > ul .collapsible.open:hover {
+	box-shadow: inset 0 0 3px #ddd;
+}
+
+#app-navigation > ul .collapsible.open ul {
+	display: block;
+}
+
+/* Deleted entries with undo button */
+#app-navigation .app-navigation-entry-deleted {
+	display: inline-block;
+	height: 44px;
+	width: 100%;
+}
+
+	#app-navigation .app-navigation-entry-deleted-description {
+		padding-left: 12px;
+		position: relative;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		overflow: hidden;
+		display: inline-block;
+		width: 201px; /* fallback for IE8 */
+		width: calc(100% - 49px);
+		line-height: 44px;
+		float: left;
+	}
+
+	#app-navigation .app-navigation-entry-deleted-button {
+		margin: 0;
+		height: 44px;
+		width: 44px;
+		line-height: 44px;
+		border: 0;
+		display: inline-block;
+		background-color: transparent;
+		opacity: .5;
+	}
+
+	#app-navigation .app-navigation-entry-deleted-button:hover {
+		opacity: 1;
+	}
+
+
+/**
+ * App navigation utils, buttons and counters for drop down menu
+ */
+#app-navigation .app-navigation-entry-utils {
+	position: absolute;
+	top: 0;
+	right: 0;
+	z-index: 105;
+}
+
+	#app-navigation .app-navigation-entry-utils ul {
+		display: block !important;
+	}
+
+
+	#app-navigation .app-navigation-entry-utils li {
+		float: left;
+		width: 44px !important;
+		height: 44px;
+		line-height: 44px;
+	}
+
+	#app-navigation .active > .app-navigation-entry-utils li {
+		display: inline-block;
+	}
+
+	#app-navigation .app-navigation-entry-utils button {
+		height: 38px;
+		width: 38px;
+		line-height: 38px;
+		float: left;
+	}
+
+	#app-navigation .app-navigation-entry-utils-menu-button {
+		display: none;
+	}
+	#app-navigation .app-navigation-entry-utils-menu-button button {
+		border: 0;
+		opacity: .5;
+		background-color: transparent;
+		background-repeat: no-repeat;
+		background-position: center;
+		background-image: url('../img/7/more.svg');
+	}
+
+	#app-navigation .app-navigation-entry-utils-menu-button:hover button,
+	#app-navigation .app-navigation-entry-utils-menu-button:focus button {
+		background-color: transparent;
+		opacity: 1;
+	}
+
+	#app-navigation .app-navigation-entry-utils-counter {
+		overflow: hidden;
+		text-overflow: hidden;
+		text-align: right;
+		font-size: 9pt;
+		width: 38px;
+		line-height: 44px;
+		padding: 0 10px;
+	}
+
+	#app-navigation .app-navigation-entry-utils ul,
+	#app-navigation .app-navigation-entry-menu ul {
+		list-style-type: none;
+	}
+
+#app-navigation .app-navigation-entry-menu {
+	display: none;
+	position: absolute;
+	background-color: #eee;
+	color: #333;
+	border-radius: 3px;
+	border-top-right-radius: 0px;
+	z-index: 110;
+	margin: -5px 14px 5px 10px;
+	right: 0;
+	border: 1px solid #bbb;
+	-webkit-filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75));
+	-moz-filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75));
+	-ms-filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75));
+	-o-filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75));
+	filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75));
+}
+
+#app-navigation .app-navigation-entry-menu.open {
+	display: block;
+}
+
+/* miraculous border arrow stuff */
+#app-navigation .app-navigation-entry-menu:after,
+#app-navigation .app-navigation-entry-menu:before {
+	bottom: 100%;
+	right: 0; /* change this to adjust the arrow position */
+	border: solid transparent;
+	content: " ";
+	height: 0;
+	width: 0;
+	position: absolute;
+	pointer-events: none;
+}
+
+#app-navigation .app-navigation-entry-menu:after {
+	border-color: rgba(238, 238, 238, 0);
+	border-bottom-color: #eee;
+	border-width: 10px;
+	margin-left: -10px;
+}
+#app-navigation .app-navigation-entry-menu:before {
+	border-color: rgba(187, 187, 187, 0);
+	border-bottom-color: #bbb;
+	border-width: 11px;
+	margin-left: -11px;
+}
+
+	/* list of options for an entry */
+	#app-navigation .app-navigation-entry-menu ul {
+		display: block !important;
+	}
+
+	#app-navigation .app-navigation-entry-menu li {
+		float: left;
+		width: 38px !important;
+	}
+
+		#app-navigation .app-navigation-entry-menu li button {
+			float: right;
+			width: 36px !important;
+			height: 36px;
+			line-height: 36px;
+			border: 0;
+			opacity: .5;
+			background-color: transparent;
+		}
+
+		#app-navigation .app-navigation-entry-menu li button:hover,
+		#app-navigation .app-navigation-entry-menu li button:focus {
+			opacity: 1;
+			background-color: transparent;
+		}
+
+/* editing an entry */
+#app-navigation .app-navigation-entry-edit {
+	padding-left: 5px;
+	padding-right: 5px;
+	display: inline-block;
+	height: 39px;
+	width: 100%;
+}
+
+	#app-navigation .app-navigation-entry-edit input {
+		border-bottom-right-radius: 0;
+		border-top-right-radius: 0;
+		width: 204px; /* fallback for IE8 */
+		width: calc(100% - 36px);
+		padding: 5px;
+		margin-right: 0;
+		height: 38px;
+		float: left;
+		border: 1px solid rgba(190,190,190,.9);
+	}
+
+	#app-navigation .app-navigation-entry-edit button,
+	#app-navigation .app-navigation-entry-edit input[type="submit"] {
+		width: 36px;
+		height: 38px;
+		float: left;
+	}
+
+	#app-navigation .app-navigation-entry-edit .icon-checkmark {
+		border-bottom-left-radius: 0;
+		border-top-left-radius: 0;
+		border-left: 0;
+		margin-right: 0;
+	}
\ No newline at end of file
diff --git a/img/7/more.svg b/img/7/more.svg
new file mode 100644
index 000000000..9ab5d4243
--- /dev/null
+++ b/img/7/more.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/>
+ <path d="m3 6c-1.1046 0-2 0.8954-2 2s0.8954 2 2 2 2-0.8954 2-2-0.8954-2-2-2zm5 0c-1.1046 0-2 0.8954-2 2s0.8954 2 2 2 2-0.8954 2-2-0.8954-2-2-2zm5 0c-1.105 0-2 0.8954-2 2s0.895 2 2 2 2-0.8954 2-2-0.895-2-2-2z" fill-rule="evenodd"/>
+</svg>
diff --git a/templates/7.php b/templates/7.php
new file mode 100644
index 000000000..06c73b277
--- /dev/null
+++ b/templates/7.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Backports for <7.0.3
+ */
+
+/**
+ * Shortcut for adding scripts to a page
+ * @param string $app the appname
+ * @param string|string[] $file the filename,
+ * if an array is given it will add all scripts
+ */
+function script($app, $file) {
+	if(is_array($file)) {
+		foreach($file as $f) {
+			OC_Util::addScript($app, $f);
+		}
+	} else {
+		OC_Util::addScript($app, $file);
+	}
+}
+
+/**
+ * Shortcut for adding styles to a page
+ * @param string $app the appname
+ * @param string|string[] $file the filename,
+ * if an array is given it will add all styles
+ */
+function style($app, $file) {
+	if(is_array($file)) {
+		foreach($file as $f) {
+			OC_Util::addStyle($app, $f);
+		}
+	} else {
+		OC_Util::addStyle($app, $file);
+	}
+}
+
+/**
+ * Shortcut for HTML imports
+ * @param string $app the appname
+ * @param string|string[] $file the path relative to the app's component folder,
+ * if an array is given it will add all components
+ */
+function component($app, $file) {
+	if(is_array($file)) {
+		foreach($file as $f) {
+			$url = link_to($app, 'component/' . $f . '.html');
+			OC_Util::addHeader('link', array('rel' => 'import', 'href' => $url));
+		}
+	} else {
+		$url = link_to($app, 'component/' . $file . '.html');
+		OC_Util::addHeader('link', array('rel' => 'import', 'href' => $url));
+	}
+}
\ No newline at end of file
diff --git a/templates/index.php b/templates/index.php
index a85f23ca7..9eb870666 100644
--- a/templates/index.php
+++ b/templates/index.php
@@ -1,4 +1,13 @@
 <?php
+
+// backports
+if (version_compare(implode('.', \OCP\Util::getVersion()), '7.8', '<=')) {
+    if (!function_exists('style')) {
+        require_once __DIR__ . '/7.php';
+    }
+    style('news', '7');
+}
+
 script('news', [
     'vendor/es6-shim/es6-shim.min',
     'vendor/angular/angular.min',
@@ -16,6 +25,8 @@ style('news', [
     'mobile',
     'custom'
 ]);
+
+
 ?>