diff options
author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-08-03 16:25:16 +0200 |
---|---|---|
committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-08-03 16:25:16 +0200 |
commit | 0524db5914bf22568cc56ecbb56fbd41345541a6 (patch) | |
tree | 561a19d4a7188163bcb3ad2153d72273e72a7767 /templates | |
parent | bcd1bed967a5f71a3e05d2247cbf8e53084991d4 (diff) |
New layout fix, scrolling and keyboard shortcuts fixes
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'templates')
-rw-r--r-- | templates/index.php | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/templates/index.php b/templates/index.php index 5d9f0f63b..363b0fee0 100644 --- a/templates/index.php +++ b/templates/index.php @@ -3,6 +3,7 @@ use OCA\News\Plugin\Client\Plugin; script('news', [ 'build/app.min', + 'app-inject-14' ]); style('news', [ @@ -25,14 +26,21 @@ foreach (Plugin::getScripts() as $appName => $fileName) { } ?> -<div id="app" ng-app="News" ng-cloak ng-strict-di - ng-controller="AppController as App"> - - <div id="global-loading" class="icon-loading" ng-show="App.loading.isLoading('global')"></div> + <!-- content --> + <script type="text/ng-template" id="content.html"> + <?php print_unescaped($this->inc('part.content')) ?> + </script> + <script type="text/ng-template" id="shortcuts.html"> + <?php print_unescaped($this->inc('part.content.shortcuts')) ?> + </script> + <script type="text/ng-template" id="explore.html"> + <?php print_unescaped($this->inc('part.content.explore')) ?> + </script> + <!-- navigation --> <div id="app-navigation" ng-controller="NavigationController as Navigation" @@ -61,17 +69,6 @@ foreach (Plugin::getScripts() as $appName => $fileName) { </div> </div> - <!-- content --> - <script type="text/ng-template" id="content.html"> - <?php print_unescaped($this->inc('part.content')) ?> - </script> - <script type="text/ng-template" id="shortcuts.html"> - <?php print_unescaped($this->inc('part.content.shortcuts')) ?> - </script> - <script type="text/ng-template" id="explore.html"> - <?php print_unescaped($this->inc('part.content.explore')) ?> - </script> - <div id="app-content" ng-class="{ 'loading-content': App.loading.isLoading('content') && @@ -96,8 +93,7 @@ foreach (Plugin::getScripts() as $appName => $fileName) { }" ng-hide="App.loading.isLoading('global')" ng-view - news-scroll=".app-content-detail" + news-scroll news-scroll-enabled-mark-read="Content.markReadEnabled()" news-scroll-auto-page="Content.autoPage()" news-scroll-mark-read="Content.scrollRead(itemIds)"></div> -</div> |