From: <mako@atdot.cc>
Date: Wed, 29 Aug 2007 13:05:03 +0000 (-0400)
Subject: changed images on the front page and added new headings
X-Git-Url: https://projects.mako.cc/source/selectricity/commitdiff_plain/cf61519ba2f371181958d4aeb7f5f19384453187

changed images on the front page and added new headings
---

diff --git a/app/views/quickvote/_advanced.rhtml b/app/views/quickvote/_advanced.rhtml
index 609e84a..d8228cf 100644
--- a/app/views/quickvote/_advanced.rhtml
+++ b/app/views/quickvote/_advanced.rhtml
@@ -1,14 +1,14 @@
 <% fields_for 'quickvote', quickvote do |quickform| %>
 
-<h3><label for="quickvote_election_method">Election Method</label></h3>
+<p><label for="quickvote_election_method">Election Method</label></p>
 
 <p><%= quickform.select('election_method', 
     %w(ssd condorcet plurality approval borda) ) %></p>
 
-<h3><label for="quickvote_enddate">End Time</label></h3>
+<p><label for="quickvote_enddate">End Time</label></p>
 <p><%= quickform.date_select(:enddate, :start_year => Time.now.year) %></p>
 
-<h3>Visibility</h3>
+<p>Visibility</p>
 
 <p>Do you want the results to be visible while the election is active?</p>
 
@@ -16,7 +16,7 @@
 No  <%= quickform.radio_button(:viewable, 0)%></p>
 
 <% if session[:user] %>
-<h3>Notification</h3>
+<p>Notification</p>
 
 <p>Would you like to be e-mailed when this QuickVote concludes?</p>
 
diff --git a/app/views/quickvote/create.rhtml b/app/views/quickvote/create.rhtml
index 57df1ed..b1b6004 100644
--- a/app/views/quickvote/create.rhtml
+++ b/app/views/quickvote/create.rhtml
@@ -1,8 +1,35 @@
-<h2>Create QuickVote</h2>
+<div id="voters-title">
+	<span class="header">Title</span>
+	<span class="subheader">Subtitle</span>
+	<div style="clear:both;"></div>
+</div>
+
+<div id="controlroom-title">
+	<span class="header">Title</span>
+	<span class="subheader">Subtitle</span>
+	<div style="clear:both;"></div>
+</div>
+
+<div id="quickvote-title">
+	<span class="header">Quickvote</span>
+	<span class="subheader"></span>
+	<div style="clear:both;"></div>
+</div>
 
 <%= error_messages_for 'quickvote' %>
 
-<h3><label for="quickvote_candidate_names">Choices</h3>
+<span class="header">Header</span>
+<span class="subheader">Subheader</span>
+<div style="clear:both;"></div>
+
+<span class="header">Header</span>
+<span class="subheader"></span>
+<div style="clear:both;"></div>
+
+<span class="header">Header</span>
+<div style="clear:both;"></div>
+
+<p><label for="quickvote_candidate_names">Choices</p>
 
 <!-- the list of candidates -->
 <div id="candidate_names">
@@ -12,13 +39,13 @@
 <% form_tag(:action => 'create') do %>
 <!--[form:election]-->
 
-<h3><label for="quickvote_name">One Word Description (for URL)</label></h3>
+<p><label for="quickvote_name">One Word Description (for URL)</label></p>
 
 <p><em><font size="-1">required; 5-12 characters; only letters and numbers; no spaces</font></em></p>
 
 <p><%= text_field 'quickvote', 'name', :size => 15, :maxsize => 12  %></p>
 
-<h3><label for="quickvote_description">Description</label></h3>
+<p><label for="quickvote_description">Description</label></p>
 
 <p><font size="-1">required; one line summary on the first line</font></em><br/>
 
diff --git a/public/images/bg_quickvotes.png b/public/images/bg_quickvotes.png
index fd844ec..53e3c21 100644
Binary files a/public/images/bg_quickvotes.png and b/public/images/bg_quickvotes.png differ
diff --git a/public/images/bg_voters.png b/public/images/bg_voters.png
index 8901917..c7da281 100644
Binary files a/public/images/bg_voters.png and b/public/images/bg_voters.png differ
diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css
index ca71d76..185b48a 100644
--- a/public/stylesheets/main.css
+++ b/public/stylesheets/main.css
@@ -24,6 +24,13 @@ h3 {
 	margin: 0 0 1em 0 !important;
 }
 
+.special {
+	background-color: #999999;
+	color: white;
+	text-align: center;
+	pading: 0 1em 0 1em;
+}
+
 
 /* Left column. Includes logo, poll information, and graph. */
  
@@ -140,7 +147,59 @@ h5 {
 	overflow: hidden;
 }
 
+#quickvote-title .header {
+	background-color: #74ce00;
+}
+
+#quickvote-title .subheader {
+	color: #74ce00;
+	background-color: #e5e5e5;
+}
 
+#controlroom-title .header {
+	background-color: #dc0d13;
+}
+
+#controlroom-title .subheader {
+	color: #dc0d13;
+	background-color: #e5e5e5;
+}
+
+#voters-title .header {
+	background-color: #005cd9;
+}
+
+#voters-title .subheader {
+	color: #005cd9;
+	background-color: #e5e5e5;
+}
+
+.header {
+	display: block;
+	font-family: "trebuchet ms",trebuchet,verdana,arial,sans-serif;
+	font-size:30px;
+	text-transform: uppercase;
+	text-align: center;
+	color: white;
+	background-color: #999999;
+	height: 32px;
+	float: left;
+	padding: 0px .75em 0px .75em;
+	margin-right: 10px;
+	margin-bottom: 14px;
+}
+
+.subheader {
+	display: block;
+	font-family: "trebuchet ms",trebuchet,verdana,arial,sans-serif;
+	font-size: 18px;
+	text-align: left;
+	color: #666666;
+	background-color: #CCCCCC;
+	height: 26px;
+	padding: 6px 1em 0px 20px;
+	margin-bottom: 14px;
+}
 
 #main-box {
 	float: right;