зеркало из https://github.com/nextcloud/news.git
use twitter bootstrap for tooltips
This commit is contained in:
Родитель
402c534ee6
Коммит
4f317fe9d7
|
@ -160,4 +160,9 @@ button.action:hover {
|
||||||
|
|
||||||
.folder .feed.failed .message {
|
.folder .feed.failed .message {
|
||||||
padding-left: 48px;
|
padding-left: 48px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.tooltip {
|
||||||
|
text-shadow: none;
|
||||||
|
text-transform: none;
|
||||||
|
}
|
|
@ -2,6 +2,7 @@
|
||||||
\OCP\Util::addScript('news', 'vendor/momentjs/moment');
|
\OCP\Util::addScript('news', 'vendor/momentjs/moment');
|
||||||
\OCP\Util::addScript('news', 'vendor/momentjs/langs');
|
\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', 'vendor/angular/angular');
|
||||||
\OCP\Util::addScript('appframework', 'public/app');
|
\OCP\Util::addScript('appframework', 'public/app');
|
||||||
|
|
||||||
|
@ -9,6 +10,8 @@
|
||||||
|
|
||||||
\OCP\Util::addScript('news', 'public/app');
|
\OCP\Util::addScript('news', 'public/app');
|
||||||
|
|
||||||
|
\OCP\Util::addStyle('appframework', 'bootstrap/tooltip');
|
||||||
|
|
||||||
\OCP\Util::addStyle('news', 'addnew');
|
\OCP\Util::addStyle('news', 'addnew');
|
||||||
\OCP\Util::addStyle('news', 'feeds');
|
\OCP\Util::addStyle('news', 'feeds');
|
||||||
\OCP\Util::addStyle('news', 'items');
|
\OCP\Util::addStyle('news', 'items');
|
||||||
|
|
|
@ -36,17 +36,20 @@
|
||||||
<button class="svg action mark-read-icon"
|
<button class="svg action mark-read-icon"
|
||||||
ng-show="feedBusinessLayer.getUnreadCount(feed.id) > 0 && feed.id"
|
ng-show="feedBusinessLayer.getUnreadCount(feed.id) > 0 && feed.id"
|
||||||
ng-click="feedBusinessLayer.markFeedRead(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)"
|
<button ng-click="feedBusinessLayer.delete(feed.id)"
|
||||||
class="svg action delete-icon"
|
class="svg action delete-icon"
|
||||||
title="<?php p($l->t('Delete feed')); ?>"
|
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"
|
<button class="svg action delete-icon"
|
||||||
ng-click="feedBusinessLayer.markErrorRead(feed.urlHash)"
|
ng-click="feedBusinessLayer.markErrorRead(feed.urlHash)"
|
||||||
title="<?php p($l->t('Delete website')); ?>"
|
title="<?php p($l->t('Delete website')); ?>"
|
||||||
ng-show="feed.error"></button>
|
ng-show="feed.error"
|
||||||
|
oc-tooltip></button>
|
||||||
</span>
|
</span>
|
||||||
|
|
||||||
<div class="message" ng-show="feed.error">{{ feed.error }}</div>
|
<div class="message" ng-show="feed.error">{{ feed.error }}</div>
|
||||||
|
|
|
@ -28,7 +28,8 @@
|
||||||
<button ng-click="folderBusinessLayer.delete(folder.id)"
|
<button ng-click="folderBusinessLayer.delete(folder.id)"
|
||||||
ng-hide="folderBusinessLayer.hasFeeds(folder.id) || !folder.id"
|
ng-hide="folderBusinessLayer.hasFeeds(folder.id) || !folder.id"
|
||||||
class="svg action delete-icon"
|
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"
|
<span class="unread-counter"
|
||||||
ng-show="folderBusinessLayer.getUnreadCount(folder.id) > 0">
|
ng-show="folderBusinessLayer.getUnreadCount(folder.id) > 0">
|
||||||
|
@ -38,12 +39,14 @@
|
||||||
<button class="svg action mark-read-icon"
|
<button class="svg action mark-read-icon"
|
||||||
ng-show="folderBusinessLayer.getUnreadCount(folder.id) > 0 && folder.id"
|
ng-show="folderBusinessLayer.getUnreadCount(folder.id) > 0 && folder.id"
|
||||||
ng-click="folderBusinessLayer.markFolderRead(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"
|
<button class="svg action delete-icon"
|
||||||
ng-click="folderBusinessLayer.markErrorRead(folder.name)"
|
ng-click="folderBusinessLayer.markErrorRead(folder.name)"
|
||||||
title="<?php p($l->t('Delete folder')); ?>"
|
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"
|
<!-- <button class="svg action edit-icon"
|
||||||
ng-click="renameFolder(folder.id)"
|
ng-click="renameFolder(folder.id)"
|
||||||
|
|
Загрузка…
Ссылка в новой задаче