button to add feed; selection of a feed

5 files changed, 41 insertions, 29 deletions

diff --git a/templates/main.php b/templates/main.php
index f05a548b6..775dd46bf 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -14,8 +14,15 @@
 	</form>
 </div>
 	
-<div id="rightcontent" class="rightcontent">
-	<?php ?>
+<div id="rightcontent" class="rightcontent" data-id="<?php echo $_['feedid']; ?>">
+	<?php
+		if ($_['feedid']){
+			echo $this->inc('part.items');
+		}
+		else {
+			echo $this->inc('part.nofeeds');
+		}
+	?>
 </div>
 
 <!-- Dialogs -->
diff --git a/templates/part.addfeedfolder.php b/templates/part.addfeedfolder.php
index 693a55e53..7f6a8f6a7 100644
--- a/templates/part.addfeedfolder.php
+++ b/templates/part.addfeedfolder.php
@@ -1,34 +1,18 @@
 <div id="addfeedfolder_dialog" title="<?php echo $l->t("Add Feed/Folder"); ?>">
 <table width="100%" style="border: 0;">
 <tr>
-	<td>
-	Add new feed
-	</td>
-	<td>
-	...where?...
-	</td>
+	<td>Add new feed</td>
+	<td>...where?...</td>
 </tr>
 <tr>
-	<td>
-	<input type="text" id="feed_add_url" placeholder="<?php echo $l->t('URL'); ?>" class="news_input" />
-	</td>
-	<td>
-	<input type="submit" value="<?php echo $l->t('Add feed'); ?>" id="feed_add_submit" />
-	</td>
+	<td><input type="text" id="feed_add_url" placeholder="<?php echo $l->t('URL'); ?>" class="news_input" /></td>
+	<td><input type="submit" value="<?php echo $l->t('Add feed'); ?>" onclick="News.Feed.submit(this)" id="feed_add_submit" /></td>
 </tr>
-	<td>
-	Add new folder
-	</td>
-	<td>
-	...where?...
-	</td>
+	<td>Add new folder</td>
+	<td>...where?...</td>
 </tr>
 <tr>
-	<td>
-	<input type="text" id="folder_add_name" placeholder="<?php echo $l->t('Folder name'); ?>" class="news_input" />
-	</td>
-	<td>
-	<input type="submit" value="<?php echo $l->t('Add folder'); ?>" onclick="News.Feeds.submit(this)" id="folder_add_submit" />
-	</td>
+	<td><input type="text" id="folder_add_name" placeholder="<?php echo $l->t('Folder name'); ?>" class="news_input" /></td>
+	<td><input type="submit" value="<?php echo $l->t('Add folder'); ?>" onclick="News.Folder.submit(this)" id="folder_add_submit" /></td>
 </tr>
 </table>
\ No newline at end of file
diff --git a/templates/part.feeds.php b/templates/part.feeds.php
index a2fc0bb24..7b9b72126 100644
--- a/templates/part.feeds.php
+++ b/templates/part.feeds.php
@@ -9,13 +9,17 @@
 			if ($child instanceOf OC_News_Folder){
 				print_folder($child, $depth+1);
 			}
-			else { //print all feeds contained in the folder
-				echo '<li>' . $child->getTitle(). '</li>';
+			elseif ($child instanceOf OC_News_Feed) {
+?>
+				<li><a href="index.php?feedid=<?php echo $child->getId(); ?>"><?php echo $child->getTitle(); ?></a></li>
+<?php
+			}
+			else {
+			//TODO:handle error in this case
 			}
 		}
 		echo '</ul></li></ul>';
 	}
 	
 	print_folder($_['allfeeds'], 0);
-
 ?>
diff --git a/templates/part.items.php b/templates/part.items.php
new file mode 100644
index 000000000..ce5186052
--- /dev/null
+++ b/templates/part.items.php
@@ -0,0 +1,14 @@
+<?php
+$feedid = isset($_['id']) ? $_['id'] : '';
+
+$itemmapper = new OC_News_ItemMapper();
+
+$items = $itemmapper->findAll($feedid);
+
+echo '<ul>';
+foreach($items as $item) {
+	echo '<li>' . $item->getTitle() . '</li>';
+}
+echo '</ul>';
+
+?>
\ No newline at end of file
diff --git a/templates/part.nofeeds.php b/templates/part.nofeeds.php
new file mode 100644
index 000000000..bb78dedbf
--- /dev/null
+++ b/templates/part.nofeeds.php
@@ -0,0 +1,3 @@
+<div id="firstrun">
+	<?php echo $l->t('You have no feeds in your reader.') ?>
+</div>
\ No newline at end of file