From 810b753edf6242681d0b350b22532edbc7c3a931 Mon Sep 17 00:00:00 2001
From: Thomas Keller <me@thomaskeller.biz>
Date: Mon, 10 Oct 2011 22:32:08 +0200
Subject: [PATCH] Re-order the issue links so that "New Issue" goes to the very
 right just before the search input field. Also rename "Open Issues" to "All
 Issues" (since one can view both, open and closed issues under this view,
 just like in every other issue list view we have) and mark "All Issues" as
 active if we filter by label.

---
 src/IDF/templates/idf/issues/base.html     | 13 ++++++++-----
 src/IDF/templates/idf/issues/by-label.html |  2 +-
 src/IDF/templates/idf/issues/index.html    |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/IDF/templates/idf/issues/base.html b/src/IDF/templates/idf/issues/base.html
index 5de2749..7b839c8 100644
--- a/src/IDF/templates/idf/issues/base.html
+++ b/src/IDF/templates/idf/issues/base.html
@@ -2,11 +2,14 @@
 {block tabissues} class="active"{/block}
 {block subtabs}
 <div id="sub-tabs">
-<a {if $inSummaryIssues}class="active" {/if}href="{url 'IDF_Views_Issue::summary', array($project.shortname)}">{trans 'Summary'}</a>
-| <a {if $inOpenIssues}class="active" {/if}href="{url 'IDF_Views_Issue::index', array($project.shortname)}">{trans 'Open Issues'}</a>
-{if !$user.isAnonymous()} | <a {if $inCreate}class="active" {/if}href="{url 'IDF_Views_Issue::create', array($project.shortname)}">{trans 'New Issue'}</a> | <a {if $inMyIssues}class="active" {/if}href="{url 'IDF_Views_Issue::userIssues', array($project.shortname, $user.login, 'submit')}">{trans 'My Issues'}</a>
-| <a {if $inWatchList}class="active" {/if}href="{url 'IDF_Views_Issue::watchList', array($project.shortname, 'open')}">{trans 'My watch list'}</a>{/if} |
-<form class="star" action="{url 'IDF_Views_Issue::search', array($project.shortname)}" method="get">
+  <a {if $inSummaryIssues}class="active" {/if}href="{url 'IDF_Views_Issue::summary', array($project.shortname)}">{trans 'Summary'}</a>
+| <a {if $inAllIssues}class="active" {/if}href="{url 'IDF_Views_Issue::index', array($project.shortname)}">{trans 'All Issues'}</a>
+{if !$user.isAnonymous()}
+| <a {if $inMyIssues}class="active" {/if}href="{url 'IDF_Views_Issue::userIssues', array($project.shortname, $user.login, 'submit')}">{trans 'My Issues'}</a>
+| <a {if $inWatchList}class="active" {/if}href="{url 'IDF_Views_Issue::watchList', array($project.shortname, 'open')}">{trans 'My watch list'}</a>
+| <a {if $inCreate}class="active" {/if}href="{url 'IDF_Views_Issue::create', array($project.shortname)}">{trans 'New Issue'}</a>
+{/if}
+| <form class="star" action="{url 'IDF_Views_Issue::search', array($project.shortname)}" method="get">
 <input accesskey="4" type="text" value="{$query}" name="q" size="20" />
 <input type="submit" name="s" value="{trans 'Search'}" />
 </form>
diff --git a/src/IDF/templates/idf/issues/by-label.html b/src/IDF/templates/idf/issues/by-label.html
index fdac576..25e6625 100644
--- a/src/IDF/templates/idf/issues/by-label.html
+++ b/src/IDF/templates/idf/issues/by-label.html
@@ -1,5 +1,5 @@
 {extends "idf/issues/base.html"}
-{block docclass}yui-t1{/block}
+{block docclass}yui-t1{assign $inAllIssues=true}{/block}
 {block body}
 {$issues.render}
 {if !$user.isAnonymous()}
diff --git a/src/IDF/templates/idf/issues/index.html b/src/IDF/templates/idf/issues/index.html
index 979c7ee..526d7ec 100644
--- a/src/IDF/templates/idf/issues/index.html
+++ b/src/IDF/templates/idf/issues/index.html
@@ -1,5 +1,5 @@
 {extends "idf/issues/base.html"}
-{block docclass}yui-t2{assign $inOpenIssues=true}{/block}
+{block docclass}yui-t2{assign $inAllIssues=true}{/block}
 {block body}
 {$issues.render}
 {if !$user.isAnonymous()}