From c9959a839b3955cc7333b73e3dadfa70525f86c0 Mon Sep 17 00:00:00 2001 From: Pablo Vazquez Date: Thu, 22 Sep 2016 19:07:26 +0200 Subject: [PATCH] Pillar's tutti is now loaded on layout --- src/styles/_shots.sass | 1 + src/templates/attract/layout.jade | 3 ++- src/templates/attract/shots/for_project.jade | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/styles/_shots.sass b/src/styles/_shots.sass index 371b609..604fdef 100644 --- a/src/styles/_shots.sass +++ b/src/styles/_shots.sass @@ -41,6 +41,7 @@ padding: 3px 10px &.active + text-decoration: none +status-border-color a[class^="status-"] diff --git a/src/templates/attract/layout.jade b/src/templates/attract/layout.jade index cfd91c7..453ac7b 100644 --- a/src/templates/attract/layout.jade +++ b/src/templates/attract/layout.jade @@ -7,13 +7,13 @@ html(lang="en") | {% block head %}{% endblock %} - script(src="{{ url_for('static_pillar', filename='assets/js/vendor/jquery-3.1.0.min.js')}}") link(href='//fonts.googleapis.com/css?family=Roboto:300,400', rel='stylesheet', type='text/css') link(href="{{ url_for('static_pillar', filename='assets/css/vendor/bootstrap.min.css') }}", rel="stylesheet") link(href="{{ url_for('static_attract', filename='assets/css/main.css') }}", rel="stylesheet") link(href="{{ url_for('static_attract', filename='assets/css/plugins/js_select2.css') }}", rel="stylesheet") + script(src="{{ url_for('static_pillar', filename='assets/js/vendor/jquery-3.1.0.min.js')}}") | {% block style %}{% endblock %} @@ -37,6 +37,7 @@ html(lang="en") h1 Right | {% endblock %} + script(src="{{ url_for('static_pillar', filename='assets/js/tutti.min.js') }}") script(src="{{ url_for('static_attract', filename='js/tasks.js') }}", async=true) script(src="{{ url_for('static_pillar', filename='assets/js/vendor/jquery.select2.min.js') }}", async=true) | {% block footer_scripts %}{% endblock %} diff --git a/src/templates/attract/shots/for_project.jade b/src/templates/attract/shots/for_project.jade index 60f085e..2b49a6f 100644 --- a/src/templates/attract/shots/for_project.jade +++ b/src/templates/attract/shots/for_project.jade @@ -59,6 +59,8 @@ | {% endblock %} | {% block footer_scripts %} script. + ProjectUtils.setProjectAttributes({context: 'shot'}); + {% if open_task_id %} $(function() { task_open('{{ open_task_id }}', '{{ project.url }}'); }); {% endif %}