From 8ecc37bafc86fdf954ea5606b87f04a7bae54570 Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <dev@bernhard-posselt.com>
Date: Sat, 4 Oct 2014 13:48:44 +0200
Subject: fix #624

---
 templates/7.php            | 37 -------------------------------------
 templates/index.php        |  6 +-----
 templates/part.content.php |  3 +++
 3 files changed, 4 insertions(+), 42 deletions(-)
 delete mode 100644 templates/7.php

(limited to 'templates')

diff --git a/templates/7.php b/templates/7.php
deleted file mode 100644
index 0e2355fd3..000000000
--- a/templates/7.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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) {
-			\OCP\Util::addScript($app, $f);
-		}
-	} else {
-		\OCP\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) {
-			\OCP\Util::addStyle($app, $f);
-		}
-	} else {
-		\OCP\Util::addStyle($app, $file);
-	}
-}
-
diff --git a/templates/index.php b/templates/index.php
index 9eb870666..929f25d13 100644
--- a/templates/index.php
+++ b/templates/index.php
@@ -1,10 +1,6 @@
 <?php
-
 // backports
 if (version_compare(implode('.', \OCP\Util::getVersion()), '7.8', '<=')) {
-    if (!function_exists('style')) {
-        require_once __DIR__ . '/7.php';
-    }
     style('news', '7');
 }
 
@@ -62,7 +58,7 @@ style('news', [
             'first-run': App.isFirstRun()
         }"
         tabindex="-1"
-        news-pull-to-refresh>
+        news-pull-to-refresh="showPullToRefresh">
         <div id="app-content-wrapper"
             ng-class="{'autopaging': App.loading.isLoading('autopaging')}"
             ng-hide="App.loading.isLoading('global')"
diff --git a/templates/part.content.php b/templates/part.content.php
index ed83aef75..2b19b93f6 100644
--- a/templates/part.content.php
+++ b/templates/part.content.php
@@ -8,6 +8,9 @@
 
 <div news-auto-focus="#app-content"
      ng-class="{compact: Content.isCompactView(), 'feed-view': Content.isFeed()}">
+    <div class="pull-to-refresh" ng-class="{'show-pull-to-refresh': showPullToRefresh}">
+        <button ng-click="Content.refresh()"><?php p($l->t('Refresh')) ?></button>
+    </div>
     <ul>
         <li class="item {{ Content.getFeed(item.feedId).cssClass }}"
             ng-repeat="item in Content.getItems() | orderBy:[Content.orderBy()] track by item.id"
-- 
cgit v1.2.3