#35 admin_shifts: escape from preview

2 files changed, 35 insertions, 11 deletions

diff --git a/templates/admin_shift_preview.html b/templates/admin_shift_preview.html
index 30905618..e04313f6 100644
--- a/templates/admin_shift_preview.html
+++ b/templates/admin_shift_preview.html
@@ -17,7 +17,16 @@
             </tbody>
         </table>
         <p>
-            <input type="submit" name="submit" value="Erstellen" />
+            <input type="submit" name="back" value="Zurück" /><input type="submit" name="submit" value="Erstellen" />
         </p>
+		<input type="hidden" name="name" value="%name%" />
+		<input type="hidden" name="rid" value="%rid%" />
+		<input type="hidden" name="start" value="%start%" />
+		<input type="hidden" name="end" value="%end%" />
+		<input type="hidden" name="mode" value="%mode%" />
+		<input type="hidden" name="length" value="%length%" />
+		<input type="hidden" name="change_hours" value="%change_hours%" />
+		<input type="hidden" name="angelmode" value="%angelmode%" />
+		%needed_angel_types%
     </fieldset>
 </form>
\ No newline at end of file
diff --git a/templates/admin_shifts.html b/templates/admin_shifts.html
index bfcc4623..3840b76e 100644
--- a/templates/admin_shifts.html
+++ b/templates/admin_shifts.html
@@ -29,43 +29,58 @@
         </p><h2>Modus:</h2>
         <p>
             <label>
-                <input type="radio" name="mode" value="single" %mode_single_selected%/>
-            </label>Eine Schicht erstellen.
+                <input id="mode_single" type="radio" name="mode" value="single" %mode_single_selected%/>
+            </label>
+            <label for="mode_single">
+                Eine Schicht erstellen.
+            </label>
         </p>
         <p>
             <label>
                 <input type="radio" name="mode" id="multi_shifts" value="multi" %mode_multi_selected%/>
-            </label>Mehrere Schichten erstellen:
+            </label>
+            <label for="multi_shifts">
+                Mehrere Schichten erstellen:
+            </label>
         </p>
         <p>
             <label>
                 Schichtlänge in Minuten:
             </label>
-            <input type="text" name="length" value="%mode_multi_length%" onchange="document.getElementById('multi_shifts').checked = true;" />
+            <input type="text" name="length" value="%mode_multi_length%" onchange="document.getElementById('multi_shifts').checked = true;"/>
         </p>
         <p>
             <label>
                 <input type="radio" name="mode" id="var_multi_shifts" value="variable" %mode_variable_selected%/>
-            </label>Mehrere Schichten mit variabler Länge erstellen:
+            </label>
+            <label for="var_multi_shifts">
+                Mehrere Schichten mit variabler Länge erstellen:
+            </label>
         </p>
         <p>
             <label>
                 Schichtwechsel-Stunden:
             </label>
-            <input type="text" name="change_hours" style="width: 300px;" value="%mode_variable_hours%" onchange="document.getElementById('var_multi_shifts').checked = true;" />
+            <input type="text" name="change_hours" style="width: 300px;" value="%mode_variable_hours%" onchange="document.getElementById('var_multi_shifts').checked = true;"/>
         </p><h2>Benötigte Engel:</h2>
         <p>
             <label>
-                <input type="radio" name="angelmode" value="location" %angelmode_location_selected%/>
-            </label>Benötigte Engel vom Ort übernehmen.
+                <input id="angelmode_location" type="radio" name="angelmode" value="location" %angelmode_location_selected%/>
+            </label>
+            <label for="angelmode_location">
+                Benötigte Engel vom Ort übernehmen.
+            </label>
         </p>
         <p>
             <label>
                 <input type="radio" name="angelmode" id="manual_angelmode" value="manually" %angelmode_manually_selected%/>
-            </label>Es werden folgende Engel benötigt:
+            </label>
+            <label for="manual_angelmode">
+                Es werden folgende Engel benötigt:
+            </label>
         </p>%angel_types%
         <p>
             <input type="submit" name="preview" value="Vorschau" />
         </p>
     </fieldset>
-</form>
+</form>
\ No newline at end of file