Merge "Render roles without images differently"

This commit is contained in:
Jenkins 2015-03-06 12:32:53 +00:00 committed by Gerrit Code Review
commit da5e913019
4 changed files with 17 additions and 3 deletions

View File

@ -149,6 +149,11 @@ class IndexView(views.IndexView):
if field: if field:
field.initial = 0 field.initial = 0
free_roles.append(role) free_roles.append(role)
# For now, role is valid if it has image.
if role['role'].image:
role['is_valid'] = True
else:
role['is_valid'] = False
data['free_roles'] = free_roles data['free_roles'] = free_roles
flavor_data = list( flavor_data = list(
_flavor_data(self.request, flavors, flavor_roles)) _flavor_data(self.request, flavors, flavor_roles))

View File

@ -64,7 +64,7 @@ tuskar.boxes = (function () {
// Only activate on a page that has the right classes. // Only activate on a page that has the right classes.
return; return;
} }
$('div.boxes-role').draggable({ $('div.boxes-role:not(.boxes-role-invalid)').draggable({
revert: 'invalid', revert: 'invalid',
helper: 'clone', helper: 'clone',
zIndex: 1000, zIndex: 1000,

View File

@ -91,6 +91,11 @@
.deploy-role-status .boxes-role { .deploy-role-status .boxes-role {
cursor: default; cursor: default;
} }
.boxes-role-invalid {
border: 1px solid #999;
background: #eee;
color: #666;
}
.boxes-role-controller { .boxes-role-controller {
background-color: #fcaf3e; background-color: #fcaf3e;
border-color: #f57900; border-color: #f57900;

View File

@ -3,8 +3,9 @@
{% load url from future %} {% load url from future %}
{% load form_helpers %} {% load form_helpers %}
<div <div
class="boxes-role-{{ role.name|slugify }} boxes-role" class="{% if role.is_valid %}boxes-role-{{ role.name|slugify }}{% else %}boxes-role-invalid{% endif %} boxes-role"
data-name="{{ role.name|slugify }}" data-name="{{ role.name|slugify }}"
{% if not role.is_valid %}title="{% trans 'Please edit this role to fill out any necessary missing configuration.' %}"{% endif %}
> >
<div class="row"> <div class="row">
<div class="col-xs-5 deploy-role-count"> <div class="col-xs-5 deploy-role-count">
@ -12,7 +13,10 @@
{{ role.flavor_field|add_bootstrap_class }} {{ role.flavor_field|add_bootstrap_class }}
</div> </div>
<div class="col-xs-7 deploy-role-label"> <div class="col-xs-7 deploy-role-label">
<div class="deployment-roles-label">{{ role.name|title }}</div> <div class="deployment-roles-label">
{% if not role.is_valid %}<b class="fa fa-lg fa-fw fa-question"></b>{% endif %}
{{ role.name|title }}
</div>
</div> </div>
<div class="deploy-role-icon"> <div class="deploy-role-icon">
<a name="role-edit-{{role.name|slugify}}" <a name="role-edit-{{role.name|slugify}}"