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

AUTHORS

@@ -25,6 +25,8 @@ Much appreciated contributors:
     Raphaël Emourgeon
     Jakub Viták
     Vladimir Solomatin
+    William Martin <wysman@gmail.com>
+    Thomas Keller <me@thomaskeller.biz>
 
 And all the nice users who spent time reporting issues and promoting
 the project. The project could not live without them.

INSTALL.mdtext

@@ -37,6 +37,7 @@ docroot.
     $ sudo pear upgrade-all
     $ sudo pear install --alldeps Mail
     $ sudo pear install --alldeps Mail_mime
+    $ sudo pear install --alldeps Console_Getopt
 
 If you already have some of the PEAR packages installed with your
 distribution, the `Mail` package is often not up-to-date, 

src/IDF/Form/UserAccount.php

@@ -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,
                                                                     ),

src/IDF/Views/Download.php

@@ -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,
                                                      ),

src/IDF/Views/Issue.php

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

src/IDF/Views/Source.php

@@ -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);

src/IDF/Views/Wiki.php

@@ -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,
                                                      ),

src/IDF/templates/idf/downloads/index.html

@@ -9,13 +9,9 @@
 {/block}
 {block context}
 <p><strong>{trans 'Number of files:'}</strong> {$downloads.nb_items}</p>
-{assign $class = ''}{assign $i = 0}
+{assign $cloud_url = 'IDF_Views_Download::listLabel'}
-{if !$label or $label.id != $dlabel.id}
+{assign $cloud = 'downloads'}
-<p class="smaller">{foreach $tags as $lab}
+{include 'idf/tags-cloud.html'}
-{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}
 {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>

src/IDF/templates/idf/issues/index.html

@@ -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}
+{assign $cloud_url = 'IDF_Views_Issue::listLabel'}
-<p class="smaller">{foreach $project.getTagCloud($cloud) as $label}
+{assign $cloud = 'issues'}
-{aurl 'url', 'IDF_Views_Issue::listLabel', array($project.shortname, $label.id, 'open')}
+{include 'idf/tags-cloud.html'}
-{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>
 {/block}

src/IDF/templates/idf/login_form.html

@@ -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>
+{aurl 'url', 'IDF_Views::register', array()}
-<p>{trans 'It takes less than a minute to create your account'}</p>
+<p>{blocktrans}If you don't have an account yet, you can create one <a href="{$url}">here</a>.{/blocktrans}</a></p>
-</div>
+<p>{trans 'It takes less than a minute to create your account.'}</p></div>
 {/block}

src/IDF/templates/idf/source/invalid_revision.html

@@ -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

src/IDF/templates/idf/tags-cloud.html

@@ -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>

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

@@ -9,13 +9,9 @@
 {/block}
 {block context}
 <p><strong>{trans 'Number of pages:'}</strong> {$pages.nb_items}</p>
-{assign $class = ''}{assign $i = 0}
+{assign $cloud_url = 'IDF_Views_Wiki::listLabel'}
-{if !$label or $label.id != $dlabel.id}
+{assign $cloud = 'wiki'}
-<p class="smaller">{foreach $tags as $lab}
+{include 'idf/tags-cloud.html'}
-{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}
 {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>

www/media/idf/css/style.css

@@ -203,6 +203,20 @@ span.px-header-title a, span.px-header-title a:link, span.px-header-title a:visi
 /**
  * Issue
  */
+#tagscloud dl {
+    margin: 0;
+}
+
+#tagscloud dt {
+    margin-top: .5em;
+    font-weight: bold;
+}
+
+#tagscloud dd {
+    margin: 0;
+    display: inline;
+}
+ 
 a.issue-c {
   text-decoration: line-through;
 }