rrs: Set of UI improvments

Give some space to the tabs,
	Add some top margin to the nav-pills class so we
	create some breathing space between the milestone
	overview and the tabs.

Change 'No Maintainer' to 'No maintainer'
	Just to keep the capitalisation style consistent
	across the interface.

Apply the muted class to all not-sortable table headings
	The class was missing from the Recipe and Maintainer
	columns in the recipes table; and from the Not updated
	and % done column in the maintainers table.

Remove the strong tag from the recipe status information
	This is just to match the presentation of the milestone
	overview information in the base_toplevel.html template.

Separate the footer from the bottom of the viewport,
	It's hard to see the footer on click on its links when
	they are so close to the bottom of the veiwport, so
	add some margin at the bottom of the footer <div>.

Change the label of the recipes tab,
	From 'Recipes status' to 'Recipes upstream status' to
	match the label of the 'Upstream status' filter in the
	recipes table.

Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com>
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
This commit is contained in:
Belen Barros Pena 2015-02-18 16:36:15 +00:00 committed by Aníbal Limón
parent 748182c66b
commit fc0355fb27
7 changed files with 17 additions and 12 deletions

View File

@ -33,6 +33,7 @@ textarea {
.footer { .footer {
text-align: center; text-align: center;
margin-bottom: 40px;
} }
.description { .description {
@ -198,4 +199,4 @@ padding: 8px;
.buttonblock-btn { .buttonblock-btn {
margin-left: 8px; margin-left: 8px;
} }

View File

@ -3,7 +3,7 @@
"pk": 0, "pk": 0,
"model": "rrs.maintainer", "model": "rrs.maintainer",
"fields": { "fields": {
"name": "No Maintainer", "name": "No maintainer",
"email": "" "email": ""
} }
}, },

View File

@ -35,6 +35,10 @@
margin-top: 5px; margin-top: 5px;
} }
.nav-pills {
margin-top: 40px;
}
/* Sorting styles */ /* Sorting styles */
th > a, th.muted { th > a, th.muted {
font-weight: normal; font-weight: normal;

View File

@ -227,7 +227,7 @@ class RecipeListView(ListView):
context['upstream_status_choices'] = [ruch['N'], ruch['C'], ruch['Y'], ruch['U']] context['upstream_status_choices'] = [ruch['N'], ruch['C'], ruch['Y'], ruch['U']]
context['maintainer_name'] = self.maintainer_name context['maintainer_name'] = self.maintainer_name
context['set_maintainers'] = ['All', 'No Maintainer'] context['set_maintainers'] = ['All', 'No maintainer']
all_maintainers = [] all_maintainers = []
for rm in RecipeMaintainer.objects.filter(history = for rm in RecipeMaintainer.objects.filter(history =
self.recipe_maintainer_history).values( self.recipe_maintainer_history).values(

View File

@ -87,7 +87,7 @@
<li> <li>
<a href="{% url 'recipes' release_name milestone_name %}{{ extra_url_param }}"> <a href="{% url 'recipes' release_name milestone_name %}{{ extra_url_param }}">
{% endif %} {% endif %}
Recipes status</a> Recipes upstream status</a>
</li> </li>
{% if this_url_name == 'maintainers' %} {% if this_url_name == 'maintainers' %}

View File

@ -40,10 +40,10 @@
<th class="sorted">Maintainer</th> <th class="sorted">Maintainer</th>
<th class="muted">Assigned recipes</th> <th class="muted">Assigned recipes</th>
<th class="muted">Up-to-date</th> <th class="muted">Up-to-date</th>
<th>Not updated</th> <th class="muted">Not updated</th>
<th class="muted">Can't be updated</th> <th class="muted">Can't be updated</th>
<th class="muted">Unknown</th> <th class="muted">Unknown</th>
<th>% done</th> <th class="muted">% done</th>
{% for i in intervals %} {% for i in intervals %}
{% if current_interval == forloop.counter0 %} {% if current_interval == forloop.counter0 %}

View File

@ -31,20 +31,20 @@
<div class="navbar-inner"> <div class="navbar-inner">
<ul class="nav"> <ul class="nav">
{% if upstream_status == "Up-to-date" %} {% if upstream_status == "Up-to-date" %}
<li class="lead">Upstream status: <strong class="text-success">{{ upstream_status }}</strong></li> <li class="lead">Upstream status: <span class="text-success">{{ upstream_status }}</span></li>
{% elif upstream_status == "Not updated" %} {% elif upstream_status == "Not updated" %}
<li class="lead">Upstream status: <strong class="text-error">{{ upstream_status }}</strong></li> <li class="lead">Upstream status: <span class="text-error">{{ upstream_status }}</span></li>
{% elif upstream_status == "Can't be updated" %} {% elif upstream_status == "Can't be updated" %}
<li class="lead">Upstream status: <strong class="muted">{{ upstream_status }}</strong></li> <li class="lead">Upstream status: <span class="muted">{{ upstream_status }}</span></li>
{% else %} {% else %}
<li class="lead">Upstream status: <strong class="text-warning">{{ upstream_status }}</strong></li> <li class="lead">Upstream status: <span class="text-warning">{{ upstream_status }}</span></li>
{% endif %} {% endif %}
{% if upstream_status == "Not updated" or upstream_status == "Can't be updated" %} {% if upstream_status == "Not updated" or upstream_status == "Can't be updated" %}
<li class="divider-vertical"></li> <li class="divider-vertical"></li>
<li class="lead">Upstream version: <strong>{{ upstream_version }}</strong></li> <li class="lead">Upstream version: <span>{{ upstream_version }}</span></li>
{% endif %} {% endif %}
<li class="divider-vertical"></li> <li class="divider-vertical"></li>
<li class="lead">Maintainer: <strong><a href="{% url recipes release_name milestone_name %}?maintainer_name={{ maintainer_name|urlencode }}">{{ maintainer_name }}</a></strong></li> <li class="lead">Maintainer: <span><a href="{% url recipes release_name milestone_name %}?maintainer_name={{ maintainer_name|urlencode }}">{{ maintainer_name }}</a></span></li>
<li class="divider-vertical"></li> <li class="divider-vertical"></li>
</ul> </ul>
</div> </div>