Fixed issue 283, confusing with two 'Administer' tabs.

INSTALL.mdtext

@@ -97,7 +97,7 @@ Here is the step-by-step installation procedure:
 * Open the `www/index.php` file and ensure that the path to Pluf and
   Indefero are correctly set for your configuration.
 * Now you can login with this user into the interface.
-* Click on the Administer link on top and create your first project.
+* Click on the Forge Management link on top and create your first project.
 
 ## Upgrade InDefero
 

src/IDF/Form/Admin/ProjectCreate.php

@@ -218,7 +218,7 @@ class IDF_Form_Admin_ProjectCreate extends Pluf_Form
         $project->name = $this->cleaned_data['name'];
         $project->shortname = $this->cleaned_data['shortname'];
         $project->private = $this->cleaned_data['private_project'];
-        $project->description = __('Click on the Administer tab to set the description of your project.');
+        $project->description = __('Click on the Project Management tab to set the description of your project.');
         $project->create();
         $conf = new IDF_Conf();
         $conf->setProject($project);

src/IDF/Views/Admin.php

@@ -39,7 +39,7 @@ class IDF_Views_Admin
     public $home_precond = array('Pluf_Precondition::staffRequired');
     public function home($request, $match)
     {
-        $title = __('Administer');
+        $title = __('Forge Management');
         return Pluf_Shortcuts_RenderToResponse('idf/gadmin/home.html',
                                                array(
                                                      'page_title' => $title,

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

@@ -49,7 +49,7 @@
 {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}
 {if $isOwner}
-  <a href="{url 'IDF_Views_Project::admin', array($project.shortname)}"{block tabadmin}{/block}>{trans 'Administer'}</a>{/if}{/if}
+  <a href="{url 'IDF_Views_Project::admin', array($project.shortname)}"{block tabadmin}{/block}>{trans 'Project Management'}</a>{/if}{/if}
 </div>
 {block subtabs}{if $user.isAnonymous()} | {aurl 'url', 'IDF_Views::login'}{blocktrans}<a href="{$url}">Sign in or create your account</a> to create issues or add comments{/blocktrans}{/if}{/block}
 </div>

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

@@ -35,7 +35,7 @@
   <div id="hd">
     <p class="top"><a href="#title" accesskey="2"></a>
 {if !$user.isAnonymous()}{aurl 'url', 'idf_dashboard'}{blocktrans}Welcome, <strong><a class="userw" href="{$url}">{$user}</a></strong>.{/blocktrans} <a href="{url 'IDF_Views::logout'}">{trans 'Sign Out'}</a>{else}<a href="{url 'IDF_Views::login'}">{trans 'Sign in or create your account'}</a>{/if}
- | <a href="{url 'IDF_Views::index'}">{trans 'Project List'}</a> {if $isAdmin}| <a href="{url 'IDF_Views_Admin::projects'}">{trans 'Administer'}</a>{/if}
+ | <a href="{url 'IDF_Views::index'}">{trans 'Project List'}</a> {if $isAdmin}| <a href="{url 'IDF_Views_Admin::projects'}">{trans 'Forge Management'}</a>{/if}
 | <a href="{url 'IDF_Views::faq'}" title="{trans 'Help and accessibility features'}">{trans 'Help'}</a>
     </p>
 	  <h1 id="title" class="title">{block title}{$page_title}{/block}</h1>

src/IDF/templates/idf/base.html

@@ -37,7 +37,7 @@
     <p class="top"><a href="#title" accesskey="2"></a>
 {if !$user.isAnonymous()}{aurl 'url', 'idf_dashboard'}{blocktrans}Welcome, <strong><a class="userw" href="{$url}">{$user}</a></strong>.{/blocktrans} <a href="{url 'IDF_Views::logout'}">{trans 'Sign Out'}</a>{else}<a href="{url 'IDF_Views::login'}">{trans 'Sign in or create your account'}</a>{/if}
 {if $project} | <a href="{url 'IDF_Views::index'}">{trans 'Project List'}</a>{/if}
-{if $isAdmin}| <a href="{url 'IDF_Views_Admin::projects'}">{trans 'Administer'}</a>{/if}
+{if $isAdmin}| <a href="{url 'IDF_Views_Admin::projects'}">{trans 'Forge Management'}</a>{/if}
 | <a href="{url 'IDF_Views::faq'}" title="{trans 'Help and accessibility features'}">{trans 'Help'}</a>
     </p>
 <div id="header">
@@ -50,7 +50,7 @@
 {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}
 {if $isOwner}
-  <a href="{url 'IDF_Views_Project::admin', array($project.shortname)}"{block tabadmin}{/block}>{trans 'Administer'}</a>{/if}{/if}
+  <a href="{url 'IDF_Views_Project::admin', array($project.shortname)}"{block tabadmin}{/block}>{trans 'Project Management'}</a>{/if}{/if}
 </div>
 {block subtabs}{if $user.isAnonymous()} | {aurl 'url', 'IDF_Views::login'}{blocktrans}<a href="{$url}">Sign in or create your account</a> to create issues or add comments{/blocktrans}{/if}{/block}
 </div>
@@ -89,4 +89,4 @@ $(document).ready(function(){
 //]]>{/literal}
 </script>{/if}
 </body>
-</html>
+</html>