Ubuntu Apps Directory

Merge lp:~jonas-drange/ubuntu-webcatalog/always-include-carousel-css into lp:ubuntu-webcatalog

  1. always-include-carousel-css
  2. Merge into trunk
Proposed by Jonas G. Drange
Status: Merged
Approved by: Jonas G. Drange
Approved revision: 194
Merged at revision: 191
Proposed branch: lp:~jonas-drange/ubuntu-webcatalog/always-include-carousel-css
Merge into: lp:ubuntu-webcatalog
Diff against target: 28 lines (+6/-2)
2 files modified
src/webcatalog/templates/webcatalog/application_detail.html (+5/-0)
src/webcatalog/templates/webcatalog/index.html (+1/-2)
To merge this branch: bzr merge lp:~jonas-drange/ubuntu-webcatalog/always-include-carousel-css
Reviewer Review Type Date Requested Status
Stephen Stewart (community) Approve
Review via email: mp+185452@code.launchpad.net

Commit message

include the carousel css with application_detail template

Description of the change

include the carousel css with application_detail template

To post a comment you must log in.
lp:~jonas-drange/ubuntu-webcatalog/always-include-carousel-css updated
192. By Jonas G. Drange

moving out of base, into index and application_detail

Revision history for this message
Stephen Stewart (stephen-stewart) wrote :

I don't think you need the block.super if using css-extra, there should be nothing to override there

lp:~jonas-drange/ubuntu-webcatalog/always-include-carousel-css updated
193. By Jonas G. Drange

super is not strictly needed here

Revision history for this message
Stephen Stewart (stephen-stewart) :
review: Approve
lp:~jonas-drange/ubuntu-webcatalog/always-include-carousel-css updated
194. By Jonas G. Drange

removing css extra super in index

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/webcatalog/templates/webcatalog/application_detail.html'
--- src/webcatalog/templates/webcatalog/application_detail.html 2013-09-03 12:52:17 +0000
+++ src/webcatalog/templates/webcatalog/application_detail.html 2013-09-17 09:03:32 +0000
@@ -9,6 +9,11 @@
9{% endblock %}9{% endblock %}
10{% block title %}{{ application.name }} — Ubuntu Apps Directory{% endblock %}10{% block title %}{{ application.name }} — Ubuntu Apps Directory{% endblock %}
11{% block header %}{{ application.name }}{% endblock %}11{% block header %}{{ application.name }}{% endblock %}
12
13{% block css-extra %}
14<link rel="stylesheet" type="text/css" href="{% url 'wc-combo' %}?css/carousel.css"/>
15{% endblock %}
16
12{% block js-base %}17{% block js-base %}
13 {{ block.super }}18 {{ block.super }}
14<script src="{% url 'wc-combo' %}?js/carousel.js&amp;js/screenshots.js"></script>19<script src="{% url 'wc-combo' %}?js/carousel.js&amp;js/screenshots.js"></script>
1520
=== modified file 'src/webcatalog/templates/webcatalog/index.html'
--- src/webcatalog/templates/webcatalog/index.html 2013-09-03 12:52:17 +0000
+++ src/webcatalog/templates/webcatalog/index.html 2013-09-17 09:03:32 +0000
@@ -5,8 +5,7 @@
5{% block header_container %}{% endblock %}5{% block header_container %}{% endblock %}
6{% block search %}{% endblock %}6{% block search %}{% endblock %}
77
8{% block css-base %}8{% block css-extra %}
9{{ block.super }}
10<link rel="stylesheet" type="text/css" href="{% url 'wc-combo' %}?css/carousel.css"/>9<link rel="stylesheet" type="text/css" href="{% url 'wc-combo' %}?css/carousel.css"/>
11{% endblock %}10{% endblock %}
1211

Subscribers

People subscribed via source and target branches