diff options
author | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-09-12 19:40:16 +0200 |
---|---|---|
committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-09-12 19:40:16 +0200 |
commit | b86a5591667ca8de3a83ef5bcbc756e356979b5a (patch) | |
tree | 4e364688193ab00a015301659e126ba2c6397a55 /templates | |
parent | 748500380e39880e54ee73ebaf5234ddf442e149 (diff) |
adding feeds and folders, lady and gentlemen :P
Diffstat (limited to 'templates')
-rw-r--r-- | templates/index.php | 7 | ||||
-rw-r--r-- | templates/part.content.php | 15 | ||||
-rw-r--r-- | templates/part.navigation.addfeed.php | 99 | ||||
-rw-r--r-- | templates/part.navigation.addfolder.php | 27 | ||||
-rw-r--r-- | templates/part.navigation.feed.php | 4 | ||||
-rw-r--r-- | templates/part.navigation.folder.php | 5 |
6 files changed, 85 insertions, 72 deletions
diff --git a/templates/index.php b/templates/index.php index aaf50d9f1..2ad7fa430 100644 --- a/templates/index.php +++ b/templates/index.php @@ -45,7 +45,12 @@ style('news', [ <!-- content --> <script type="text/ng-template" id="content.html"><?php print_unescaped($this->inc('part.content')) ?></script> - <div id="app-content" ng-class="{'loading-content': App.loading.isLoading('content') && !App.loading.isLoading('global')}" tabindex="-1"> + <div id="app-content" + ng-class="{ + 'loading-content': App.loading.isLoading('content') && !App.loading.isLoading('global'), + 'first-run': App.isFirstRun() + }" + tabindex="-1"> <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 e1999e268..f97ad91d5 100644 --- a/templates/part.content.php +++ b/templates/part.content.php @@ -1,9 +1,12 @@ -<div id="first-run" ng-if="App.isFirstRun()"> - <h1><?php p($l->t('Welcome to the ownCloud News app!')) ?></h1> +<div id="first-run"> + <div> + <div class="helper"><h1><?php p($l->t('Add a feed')) ?></h1></div> + <div class="title"><h1><?php p($l->t('There are no feeds yet. Go ahead and add some')) ?> :)</h1></div> + <div class="helper"><h1><?php p($l->t('Import feeds and articles')) ?></h1></div> + </div> </div> -<div ng-if="!App.isFirstRun()" - news-auto-focus="#app-content" +<div news-auto-focus="#app-content" ng-class="{compact: Content.isCompactView(), 'feed-view': Content.isFeed()}"> <ul> <li class="item {{ Content.getFeed(item.feedId).cssClass }}" @@ -46,10 +49,10 @@ </div> <div class="enclosure" ng-if="item.enclosureLink"> - <news-audio type="{{ item.enclosureType }}" + <!--<news-audio type="{{ item.enclosureType }}" ng-src="{{ item.enclosureLink|trustUrl }}"> <?php p($l->t('Download')) ?> - </news-audio> + </news-audio>--> </div> <div class="body" news-bind-html-unsafe="item.body"></div> diff --git a/templates/part.navigation.addfeed.php b/templates/part.navigation.addfeed.php index 6e014311b..6afc31c5d 100644 --- a/templates/part.navigation.addfeed.php +++ b/templates/part.navigation.addfeed.php @@ -8,53 +8,58 @@ <div class="add-new-popup" id="new-feed"> <form ng-submit="Navigation.createFeed(feed)" name="feedform"> - <input type="text" - ng-model="feed.url" - ng-class="{'ng-invalid': Navigation.feedUrlExists(feed.url)}" - placeholder="<?php p($l->t('Web address')); ?>" - name="address" - pattern="[^\s]+" - required> - - <p class="error" ng-show="Navigation.feedUrlExists(feed.url)"><?php p($l->t('Feed exists already!')); ?></p> - - <!-- select a folder --> - <select name="folder" - title="<?php p($l->t('Folder')); ?>" - ng-if="!Navigation.newFolder" - ng-model="$parent.feed.folderId" - ng-options="folder.name for folder in Navigation.getFolders() track by folder.name"> - <option value="">-- <?php p($l->t('No folder')); ?> --</option> - </select> - <button type="button" - class="icon-add add-new-folder-primary" - ng-hide="Navigation.newFolder" - title="<?php p($l->t('New folder')); ?>" - ng-click="Navigation.newFolder=true" - news-focus="#new-feed [name='folderName']"></button> - - <!-- add a folder --> - <input type="text" - ng-model="$parent.feed.folder" - ng-class="{'ng-invalid': Navigation.newFolder && Navigation.folderNameExists($parent.feed.folder)}" - placeholder="<?php p($l->t('Folder name')); ?>" - name="folderName" - ng-if="Navigation.newFolder" - required> - <button type="button" - ng-show="Navigation.newFolder" - class="icon-close add-new-folder-primary" - title="<?php p($l->t('Go back')); ?>" - ng-click="Navigation.newFolder=false; feed.folder=''"></button> - - - <p class="error" ng-show="Navigation.folderNameExists(feed.folder)"><?php p($l->t('Folder exists already!')); ?></p> - - <input type="submit" - value="<?php p($l->t('Subscribe')); ?>" - class="primary" - ng-disabled="Navigation.feedUrlExists(feed.url) || - (Navigation.newFolder && Navigation.folderNameExists(folder.name))"> + <fieldset ng-disabled="Navigation.addingFeed"> + <input type="text" + ng-model="feed.url" + ng-class="{'ng-invalid': !Navigation.addingFeed && Navigation.feedUrlExists(feed.url)}" + placeholder="<?php p($l->t('Web address')); ?>" + name="address" + pattern="[^\s]+" + required> + + <p class="error" + ng-show="!Navigation.addingFeed && Navigation.feedUrlExists(feed.url)"> + <?php p($l->t('Feed exists already!')); ?> + </p> + + <!-- select a folder --> + <select name="folder" + title="<?php p($l->t('Folder')); ?>" + ng-if="!Navigation.newFolder" + ng-model="$parent.feed.existingFolder" + ng-options="folder.name for folder in Navigation.getFolders() track by folder.name"> + <option value="">-- <?php p($l->t('No folder')); ?> --</option> + </select> + <button type="button" + class="icon-add add-new-folder-primary" + ng-hide="Navigation.newFolder" + title="<?php p($l->t('New folder')); ?>" + ng-click="Navigation.newFolder=true" + news-focus="#new-feed [name='folderName']"></button> + + <!-- add a folder --> + <input type="text" + ng-model="$parent.feed.newFolder" + ng-class="{'ng-invalid': !Navigation.addingFeed && !Navigation.addingFeed && Navigation.newFolder && Navigation.folderNameExists($parent.feed.newFolder)}" + placeholder="<?php p($l->t('Folder name')); ?>" + name="folderName" + ng-if="Navigation.newFolder" + required> + <button type="button" + ng-show="Navigation.newFolder" + class="icon-close add-new-folder-primary" + title="<?php p($l->t('Go back')); ?>" + ng-click="Navigation.newFolder=false; feed.folder=''"></button> + + + <p class="error" ng-show="!Navigation.addingFeed && Navigation.folderNameExists(feed.newFolder)"><?php p($l->t('Folder exists already!')); ?></p> + + <input type="submit" + value="<?php p($l->t('Subscribe')); ?>" + class="primary" + ng-disabled="Navigation.feedUrlExists(feed.url) || + (Navigation.newFolder && Navigation.folderNameExists(folder.name))"> + </fieldset> </form> </div> </li> diff --git a/templates/part.navigation.addfolder.php b/templates/part.navigation.addfolder.php index f1c494fb8..2f65e9d2b 100644 --- a/templates/part.navigation.addfolder.php +++ b/templates/part.navigation.addfolder.php @@ -8,22 +8,23 @@ <div class="add-new-popup" id="new-folder"> <form ng-submit="Navigation.createFolder(folder)" name="folderform"> - + <fieldset ng-disabled="Navigation.addingFolder"> <!-- add a folder --> - <input type="text" - ng-class="{'ng-invalid': Navigation.folderNameExists(folder.name)}" - ng-model="folder.name" - placeholder="<?php p($l->t('Folder name')); ?>" - title="<?php p($l->t('Folder name')); ?>" - name="folderName" - required> + <input type="text" + ng-class="{'ng-invalid': !Navigation.addingFolder && Navigation.folderNameExists(folder.name)}" + ng-model="folder.name" + placeholder="<?php p($l->t('Folder name')); ?>" + title="<?php p($l->t('Folder name')); ?>" + name="folderName" + required> - <p class="error" ng-show="Navigation.folderNameExists(folder.name)"><?php p($l->t('Folder exists already!')); ?></p> + <p class="error" ng-show="!Navigation.addingFolder && Navigation.folderNameExists(folder.name)"><?php p($l->t('Folder exists already!')); ?></p> - <input type="submit" - value="<?php p($l->t('Create')); ?>" - class="primary" - ng-disabled="Navigation.folderNameExists(folder.name)"> + <input type="submit" + value="<?php p($l->t('Create')); ?>" + class="primary" + ng-disabled="Navigation.folderNameExists(folder.name)"> + </fieldset> </form> </div> </li> diff --git a/templates/part.navigation.feed.php b/templates/part.navigation.feed.php index fc8a41a6b..fb80b5021 100644 --- a/templates/part.navigation.feed.php +++ b/templates/part.navigation.feed.php @@ -9,7 +9,7 @@ || !feed.id" data-id="{{ feed.id }}" class="feed with-counter with-menu" - news-draggable-disable="{{ feed.error.length > 0 || !feed.id }}" + news-draggable-disable="{{ feed.error.length > 0 || !feed.id || !feed.deleted || !feed.editing}}" news-draggable="{ stack: '> li', zIndex: 1000, @@ -28,7 +28,7 @@ {{ feed.title }} </a> - <a ng-hide="feed.id" + <a ng-hide="feed.id || feed.error" class="entry-loading title" title="{{ feed.title }}"> {{ feed.title }} diff --git a/templates/part.navigation.folder.php b/templates/part.navigation.folder.php index 62dbc57a2..22b3b268a 100644 --- a/templates/part.navigation.folder.php +++ b/templates/part.navigation.folder.php @@ -43,7 +43,7 @@ {{ folder.name }} </a> - <a class="title entry-loading" ng-hide="folder.id"> + <a class="title entry-loading" ng-hide="folder.id || folder.error"> {{ folder.name }} </a> @@ -68,8 +68,7 @@ <li><button ng-click="Navigation.deleteFolder(folder)" class="icon-delete" title="<?php p($l->t('Delete folder')); ?>"></button></li> - <li><button ng-show="Navigation.getFolderUnreadCount(folder.id) > 0" - class="icon-checkmark" + <li ng-show="Navigation.getFolderUnreadCount(folder.id) > 0"><button class="icon-checkmark" ng-click="Navigation.markFolderRead(folder.id)" title="<?php p($l->t('Read all')); ?>"></button></li> </ul> |