From d8933e35a6bfbba12a40d100db56700fd381a968 Mon Sep 17 00:00:00 2001 From: Johannes Raggam Date: Fri, 27 May 2011 17:07:58 +0200 Subject: integration of nowplaying into plone diff --git a/nop/site_media/nowplaying_form.js b/nop/site_media/nowplaying_form.js new file mode 100644 index 0000000..86656d5 --- /dev/null +++ b/nop/site_media/nowplaying_form.js @@ -0,0 +1,12 @@ +$(document).ready(function() { + $("#nop_date").dateinput({ + format: 'yyyy-mm-dd', + firstDay: 1 + }); + $("#nop_time").AnyTime_picker({ + format: "%H:%i", + labelTitle: "Zeit", + labelHour: "Stunde", + labelMinute: "Minute" + }); +}); diff --git a/nop/templates/nop_form.html b/nop/templates/nop_form.html index b9be92f..98b000d 100644 --- a/nop/templates/nop_form.html +++ b/nop/templates/nop_form.html @@ -5,24 +5,9 @@ + - - - diff --git a/nop/urls.py b/nop/urls.py index caa6898..63c183c 100644 --- a/nop/urls.py +++ b/nop/urls.py @@ -6,8 +6,8 @@ NOP_STATIC_DIR = os.path.join(os.path.dirname(__file__), 'site_media') urlpatterns = patterns('', - url(r'^get_current/?$', get_current), - url(r'^(?P\d{4})/(?P\d{1,2})/(?P\d{1,2})/(?P\d{1,2})/(?P\d{1,2})/?$', get), - url(r'^$', nop_form), - url(r'^static/(?P.*)$', 'django.views.static.serve', {'document_root': NOP_STATIC_DIR}), + url(r'^/get_current/?$', get_current), + url(r'^/(?P\d{4})/(?P\d{1,2})/(?P\d{1,2})/(?P\d{1,2})/(?P\d{1,2})/?$', get), + url(r'^/?$', nop_form), + url(r'^/static/(?P.*)$', 'django.views.static.serve', {'document_root': NOP_STATIC_DIR}), ) diff --git a/urls.py b/urls.py index 97f1a8b..e77334c 100644 --- a/urls.py +++ b/urls.py @@ -7,7 +7,7 @@ admin.autodiscover() urlpatterns = patterns('', (r'^admin/', include(admin.site.urls)), (r'^program/', include('program.urls')), - (r'^nop/', include('nop.urls')), + (r'^nop', include('nop.urls')), (r'^tinymce/', include('tinymce.urls')), ) if settings.DEBUG: -- cgit v0.10.2