diff options
| author | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-05-19 02:22:02 +0200 |
|---|---|---|
| committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-05-19 02:22:02 +0200 |
| commit | 90584316b8f275fcad904b644676544eb0322636 (patch) | |
| tree | 35ead28e8f0cdccc1771464442bb83ce5b558cc6 /templates/main.php | |
| parent | ded252d29e99e068ea341506129e47a05e053a24 (diff) | |
add test for firstrun page
Diffstat (limited to 'templates/main.php')
| -rw-r--r-- | templates/main.php | 43 |
1 files changed, 26 insertions, 17 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> |