Rename a couple of view methods and templates to better accomodate

the upcoming changes.

src/IDF/templates/idf/base-full.html

@@ -44,7 +44,7 @@
 {if $project}
   <a accesskey="1" href="{url 'IDF_Views_Project::home', array($project.shortname)}"{block tabhome}{/block}>{trans 'Project Home'}</a>
 {if $hasDownloadsAccess}  <a href="{url 'IDF_Views_Download::index', array($project.shortname)}"{block tabdownloads}{/block}>{trans 'Downloads'}</a>{/if}
-{if $hasWikiAccess}  <a href="{url 'IDF_Views_Wiki::index', array($project.shortname)}"{block tabwiki}{/block}>{trans 'Documentation'}</a>{/if}
+{if $hasWikiAccess}  <a href="{url 'IDF_Views_Wiki::listPages', array($project.shortname)}"{block tabwiki}{/block}>{trans 'Documentation'}</a>{/if}
 {if $hasIssuesAccess} <a href="{url 'IDF_Views_Issue::index', array($project.shortname)}"{block tabissues}{/block}>{trans 'Issues'}</a>{/if}
 {if $hasSourceAccess} <a href="{url 'IDF_Views_Source::treeBase', array($project.shortname, $project.getScmRoot())}"{block tabsource}{/block}>{trans 'Source'}</a>{/if}
 {if $hasReviewAccess} <a href="{url 'IDF_Views_Review::index', array($project.shortname)}"{block tabreview}{/block}>{trans 'Code Review'}</a>{/if}

src/IDF/templates/idf/base.html

@@ -44,7 +44,7 @@
 {if $project}
   <a accesskey="1" href="{url 'IDF_Views_Project::home', array($project.shortname)}"{block tabhome}{/block}>{trans 'Project Home'}</a>
 {if $hasDownloadsAccess}  <a href="{url 'IDF_Views_Download::index', array($project.shortname)}"{block tabdownloads}{/block}>{trans 'Downloads'}</a>{/if}
-{if $hasWikiAccess}  <a href="{url 'IDF_Views_Wiki::index', array($project.shortname)}"{block tabwiki}{/block}>{trans 'Documentation'}</a>{/if}
+{if $hasWikiAccess}  <a href="{url 'IDF_Views_Wiki::listPages', array($project.shortname)}"{block tabwiki}{/block}>{trans 'Documentation'}</a>{/if}
 {if $hasIssuesAccess} <a href="{url 'IDF_Views_Issue::index', array($project.shortname)}"{block tabissues}{/block}>{trans 'Issues'}</a>{/if}
 {if $hasSourceAccess} <a href="{url 'IDF_Views_Source::treeBase', array($project.shortname, $project.getScmRoot())}"{block tabsource}{/block}>{trans 'Source'}</a>{/if}
 {if $hasReviewAccess} <a href="{url 'IDF_Views_Review::index', array($project.shortname)}"{block tabreview}{/block}>{trans 'Code Review'}</a>{/if}

src/IDF/templates/idf/js-hotkeys.html

@@ -7,7 +7,7 @@
 {if $hasIssuesAccess}{hotkey 'Shift+a', 'IDF_Views_Issue::create', array($project.shortname)}
 {hotkey 'Shift+i', 'IDF_Views_Issue::index', array($project.shortname)}{/if}
 {if $hasDownloadsAccess}{hotkey 'Shift+d', 'IDF_Views_Download::index', array($project.shortname)}{/if}
-{if $hasWikiAccess}{hotkey 'Shift+o', 'IDF_Views_Wiki::index', array($project.shortname)}{/if}
+{if $hasWikiAccess}{hotkey 'Shift+o', 'IDF_Views_Wiki::listPages', array($project.shortname)}{/if}
 {if $hasSourceAccess}{hotkey 'Shift+s', 'IDF_Views_Source::treeBase', array($project.shortname, $project.getScmRoot())}{/if}
 {if $hasIssuesAccess and !$user.isAnonymous()}
 {hotkey 'Shift+m', 'IDF_Views_Issue::userIssues', array($project.shortname, $user.login, 'submit')}

src/IDF/templates/idf/project/home.html

@@ -20,9 +20,9 @@
 {if count($pages) > 0}
 <p><strong>{trans 'Featured Documentation'}</strong><br />
 {foreach $pages as $page}
-<span class="label"><a href="{url 'IDF_Views_Wiki::view', array($project.shortname, $page.title)}" title="{$page.summary}">{$page.title}</a></span><br />
+<span class="label"><a href="{url 'IDF_Views_Wiki::viewPage', array($project.shortname, $page.title)}" title="{$page.summary}">{$page.title}</a></span><br />
 {/foreach}
-<span class="label"> </span><span class="note"><a href="{url 'IDF_Views_Wiki::index', array($project.shortname)}">{trans 'show more...'}</a></span>
+<span class="label"> </span><span class="note"><a href="{url 'IDF_Views_Wiki::listPages', array($project.shortname)}">{trans 'show more...'}</a></span>
 {/if}
 {assign $ko = 'owners'}
 {assign $km = 'members'}

src/IDF/templates/idf/wiki/base.html

@@ -2,9 +2,9 @@
 {block tabwiki} class="active"{/block}
 {block subtabs}
 <div id="sub-tabs">
-<a {if $inWiki}class="active" {/if}href="{url 'IDF_Views_Wiki::index', array($project.shortname)}">{trans 'List Pages'}</a>
-{if !$user.isAnonymous()} | <a {if $inCreate}class="active" {/if}href="{url 'IDF_Views_Wiki::create', array($project.shortname)}">{trans 'New Page'}</a> {/if} 
-{if !$user.isAnonymous() and $inView} | <a href="{url 'IDF_Views_Wiki::update', array($project.shortname, $page.title)}">{trans 'Update This Page'}</a> {/if} 
+<a {if $inPageList}class="active" {/if}href="{url 'IDF_Views_Wiki::listPages', array($project.shortname)}">{trans 'List Pages'}</a>
+{if !$user.isAnonymous()} | <a {if $inCreate}class="active" {/if}href="{url 'IDF_Views_Wiki::createPage', array($project.shortname)}">{trans 'New Page'}</a> {/if} 
+{if !$user.isAnonymous() and $inPageView} | <a href="{url 'IDF_Views_Wiki::updatePage', array($project.shortname, $page.title)}">{trans 'Update This Page'}</a> {/if} 
  |
 <form class="star" action="{url 'IDF_Views_Wiki::search', array($project.shortname)}" method="get">
 <input accesskey="4" type="text" value="{$q}" name="q" size="20" />

src/IDF/templates/idf/wiki/createPage.html

@@ -49,7 +49,7 @@
 </tr>{/if}
 <tr>
 <td>&nbsp;</td>
-<td><input type="submit" value="{trans 'Preview'}" name="preview" /> &nbsp; <input type="submit" value="{trans 'Create Page'}" name="submit" /> | <a href="{url 'IDF_Views_Wiki::index', array($project.shortname)}">{trans 'Cancel'}</a>
+<td><input type="submit" value="{trans 'Preview'}" name="preview" /> &nbsp; <input type="submit" value="{trans 'Create Page'}" name="submit" /> | <a href="{url 'IDF_Views_Wiki::listPages', array($project.shortname)}">{trans 'Cancel'}</a>
 </td>
 </tr>
 </table>

src/IDF/templates/idf/wiki/deletePage.html

@@ -1,5 +1,5 @@
 {extends "idf/wiki/base.html"}
-{block docclass}yui-t3{assign $inView=true}{/block}
+{block docclass}yui-t3{assign $inPageView=true}{/block}
 {block body}
 
 <p>{blocktrans}If you delete this documentation page, it will be removed from the database with all the associated revisions and <strong>you will not be able to recover it</strong>.{/blocktrans}</p>
@@ -10,7 +10,7 @@
 <td>
 {$form.f.confirm|unsafe} <strong>{$form.f.confirm.labelTag}</strong><br />
 {if $form.f.confirm.errors}{$form.f.confirm.fieldErrors}{/if}
-<input type="submit" value="{trans 'Delete Page'}" name="submit" /> | <a href="{url 'IDF_Views_Wiki::view', array($project.shortname, $page.title)}">{trans 'Cancel'}</a> 
+<input type="submit" value="{trans 'Delete Page'}" name="submit" /> | <a href="{url 'IDF_Views_Wiki::viewPage', array($project.shortname, $page.title)}">{trans 'Cancel'}</a> 
 </td>
 </tr>
 </table>
@@ -36,7 +36,7 @@
 {if $revs.count() > 0}
 <p><strong>{trans 'Old Revisions'}</strong></p>
 <ul>{foreach $revs as $old}
-<li><a href="{url 'IDF_Views_Wiki::view', array($project.shortname, $page.title), array('rev'=>$old.id)}">{$old.summary}</a></li>
+<li><a href="{url 'IDF_Views_Wiki::viewPage', array($project.shortname, $page.title), array('rev'=>$old.id)}">{$old.summary}</a></li>
 {/foreach}</ul>
 {/if}
 {/block}

src/IDF/templates/idf/wiki/deletePageRev.html

@@ -1,9 +1,9 @@
 {extends "idf/wiki/base.html"}
 {block extraheader}{if $oldrev}<meta name="ROBOTS" content="NOINDEX" />{/if}{/block}
-{block docclass}yui-t3{assign $inView=true}{/block}
+{block docclass}yui-t3{assign $inPageView=true}{/block}
 {block body}
 
-{assign $submitter = $oldrev.get_submitter()}{aurl 'url', 'IDF_Views_Wiki::view', array($project.shortname, $page.title)}
+{assign $submitter = $oldrev.get_submitter()}{aurl 'url', 'IDF_Views_Wiki::viewPage', array($project.shortname, $page.title)}
 <div class="old-rev">
 <p>{blocktrans}You are looking at an old revision (<em>{$oldrev.summary}</em>) of the page 
 <a href="{$url}">{$page.title}</a>. This revision was created
@@ -14,7 +14,7 @@ by {$submitter}.{/blocktrans}</p>
 <table class="form" summary="">
 <tr>
 <td>&nbsp;</td>
-<td><input type="submit" value="{trans 'Delete Revision'}" name="submit" /> | <a href="{url 'IDF_Views_Wiki::view', array($project.shortname, $page.title)}">{trans 'Cancel'}</a> 
+<td><input type="submit" value="{trans 'Delete Revision'}" name="submit" /> | <a href="{url 'IDF_Views_Wiki::viewPage', array($project.shortname, $page.title)}">{trans 'Cancel'}</a> 
 </td>
 </tr>
 </table>
@@ -40,7 +40,7 @@ by {$submitter}.{/blocktrans}</p>
 {if $revs.count() > 0}
 <p><strong>{trans 'Old Revisions'}</strong></p>
 <ul>{foreach $revs as $old}
-<li><a href="{url 'IDF_Views_Wiki::view', array($project.shortname, $page.title), array('rev'=>$old.id)}">{$old.summary}</a></li>
+<li><a href="{url 'IDF_Views_Wiki::viewPage', array($project.shortname, $page.title), array('rev'=>$old.id)}">{$old.summary}</a></li>
 {/foreach}</ul>
 {/if}
 {/block}

src/IDF/templates/idf/wiki/listPages.html

@@ -1,19 +1,19 @@
 {extends "idf/wiki/base.html"}
-{block docclass}yui-t1{assign $inWiki=true}{/block}
+{block docclass}yui-t1{assign $inPageList=true}{/block}
 {block body}
 {$pages.render}
 {if !$user.isAnonymous()}
-{aurl 'url', 'IDF_Views_Wiki::create', array($project.shortname)}
+{aurl 'url', 'IDF_Views_Wiki::createPage', array($project.shortname)}
 <p><a href="{$url}"><img style="vertical-align: text-bottom;" src="{media '/idf/img/add.png'}" alt="+" align="bottom" /></a> <a href="{$url}">{trans 'New Page'}</a></p>{/if}
 
 {/block}
 {block context}
 <p><strong>{trans 'Number of pages:'}</strong> {$pages.nb_items}</p>
-{assign $cloud_url = 'IDF_Views_Wiki::listLabel'}
+{assign $cloud_url = 'IDF_Views_Wiki::listPagesWithLabel'}
 {assign $cloud = 'wiki'}
 {include 'idf/tags-cloud.html'}
 {if $deprecated > 0}
-{aurl 'url', 'IDF_Views_Wiki::listLabel', array($project.shortname, $dlabel.id)}
+{aurl 'url', 'IDF_Views_Wiki::listPagesWithLabel', array($project.shortname, $dlabel.id)}
 <p class="helptext">{blocktrans}See <a href="{$url}">the deprecated pages</a>.{/blocktrans}</p>
 {/if}
 {/block}

src/IDF/templates/idf/wiki/search.html

@@ -3,7 +3,7 @@
 {block body}
 {$pages.render}
 {if !$user.isAnonymous()}
-{aurl 'url', 'IDF_Views_Wiki::create', array($project.shortname)}
+{aurl 'url', 'IDF_Views_Wiki::createPage', array($project.shortname)}
 <p><a href="{$url}"><img style="vertical-align: text-bottom;" src="{media '/idf/img/add.png'}" alt="+" align="bottom" /></a> <a href="{$url}">{trans 'New Page'}</a></p>{/if}
 
 {/block}

src/IDF/templates/idf/wiki/updatePage.html

@@ -57,8 +57,8 @@
 <tr>
 <td>&nbsp;</td>
 <td>{* float left is a fix for Firefox < 3.5 *}
-<span style="float: left;"><input type="submit" value="{trans 'Preview'}" name="preview" /> &nbsp; <input type="submit" value="{trans 'Update Page'}" name="submit" /> | <a href="{url 'IDF_Views_Wiki::view', array($project.shortname, $page.title)}">{trans 'Cancel'}</a></span>{if $isOwner or $isAdmin or $isMember}
-{aurl 'url', 'IDF_Views_Wiki::delete', array($project.shortname, $page.id)}
+<span style="float: left;"><input type="submit" value="{trans 'Preview'}" name="preview" /> &nbsp; <input type="submit" value="{trans 'Update Page'}" name="submit" /> | <a href="{url 'IDF_Views_Wiki::viewPage', array($project.shortname, $page.title)}">{trans 'Cancel'}</a></span>{if $isOwner or $isAdmin or $isMember}
+{aurl 'url', 'IDF_Views_Wiki::deletePage', array($project.shortname, $page.id)}
 <span class="dellink"><a href="{$url}" title="{trans 'Delete this page'}"><img src="{media '/idf/img/trash.png'}" style="vertical-align: text-bottom;" alt="{trans 'Trash'}" /></a> <a href="{$url}" title="{trans 'Delete this page'}">{trans 'Delete this page'}</a></span>{/if}
 </td>
 </tr>

src/IDF/templates/idf/wiki/viewPage.html

@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" media="print" href="{media '/idf/css/print-wiki.css'}" />
 {/block}
 
-{block docclass}yui-t3{assign $inView=true}{/block}
+{block docclass}yui-t3{assign $inPageView=true}{/block}
 
 {block body}
 {if $deprecated}{* deprecated page *}
@@ -15,7 +15,7 @@ use it as reference only if you are sure you need these specific information.{/b
 </div>
 {/if}
 {if $oldrev}
-{ashowuser 'submitter', $oldrev.get_submitter(), $request}{aurl 'url', 'IDF_Views_Wiki::view', array($project.shortname, $page.title)}
+{ashowuser 'submitter', $oldrev.get_submitter(), $request}{aurl 'url', 'IDF_Views_Wiki::viewPage', array($project.shortname, $page.title)}
 <div class="old-rev">
 <p>{blocktrans}You are looking at an old revision of the page 
 <a href="{$url}">{$page.title}</a>. This revision was created
@@ -32,7 +32,7 @@ by {$submitter}.{/blocktrans}</p>
 {markdown $rev.content, $request}
 {else}
 {markdown $oldrev.content, $request}
-{if $isOwner or $isAdmin}{aurl 'url', 'IDF_Views_Wiki::deleteRev', array($project.shortname, $oldrev.id)}
+{if $isOwner or $isAdmin}{aurl 'url', 'IDF_Views_Wiki::deletePageRev', array($project.shortname, $oldrev.id)}
 <p class="delp"><a href="{$url}" title="{trans 'Delete this revision'}"><img src="{media '/idf/img/trash.png'}" style="vertical-align: text-bottom;" alt="{trans 'Trash'}" /></a> <a href="{$url}">{trans 'Delete this revision'}</a></p>
 {/if}
 {/if}
@@ -54,7 +54,7 @@ by {$submitter}.{/blocktrans}</p>
 {if $revs.count() > 0}
 <p><strong>{trans 'Old Revisions'}</strong></p>
 <ul>{foreach $revs as $old}
-<li><a href="{url 'IDF_Views_Wiki::view', array($project.shortname, $page.title), array('rev'=>$old.id)}">{$old.summary}</a></li>
+<li><a href="{url 'IDF_Views_Wiki::viewPage', array($project.shortname, $page.title), array('rev'=>$old.id)}">{$old.summary}</a></li>
 {/foreach}</ul>
 {/if}
 {/block}