merged the angularjs branch

1 files changed, 56 insertions, 55 deletions

diff --git a/templates/main.php b/templates/main.php
index f447c9f30..cd2cd8821 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -1,63 +1,64 @@
-<!-- Dialogs -->
-<div id="dialog_holder"></div>
-<!-- End of Dialogs -->
+<div class="content_wrapper" ng-app="News">
+	<div id="leftcontent_news" class="main_column">
+		<div id="feed_wrapper">
+			<div id="feeds" ng-controller="FeedController">
+				<ul data-id="0" droppable>
+					<li ng-class="{
+							active: isFeedActive(feedType.Subscriptions, 0),
+							all_read: getUnreadCount(feedType.Subscriptions, 0)==0
+						}" 
+					    class="subscriptions"
+					    ng-show="isShown(feedType.Subscriptions, 0)">
+						<a class="title" 
+						   href="#" 
+						   ng-click="loadFeed(feedType.Subscriptions, 0)">
+						   <?php p($l->t('New articles'))?>
+						</a>
+						<span class="unread_items_counter">
+							{{ getUnreadCount(feedType.Subscriptions, 0) }}
+						</span>
+						<span class="buttons">
+					    	<button class="svg action feeds_markread" 
+					    			ng-click="markAllRead(feedType.Subscriptions, 0)"
+					    	        title="<?php p($l->t('Mark all read')) ?>"></button>
+					    </span>
+					</li>
+					<li ng-class="{
+							active: isFeedActive(feedType.Starred, 0),
+							all_read: getUnreadCount(feedType.Starred, 0)==0
+						}" 
+					    class="starred"
+					    ng-show="isShown(feedType.Starred, 0)">
+						<a class="title" 
+						   href="#"
+						   ng-click="loadFeed(feedType.Starred, 0)">
+						   <?php p($l->t('Starred')) ?>
+						</a>
+						<span class="unread_items_counter">
+							{{ getUnreadCount(feedType.Starred, 0) }}
+						</span>
+					</li>
 
-<?php
-
-$lastViewedFeedId = $_['lastViewedFeedId'];
-$lastViewedFeedType = $_['lastViewedFeedType'];
+					<?php print_unescaped($this->inc('part.listfolder')) ?>
+					<?php print_unescaped($this->inc('part.listfeed', array('folderId' => '0'))) ?>
 
+				</ul>
+			</div>
+		</div>
 
-if($_['showAll']) {
-	$viewButtonImg = 'eye_all.svg';
-	$viewButtonTitle = $l->t('Show everything');
-	$viewButtonClass = 'show_all';
-} else {
-	$viewButtonImg = 'eye_unread.svg';
-	$viewButtonTitle = $l->t('Show only unread');
-	$viewButtonClass = 'show_unread';
-}
+		<?php print_unescaped($this->inc('part.settings')) ?>
 
-echo $this->inc("part.dialogues");
-?>
+	</div>
 
-<div id="leftcontent_news" class="leftcontent_news">
-	<div id="feed_wrapper">
-		<div id="feeds">
-			<ul data-id="0">
-				<?php echo $this->inc("part.feeds"); ?>
-			</ul>
+	<div id="rightcontent_news" class="main_column">
+		<div id="feed_items" 
+				ng-class="{loading: loading.loading>0}"
+				ng-controller="ItemController" 
+				when-scrolled="scroll()"
+				feed-navigation>
+			<?php
+				print_unescaped($this->inc("part.items"));
+			?>
 		</div>
 	</div>
-	<div id="feed_settings">
-		<ul class="controls">
-			<li id="addfeedfolder" title="<?php echo $l->t('Add feed or folder'); ?>">
-				<button><img class="svg" src="<?php echo OCP\Util::linkTo('news', 'img/add.svg'); ?>" alt="<?php echo $l->t('Add Feed/Folder'); ?>" /></button>
-				<ul class="menu" id="feedfoldermenu">
-					<li id="addfeed"><?php echo $l->t('Feed'); ?></li>
-					<li id="addfolder"><?php echo $l->t('Folder'); ?></li>
-				</ul>
-			</li>
-			<li id="view" title="<?php echo $viewButtonTitle; ?>" class="<?php echo $viewButtonClass; ?>">
-				<button></button>
-			</li>
-			<li style="float: right">
-				<button id="settingsbtn" title="<?php echo $l->t('Settings'); ?>"><img class="svg" src="<?php echo OCP\Util::imagePath('core','actions/settings.png'); ?>" alt="<?php echo $l->t('Settings'); ?>"   /></button>
-			</li>
-		</ul>
-	</div>
 </div>
-
-<div id="rightcontent" class="rightcontent">
-	<?php
-			echo '<div id="feed_items">';
-				//echo $this->inc("part.shared");
-				echo $this->inc("part.items");
-			echo '</div>';
-	?>
-
-	<div id="appsettings" class="popup bottomleft hidden"></div>
-
-</div>
-
-<div id='notification'></div>
\ No newline at end of file