Repository :
http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
---------------------------------------------------------------
commit 0a555b1d6e7b02771d7d7a80fded02639332cbee
Author: Johan Cwiklinski <johan(a)x-tnd.be>
Date: Mon Nov 5 08:18:21 2012 +0100
Include UI in master template; button'd buttons :)
---------------------------------------------------------------
fedocal/templates/add_calendar.html | 4 ++--
fedocal/templates/add_meeting.html | 8 ++------
fedocal/templates/agenda.html | 4 ----
fedocal/templates/delete_meeting.html | 4 ++--
fedocal/templates/edit_meeting.html | 8 ++------
fedocal/templates/master.html | 4 ++++
6 files changed, 12 insertions(+), 20 deletions(-)
diff --git a/fedocal/templates/add_calendar.html b/fedocal/templates/add_calendar.html
index 311d7b0..9e9959a 100644
--- a/fedocal/templates/add_calendar.html
+++ b/fedocal/templates/add_calendar.html
@@ -13,8 +13,8 @@
{{ render_field(form.calendar_multiple_meetings) }}
{{ render_field(form.calendar_regional_meetings) }}
<p class="buttons indent">
- <input type="submit" class="submit positive"
value="Create">
- <input type="button" value="Cancel"
onclick="history.back();">
+ <input type="submit" class="submit positive button"
value="Create">
+ <input type="button" value="Cancel" class="button"
onclick="history.back();">
</p>
{{ form.csrf_token }}
</form>
diff --git a/fedocal/templates/add_meeting.html b/fedocal/templates/add_meeting.html
index 4e4777e..a638096 100644
--- a/fedocal/templates/add_meeting.html
+++ b/fedocal/templates/add_meeting.html
@@ -34,18 +34,14 @@
</table>
<p class="buttons indent">
- <input type="submit" class="submit positive"
value="Add">
- <input type="button" value="Cancel"
onclick="history.back();">
+ <input type="submit" class="submit positive button"
value="Add">
+ <input type="button" value="Cancel" class="button"
onclick="history.back();">
{{ form.csrf_token }}
</form>
{% endblock %}
{% block jscripts %}
{{ super() }}
-<script type="text/javascript"
- src="{{ url_for('static',
- filename='jquery-ui-1.9.1.custom.min.js') }}">
-</script>
<script type="text/javascript">
$(function(){
$('#meeting_date').datepicker({
diff --git a/fedocal/templates/agenda.html b/fedocal/templates/agenda.html
index 3c8ca7c..23daaf2 100644
--- a/fedocal/templates/agenda.html
+++ b/fedocal/templates/agenda.html
@@ -73,10 +73,6 @@
{% block jscripts %}
{{ super() }}
-<script type="text/javascript"
- src="{{ url_for('static',
- filename='jquery-ui-1.9.1.custom.min.js') }}">
-</script>
<script type="text/javascript">
$(function(){
$('.event').click(function(){
diff --git a/fedocal/templates/delete_meeting.html
b/fedocal/templates/delete_meeting.html
index 25e8915..c17bfc6 100644
--- a/fedocal/templates/delete_meeting.html
+++ b/fedocal/templates/delete_meeting.html
@@ -32,8 +32,8 @@ meetings as well)</p>
{{ render_field_invert(form.confirm_futher_delete) }}
{% endif %}
<p class="buttons indent">
- <input type="submit" class="submit positive"
value="Delete">
- <input type="button" value="Cancel"
onclick="history.back();">
+ <input type="submit" class="submit positive button"
value="Delete">
+ <input type="button" value="Cancel" class="button"
onclick="history.back();">
</p>
{{ form.csrf_token }}
</form>
diff --git a/fedocal/templates/edit_meeting.html b/fedocal/templates/edit_meeting.html
index 0089c22..a77263d 100644
--- a/fedocal/templates/edit_meeting.html
+++ b/fedocal/templates/edit_meeting.html
@@ -44,8 +44,8 @@ affect all the meetings related.
{% endif %}
<p class="buttons indent">
- <input type="submit" class="submit positive"
value="Edit">
- <input type="button" value="Cancel"
onclick="history.back();">
+ <input type="submit" class="submit positive button"
value="Edit">
+ <input type="button" value="Cancel" class="button"
onclick="history.back();">
</p>
{{ form.csrf_token }}
</form>
@@ -53,10 +53,6 @@ affect all the meetings related.
{% block jscripts %}
{{ super() }}
-<script type="text/javascript"
- src="{{ url_for('static',
- filename='jquery-ui-1.9.1.custom.min.js') }}">
-</script>
<script type="text/javascript">
$(function(){
$('#meeting_date').datepicker({
diff --git a/fedocal/templates/master.html b/fedocal/templates/master.html
index 5dd5553..0f640f2 100644
--- a/fedocal/templates/master.html
+++ b/fedocal/templates/master.html
@@ -111,6 +111,10 @@
src="{{ url_for('static',
filename='jquery-1.8.0.min.js') }}">
</script>
+ <script type="text/javascript"
+ src="{{ url_for('static',
+ filename='jquery-ui-1.9.1.custom.min.js') }}">
+ </script>
<script type="text/javascript">
$(function(){
$('#calendars_menu').menu();