Changeset 169 for trunk/root

Timestamp:

04/06/09 23:59:10 (15 years ago)

Author:

nanardon

Message:

• split ballot admin page into subsection

Location:

trunk/root

Files:

• static/vote.css (modified) (1 diff)
• templates/admin/ballot.tt (added)
• templates/admin/default.tt (modified) (1 diff)
• templates/ballot/default.tt (modified) (1 diff)
• templates/includes/admin_menu.tt (modified) (1 diff)
• templates/includes/ballot_form.tt (modified) (2 diffs)

trunk/root/static/vote.css

@@ -127 +127 @@
 #vote_done {}
 
-#ballot {
+.ballot {
     border-style: inset;
     border-width: 10px;
+    padding: 10px;
+    background-color: Silver;
+}
+
+#ballot {
     margin-left: 30%;
     margin-right: 30%;
     margin-top: 20px;
     margin-bottom: 20px;
-    padding: 10px;
-    background-color: Silver;
 }
 

trunk/root/templates/admin/default.tt

@@ -45 +45 @@
 <input type="text" name="free_choice" value="[% c.req.param('free_choice') || thisvote.free_choice || 0 | html %]">
 <br>
-<input type="submit" value="Enregistrer">
+<input type="submit" name="pollparam" value="Enregistrer">
 </form>
 </td>

trunk/root/templates/ballot/default.tt

@@ -37 +37 @@
 [% INCLUDE 'includes/ballot_form.tt' %]
 
-<hr>
-<input type="submit" name="ballot" value="Voter &gt;&gt;">
 <p>Votre vote ne sera pris en compte qu'aprÚs confirmation</p>
 [% END %]

trunk/root/templates/includes/admin_menu.tt

@@ -5 +5 @@
 <a href="[% c.uri_for('/admin', voteid) %]">[% poll.info.label | html %]</a>
 :: <a href="[% c.uri_for('/admin', voteid, 'voting') %]">Electeurs</a>
+[% IF poll.status == 'BEFORE' %]
+:: <a href="[% c.uri_for('/admin', voteid, 'ballot') %]">Bulletins</a>
+[% END %]
 </div>

trunk/root/templates/includes/ballot_form.tt

@@ -1 @@
-[% vote = c.model('Vote') %]
 [% poll = c.model('Vote').poll(voteid) %]
 [% thisvote = poll.info() %]
@@ -15 +14 @@
 [% count = count + 1 %]
 [% END %]
+<hr>
+<input type="submit" name="ballot" value="Voter &gt;&gt;">