Indefero

Indefero Commit Details


Date:2009-10-01 07:44:39 (15 years 6 months ago)
Author:Loic d'Anterroches
Branch:develop, feature-issue_links, feature.better-home, feature.content-md5, feature.diff-whitespace, feature.download-md5, feature.issue-links, feature.issue-of-others, feature.issue-summary, feature.search-filter, feature.webrepos, feature.wiki-default-page, master, release-1.1, release-1.2, release-1.3
Commit:6edaf03faa6ee839810c991948db6fa0789f2db0
Parents: 0dedee442910e45aea7cd3de62ef974e7cc7f6c3
Message:Fixed issue 283, confusing with two 'Administer' tabs.
Changes:

File differences

INSTALL.mdtext
9797
9898
9999
100
100
101101
102102
103103
* 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
218218
219219
220220
221
221
222222
223223
224224
        $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
3939
4040
4141
42
42
4343
4444
4545
    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
4949
5050
5151
52
52
5353
5454
5555
{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
3535
3636
3737
38
38
3939
4040
4141
  <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
3737
3838
3939
40
40
4141
4242
4343
......
5050
5151
5252
53
53
5454
5555
5656
......
8989
9090
9191
92
92
    <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">␊
{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>␊
//]]>{/literal}␊
</script>{/if}␊
</body>␊
</html>
</html>␊

Archive Download the corresponding diff file

Page rendered in 0.19888s using 14 queries.