Merge lp:~stephen-stewart/ubuntu-webcatalog/unfubar-js into lp:ubuntu-webcatalog

[Stephen Stewart]

move js to end of document

move js to end of page, fixing errors with carousels being called before yui was loaded (caused by global nav change)

[Michael Nelson (michael.nelson)]

+1 LGTM. I think Jonas is bootstrapping to run it too.

review: Approve

[Jonas G. Drange (jonas-drange)]

LGTM

review: Approve

=== modified file 'src/webcatalog/templates/webcatalog/application_detail.html'
--- src/webcatalog/templates/webcatalog/application_detail.html	2013-06-20 15:48:43 +0000
+++ src/webcatalog/templates/webcatalog/application_detail.html	2013-09-03 12:55:42 +0000
@@ -45,6 +45,11 @@
 });
 </script>
 {% endblock %}
+{% block js-extra %}
+<script type="text/javascript" charset="utf-8">
+    setup_screenshots({{ application.screenshots|length  }}, '{{ application.package_name }}', '{% url 'wc-combo' %}?', '{% url 'wc-package-screenshots' application.package_name %}');
+</script>
+{% endblock %}
 {% block body_extra %}class="yui3-skin-sam"{% endblock %}
 {% block content %}
     {% if messages %}

=== modified file 'src/webcatalog/templates/webcatalog/exhibits_widget.html'
--- src/webcatalog/templates/webcatalog/exhibits_widget.html	2013-04-09 13:47:13 +0000
+++ src/webcatalog/templates/webcatalog/exhibits_widget.html	2013-09-03 12:55:42 +0000
@@ -19,15 +19,3 @@
         </ol>
     </div>
 </div>
-<script type="text/javascript">
-YUI({combine: true, comboBase: '{% url 'wc-combo' %}?', root: 'yui/3.4.0/build/'}).use('uwc-carousel', function(Y) {
-    var caro = new Y.uwc.Carousel({
-        nodeContainer: "#exhibits-carousel",
-        controlsContainer: "#exhibits-carousel",
-        containerHeight: 200,
-        containerWidth: 912,
-        autoPlay: true
-    });
-    Y.all('.slide').removeClass('disabled');
-});
-</script>

=== modified file 'src/webcatalog/templates/webcatalog/featured_apps_widget.html'
--- src/webcatalog/templates/webcatalog/featured_apps_widget.html	2013-04-09 13:47:13 +0000
+++ src/webcatalog/templates/webcatalog/featured_apps_widget.html	2013-09-03 12:55:42 +0000
@@ -5,15 +5,3 @@
 {% include "webcatalog/app_carousel_widget.html" %}
 {% endwith %}
 </div>
-<script type="text/javascript">
-YUI({combine: true, comboBase: '{% url 'wc-combo' %}?', root: 'yui/3.4.0/build/'}).use('uwc-carousel', function(Y) {
-    var caro = new Y.uwc.Carousel({
-        nodeContainer: "#featured-carousel .carousel",
-        controlsContainer: "#featured-carousel .carousel-controls",
-        containerHeight: 200,
-        containerWidth: 912,
-        autoPlay: false
-    });
-    Y.all('.slide').removeClass('disabled');
-});
-</script>

=== modified file 'src/webcatalog/templates/webcatalog/index.html'
--- src/webcatalog/templates/webcatalog/index.html	2013-06-20 15:48:43 +0000
+++ src/webcatalog/templates/webcatalog/index.html	2013-09-03 12:55:42 +0000
@@ -59,4 +59,42 @@
     </div>
 {% endif %}
 
+{% endblock content %}
+
+{% block js-extra %}
+<script>
+YUI().use('uwc-carousel', function(Y) {
+    var height = 200,
+        width = 912;
+
+{% if exhibits %}
+    new Y.uwc.Carousel({
+        nodeContainer: "#exhibits-carousel",
+        controlsContainer: "#exhibits-carousel",
+        containerHeight: height,
+        containerWidth: width,
+        autoPlay: true
+    });
+{% endif %}
+{% if featured_apps %}
+    new Y.uwc.Carousel({
+        nodeContainer: "#featured-carousel .carousel",
+        controlsContainer: "#featured-carousel .carousel-controls",
+        containerHeight: height,
+        containerWidth: width,
+        autoPlay: false
+    });
+{% endif %}
+{% if top_rated_apps %}
+    new Y.uwc.Carousel({
+        nodeContainer: "#top-rated-carousel .carousel",
+        controlsContainer: "#top-rated-carousel .carousel-controls",
+        containerHeight: height,
+        containerWidth: width,
+        autoPlay: false
+    });
+{% endif %}
+    Y.all('.slide').removeClass('disabled');
+});
+</script>
 {% endblock %}

=== modified file 'src/webcatalog/templates/webcatalog/screenshot_widget.html'
--- src/webcatalog/templates/webcatalog/screenshot_widget.html	2013-02-22 20:50:08 +0000
+++ src/webcatalog/templates/webcatalog/screenshot_widget.html	2013-09-03 12:55:42 +0000
@@ -13,6 +13,3 @@
     </div>
 {% endif %}
 </div>
-<script type="text/javascript" charset="utf-8">
-    setup_screenshots({{ application.screenshots|length  }}, '{{ application.package_name }}', '{% url 'wc-combo' %}?', '{% url 'wc-package-screenshots' application.package_name %}');
-</script>

=== modified file 'src/webcatalog/templates/webcatalog/top_rated_apps_widget.html'
--- src/webcatalog/templates/webcatalog/top_rated_apps_widget.html	2013-04-09 13:47:13 +0000
+++ src/webcatalog/templates/webcatalog/top_rated_apps_widget.html	2013-09-03 12:55:42 +0000
@@ -5,15 +5,3 @@
 {% include "webcatalog/app_carousel_widget.html" %}
 {% endwith %}
 </div>
-<script type="text/javascript">
-YUI({combine: true, comboBase: '{% url 'wc-combo' %}?', root: 'yui/3.4.0/build/'}).use('uwc-carousel', function(Y) {
-    var caro = new Y.uwc.Carousel({
-        nodeContainer: "#top-rated-carousel .carousel",
-        controlsContainer: "#top-rated-carousel .carousel-controls",
-        containerHeight: 200,
-        containerWidth: 912,
-        autoPlay: false
-    });
-    Y.all('.slide').removeClass('disabled');
-});
-</script>