diff options
| -rw-r--r-- | templates/main.php | 16 | ||||
| -rw-r--r-- | templates/part.addnew.php | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/templates/main.php b/templates/main.php index 2de7c0fba..28cb83041 100644 --- a/templates/main.php +++ b/templates/main.php @@ -20,15 +20,15 @@ ?> <div id="app" ng-app="News"> - <div id="left-content" ng-controller="FeedController"> + <div id="app-navigation" ng-controller="FeedController"> <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.listfolder')) ?> - <?php // print_unescaped($this->inc('part.listfeed', array('folderId' => '0'))) ?> - <?php // print_unescaped($this->inc('part.showall')); ?> + <?php print_unescaped($this->inc('part.feed.unread')) ?> + <?php print_unescaped($this->inc('part.feed.starred')) ?> + <?php print_unescaped($this->inc('part.listfolder')) ?> + <?php //print_unescaped($this->inc('part.listfeed', array('folderId' => '0'))) ?> + <?php print_unescaped($this->inc('part.showall')); ?> </ul> <div id="app-settings" ng-controller="SettingsController"> @@ -47,9 +47,9 @@ </div> - <div id="right-content" ng-class="{loading: isLoading()}" + <div id="app-content" ng-class="{loading: isLoading()}" ng-controller="ItemController" when-scrolled="scroll()" feed-navigation> - <?php //print_unescaped($this->inc("part.items")); ?> + <?php print_unescaped($this->inc("part.items")); ?> </div> </div>
\ No newline at end of file diff --git a/templates/part.addnew.php b/templates/part.addnew.php index 8dadc947b..d7d549ad0 100644 --- a/templates/part.addnew.php +++ b/templates/part.addnew.php @@ -1,6 +1,6 @@ <li class="add-new"> <a class="list-title list-title-with-icon" ng-click="showAdd=!showAdd" - click-slide-toggle="{ + oc-click-slide-toggle="{ selector: '.add-new-popup', hideOnFocusLost: true }" href="#"> |