garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

js dependencies update

Browse Source
This commit is contained in:
Athou
2013-10-13 10:49:03 +02:00
parent 3fec1c6890
commit 94f469a6b1
22 changed files with 878 additions and 510 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/webapp/templates/_category.html
View File

@@ -1,5 +1,5 @@
<li>
<div class="pointer tree-item" ui-if="showLabel" ng-class="getClass(level - 1)" droppable="node">
<div class="pointer tree-item" ng-if="showLabel" ng-class="getClass(level - 1)" droppable="node">
<div class="dropdown pull-right">
<div class="pull-right" ng-click="showCategoryDetails(node)">
<i class="icon-wrench config pointer"></i>

2
src/main/webapp/templates/_footer.html
View File

@@ -1,3 +1,3 @@
<div ng-controller="FooterController">
<iframe ui-if="subToMeUrl" style="display:none;" ng-src='https://www.subtome.com/register-no-ui.html?name={{subToMeName}}&url={{subToMeUrl}}'></iframe>
<iframe ng-if="subToMeUrl" style="display:none;" ng-src='https://www.subtome.com/register-no-ui.html?name={{subToMeName}}&url={{subToMeUrl}}'></iframe>
</div>

4
src/main/webapp/templates/admin.duplicate_feeds.html
View File

@@ -16,7 +16,7 @@
<input type="button" class="btn" ng-click="autoMerge()" value="Auto merge selected" />
</div>
<table class="table table-condensed table-hover" ui-if="counts">
<table class="table table-condensed table-hover" ng-if="counts">
<thead>
<tr>
<th></th>
@@ -33,7 +33,7 @@
</tbody>
</table>
<div ui-if="current">
<div ng-if="current">
<div>
Merge
<select ng-model="mergeData.feedIds" size="30" multiple="multiple" class="input-block-level"

10
src/main/webapp/templates/feeds.category_details.html
View File

@@ -3,7 +3,7 @@
<h3>${details.category_details}</h3>
</div>
<form name="form" class="form-horizontal" ng-submit="save()">
<div class="control-group" ng-class="{error : !form.name.$valid}" ui-if="!isMeta()">
<div class="control-group" ng-class="{error : !form.name.$valid}" ng-if="!isMeta()">
<label class="control-label">${details.name}</label>
<div class="controls">
<input type="text" name="name" ng-model="category.name" class="input-block-level" required></input>
@@ -11,7 +11,7 @@
</div>
</div>
<div class="control-group" ng-class="{error : !form.category.$valid}" ui-if="!isMeta()">
<div class="control-group" ng-class="{error : !form.category.$valid}" ng-if="!isMeta()">
<label class="control-label">${details.parent_category}</label>
<div class="controls">
<select name="category" class="input-block-level" ng-model="category.parentId"
@@ -21,7 +21,7 @@
</div>
</div>
<div class="control-group" ui-if="!isMeta()">
<div class="control-group" ng-if="!isMeta()">
<label class="control-label">${details.position}</label>
<div class="controls">
<input type="number" min="0" ng-model="category.position" />
@@ -37,9 +37,9 @@
</div>
<div class="form-actions">
<button type="submit" class="btn btn-primary" ui-if="!isMeta()">${global.save}</button>
<button type="submit" class="btn btn-primary" ng-if="!isMeta()">${global.save}</button>
<button type="button" class="btn" ng-click="back()">${global.cancel}</button>
<button type="button" class="btn btn-danger" ng-click="deleteCategory()" ui-if="!isMeta()">${global.delete}</button>
<button type="button" class="btn btn-danger" ng-click="deleteCategory()" ng-if="!isMeta()">${global.delete}</button>
</div>
</form>

28
src/main/webapp/templates/feeds.view.html
View File

@@ -1,5 +1,5 @@
<div ng-class="{expanded: settingsService.settings.viewMode == 'expanded'}">
<div class="entrylist-header" ui-if="name">
<div class="entrylist-header" ng-if="name">
<h3>
<span ng-switch on="selectedId">
<span ng-switch-when="all">${tree.all}</span>
@@ -36,17 +36,17 @@
<i class="icon-external-link"></i>
</a>
</div>
<div class="entry-body" ui-if="settingsService.settings.viewMode == 'expanded' || (isOpen && current == entry)" ng-mouseup="bodyClicked(entry, $event)"
<div class="entry-body" ng-if="settingsService.settings.viewMode == 'expanded' || (isOpen && current == entry)" ng-mouseup="bodyClicked(entry, $event)"
ng-class="{rtl: entry.rtl}">
<div class="entry-header">
<div class="entry-title">
<a href="{{entry.url}}" target="_blank" ng-bind-html-unsafe="entry.title | highlight:keywords"></a>
<div class="entry-subtitle">
<span class="entry-source" ui-if="selectedType == 'category'">
<span class="entry-source" ng-if="selectedType == 'category'">
<span class="entry-source-prefix">${view.entry_source}</span>
<a ng-click="goToFeed(entry.feedId)" class="pointer bidi-embed"><span>{{entry.feedName}}</span></a>
</span>
<span class="entry-author" ui-if="entry.author">
<span class="entry-author" ng-if="entry.author">
<span class="entry-author-prefix">${view.entry_author}</span>
<span class="entry-author-name">{{entry.author}}</span>
</span>
@@ -56,17 +56,17 @@
<div class="entry-body-content">
<div ng-bind-html-unsafe="entry.content | highlight:keywords"></div>
<div class="entry-enclosure" ui-if="entry.enclosureType">
<video controls ui-if="entry.enclosureType && entry.enclosureType.indexOf('video') == 0">
<div class="entry-enclosure" ng-if="entry.enclosureType">
<video controls ng-if="entry.enclosureType && entry.enclosureType.indexOf('video') == 0">
<source src="{{entry.enclosureUrl}}" type="{{entry.enclosureType}}" />
</video>
<audio controls ui-if="entry.enclosureType && entry.enclosureType.indexOf('audio') == 0">
<audio controls ng-if="entry.enclosureType && entry.enclosureType.indexOf('audio') == 0">
<source src="{{entry.enclosureUrl}}" type="{{entry.enclosureType}}" />
</audio>
<div ui-if="entry.enclosureType && entry.enclosureType.indexOf('image') == 0">
<div ng-if="entry.enclosureType && entry.enclosureType.indexOf('image') == 0">
<img ng-src="{{entry.enclosureUrl}}" />
</div>
<a href="{{entry.enclosureUrl}}" target="_blank" ui-if="entry.enclosureType" download>
<a href="{{entry.enclosureUrl}}" target="_blank" ng-if="entry.enclosureType" download>
${global.download}
</a>
</div>
@@ -77,12 +77,12 @@
<i ng-class="{'icon-star icon-star-yellow': entry.starred, 'icon-star-empty': !entry.starred}"
class="pointer"></i>
</span>
<label class="checkbox inline" ui-if="entry.markable">
<label class="checkbox inline" ng-if="entry.markable">
<input type="checkbox" ng-checked="!entry.read" ng-click="mark(entry, !entry.read)" class="mousetrap"></input>
${view.keep_unread}
</label>
<span class="share-buttons" ui-if="settingsService.settings.socialButtons">
<span class="share-buttons" ng-if="settingsService.settings.socialButtons">
<a href="mailto:?subject={{entry.title|escape}}&body={{entry.url|escape}}" title="E-mail" popup>
<i class="icon-envelope"></i>
</a>
@@ -127,6 +127,6 @@
<div ng-include="'templates/_shortcuts.html'"></div>
</div>
</div>
<div style="height: 30px" ui-if="settingsService.settings.viewMode != 'expanded' && entries.length != 0"></div>
<div style="height: 1000px" ui-if="settingsService.settings.viewMode == 'expanded' && entries.length != 0"></div>
<div style="height: 30px" ng-if="settingsService.settings.viewMode != 'expanded' && entries.length != 0"></div>
<div style="height: 1000px" ng-if="settingsService.settings.viewMode == 'expanded' && entries.length != 0"></div>
</div>