diff options
author | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-05-23 17:55:30 +0200 |
---|---|---|
committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-05-23 17:55:30 +0200 |
commit | 6208debf043fc8af28de13515dec4d10ace99bc3 (patch) | |
tree | 3d1cfc3a94b622f5fc7c65fac0a8f9fb8aadfb37 /templates | |
parent | 4fa9c6d6cfc24b848bc8bb1526ef8ef50f046cb3 (diff) |
use firefox for ci and e2e
Diffstat (limited to 'templates')
-rw-r--r-- | templates/main.php | 37 | ||||
-rw-r--r-- | templates/part.settings.php | 20 | ||||
-rw-r--r-- | templates/part.undo.php | 7 |
3 files changed, 22 insertions, 42 deletions
diff --git a/templates/main.php b/templates/main.php index 4c576754b..ad0d0a6ed 100644 --- a/templates/main.php +++ b/templates/main.php @@ -10,28 +10,21 @@ \OCP\Util::addScript('news', 'build/app'); \OCP\Util::addStyle('news', 'bootstrap/tooltip'); -\OCP\Util::addStyle('news', 'navigation'); \OCP\Util::addStyle('news', 'app'); -\OCP\Util::addStyle('news', 'content'); +//\OCP\Util::addStyle('news', 'navigation'); +//\OCP\Util::addStyle('news', 'content'); \OCP\Util::addStyle('news', 'settings'); ?> <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> - <news-translate key="appName"><?php p($l->t('News')); ?></news-translate> - --> + <div id="global-loading" class="icon-loading" ng-show="App.loading.isLoading('global')"></div> + <!-- navigation --> <div id="app-navigation" ng-controller="NavigationController" ng-hide="App.loading.isLoading('global')"> - <ul class="with-icon" data-id="0" droppable> + <ul class="with-icon" data-folder-id="0" news-droppable> <?php //print_unescaped($this->inc('part.addnew')) ?> <?php //print_unescaped($this->inc('part.feed.unread')) ?> <?php //print_unescaped($this->inc('part.feed.starred')) ?> @@ -45,25 +38,9 @@ </div> + <!-- content --> <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() - }" - ng-controller="ItemController" - ng-show="initialized && !feedBusinessLayer.noFeeds()" - news-item-scroll="true" - item-shortcuts - news-pull-to-refresh="loadNew()" - tabindex="-1" - news-auto-focus> - <?php print_unescaped($this->inc("part.items")); ?> - </div> - - --> + <div id="app-content" ng-class="{'icon-loading': App.loading.isLoading('content')}" ng-hide="App.loading.isLoading('global')" ng-view></div> </div> diff --git a/templates/part.settings.php b/templates/part.settings.php index 81c3550d5..4ad4874f3 100644 --- a/templates/part.settings.php +++ b/templates/part.settings.php @@ -1,11 +1,7 @@ <div id="app-settings-header"> <button name="app settings" class="settings-button" - news-slide-up="{ - selector: '#app-settings-content', - hideOnFocusLost: true, - cssClass: 'opened' - }"></button> + data-apps-slide-up-area="#app-settings-content"></button> </div> <div id="app-settings-content"> @@ -41,14 +37,14 @@ news-read-file="Settings.importOpml($fileContent)"/> <button title="<?php p($l->t('Import')); ?>" - class="upload-icon svg" + class="icon-upload svg button-icon-label" news-trigger-click="#opml-upload"> <?php p($l->t('Import')); ?> </button> <a title="<?php p($l->t('Export')); ?>" - class="button download-icon svg" + class="button icon-download svg button-icon-label" href="<?php p(\OCP\Util::linkToRoute('news.export.opml')); ?>" target="_blank" ng-show="feedSize() > 0"> @@ -56,7 +52,7 @@ </a> <button - class="download-icon svg" + class="icon-download svg button-icon-label" title="<?php p($l->t('Export')); ?>" ng-hide="feedSize() > 0" disabled> @@ -78,21 +74,21 @@ news-read-file="Settings.importArticles($fileContent)"/> <button title="<?php p($l->t('Import')); ?>" - class="upload-icon svg" - ng-class="{loading: Settings.importing}" + class="icon-upload svg button-icon-label" + ng-class="{'icon-loading-small': Settings.importing}" ng-disabled="importing" news-trigger-click="#article-upload"> <?php p($l->t('Import')); ?> </button> - <a title="<?php p($l->t('Export')); ?>" class="button download-icon svg" + <a title="<?php p($l->t('Export')); ?>" class="button icon-download svg button-icon-label" href="<?php p(\OCP\Util::linkToRoute('news.export.articles')); ?>" target="_blank" ng-show="feedSize() > 0"> <?php p($l->t('Export')); ?> </a> <button - class="download-icon svg" + class="icon-download svg button-icon-label" title="<?php p($l->t('Export')); ?>" ng-hide="feedSize() > 0" disabled> diff --git a/templates/part.undo.php b/templates/part.undo.php new file mode 100644 index 000000000..15f4b0cea --- /dev/null +++ b/templates/part.undo.php @@ -0,0 +1,7 @@ +<div id="undo-container"> + <div undo-notification id="undo"> + <a href="#"><?php p($l->t('Undo deletion of %s', '{{ getCaption() }}')); ?></a> + </div> +</div> +<news-translate key="appName"><?php p($l->t('News')); ?></news-translate> + |