add custom heise.de style

8 files changed, 16 insertions, 66 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4af542cf5..0d0b794cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,5 @@
 owncloud-news (3.001)
-* **New dependency**: Minimum ownCloud version: 7
+* **New dependency**: Minimum ownCloud version: 8
 * **New dependency**: Minimum PHP version: 5.4
 * **Breaking Change**: Plugin API: BusinessLayer has been renamed to Service, (FeedBusinessLayer -> FeedService) and different exceptions are now thrown to make failure better distinguishable, accessing the BusinessLayer links to the Service equivalents to keep compability
 * **Bugfix**: Disable drag and drop if a feed is in an invalid state
diff --git a/README.md b/README.md
index ce7faaa32..975f884f5 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ For further developer and user documentation please visit [the wiki](https://git
 ## Dependencies
 * PHP >= 5.4
 * php-curl
-* ownCloud >= 7
+* ownCloud >= 8
 
 ## Supported Databases
 * PostgreSQL
@@ -70,10 +70,13 @@ The **News** App can be updated through the ownCloud apps page.
 
 
 ### Git (development version)
-
+* The master branch will always be stable in conjunction with the latest master branch from ownCloud
+* If you are using an earlier ownCloud version, use the stableX branch (ownCloud 7 -> stable7)
 * Clone the **News** app into the **/var/www/owncloud/apps/** directory:
 
-	git clone https://github.com/owncloud/news.git
+	git clone -b $YOUR_BRANCH https://github.com/owncloud/news.git
+
+ where $YOUR_BRANCH is the branch that you want to use
 
 * Activate the **News** app in the apps menu
 
diff --git a/appinfo/app.json b/appinfo/app.json
index 14f155e62..ce906682b 100644
--- a/appinfo/app.json
+++ b/appinfo/app.json
@@ -36,7 +36,7 @@
     "categories": ["Multimedia"],
     "dependencies": {
         "php": ">=5.4",
-        "owncloud": ">=7",
+        "owncloud": ">=7.8",
         "libs": {
             "curl": "*"
         }
diff --git a/appinfo/info.xml b/appinfo/info.xml
index d5125f02b..5f79140a9 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -6,5 +6,5 @@
 	<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.001</version>
-	<require>7</require>
+	<require>7.8</require>
 </info>
diff --git a/css/7.css b/css/7.css
deleted file mode 100644
index 5e631c417..000000000
--- a/css/7.css
+++ /dev/null
@@ -1,3 +0,0 @@
-/**
- * Backported styles for ownCloud 7
- */
\ No newline at end of file
diff --git a/css/custom.css b/css/custom.css
index d87a2669a..6bace7e11 100644
--- a/css/custom.css
+++ b/css/custom.css
@@ -1,3 +1,9 @@
 /**
  * Add your custom styles here
- */
\ No newline at end of file
+ */
+#app-content .custom-heise-de .body p > span:first-child {
+    display: inline-block;
+    float: left;
+    margin-right: 10px;
+    padding: 6px 0;
+}
\ No newline at end of file
diff --git a/templates/7.php b/templates/7.php
deleted file mode 100644
index 24dde55b4..000000000
--- a/templates/7.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * ownCloud - News
- *
- * This file is licensed under the Affero General Public License version 3 or
- * later. See the COPYING file.
- *
- * @author Alessandro Cosentino <cosenal@gmail.com>
- * @author Bernhard Posselt <dev@bernhard-posselt.com>
- * @copyright Alessandro Cosentino 2012
- * @copyright Bernhard Posselt 2012, 2014
- */
-
-
-/**
- * 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);
-	}
-}
\ No newline at end of file
diff --git a/templates/index.php b/templates/index.php
index 3d277dbbf..cb6a89bc1 100644
--- a/templates/index.php
+++ b/templates/index.php
@@ -1,15 +1,4 @@
 <?php
-// owncloud 7 backported style sheets
-$version = \OCP\Util::getVersion();
-
-if ($version[0] === 7 && $version[1] === 0 && $version[2] < 3) {
-    require_once __DIR__ . '/7.php';
-}
-
-if($version[0] > 7 && $version[1] <= 8) {
-    style('news', '7');
-}
-
 script('news', [
     'vendor/es6-shim/es6-shim.min',
     'vendor/angular/angular.min',