summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorBernhard Posselt <nukeawhale@gmail.com>2013-04-18 19:00:33 +0200
committerBernhard Posselt <nukeawhale@gmail.com>2013-04-18 19:00:33 +0200
commit4f317fe9d74cb6180472ee84db7f7c580cce49f0 (patch)
tree3a8a8342a3f1e864558e953a740cb6d5c1f811ae /templates
parent402c534ee6453e28e5902f3d4f3a21b534309d24 (diff)
use twitter bootstrap for tooltips
Diffstat (limited to 'templates')
-rw-r--r--templates/main.php3
-rw-r--r--templates/part.listfeed.php9
-rw-r--r--templates/part.listfolder.php9
3 files changed, 15 insertions, 6 deletions
diff --git a/templates/main.php b/templates/main.php
index ca01e1093..10533f93b 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -2,6 +2,7 @@
\OCP\Util::addScript('news', 'vendor/momentjs/moment');
\OCP\Util::addScript('news', 'vendor/momentjs/langs');
+\OCP\Util::addScript('appframework', 'vendor/bootstrap/tooltip');
\OCP\Util::addScript('appframework', 'vendor/angular/angular');
\OCP\Util::addScript('appframework', 'public/app');
@@ -9,6 +10,8 @@
\OCP\Util::addScript('news', 'public/app');
+\OCP\Util::addStyle('appframework', 'bootstrap/tooltip');
+
\OCP\Util::addStyle('news', 'addnew');
\OCP\Util::addStyle('news', 'feeds');
\OCP\Util::addStyle('news', 'items');
diff --git a/templates/part.listfeed.php b/templates/part.listfeed.php
index 1a56febf2..a8e8b1ccb 100644
--- a/templates/part.listfeed.php
+++ b/templates/part.listfeed.php
@@ -36,17 +36,20 @@
<button class="svg action mark-read-icon"
ng-show="feedBusinessLayer.getUnreadCount(feed.id) > 0 && feed.id"
ng-click="feedBusinessLayer.markFeedRead(feed.id)"
- title="<?php p($l->t('Mark all read')); ?>"> </button>
+ title="<?php p($l->t('Mark all read')); ?>"
+ oc-tooltip></button>
<button ng-click="feedBusinessLayer.delete(feed.id)"
class="svg action delete-icon"
title="<?php p($l->t('Delete feed')); ?>"
- ng-show="feed.id"></button>
+ ng-show="feed.id"
+ oc-tooltip></button>
<button class="svg action delete-icon"
ng-click="feedBusinessLayer.markErrorRead(feed.urlHash)"
title="<?php p($l->t('Delete website')); ?>"
- ng-show="feed.error"></button>
+ ng-show="feed.error"
+ oc-tooltip></button>
</span>
<div class="message" ng-show="feed.error">{{ feed.error }}</div>
diff --git a/templates/part.listfolder.php b/templates/part.listfolder.php
index 4266b4814..c8760f8aa 100644
--- a/templates/part.listfolder.php
+++ b/templates/part.listfolder.php
@@ -28,7 +28,8 @@
<button ng-click="folderBusinessLayer.delete(folder.id)"
ng-hide="folderBusinessLayer.hasFeeds(folder.id) || !folder.id"
class="svg action delete-icon"
- title="<?php p($l->t('Delete folder')); ?>"></button>
+ title="<?php p($l->t('Delete folder')); ?>"
+ oc-tooltip></button>
<span class="unread-counter"
ng-show="folderBusinessLayer.getUnreadCount(folder.id) > 0">
@@ -38,12 +39,14 @@
<button class="svg action mark-read-icon"
ng-show="folderBusinessLayer.getUnreadCount(folder.id) > 0 && folder.id"
ng-click="folderBusinessLayer.markFolderRead(folder.id)"
- title="<?php p($l->t('Mark all read')); ?>"></button>
+ title="<?php p($l->t('Mark all read')); ?>"
+ oc-tooltip></button>
<button class="svg action delete-icon"
ng-click="folderBusinessLayer.markErrorRead(folder.name)"
title="<?php p($l->t('Delete folder')); ?>"
- ng-show="folder.error"></button>
+ ng-show="folder.error"
+ oc-tooltip></button>
<!-- <button class="svg action edit-icon"
ng-click="renameFolder(folder.id)"