Fixed media references to use properly namedspaces media in the form …

…{{ MEDIA_URL }}schedules/(img|js|css)/foo except when the media is 100% generic (like jquery), in which case it's at media/(js|img|css) and referenced at {{ MEDIA_URL }}(img|js|css)/foo

Signed-off-by: Bartek Górny <bartek@gorny.edu.pl>

.gitignore

@@ -1,3 +1,4 @@
 *.pyc
 /project_sample/project_sample.db
 /docs/_build/
+django_schedule.egg-info

schedule/templates/schedule/_create_event_options.html

@@ -1 +1 @@
-<a href="{{ create_event_url }}&next={{here}}"><img border="0" src="{{ MEDIA_URL }}img/add.png" alt="Add Event"></a>
+<a href="{{ create_event_url }}&next={{here}}"><img border="0" src="{{ MEDIA_URL }}schedule/img/add.png" alt="Add Event"></a>

schedule/templates/schedule/_event_options.html

@@ -4,16 +4,16 @@
 {% if occurrence.event.rule %}
     {% if occurrence.id %}
         <a href="#" onclick="openURL('{{ edit_occurrence }}?next={{ here }}', event);">
-            <img border="0" src="{{ MEDIA_URL }}img/pencil.png" alt="Edit Event">
+            <img border="0" src="{{ MEDIA_URL }}schedule/img/pencil.png" alt="Edit Event">
         </a>
     {% else %}
         <a href="#" onclick="openEditDialog(this, '{{ edit_occurrence }}?next={{ here }}', '{{ edit_event }}?next={{ here }}', event);">
-            <img border="0" src="{{ MEDIA_URL }}img/pencil.png" alt="Edit Event">
+            <img border="0" src="{{ MEDIA_URL }}schedule/img/pencil.png" alt="Edit Event">
         </a>
     {% endif %}
 {% else %}
     <a href="#" onclick="openURL('{{ edit_event }}?next={{ here }}', event);">
-        <img border="0" src="{{ MEDIA_URL }}img/pencil.png" alt="Edit Event">
+        <img border="0" src="{{ MEDIA_URL }}schedule/img/pencil.png" alt="Edit Event">
     </a>
 {% endif %}
 {% endif %}
@@ -23,16 +23,16 @@
 {% if occurrence.event.rule %}
     {% if occurrence.id %}
         <a href="#" onclick="openURL('{{cancel_occurrence}}?next={{here}}', event);">
-            <img border="0" src="{{ MEDIA_URL }}img/delete.png" alt="Delete Event">
+            <img border="0" src="{{ MEDIA_URL }}schedule/img/delete.png" alt="Delete Event">
         </a>
     {% else %}
         <a href="#" onclick="openCancelDialog(this, '{{ cancel_occurrence }}?next={{here}}', '{{delete_event}}?next={{here}}', event);">
-            <img border="0" src="{{ MEDIA_URL }}img/delete.png" alt="Delete Event">
+            <img border="0" src="{{ MEDIA_URL }}schedule/img/delete.png" alt="Delete Event">
         </a>
     {% endif %}
 {% else %}
 <a href="#" onclick="openURL('{{delete_event}}?next={{here}}', event);">
-    <img border="0" src="{{ MEDIA_URL }}img/delete.png" alt="Delete Event">
+    <img border="0" src="{{ MEDIA_URL }}schedule/img/delete.png" alt="Delete Event">
 </a>
 {% endif %}
 {% endif %}

schedule/templates/schedule/_prevnext.html

@@ -1,11 +1,11 @@
 {% load scheduletags %}
 <div class="prevnext">
     <a href="{% prev_url target slug period %}">
-      <img align="top" border="0" src="{{ MEDIA_URL }}/img/left_mod.png"/>
+      <img align="top" border="0" src="{{ MEDIA_URL }}schedule/img/left_mod.png"/>
     </a>
     &nbsp; <b>{{period_name}}</b> &nbsp;
     <a href="{% next_url target slug period %}">
-      <img align="top" border="0" src="{{ MEDIA_URL }}/img/right_mod.png"/>
+      <img align="top" border="0" src="{{ MEDIA_URL }}schedule/img/right_mod.png"/>
     </a>
 </div>
 

schedule/templates/schedule/base.html

@@ -1,10 +1,20 @@
 {% extends "site_base.html" %}
 {% block extra_head %}
 {{ block.super }}
-<link rel="stylesheet" href="{{ MEDIA_URL }}css/schedule.css" type="text/css" media="screen" />
+<link rel="stylesheet" href="{{ MEDIA_URL }}schedule/css/schedule.css" type="text/css" media="screen" />
 <link rel="stylesheet" href="{{ MEDIA_URL }}css/jquery-ui.css" type="text/css" media="screen" />
 <link rel="stylesheet" href="{{ MEDIA_URL }}css/jquery.tooltip.css" />
 <script type="text/javascript" src="{{ MEDIA_URL }}js/jquery.js"></script>
 <script type="text/javascript" src="{{ MEDIA_URL }}js/jquery-ui.js"></script>
 <script type="text/javascript" src="{{ MEDIA_URL }}js/jquery.tooltip.js"></script>
 {% endblock %}
+
+{% block rtab_id %}id="schedule_tab"{% endblock %}
+
+{% block subnav %}
+    <ul>
+        <li><a href="">Create a Calendar</a></li>
+        <li><a href="">Your Calendars</a></li>
+        <li><a href="">All Calendars</a></li>
+    </ul>
+{% endblock %}

schedule/templates/schedule/event.html

@@ -19,16 +19,16 @@
 <div class="event_actions" align="center">
   {% if back_url %}
   <a href="{{ back_url }}">
-    <img border="0" src="{{ MEDIA_URL }}img/left_mod.png" alt="{% trans "Back" %}"/>
+    <img border="0" src="{{ MEDIA_URL }}schedule/img/left_mod.png" alt="{% trans "Back" %}"/>
   </a>
   &nbsp;
   {% endif %}
   <a href="{% url edit_event event.calendar.slug,event.id %}">
-    <img border="0" src="{{ MEDIA_URL }}img/pencil.png" alt="{% trans "Change" %}"/>
+    <img border="0" src="{{ MEDIA_URL }}schedule/img/pencil.png" alt="{% trans "Change" %}"/>
   </a>
   &nbsp;
   <a href="{% url delete_event event.id %}">
-    <img border="0" src="{{ MEDIA_URL }}img/delete.png" alt="{% trans "Delete" %}"/>
+    <img border="0" src="{{ MEDIA_URL }}schedule/img/delete.png" alt="{% trans "Delete" %}"/>
   </a>
 </div>
 <h2 align="center">{{event.title}}</h2>

schedule/templates/schedule/event_form_base.html

@@ -2,7 +2,7 @@
 {% block extra_head %}
     {{ block.super }}
     <link rel="stylesheet" href="{{ MEDIA_URL }}css/jquery-ui.css" type="text/css" media="screen" />
-    <link rel="stylesheet" href="{{ MEDIA_URL }}css/schedule.css" type="text/css" media="screen" />
+    <link rel="stylesheet" href="{{ MEDIA_URL }}schedule/css/schedule.css" type="text/css" media="screen" />
     <script type="text/javascript" src="{{ MEDIA_URL }}js/jquery.js"></script>
     <script type="text/javascript" src="{{ MEDIA_URL }}js/jquery-ui.js"></script>
     <script type="text/javascript" src="{{ MEDIA_URL }}js/jquery.timePicker.js"></script>

schedule/templates/schedule/occurrence.html

@@ -13,10 +13,10 @@
 </div>
 <div class="event_actions" align="center">
 	{% if back_url %}
-	<a href="{{ back_url }}"><img border="0" src="{{ MEDIA_URL }}img/left_mod.png" alt="{% trans "Back" %}"></a> &nbsp;
+	<a href="{{ back_url }}"><img border="0" src="{{ MEDIA_URL }}schedule/img/left_mod.png" alt="{% trans "Back" %}"></a> &nbsp;
 	{% endif %}
-	<a href="{{occurrence.get_edit_url}}"><img border="0" src="{{ MEDIA_URL }}img/pencil.png" alt="{% trans "Change" %}"></a> &nbsp;
-	<a href="{{occurrence.get_cancel_url}}"><img border="0" src="{{ MEDIA_URL }}img/delete.png" alt="{% trans "Cancel" %}"></a>
+	<a href="{{occurrence.get_edit_url}}"><img border="0" src="{{ MEDIA_URL }}schedule/img/pencil.png" alt="{% trans "Change" %}"></a> &nbsp;
+	<a href="{{occurrence.get_cancel_url}}"><img border="0" src="{{ MEDIA_URL }}schedule/schedule/img/delete.png" alt="{% trans "Cancel" %}"></a>
 </div>
 <h2 align="center">{{occurrence.title}}</h2>
 <table align="center">