diff options
| -rw-r--r-- | nop/site_media/nowplaying_form.js | 12 | ||||
| -rw-r--r-- | nop/templates/nop_form.html | 17 | ||||
| -rw-r--r-- | nop/urls.py | 8 | ||||
| -rw-r--r-- | urls.py | 2 |
4 files changed, 18 insertions, 21 deletions
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 @@ <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.0/jquery.min.js"></script> <script type="text/javascript" src="http://cdn.jquerytools.org/1.2.5/form/jquery.tools.min.js"></script> <script type="text/javascript" src="/nop/static/anytimec.js"></script> + <script type="text/javascript" src="/nop/static/nowplaying_form.js"></script> <link rel="stylesheet" type="text/css" href="/nop/static/dateinput.css"/> <link rel="stylesheet" type="text/css" href="/nop/static/anytimec.css"/> - - <script type="text/javascript"><!-- - $(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" - }); - }); - --></script> - </head> <body> 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<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/(?P<hour>\d{1,2})/(?P<minute>\d{1,2})/?$', get), - url(r'^$', nop_form), - url(r'^static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': NOP_STATIC_DIR}), + url(r'^/get_current/?$', get_current), + url(r'^/(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/(?P<hour>\d{1,2})/(?P<minute>\d{1,2})/?$', get), + url(r'^/?$', nop_form), + url(r'^/static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': NOP_STATIC_DIR}), ) @@ -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: |