aboutsummaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorAníbal Limón <anibal.limon@linux.intel.com>2015-02-19 15:01:08 +0000
committerPaul Eggleton <paul.eggleton@linux.intel.com>2018-05-04 23:57:51 +1200
commit665dfae57735149cb60d40b6f2a6bf6db1577831 (patch)
treed2c8551d6c360f42709315f187db77eb01e662be /templates
parentd61f95164b8a57b5053c6ea3b324bd2ae74757fb (diff)
downloadopenembedded-core-contrib-665dfae57735149cb60d40b6f2a6bf6db1577831.tar.gz
rrs: Release/Milestone improvments
rrs/models.py: Milestone now have unique in Release and Name fields instead of only field. When try to get current milestone give priority to Mn instead of All. templates/rrs/base_toplevel.html: Display only release name when milestone is All. Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Diffstat (limited to 'templates')
-rw-r--r--templates/rrs/base_toplevel.html9
1 files changed, 7 insertions, 2 deletions
diff --git a/templates/rrs/base_toplevel.html b/templates/rrs/base_toplevel.html
index 3339000b9d..9804c03817 100644
--- a/templates/rrs/base_toplevel.html
+++ b/templates/rrs/base_toplevel.html
@@ -24,7 +24,7 @@
</a>
<ul class="dropdown-menu">
{% for r in all_releases %}
- <li><a href="{% url this_url_name r.name r.name|add:"All" %}{{ extra_url_param }}">
+ <li><a href="{% url this_url_name r.name "All" %}{{ extra_url_param }}">
{% if r.name = release_name %}<b>{% endif %}
{{ r.name }}
{% if r.name = release_name %}</b>{% endif %}
@@ -58,7 +58,12 @@
<div class="navbar">
<div class="navbar-inner">
- <span class="brand">{{ milestone_name }}</span>
+ <span class="brand">
+ {{ release_name }}
+ {% if milestone_name != "All" %}
+ {{ milestone_name }}
+ {% endif %}
+ </span>
<ul class="nav">
<li class="divider-vertical"></li>
<li class="lead" id="percentage"><strong>{{ recipes_percentage }}%</strong> done</li>