[Tikiwiki-cvs] tiki/templates tiki-view_forum.tpl,1.33,1.34 tiki-view_forum_thread.tpl,1.35,1.36

[<in...@us...>]

Update of /cvsroot/tikiwiki/tiki/templates
In directory sc8-pr-cvs1:/tmp/cvs-serv28018/templates

Modified Files:
	tiki-view_forum.tpl tiki-view_forum_thread.tpl 
Log Message:
Improved usability on forum post forms

Index: tiki-view_forum.tpl
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-view_forum.tpl,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- tiki-view_forum.tpl	1 Oct 2003 14:10:18 -0000	1.33
+++ tiki-view_forum.tpl	5 Oct 2003 18:13:52 -0000	1.34
@@ -11,18 +11,19 @@
 {else}
 {assign var="postclass" value="forumpost"}
 {/if}
-<table >
+<table width="100%">
 <tr>
 <td>
-[{if $tiki_p_forum_post_topic eq 'y'}
-<a class="forumbutlink" href="javascript:show('{$postclass}');">{tr}Show Post Form{/tr}</a> |
-<a class="forumbutlink" href="javascript:hide('{$postclass}');">{tr}Hide Post Form{/tr}</a> |
+{if $tiki_p_forum_post_topic eq 'y'}
+<input type="button" name="comments_postComment" value="{tr}new topic{/tr}" onclick="show('{$postclass}');"/>
 {/if}
-<a class="forumbutlink" href="tiki-forum_rss.php?forumId={$forumId}">{tr}RSS feed{/tr}</a> |
+<div align="right">
+[<a class="forumbutlink" href="tiki-forum_rss.php?forumId={$forumId}">{tr}RSS feed{/tr}</a> |
 <a class="forumbutlink" href="tiki-forums.php">{tr}Forum List{/tr}</a> 
 {if $tiki_p_admin_forum eq 'y'}
-| <a class="forumbutlink" href="tiki-admin_forums.php?forumId={$forum_info.forumId}">{tr}Edit Forum{/tr}</a>
-{/if}]
+| <a class="forumbutlink" href="tiki-admin_forums.php?forumId={$forum_info.forumId}">{tr}Edit Forum{/tr}</a>]
+</div>
+{/if}
 </td>
 <td style="text-align:right;">
 {if $user and $feature_user_watches eq 'y'}
@@ -96,14 +97,6 @@
     <input type="hidden" name="forumId" value="{$forumId|escape}" />
     <table class="forumformtable">
     <tr>
-      <td class="forumform">{tr}Post{/tr}</td>
-      <td class="forumform">
-      <input type="submit" name="comments_previewComment" value="{tr}preview{/tr}"/>
-      <input type="submit" name="comments_postComment" value="{tr}post{/tr}"/>
-      </td>
-      {if $feature_smileys eq 'y'}<td class="forumform">{tr}smileys{/tr}</td>{/if}
-    </tr>
-    <tr>
       <td class="forumform">{tr}Title{/tr}</td>
       <td class="forumform"><input type="text" name="comments_title" value="{$comment_title|escape}" /></td>
       
@@ -205,6 +198,14 @@
 	  </td>   
     </tr>
     {/if}
+    <tr>
+      <td class="forumform">{tr}Post{/tr}</td>
+      <td class="forumform">
+      <input type="submit" name="comments_previewComment" value="{tr}preview{/tr}"/>
+      <input type="submit" name="comments_postComment" value="{tr}post{/tr}"/>
+      <input type="button" name="comments_postComment" value="{tr}cancel{/tr}" onclick="hide('{$postclass}');"/></td>
+      </td>
+    </tr>
     </table>
     </form>
 <br/>    

Index: tiki-view_forum_thread.tpl
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-view_forum_thread.tpl,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- tiki-view_forum_thread.tpl	28 Sep 2003 18:46:34 -0000	1.35
+++ tiki-view_forum_thread.tpl	5 Oct 2003 18:13:53 -0000	1.36
@@ -11,6 +11,10 @@
 </div>
 {/if}
 <a class="link" href="tiki-forums.php">{tr}Tiki forums{/tr}</a>-><a class="link" href="tiki-view_forum.php?forumId={$forumId}">{$forum_info.name}</a>-><a class="link" href="tiki-view_forum_thread.php?topics_offset={$smarty.request.topics_offset}&amp;topics_sort_mode={$smarty.request.topics_sort_mode}&amp;topics_threshold={$smarty.request.topics_threshold}&topics_find={$smarty.request.topics_find}&amp;forumId={$forumId}&amp;comments_parentId={$smarty.request.comments_parentId}">{$thread_info.title}</a>
+<div align="right">
+[{if $prev_topic}<a href="tiki-view_forum_thread.php?topics_offset={$topics_prev_offset}&amp;topics_sort_mode={$smarty.request.topics_sort_mode}&amp;topics_threshold={$smarty.request.topics_threshold}&amp;topics_find={$smarty.request.topics_find}&amp;forumId={$forumId}&amp;comments_parentId={$prev_topic}" class="link">{tr}prev topic{/tr}</a>{if $next_topic} | {/if}{/if}
+{if $next_topic}<a href="tiki-view_forum_thread.php?topics_offset={$topics_next_offset}&amp;topics_sort_mode={$smarty.request.topics_sort_mode}&amp;topics_threshold={$smarty.request.topics_threshold}&amp;topics_find={$smarty.request.topics_find}&amp;forumId={$forumId}&amp;comments_parentId={$next_topic}" class="link">{tr}next topic{/tr}</a>{/if}] 
+ </div>
 <br/><br/>
 {if $openpost eq 'y'}
 {assign var="postclass" value="forumpostopen"}
@@ -133,10 +137,7 @@
 {if $tiki_p_admin_form eq 'y' or $thread_info.type ne 'l'}
 {if $tiki_p_admin_forum eq 'y' or $tiki_p_forum_post eq 'y'}
 
-[<a class="forumbutlink" href="javascript:show('{$postclass}');">{tr}Show Post Form{/tr}</a> |
- <a class="forumbutlink" href="javascript:hide('{$postclass}');">{tr}Hide Post Form{/tr}</a>]
-[{if $prev_topic}<a href="tiki-view_forum_thread.php?topics_offset={$topics_prev_offset}&amp;topics_sort_mode={$smarty.request.topics_sort_mode}&amp;topics_threshold={$smarty.request.topics_threshold}&amp;topics_find={$smarty.request.topics_find}&amp;forumId={$forumId}&amp;comments_parentId={$prev_topic}" class="link">{tr}prev topic{/tr}</a>{if $next_topic} | {/if}{/if}
-{if $next_topic}<a href="tiki-view_forum_thread.php?topics_offset={$topics_next_offset}&amp;topics_sort_mode={$smarty.request.topics_sort_mode}&amp;topics_threshold={$smarty.request.topics_threshold}&amp;topics_find={$smarty.request.topics_find}&amp;forumId={$forumId}&amp;comments_parentId={$next_topic}" class="link">{tr}next topic{/tr}</a>{/if}] 
+<input type="button" name="comments_postComment" value="{tr}new reply{/tr}" onclick="show('{$postclass}');"/>
  
  {if $comment_preview eq 'y'}
   <br/><br/>
@@ -182,14 +183,7 @@
     <input type="hidden" name="topics_sort_mode" value="{$smarty.request.topics_sort_mode|escape}" />    
     <input type="hidden" name="topics_threshold" value="{$smarty.request.topics_threshold|escape}" />    
     <input type="hidden" name="forumId" value="{$forumId|escape}" />
-    <table class="forumformtable">
-    <tr>
-      <td class="forumform">{tr}Post{/tr}</td>
-      <td class="forumform">
-      <input type="submit" name="comments_previewComment" value="{tr}preview{/tr}"/>
-      <input type="submit" name="comments_postComment" value="{tr}post{/tr}"/></td>
-      {if $feature_smileys eq 'y'}<td class="forumform">{tr}smileys{/tr}</td>{/if}
-    </tr>
+    <table class="forumformtable">	
     <tr>
       <td class="forumform">{tr}Title{/tr}</td>
       <td class="forumform"><input type="text" name="comments_title" value="{$comment_title|escape}" /></td>
@@ -238,6 +232,7 @@
     	</td>
     </tr>
     {/if}
+    
 {if $feature_forum_parse eq 'y'}        
     <tr><td class="formcolor">{tr}Quicklinks{/tr}</td><td class="formcolor">
 {assign var=area_name value="editpost"}
@@ -257,6 +252,13 @@
 	  </td>   
     </tr>
     {/if}
+    <tr>
+      <td class="forumform">{tr}Post{/tr}</td>
+      <td class="forumform">
+      <input type="submit" name="comments_previewComment" value="{tr}preview{/tr}"/>
+      <input type="submit" name="comments_postComment" value="{tr}post{/tr}"/>
+      <input type="button" name="comments_postComment" value="{tr}cancel{/tr}" onclick="hide('{$postclass}');"/></td>
+    </tr>
     </table>
     </form>