From b8c4d41508a0dd1c0019e8cb6e699d276c9d9882 Mon Sep 17 00:00:00 2001
From: Johannes Raggam <raggam-nl@adm.at>
Date: Thu, 26 May 2011 13:29:24 +0200
Subject: move nop_form one level up
diff --git a/nop/templates/nop/nop_form.html b/nop/templates/nop/nop_form.html
deleted file mode 100644
index e4efcd9..0000000
--- a/nop/templates/nop/nop_form.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<html>
-<head>
- <title>Now Playing — Radio Helsinki - Freies Radio Graz</title>
- <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>
- <link rel="stylesheet" type="text/css" href="http://static.flowplayer.org/tools/demos/dateinput/css/skin1.css"/>
-
- <script type="text/javascript" src="http://www.ama3.com/anytime/AnyTime/anytimec.js"></script>
- <link rel="stylesheet" type="text/css" href="http://www.ama3.com/anytime/AnyTime/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>
-
- <div id="content-main" class="show-detail">
- <form action="" method="post">{% csrf_token %}
- {{ form.as_table }}
- <input type="submit" value="senden" />
- </form>
-
- {% if nowplaying %}
- <ul>
- {% for track in nowplaying %}
- <li>
- <small>{{track.datetime}}:</small>
- <strong>{{track.artist}}</strong> -
- {{track.title}} -
- {{track.album}}
- in der Sendung <em>{{track.showtitle}}</em>
- </li>
- {% endfor %}
- </ul>
- {% endif %}
- </div>
-
-</body>
-</html>
diff --git a/nop/templates/nop_form.html b/nop/templates/nop_form.html
new file mode 100644
index 0000000..e4efcd9
--- /dev/null
+++ b/nop/templates/nop_form.html
@@ -0,0 +1,51 @@
+<html>
+<head>
+ <title>Now Playing — Radio Helsinki - Freies Radio Graz</title>
+ <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>
+ <link rel="stylesheet" type="text/css" href="http://static.flowplayer.org/tools/demos/dateinput/css/skin1.css"/>
+
+ <script type="text/javascript" src="http://www.ama3.com/anytime/AnyTime/anytimec.js"></script>
+ <link rel="stylesheet" type="text/css" href="http://www.ama3.com/anytime/AnyTime/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>
+
+ <div id="content-main" class="show-detail">
+ <form action="" method="post">{% csrf_token %}
+ {{ form.as_table }}
+ <input type="submit" value="senden" />
+ </form>
+
+ {% if nowplaying %}
+ <ul>
+ {% for track in nowplaying %}
+ <li>
+ <small>{{track.datetime}}:</small>
+ <strong>{{track.artist}}</strong> -
+ {{track.title}} -
+ {{track.album}}
+ in der Sendung <em>{{track.showtitle}}</em>
+ </li>
+ {% endfor %}
+ </ul>
+ {% endif %}
+ </div>
+
+</body>
+</html>
diff --git a/nop/views.py b/nop/views.py
index a106493..1faf7f4 100644
--- a/nop/views.py
+++ b/nop/views.py
@@ -82,4 +82,4 @@ def nop_form(request):
result = _bydate(date.year, date.month, date.day, time.hour, time.minute)
context['nowplaying'] = result
context['form'] = form
- return render_to_response('nop/nop_form.html', context)
+ return render_to_response('nop_form.html', context)
--
cgit v0.10.2