From 6f1bb309d490ee7d9b56ddbd73e75557fd7cfc35 Mon Sep 17 00:00:00 2001 From: William MARTIN Date: Wed, 23 Feb 2011 22:35:43 +0100 Subject: [PATCH] Apply the UI enhancement of issue tags cloud to wiki and download part too. --- src/IDF/Views/Download.php | 4 +--- src/IDF/Views/Issue.php | 3 +-- src/IDF/Views/Wiki.php | 2 -- src/IDF/templates/idf/downloads/index.html | 9 ++------- src/IDF/templates/idf/issues/index.html | 10 ++-------- src/IDF/templates/idf/tags-cloud.html | 8 ++++++++ src/IDF/templates/idf/wiki/index.html | 9 ++------- www/media/idf/css/style.css | 6 +++--- 8 files changed, 19 insertions(+), 32 deletions(-) create mode 100644 src/IDF/templates/idf/tags-cloud.html diff --git a/src/IDF/Views/Download.php b/src/IDF/Views/Download.php index 972f286..49f8187 100644 --- a/src/IDF/Views/Download.php +++ b/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, ), @@ -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); -} \ No newline at end of file +} diff --git a/src/IDF/Views/Issue.php b/src/IDF/Views/Issue.php index 2f43f6a..75f569a 100644 --- a/src/IDF/Views/Issue.php +++ b/src/IDF/Views/Issue.php @@ -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); diff --git a/src/IDF/Views/Wiki.php b/src/IDF/Views/Wiki.php index cd68cb2..c6b17b9 100644 --- a/src/IDF/Views/Wiki.php +++ b/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, ), diff --git a/src/IDF/templates/idf/downloads/index.html b/src/IDF/templates/idf/downloads/index.html index d5805aa..f5b6c4b 100644 --- a/src/IDF/templates/idf/downloads/index.html +++ b/src/IDF/templates/idf/downloads/index.html @@ -9,13 +9,8 @@ {/block} {block context}

{trans 'Number of files:'} {$downloads.nb_items}

-{assign $class = ''}{assign $i = 0} -{if !$label or $label.id != $dlabel.id} -

{foreach $tags as $lab} -{aurl 'url', 'IDF_Views_Download::listLabel', array($project.shortname, $lab.id)} -{if $class != $lab.class}{if $i != 0}
{/if}{$lab.class}: {/if} -{$lab.name},{assign $i = $i + 1}{assign $class = $lab.class}{/foreach}

-{/if} +{assign $cloud = 'downloads'} +{include 'idf/tags-cloud.html'} {if $deprecated > 0} {aurl 'url', 'IDF_Views_Download::listLabel', array($project.shortname, $dlabel.id)}

{blocktrans}See the deprecated files.{/blocktrans}

diff --git a/src/IDF/templates/idf/issues/index.html b/src/IDF/templates/idf/issues/index.html index b47d980..ac1e1fb 100644 --- a/src/IDF/templates/idf/issues/index.html +++ b/src/IDF/templates/idf/issues/index.html @@ -12,12 +12,6 @@ {aurl 'closed_url', 'IDF_Views_Issue::listStatus', array($project.shortname, 'closed')} {blocktrans}

Open issues: {$open}

Closed issues: {$closed}

{/blocktrans} -{assign $class = ''}{assign $i = 0} -
{foreach $project.getTagCloud($cloud) as $label} -{aurl 'url', 'IDF_Views_Issue::listLabel', array($project.shortname, $label.id, 'open')} -{if $class != $label.class}
{$label.class}
{assign $i = 0}{/if} -
{$label.name},
-{assign $class = $label.class} -{assign $i = $i + 1} -{/foreach}

+{assign $cloud = 'issues'} +{include 'idf/tags-cloud.html'} {/block} diff --git a/src/IDF/templates/idf/tags-cloud.html b/src/IDF/templates/idf/tags-cloud.html new file mode 100644 index 0000000..cdf375e --- /dev/null +++ b/src/IDF/templates/idf/tags-cloud.html @@ -0,0 +1,8 @@ +{assign $class = ''}{assign $i = 0} +
{foreach $project.getTagCloud($cloud) as $label} +{aurl 'url', 'IDF_Views_Issue::listLabel', array($project.shortname, $label.id, 'open')} +{if $class != $label.class}
{$label.class}
{assign $i = 0}{/if} +
{$label.name},
+{assign $class = $label.class} +{assign $i = $i + 1} +{/foreach}

diff --git a/src/IDF/templates/idf/wiki/index.html b/src/IDF/templates/idf/wiki/index.html index d6dee59..af6cdec 100644 --- a/src/IDF/templates/idf/wiki/index.html +++ b/src/IDF/templates/idf/wiki/index.html @@ -9,13 +9,8 @@ {/block} {block context}

{trans 'Number of pages:'} {$pages.nb_items}

-{assign $class = ''}{assign $i = 0} -{if !$label or $label.id != $dlabel.id} -

{foreach $tags as $lab} -{aurl 'url', 'IDF_Views_Wiki::listLabel', array($project.shortname, $lab.id)} -{if $class != $lab.class}{if $i != 0}
{/if}{$lab.class}: {/if} -{$lab.name},{assign $i = $i + 1}{assign $class = $lab.class}{/foreach}

-{/if} +{assign $cloud = 'wiki'} +{include 'idf/tags-cloud.html'} {if $deprecated > 0} {aurl 'url', 'IDF_Views_Wiki::listLabel', array($project.shortname, $dlabel.id)}

{blocktrans}See the deprecated pages.{/blocktrans}

diff --git a/www/media/idf/css/style.css b/www/media/idf/css/style.css index 8ea1d8e..ff0ce44 100644 --- a/www/media/idf/css/style.css +++ b/www/media/idf/css/style.css @@ -203,16 +203,16 @@ span.px-header-title a, span.px-header-title a:link, span.px-header-title a:visi /** * Issue */ -#issue-tags dl { +#tagscloud dl { margin: 0; } -#issue-tags dt { +#tagscloud dt { margin-top: .5em; font-weight: bold; } -#issue-tags dd { +#tagscloud dd { margin: 0; display: inline; }