diff options
Diffstat (limited to 'templates')
-rw-r--r-- | templates/main.php | 43 | ||||
-rw-r--r-- | templates/part.content.php | 3 | ||||
-rw-r--r-- | templates/part.firstrun.php | 3 | ||||
-rw-r--r-- | templates/part.items.php | 12 |
4 files changed, 34 insertions, 27 deletions
diff --git a/templates/main.php b/templates/main.php index 8755a2542..465dadaba 100644 --- a/templates/main.php +++ b/templates/main.php @@ -9,39 +9,49 @@ \OCP\Util::addScript('news', 'build/app'); \OCP\Util::addStyle('news', 'bootstrap/tooltip'); +\OCP\Util::addStyle('news', 'navigation'); \OCP\Util::addStyle('news', 'addnew'); -\OCP\Util::addStyle('news', 'feeds'); -\OCP\Util::addStyle('news', 'items'); +\OCP\Util::addStyle('news', 'app'); +\OCP\Util::addStyle('news', 'content'); \OCP\Util::addStyle('news', 'settings'); \OCP\Util::addStyle('news', 'showall'); -\OCP\Util::addStyle('news', 'firstrun'); -\OCP\Util::addStyle('news', 'owncloud6'); ?> -<div id="app" ng-app="News" ng-cloak ng-controller="AppController"> + +<div id="app" ng-app="News" ng-cloak ng-controller="AppController as App"> + + <div id="global-loading" class="loading-icon" ng-show="App.loading.isLoading('global')"></div> + <!-- <div id="undo-container"> <div undo-notification id="undo"> <a href="#"><?php p($l->t('Undo deletion of %s', '{{ getCaption() }}')); ?></a> </div> </div> - <div id="app-navigation" ng-controller="FeedController"> - <news-translate key="appName"><?php p($l->t('News')); ?></news-translate> + <news-translate key="appName"><?php p($l->t('News')); ?></news-translate> + --> + + <div id="app-navigation" ng-controller="NavigationController" ng-hide="App.loading.isLoading('global')"> <ul class="with-icon" data-id="0" droppable> - <?php print_unescaped($this->inc('part.addnew')) ?> - <?php print_unescaped($this->inc('part.feed.unread')) ?> - <?php print_unescaped($this->inc('part.feed.starred')) ?> - <?php print_unescaped($this->inc('part.listfeed', ['folderId' => '0'])) ?> - <?php print_unescaped($this->inc('part.listfolder')) ?> - <?php print_unescaped($this->inc('part.showall')); ?> + <?php //print_unescaped($this->inc('part.addnew')) ?> + <?php //print_unescaped($this->inc('part.feed.unread')) ?> + <?php //print_unescaped($this->inc('part.feed.starred')) ?> + <?php //print_unescaped($this->inc('part.listfeed', ['folderId' => '0'])) ?> + <?php //print_unescaped($this->inc('part.listfolder')) ?> + <?php //print_unescaped($this->inc('part.showall')); ?> </ul> <div id="app-settings" ng-controller="SettingsController"> - <?php print_unescaped($this->inc('part.settings')) ?> + <!--<?php print_unescaped($this->inc('part.settings')) ?>--> </div> </div> + <script type="text/ng-template" id="content.html"><?php print_unescaped($this->inc('part.content')) ?></script> + + <div id="app-content" ng-hide="App.loading.isLoading('global')" ng-view></div> + + <!-- <div id="app-content" ng-class="{ loading: isLoading(), autopaging: isAutoPaging() @@ -55,8 +65,7 @@ news-auto-focus> <?php print_unescaped($this->inc("part.items")); ?> </div> - <div id="firstrun" ng-show="initialized && feedBusinessLayer.noFeeds()"> - <?php print_unescaped($this->inc("part.firstrun")); ?> - </div> + + --> </div> diff --git a/templates/part.content.php b/templates/part.content.php new file mode 100644 index 000000000..d3a59b08c --- /dev/null +++ b/templates/part.content.php @@ -0,0 +1,3 @@ +<div id="first-run" ng-if="App.isFirstRun()"> + <h1><?php p($l->t('Welcome to the ownCloud News app!')) ?></h1> +</div>
\ No newline at end of file diff --git a/templates/part.firstrun.php b/templates/part.firstrun.php deleted file mode 100644 index 6edf8617e..000000000 --- a/templates/part.firstrun.php +++ /dev/null @@ -1,3 +0,0 @@ -<h1 class="message"> - <?php p($l->t('Welcome to the ownCloud News app!')) ?> -</h1>
\ No newline at end of file diff --git a/templates/part.items.php b/templates/part.items.php index 8b062b787..200d5fffd 100644 --- a/templates/part.items.php +++ b/templates/part.items.php @@ -1,5 +1,3 @@ -<div class="pull-refresh" ng-class="{refresh: refresh}"></div> - <ul> <li class="feed_item" @@ -14,9 +12,9 @@ class="star" > </button> - <a class="external" - target="_blank" - ng-href="{{ item.url }}" + <a class="external" + target="_blank" + ng-href="{{ item.url }}" title="<?php p($l->t('read on website')) ?>"> </a> <span class="timeago" title="{{item.pubDate*1000|date:'dd-MM-yyyy'}}"> @@ -26,7 +24,7 @@ <a ng-click="item.active = !item.active" href="#">{{ item.title }}</a> </h1> </div> - + <h2 class="item_date"> <span class="timeago" title="{{item.pubDate*1000|date:'dd-MM-yyyy'}}"> {{ getRelativeDate(item.pubDate) }} @@ -36,7 +34,7 @@ <div class="item_utils"> <ul class="primary_item_utils"> <li> - <button + <button title="<?php p($l->t('star')) ?>" ng-class="{ important: item.isStarred() }" ng-click="itemBusinessLayer.toggleStarred(item.id)" |