Indefero Commit Details

Date:

2008-08-08 13:34:40 (16 years 4 months ago)

Author:

Loic d'Anterroches

Branch:

dev, 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, svn

Commit:

bd0209a28eac6e772209583a66ed5776443e2ef5

Parents:

6360ea93be9ad4ec6b6885a9e9812347bec413ec

Message:

Fixed some inconsistencies in the interface (thanks Luigi).

Changes:

File differences

-266
267 267
268 268
269 
269
270 270
271 271
272 272
273 273
274 274
275 
275
276 276
277 277
278 
278
279
280
281
282
279 283
280 284
281 285
+     * project. For issues, only open issues are used to generate the␊
     * cloud.␊
     *␊
     * @param string ('issues') or 'downloads'␊
     * @param string ('issues') 'closed_issues' or 'downloads'␊
     * @return ArrayObject of IDF_Tag␊
     */␊
    public function getTagCloud($what='issues')␊
    {␊
        $tag_t = Pluf::factory('IDF_Tag')->getSqlTable();␊
        if ($what == 'issues') {␊
        if ($what == 'issues' or $what == 'closed_issues') {␊
            $what_t = Pluf::factory('IDF_Issue')->getSqlTable();␊
            $asso_t = $this->_con->pfx.'idf_issue_idf_tag_assoc';␊
            $ostatus = $this->getTagIdsByStatus('open');␊
            if ($what == 'issues') {␊
                $ostatus = $this->getTagIdsByStatus('open');␊
            } else {␊
                $ostatus = $this->getTagIdsByStatus('closed');␊
            }␊
            if (count($ostatus) == 0) $ostatus[] = 0;␊
            $sql = sprintf('SELECT '.$tag_t.'.id AS id, COUNT(*) AS nb_use FROM '.$tag_t.' '."\n".␊
                      'LEFT JOIN '.$asso_t.' ON idf_tag_id='.$tag_t.'.id '."\n".␊
      * project. For issues, only open issues are used to generate the␊
      * cloud.␊
      *␊
-     * @param string ('issues') or 'downloads'␊
+     * @param string ('issues') 'closed_issues' or 'downloads'␊
      * @return ArrayObject of IDF_Tag␊
      */␊
     public function getTagCloud($what='issues')␊
     {␊
         $tag_t = Pluf::factory('IDF_Tag')->getSqlTable();␊
-        if ($what == 'issues') {␊
+        if ($what == 'issues' or $what == 'closed_issues') {␊
             $what_t = Pluf::factory('IDF_Issue')->getSqlTable();␊
             $asso_t = $this->_con->pfx.'idf_issue_idf_tag_assoc';␊
-            $ostatus = $this->getTagIdsByStatus('open');␊
+            if ($what == 'issues') {␊
+                $ostatus = $this->getTagIdsByStatus('open');␊
+            } else {␊
+                $ostatus = $this->getTagIdsByStatus('closed');␊
+            }␊
             if (count($ostatus) == 0) $ostatus[] = 0;␊
             $sql = sprintf('SELECT '.$tag_t.'.id AS id, COUNT(*) AS nb_use FROM '.$tag_t.' '."\n".␊
                       'LEFT JOIN '.$asso_t.' ON idf_tag_id='.$tag_t.'.id '."\n".␊

-15
16 16
17 17
18 
18
19 19
20 20
21 21
+<li>{trans '<kbd>Shift+d</kbd>: Downloads.'}</li>␊
<li>{trans '<kbd>Shift+s</kbd>: Source.'}</li>␊
<li>{trans '<kbd>Shift+a</kbd>: Create a new issue.'}</li>␊
<li>{trans '<kbd>Shift+i</kbd>: List of recently submitted issues.'}</li>␊
<li>{trans '<kbd>Shift+i</kbd>: List of open issues.'}</li>␊
<li>{trans '<kbd>Shift+m</kbd>: The issues you submitted.'}</li>␊
<li>{trans '<kbd>Shift+w</kbd>: The issues assigned to you.'}</li>␊
</ul>␊
 <li>{trans '<kbd>Shift+d</kbd>: Downloads.'}</li>␊
 <li>{trans '<kbd>Shift+s</kbd>: Source.'}</li>␊
 <li>{trans '<kbd>Shift+a</kbd>: Create a new issue.'}</li>␊
-<li>{trans '<kbd>Shift+i</kbd>: List of recently submitted issues.'}</li>␊
+<li>{trans '<kbd>Shift+i</kbd>: List of open issues.'}</li>␊
 <li>{trans '<kbd>Shift+m</kbd>: The issues you submitted.'}</li>␊
 <li>{trans '<kbd>Shift+w</kbd>: The issues assigned to you.'}</li>␊
 </ul>␊

-2
3 3
4 4
5 
5
6 6
7 7
8 8
+{block tabissues} class="active"{/block}␊
{block subtabs}␊
<div id="sub-tabs">␊
<a href="{url 'IDF_Views_Issue::index', array($project.shortname)}">{trans 'Recent issues'}</a>␊
<a href="{url 'IDF_Views_Issue::index', array($project.shortname)}">{trans 'Open issues'}</a>␊
{if !$user.isAnonymous()} | <a href="{url 'IDF_Views_Issue::create', array($project.shortname)}">{trans 'New Issue'}</a> | <a href="{url 'IDF_Views_Issue::myIssues', array($project.shortname, 'submit')}">{trans 'My Issues'}</a>{/if}␊
{superblock}␊
</div>␊
 {block tabissues} class="active"{/block}␊
 {block subtabs}␊
 <div id="sub-tabs">␊
-<a href="{url 'IDF_Views_Issue::index', array($project.shortname)}">{trans 'Recent issues'}</a>␊
+<a href="{url 'IDF_Views_Issue::index', array($project.shortname)}">{trans 'Open issues'}</a>␊
 {if !$user.isAnonymous()} | <a href="{url 'IDF_Views_Issue::create', array($project.shortname)}">{trans 'New Issue'}</a> | <a href="{url 'IDF_Views_Issue::myIssues', array($project.shortname, 'submit')}">{trans 'My Issues'}</a>{/if}␊
 {superblock}␊
 </div>␊

-13
14 14
15 15
16 
16
17 17
18 18
19 19
+{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() as $label}␊
<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>␊
 {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() as $label}␊
+<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>␊

Download the corresponding diff file

Indefero

File differences

Branches

Tags