use bootstrap icons

llazzaro · Jul 20, 2015 · d156cc3 · d156cc3
1 parent d22ce51
commit d156cc3
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 15 deletions.
diff --git a/schedule/templates/schedule/_create_event_options.html b/schedule/templates/schedule/_create_event_options.html
@@ -1,2 +1,4 @@
 {% load staticfiles i18n %}
-<a href="{{ create_event_url }}&amp;next={{here}}"><img border="0" src="{% static "schedule/img/add.png" %}" alt="{% trans "Add Event" %}"></a>
+<a href="{{ create_event_url }}&amp;next={{here}}">
+  <span class="glyphicon glyphicon-plus" ></span>
+</a>
diff --git a/schedule/templates/schedule/_event_options.html b/schedule/templates/schedule/_event_options.html
@@ -6,16 +6,16 @@
   {% if occurrence.event.rule %}
     {% if occurrence.id %}
         <a href="#" onclick="openURL('{{ edit_occurrence }}?next={{ here }}', event);">
-            <img border="0" src="{% static "schedule/img/pencil.png" %}" alt="{% trans "Edit Event" %}">
+          <span class="glyphicon glyphicon-pencil"></span>
         </a>
     {% else %}
         <a href="#" onclick="openEditDialog(this, '{{ edit_occurrence }}?next={{ here }}', '{{ edit_event }}?next={{ here }}', event);">
-            <img border="0" src="{% static "schedule/img/pencil.png" %}" alt="{% trans "Edit Event" %}">
+          <span class="glyphicon glyphicon-pencil"></span>
         </a>
     {% endif %}
   {% else %}
     <a href="#" onclick="openURL('{{ edit_event }}?next={{ here }}', event);">
-        <img border="0" src="{% static "schedule/img/pencil.png" %}" alt="{% trans "Edit Event" %}">
+        <span class="glyphicon glyphicon-remove"></span>
     </a>
   {% endif %}
   </span>
@@ -26,16 +26,16 @@
   {% if occurrence.event.rule %}
     {% if occurrence.id %}
         <a href="#" onclick="openURL('{{cancel_occurrence}}?next={{here}}', event);">
-            <img border="0" src="{% static "schedule/img/delete.png" %}" alt="{% trans "Delete Event" %}">
+          <span class="glyphicon glyphicon-remove"></span>
         </a>
     {% else %}
         <a href="#" onclick="openCancelDialog(this, '{{ cancel_occurrence }}?next={{here}}', '{{delete_event}}?next={{here}}', event);">
-            <img border="0" src="{% static "schedule/img/delete.png" %}" alt="{% trans "Delete Event" %}">
+          <span class="glyphicon glyphicon-remove"></span>
         </a>
     {% endif %}
   {% else %}
     <a href="#" onclick="openURL('{{delete_event}}?next={{here}}', event);">
-    <img border="0" src="{% static "schedule/img/delete.png" %}" alt="{% trans "Delete Event" %}">
+      <span class="glyphicon glyphicon-remove"></span>
     </a>
   {% endif %}
 </span>

diff --git a/schedule/templates/schedule/create_event.html b/schedule/templates/schedule/create_event.html
@@ -1,4 +1,4 @@
-{% extends "schedule/event_form_base.html" %}
+{% extends "base.html" %}
 {% load i18n %}
 
 {% block body %}

diff --git a/schedule/templates/schedule/event.html b/schedule/templates/schedule/event.html
@@ -3,34 +3,34 @@
 
 {% block body %}
 <div class="navigation">
-  <a href="{% url "day_calendar" event.calendar.slug %}{% querystring_for_date event.start 3 True %}">
+  <a class="btn btn-primary gradient" href="{% url "day_calendar" event.calendar.slug %}{% querystring_for_date event.start 3 True %}">
     {% trans "Day" %}
   </a>
-  <a href="{% url "month_calendar" event.calendar.slug %}{% querystring_for_date event.start 2 True %}">
+  <a class="btn btn-primary gradient" href="{% url "month_calendar" event.calendar.slug %}{% querystring_for_date event.start 2 True %}">
     {% trans "Month" %}
   </a>
-  <a href="{% url "year_calendar" event.calendar.slug %}{% querystring_for_date event.start 1 True %}">
+  <a class="btn btn-primary gradient" href="{% url "year_calendar" event.calendar.slug %}{% querystring_for_date event.start 1 True %}">
     {% trans "Year" %}
   </a>
 </div>
 
 <div class="event_actions" align="center">
   {% if back_url %}
   <a href="{{ back_url }}">
-    <img border="0" src="{% static "schedule/img/left_mod.png" %}" alt="{% trans "Back" %}"/>
+    <span class="glyphicon glyphicon-circle-arrow-left"></span>
   </a>
   &nbsp;
   {% endif %}
   <a href="{% url "edit_event" event.calendar.slug event.id %}">
-    <img border="0" src="{% static "schedule/img/pencil.png" %}" alt="{% trans "Change" %}"/>
+    Edit <span class="glyphicon glyphicon-pencil"></span>
   </a>
   &nbsp;
   <a href="{% url "delete_event" event.id %}">
-    <img border="0" src="{% static "schedule/img/delete.png" %}" alt="{% trans "Delete" %}"/>
+    Delete <span class="glyphicon glyphicon-remove"></span>
   </a>
 </div>
 <h2 align="center">{{event.title}}</h2>
-<table align="center">
+<table align="center" class="table table-hover">
 <tr>
 <td>{% trans "Starts" %}</td>
 <td>{% blocktrans with event.start|date:_("DATETIME_FORMAT") as start_date %}{{ start_date }}{% endblocktrans %}</td>