natalie/indefero
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of projects.ceondo.com:indefero into develop

Browse Source
This commit is contained in:
Thomas Keller
2011-02-24 13:39:58 +01:00
parent 58a5bc46d9 6e5c3a551d
commit e4b3adb2f5
22 changed files with 28876 additions and 28762 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/IDF/Form/UserAccount.php
View File

@@ -79,6 +79,7 @@ class IDF_Form_UserAccount extends Pluf_Form
'widget' => 'Pluf_Form_Widget_PasswordInput',
'help_text' => Pluf_Template::markSafe(__('Leave blank if you do not want to change your password.').'<br />'.__('Your password must be hard for other people to find it, but easy for you to remember.')),
'widget_attrs' => array(
'autocomplete' => 'off',
'maxlength' => 50,
'size' => 15,
),
@@ -89,6 +90,7 @@ class IDF_Form_UserAccount extends Pluf_Form
'initial' => '',
'widget' => 'Pluf_Form_Widget_PasswordInput',
'widget_attrs' => array(
'autocomplete' => 'off',
'maxlength' => 50,
'size' => 15,
),

4
src/IDF/Views/Download.php
View File

@@ -71,12 +71,10 @@ class IDF_Views_Download
$pag->no_results_text = __('No downloads were found.');
$pag->sort_order = array('creation_dtime', 'DESC');
$pag->setFromRequest($request);
$tags = $prj->getTagCloud('downloads');
return Pluf_Shortcuts_RenderToResponse('idf/downloads/index.html',
array(
'page_title' => $title,
'downloads' => $pag,
'tags' => $tags,
'deprecated' => count($ids),
'dlabel' => $dtag,
),
@@ -370,4 +368,4 @@ function IDF_Views_Download_SummaryAndLabels($field, $down, $extra='')
function IDF_Views_Download_Size($field, $down)
{
return Pluf_Utils::prettySize($down->$field);
}
}

3
src/IDF/Views/Issue.php
View File

@@ -71,8 +71,7 @@ class IDF_Views_Issue
'page_title' => $title,
'open' => $open,
'closed' => $closed,
'issues' => $pag,
'cloud' => 'issues');
'issues' => $pag);
if ($api) return $params;
return Pluf_Shortcuts_RenderToResponse('idf/issues/index.html',
$params, $request);

4
src/IDF/Views/Source.php
View File

@@ -56,11 +56,15 @@ class IDF_Views_Source
public function invalidRevision($request, $match)
{
$title = sprintf(__('%s Invalid Revision'), (string) $request->project);
$scm = IDF_Scm::get($request->project);
$branches = $scm->getBranches();
$commit = $match[2];
$params = array(
'page_title' => $title,
'title' => $title,
'commit' => $commit,
'branches' => $branches,
);
return Pluf_Shortcuts_RenderToResponse('idf/source/invalid_revision.html',
$params, $request);

2
src/IDF/Views/Wiki.php
View File

@@ -67,12 +67,10 @@ class IDF_Views_Wiki
$pag->no_results_text = __('No documentation pages were found.');
$pag->sort_order = array('title', 'ASC');
$pag->setFromRequest($request);
$tags = $prj->getTagCloud('wiki');
return Pluf_Shortcuts_RenderToResponse('idf/wiki/index.html',
array(
'page_title' => $title,
'pages' => $pag,
'tags' => $tags,
'deprecated' => count($ids),
'dlabel' => $dtag,
),

6953
src/IDF/locale/cs/idf.po
View File

File diff suppressed because it is too large Load Diff

7638
src/IDF/locale/de/idf.po
View File

File diff suppressed because it is too large Load Diff

7393
src/IDF/locale/es_ES/idf.po
View File

File diff suppressed because it is too large Load Diff

7676
src/IDF/locale/fr/idf.po
View File

File diff suppressed because it is too large Load Diff

6780
src/IDF/locale/idf.pot
View File

File diff suppressed because it is too large Load Diff

7221
src/IDF/locale/ru/idf.po
View File

File diff suppressed because it is too large Load Diff

6922
src/IDF/locale/sl/idf.po
View File

File diff suppressed because it is too large Load Diff

6967
src/IDF/locale/zh_CN/idf.po
View File

File diff suppressed because it is too large Load Diff

10
src/IDF/templates/idf/downloads/index.html
View File

@@ -9,13 +9,9 @@
{/block}
{block context}
<p><strong>{trans 'Number of files:'}</strong> {$downloads.nb_items}</p>
{assign $class = ''}{assign $i = 0}
{if !$label or $label.id != $dlabel.id}
<p class="smaller">{foreach $tags as $lab}
{aurl 'url', 'IDF_Views_Download::listLabel', array($project.shortname, $lab.id)}
{if $class != $lab.class}{if $i != 0}<br />{/if}<strong class="label">{$lab.class}:</strong> {/if}
<a href="{$url}" class="label">{$lab.name}</a>,{assign $i = $i + 1}{assign $class = $lab.class}{/foreach}</p>
{/if}
{assign $cloud_url = 'IDF_Views_Download::listLabel'}
{assign $cloud = 'downloads'}
{include 'idf/tags-cloud.html'}
{if $deprecated > 0}
{aurl 'url', 'IDF_Views_Download::listLabel', array($project.shortname, $dlabel.id)}
<p class="helptext">{blocktrans}See <a href="{$url}">the deprecated files</a>.{/blocktrans}</p>

8
src/IDF/templates/idf/issues/index.html
View File

@@ -12,9 +12,7 @@
{aurl 'closed_url', 'IDF_Views_Issue::listStatus', array($project.shortname, 'closed')}
{blocktrans}<p><strong>Open issues:</strong> <a href="{$open_url}">{$open}</a></p>
<p><strong>Closed issues:</strong> <a href="{$closed_url}">{$closed}</a></p>{/blocktrans}
{assign $class = ''}{assign $i = 0}
<p class="smaller">{foreach $project.getTagCloud($cloud) as $label}
{aurl 'url', 'IDF_Views_Issue::listLabel', array($project.shortname, $label.id, 'open')}
{if $class != $label.class}{if $i != 0}<br />{/if}<strong class="label">{$label.class}:</strong> {/if}
<a href="{$url}" class="label">{$label.name}</a>,{assign $class = $label.class}{assign $i = $i + 1}{/foreach}</p>
{assign $cloud_url = 'IDF_Views_Issue::listLabel'}
{assign $cloud = 'issues'}
{include 'idf/tags-cloud.html'}
{/block}

6
src/IDF/templates/idf/login_form.html
View File

@@ -29,7 +29,7 @@ document.getElementById('id_login').focus()
{block context}
<div class="issue-submit-info">
<h3>{trans 'Welcome.'}</h3>
<p>{trans 'If you don\'t have an account yet, you can create one'} <a href="{url 'IDF_Views::register', array()}">{trans 'here'}</a></p>
<p>{trans 'It takes less than a minute to create your account'}</p>
</div>
{aurl 'url', 'IDF_Views::register', array()}
<p>{blocktrans}If you don't have an account yet, you can create one <a href="{$url}">here</a>.{/blocktrans}</a></p>
<p>{trans 'It takes less than a minute to create your account.'}</p></div>
{/block}

12
src/IDF/templates/idf/source/invalid_revision.html
View File

@@ -2,9 +2,19 @@
{block docclass}yui-t2{assign $inError=true}{/block}
{block body}
<p>{blocktrans}The revision <b>{$commit}</b> is not valid or does not exist
<p>{blocktrans}The branch or revision <b>{$commit}</b> is not valid or does not exist
in this repository.{/blocktrans}</p>
<p>{blocktrans}The following list shows all available branches:{/blocktrans}</p>
<ul>
{foreach $branches as $branch => $path}
{aurl 'url', 'IDF_Views_Source::treeBase', array($project.shortname, $branch)}
<li class="label">
<a href="{$url}" class="label">{if $path}{$path}{else}{$branch}{/if}</a>
</li>
{/foreach}
</ul>
{if $isOwner or $isMember}
{aurl 'url', 'IDF_Views_Source::help', array($project.shortname)}
<p>{blocktrans}If this is a new repository, the reason for this error

8
src/IDF/templates/idf/tags-cloud.html Normal file
View File

@@ -0,0 +1,8 @@
{assign $class = ''}{assign $i = 0}
<div id="tagscloud" class="smaller"><dl>{foreach $project.getTagCloud($cloud) as $label}
{aurl 'url', $cloud_url, array($project.shortname, $label.id, 'open')}
{if $class != $label.class}<dt class="label">{$label.class}</dt>{assign $i = 0}{/if}
<dd><a href="{$url}" class="label">{$label.name},</a></dd>
{assign $class = $label.class}
{assign $i = $i + 1}
{/foreach}</dl></p>

10
src/IDF/templates/idf/wiki/index.html
View File

@@ -9,13 +9,9 @@
{/block}
{block context}
<p><strong>{trans 'Number of pages:'}</strong> {$pages.nb_items}</p>
{assign $class = ''}{assign $i = 0}
{if !$label or $label.id != $dlabel.id}
<p class="smaller">{foreach $tags as $lab}
{aurl 'url', 'IDF_Views_Wiki::listLabel', array($project.shortname, $lab.id)}
{if $class != $lab.class}{if $i != 0}<br />{/if}<strong class="label">{$lab.class}:</strong> {/if}
<a href="{$url}" class="label">{$lab.name}</a>,{assign $i = $i + 1}{assign $class = $lab.class}{/foreach}</p>
{/if}
{assign $cloud_url = 'IDF_Views_Wiki::listLabel'}
{assign $cloud = 'wiki'}
{include 'idf/tags-cloud.html'}
{if $deprecated > 0}
{aurl 'url', 'IDF_Views_Wiki::listLabel', array($project.shortname, $dlabel.id)}
<p class="helptext">{blocktrans}See <a href="{$url}">the deprecated pages</a>.{/blocktrans}</p>