svn commit: r264578 - in user/des/fbp/root: poll static
Dag-Erling Smørgrav
des at FreeBSD.org
Thu Apr 17 00:31:55 UTC 2014
Author: des
Date: Thu Apr 17 00:31:54 2014
New Revision: 264578
URL: http://svnweb.freebsd.org/changeset/base/264578
Log:
CSS improvements + disable controls when the poll is not active.
Modified:
user/des/fbp/root/poll/review.tt
user/des/fbp/root/poll/see.tt
user/des/fbp/root/poll/vote.tt
user/des/fbp/root/static/fbp.css
Modified: user/des/fbp/root/poll/review.tt
==============================================================================
--- user/des/fbp/root/poll/review.tt Thu Apr 17 00:31:20 2014 (r264577)
+++ user/des/fbp/root/poll/review.tt Thu Apr 17 00:31:54 2014 (r264578)
@@ -4,35 +4,38 @@
[% PROCESS lib/header %]
[% WRAPPER lib/main %]
+<div class="review">
+<div class="wiki synopsis">
+[% poll.synopsis | wiki %]
+</div>
[% IF error %]
<div class="error">
<p>[% error | html %]</p>
</div>
[% ELSE %]
-<div class="review">
<p>You have selected valid answers to all questions in the poll.</p>
- [% FOREACH question IN poll.questions %]
- [% qid = question.id %]
+[% END %]
+[% FOREACH question IN poll.questions %]
+[% qid = question.id %]
<div class="short">
- [% question.short | wiki %]
+[% question.short | wiki %]
</div>
- [% IF question.max_options == 1 %]
+[% IF question.max_options == 1 %]
<p>You answered: <span class="answer">[% answers.$qid.0.label | html %]</span></p>
- [% ELSE %]
+[% ELSE %]
<p>You answered:</p>
<ul>
- [% FOREACH option IN answers.$qid %]
+[% FOREACH option IN answers.$qid %]
<li class="answer">[% option.label %]</li>
- [% END %]
+[% END %]
</ul>
- [% END %]
- [% END %]
+[% END %]
+[% END %]
<form action="">
<input type="submit" name="return" value="Return to the questions"/>
-<input type="submit" name="confirm" value="Submit my vote"/>
+<input type="submit" name="confirm" value="Submit my vote"[% IF !poll.active %] disabled="disabled"[% END %]/>
</form>
</div>
-[% END %]
[% END %]
[% PROCESS lib/footer %]
Modified: user/des/fbp/root/poll/see.tt
==============================================================================
--- user/des/fbp/root/poll/see.tt Thu Apr 17 00:31:20 2014 (r264577)
+++ user/des/fbp/root/poll/see.tt Thu Apr 17 00:31:54 2014 (r264578)
@@ -5,10 +5,10 @@
[% WRAPPER lib/main %]
<div class="poll">
-<div class="synopsis">
+<div class="wiki synopsis">
[% poll.synopsis | wiki %]
</div>
-<div class="long">
+<div class="wiki long">
[% poll.long | wiki %]
</div>
<div class="question-link">
Modified: user/des/fbp/root/poll/vote.tt
==============================================================================
--- user/des/fbp/root/poll/vote.tt Thu Apr 17 00:31:20 2014 (r264577)
+++ user/des/fbp/root/poll/vote.tt Thu Apr 17 00:31:54 2014 (r264578)
@@ -3,20 +3,23 @@
[% PROCESS lib/header %]
[% WRAPPER lib/main %]
+<div class="question">
+<div class="wiki synopsis">
+[% poll.synopsis | wiki %]
+</div>
[% IF error %]
<div class="error">
<p>[% error | html %]</p>
</div>
[% END %]
-<div class="question">
-<form method="POST" action="">
-<input type="hidden" name="qid" value="[% question.id %]"/>
-<div class="short">
+<div class="wiki short">
[% question.short | wiki %]
</div>
-<div class="long">
+<div class="wiki long">
[% question.long | wiki %]
</div>
+<form method="POST" action="">
+<input type="hidden" name="qid" value="[% question.id %]"/>
<div class="options">
[% IF question.max_options == 1 %]
[% itype = 'radio' %]
@@ -26,7 +29,7 @@
[% FOREACH option = question.options %]
[% oid = option.id %]
<div class="option">
-<input type="[% itype %]" name="answer" value="[% oid %]"[% IF answer.$oid %] checked="checked"[% END %]>[% option.label | html %]</input>
+<input type="[% itype %]" name="answer" value="[% oid %]"[% IF answer.$oid %] checked="checked"[% END %][% IF !poll.active %] disabled="disabled"[% END %]>[% option.label | html %]</input>
</div>
[% END %]
<input type="submit" name="prev" value="Previous question"[% IF !question.prev %]disabled="disabled"[% END %]/>
Modified: user/des/fbp/root/static/fbp.css
==============================================================================
--- user/des/fbp/root/static/fbp.css Thu Apr 17 00:31:20 2014 (r264577)
+++ user/des/fbp/root/static/fbp.css Thu Apr 17 00:31:54 2014 (r264578)
@@ -175,13 +175,50 @@ th {
}
.poll .long {
- margin-left: 2ex;
}
/*
- * Voting
+ * Question
*/
-.vote .votebox {
- width: 2ex;
- text-align: center;
+.question .synopsis {
+}
+
+.question .short {
+ font-size: large;
+}
+
+.question .long {
+}
+
+/*
+ * Review
+ */
+.review .answer {
+ font-weight: bold;
+}
+
+/*
+ * Wiki text
+ */
+.wiki {
+}
+
+.wiki h1 {
+ font-size: 120%;
+ font-weight: bold;
+}
+
+.wiki h2 {
+ font-size: 110%;
+ font-weight: bold;
+}
+
+.wiki h3 {
+ font-size: 100%;
+ font-style: italic;
+}
+
+.wiki code {
+ font-family: monospace;
+ font-size: 90%;
}
More information about the svn-src-user
mailing list