Skip to content

Commit

Permalink
Minor fixes to templates and setup.py
Browse files Browse the repository at this point in the history
  • Loading branch information
Sebastian Vetter committed Dec 1, 2012
1 parent a25d8fc commit 331d19a
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -8,6 +8,7 @@
.coverage

.tox/
dist/
cover/
docs/_build/
sandbox/public/
1 change: 0 additions & 1 deletion setup.py
Expand Up @@ -18,7 +18,6 @@
install_requires=[
'Django>=1.4.2',
'versiontools>=1.1.9',
'django-model-utils>=1.1.0',
'django-oscar>=0.4',
'django-extra-views>=0.5.2',
],
Expand Down
2 changes: 1 addition & 1 deletion stores/templates/stores/dashboard/store_group_list.html
Expand Up @@ -83,7 +83,7 @@ <h2>{{ queryset_description }}</h2>
</table>

{% if page_obj %}
{% include "catalogue/partials/pagination.html" %}
{% include "partials/pagination.html" %}
{% endif %}
</form>

Expand Down
10 changes: 5 additions & 5 deletions stores/templates/stores/dashboard/store_list.html
Expand Up @@ -64,14 +64,14 @@ <h2>{{ queryset_description }}</h2>
<td>{{ store.address.country }}</td>
<td>
{% if store.is_pickup_store %}
<span class="label label-success">{% trans "Yes" %}</span>
<span class="label label-success">{% trans "Yes" %}</span>
{% else %}
<span class="label label-danger">{% trans "No" %}</span>
<span class="label label-danger">{% trans "No" %}</span>
{% endif %}
{% if store.is_active %}
<span class="label label-success">{% trans "Active" %}</span>
<span class="label label-success">{% trans "Active" %}</span>
{% else %}
<span class="label label-danger">{% trans "Inactive" %}</span>
<span class="label label-danger">{% trans "Inactive" %}</span>
{% endif %}
</td>
<td>
Expand All @@ -83,7 +83,7 @@ <h2>{{ queryset_description }}</h2>
</table>

{% if page_obj %}
{% include "catalogue/partials/pagination.html" %}
{% include "partials/pagination.html" %}
{% endif %}
</form>

Expand Down

0 comments on commit 331d19a

Please sign in to comment.