From 7286281e140d3f6cffbb4089391dce022c648fe4 Mon Sep 17 00:00:00 2001 From: Bradlee Speice Date: Tue, 12 Feb 2013 13:24:30 -0500 Subject: [PATCH] Fix the playlist_sidebar, change JQuery location --- web/views/templates/base | 46 ++++++++++--------- .../templates/components/playlist_sidebar | 7 ++- 2 files changed, 30 insertions(+), 23 deletions(-) diff --git a/web/views/templates/base b/web/views/templates/base index 7556ca5..2257805 100644 --- a/web/views/templates/base +++ b/web/views/templates/base @@ -2,15 +2,15 @@ List of block elements in this page: page_title + scripts + global_scripts + page_scripts navbar_title navbar_content sidebar sidebar_content body body_content - scripts - global_scripts - page_scripts {% endcomment %} @@ -27,6 +27,27 @@ List of block elements in this page: padding-top: 60px; /* Make sure that there is a gap on the navbar. */ } + + {# General scripts #} + {% block scripts %} + + + + + {% block global_scripts %} + + {% endblock %} + + + + {% endblock %}{# endblock scripts #} + @@ -75,24 +96,5 @@ List of block elements in this page: - {# General scripts #} - {% block scripts %} - - - - - {% block global_scripts %} - - {% endblock %} - - - {% endblock %}{# endblock scripts #} - diff --git a/web/views/templates/components/playlist_sidebar b/web/views/templates/components/playlist_sidebar index be01a96..651033f 100644 --- a/web/views/templates/components/playlist_sidebar +++ b/web/views/templates/components/playlist_sidebar @@ -1,9 +1,14 @@ {# This component assumes it has been placed in a sidebar, and controls options related to playlists. #} - +{# Additionally, it is assumed that the "playlist_list" has been given to us #} + +