mirror-github-bspeice
/
Melodia
mirror of https://github.com/bspeice/Melodia
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix the playlist_sidebar, change JQuery location

master
Bradlee Speice 2013-02-12 13:24:30 -05:00
parent 5c538d395e
commit 7286281e14
2 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
web/views/templates/base
View File

@ -2,15 +2,15 @@
List of block elements in this page: List of block elements in this page:
page_title page_title
scripts
global_scripts
page_scripts
navbar_title navbar_title
navbar_content navbar_content
sidebar sidebar
sidebar_content sidebar_content
body body
body_content body_content
scripts
global_scripts
page_scripts
{% endcomment %} {% 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. */ padding-top: 60px; /* Make sure that there is a gap on the navbar. */
} }
</style> </style>
{# General scripts #}
{% block scripts %}
<script type="text/javascript" src="{{ STATIC_URL }}js/jquery.min.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}js/jquery-ui.min.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}js/bootstrap.min.js"></script>
{% block global_scripts %}
<script type="text/javascript">
{# Scripts used globally go here. #}
</script>
{% endblock %}
<script type="text/javascript">
{% block page_scripts %}
{# This block is used by each page if they want to add additional scripts. #}
{% endblock %}
</script>
{% endblock %}{# endblock scripts #}
</head> </head>
<body> <body>
@ -75,24 +96,5 @@ List of block elements in this page:
</div> </div>
</div> </div>
{# General scripts #}
{% block scripts %}
<script type="text/javascript" src="{{ STATIC_URL }}js/jquery.min.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}js/jquery-ui.min.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}js/bootstrap.min.js"></script>
{% block global_scripts %}
<script type="text/javascript">
{# Scripts used globally go here. #}
</script>
{% endblock %}
<script type="text/javascript">
{% block page_scripts %}
{# This block is used by each page if they want to add additional scripts. #}
{% endblock %}
</script>
{% endblock %}{# endblock scripts #}
</body> </body>
</html> </html>

7
web/views/templates/components/playlist_sidebar
View File

@ -1,9 +1,14 @@
{# This component assumes it has been placed in a sidebar, and controls options related to playlists. #} {# 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 #}
<ul class="nav nav-list"> <ul class="nav nav-list">
<li class="nav-header">Playlists</li> <li class="nav-header">Playlists</li>
<li><a href="#" data-playlist-name="">All Music</a></li>
{% for playlist in playlist_list %} {% for playlist in playlist_list %}
<li><a href="#" data-playlist-name="{{ playlist.name }}">{{ playlist.name }}</a></li> <li><a href="#" data-playlist-name="{{ playlist.name }}">{{ playlist.name }}</a></li>
{% endfor %} {% endfor %}
</ul> </ul>
<script type="text/javascript">
//It is safe to use jQuery here, since we placed jQuery at the top of the page
</script>