Index: jonah/config/templates.php.dist
===================================================================
RCS file: /repository/jonah/config/templates.php.dist,v
retrieving revision 1.10
diff -u -r1.10 templates.php.dist
--- jonah/config/templates.php.dist     21 Jun 2005 21:36:17 -0000      1.10
+++ jonah/config/templates.php.dist     2 Sep 2005 03:23:04 -0000
@@ -34,6 +34,18 @@
 
 <if:form><tr><td><tag:form /></td></tr></if:form></table>');
 
+$templates['internal'] = array('name' => _("Internal"),
+                               'template' => '<div class="control"><strong><if:channel><tag:channel.channel_name /></if:channel></strong></div>
+<table width="100%" cellspacing="0" class="linedRow">
+<if:error><tr class="text"><td><em><tag:error /></em></td></tr></if:error>
+<if:stories>
+<loop:stories>
+<tr><td><strong><a href="<tag:stories.story_url />"><tag:story_marker /> <tag:stories.story_title /></a></strong><div style="padding-left:10px;"><tag:stories.story_desc /></div></td></tr>
+</loop:stories>
+</if:stories>
+
+<if:form><tr><td><tag:form /></td></tr></if:form></table>');
+
 $templates['compact'] = array('name' => _("Compact"),
                               'template' => '<div class="control"><strong><if:channel><tag:channel.channel_name /></if:channel></strong></div>
 <table width="100%" cellspacing="1" class="linedRow">


Index: jonah/lib/News.php
===================================================================
RCS file: /repository/jonah/lib/News.php,v
retrieving revision 1.95
diff -u -r1.95 News.php
--- jonah/lib/News.php  24 Aug 2005 05:39:13 -0000      1.95
+++ jonah/lib/News.php  2 Sep 2005 03:23:04 -0000
@@ -474,6 +474,7 @@
             $stories = $this->getStories($channel_id, $max + 1, $from, false, time());
         } else {
             $stories = $this->getStories($channel_id, null, 0, false, time());
+            $max = count($stories);
         }
 
         if (is_a($stories, 'PEAR_Error')) {


Index: jonah/stories/index.php
===================================================================
RCS file: /repository/jonah/stories/index.php,v
retrieving revision 1.44
diff -u -r1.44 index.php
--- jonah/stories/index.php     21 Jun 2005 21:36:18 -0000      1.44
+++ jonah/stories/index.php     2 Sep 2005 03:23:04 -0000
@@ -73,7 +73,7 @@
         }
         /* These links only if internal channel. */
         if ($channel['channel_type'] == JONAH_INTERNAL_CHANNEL) {
-            $stories[$key]['view_link'] = Horde::link(str_replace(array('%c', '%s'), array($channel_id, $story['story_id']), $story_url), $story['story_desc'], '', '_blank') . htmlspecialchars($story['story_title']) . '</a>';
+            $stories[$key]['view_link'] = Horde::link(str_replace(array('%c', '%s'), array($channel_id, $story['story_id']), $story_url), $story['story_desc'], '', '') . htmlspecialchars($story['story_title']) . '</a>';
 
             /* Edit story link. */
             $url = Horde::applicationUrl('stories/edit.php');


Index: jonah/stories/view.php
===================================================================
RCS file: /repository/jonah/stories/view.php,v
retrieving revision 1.25
diff -u -r1.25 view.php
--- jonah/stories/view.php      21 Jun 2005 21:36:18 -0000      1.25
+++ jonah/stories/view.php      2 Sep 2005 03:23:04 -0000
@@ -78,6 +78,7 @@
     $template->set('comments', false, true);
 }
 
+$template->set('menu', Jonah::getMenu('string'));
 $template->set('notify', Util::bufferOutput(array($notification, 'notify'), array('listeners' => 'status')));
 require JONAH_TEMPLATES . '/common-header.inc';
 echo $template->fetch(JONAH_TEMPLATES . '/stories/view.html');


Index: jonah/templates/stories/view.html
===================================================================
RCS file: /repository/jonah/templates/stories/view.html,v
retrieving revision 1.11
diff -u -r1.11 view.html
--- jonah/templates/stories/view.html   21 Jun 2005 21:36:19 -0000      1.11
+++ jonah/templates/stories/view.html   2 Sep 2005 03:23:05 -0000
@@ -1,3 +1,7 @@
+<div id="menu">
+ <tag:menu />
+</div>
+
 <tag:notify />
 
 <div class="header">