projects
/
selectricity
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
adfcf4d
)
cleaned up minor issues from testing embeddable code
author
<mako@atdot.cc>
<>
Tue, 19 Feb 2008 14:56:54 +0000
(09:56 -0500)
committer
<mako@atdot.cc>
<>
Tue, 19 Feb 2008 14:56:54 +0000
(09:56 -0500)
app/views/election/general_information.rhtml
patch
|
blob
|
history
app/views/election/show.rhtml
patch
|
blob
|
history
app/views/embed/full_vote.rhtml
patch
|
blob
|
history
app/views/embed/results.rhtml
patch
|
blob
|
history
public/stylesheets/main.css
patch
|
blob
|
history
diff --git
a/app/views/election/general_information.rhtml
b/app/views/election/general_information.rhtml
index dd1271c8febcbd94dd916b06ecd372864ddb1ee2..1eae59feeaa25dd78f7d0cd745f33303796d7311 100644
(file)
--- a/
app/views/election/general_information.rhtml
+++ b/
app/views/election/general_information.rhtml
@@
-5,6
+5,6
@@
<% form_tag (:action => 'create_election') do %>
<%= render :partial => 'overview_form' %>
<% form_tag (:action => 'create_election') do %>
<%= render :partial => 'overview_form' %>
- <%= submit_tag "
Done!
" %>
+ <%= submit_tag "
Proceed to Next Step
" %>
<% end %>
<% end %>
diff --git
a/app/views/election/show.rhtml
b/app/views/election/show.rhtml
index 87529d18c1c41633fcff130b10e5b83c0b881534..fe522aac6214b8ae11a925820da466ffc54d01cb 100644
(file)
--- a/
app/views/election/show.rhtml
+++ b/
app/views/election/show.rhtml
@@
-132,8
+132,7
@@
<p>To embed your election, copy and paste the following code into your
homepage:</p>
<p>To embed your election, copy and paste the following code into your
homepage:</p>
-<blockquote>
-<tt><pre><%= h("<iframe src='") + votepassword_url(:urlpassword => "open." + @election.id.to_s) + h("'") + "<br />" + h(" width='330px' height='370px'></iframe>") %></pre></tt>
-</blockquote>
+<pre><%= h("<iframe src='") + votepassword_url(:urlpassword => "open." + @election.id.to_s, :embed => "true") + h("' width='330px' height='370px'>") %>
+<%= h("</iframe>") %></pre>
<% end %>
<% end %>
diff --git
a/app/views/embed/full_vote.rhtml
b/app/views/embed/full_vote.rhtml
index 70a6825283a5fad7993e1e9de25eb462e1de8aa7..170b1f55c42ebbda23f70981002b21468e9906ac 100644
(file)
--- a/
app/views/embed/full_vote.rhtml
+++ b/
app/views/embed/full_vote.rhtml
@@
-1,6
+1,6
@@
<div id="header">
<div id="header">
-<
img id="header_icon" src="/images/embed_header_icon.png" />
-<h2>Vote Now</h2>
+<
%= link_to '<img id="header_icon" src="/images/embed_header_icon.png" />',
+
{:controller => 'front'}, {:target => "_parent"} %>
<h2>Vote Now</h2>
</div>
<div id="voting-box">
</div>
<div id="voting-box">
@@
-25,7
+25,7
@@
<div id="voting-bottom">
<div id="container">
<a href="<%= url_for :action => :confirm, :id => @password, :embed => 'true' %>"><h2 id="submit_vote_button">Submit Vote</h2></a>
<div id="voting-bottom">
<div id="container">
<a href="<%= url_for :action => :confirm, :id => @password, :embed => 'true' %>"><h2 id="submit_vote_button">Submit Vote</h2></a>
- <p><b>Drag and drop</b> to rank
your favorite videos
</p>
+ <p><b>Drag and drop</b> to rank
the choices.
</p>
</div>
</div>
</div>
</div>
</div>
</div>
diff --git
a/app/views/embed/results.rhtml
b/app/views/embed/results.rhtml
index b9b1eb48260ddc11553858d13c88ad92ba41af26..dea9b61a18ff5b2f0a249bd2a7c15e2dc10b2072 100644
(file)
--- a/
app/views/embed/results.rhtml
+++ b/
app/views/embed/results.rhtml
@@
-1,5
+1,6
@@
<div id="header">
<div id="header">
-<img id="header_icon" src="/images/embed_header_icon.png" />
+<%= link_to '<img id="header_icon" src="/images/embed_header_icon.png" />',
+ {:controller => 'front'}, {:target => "_parent"} %>
<h2>Current Standings</h2>
</div>
<div id="voting-box">
<h2>Current Standings</h2>
</div>
<div id="voting-box">
diff --git
a/public/stylesheets/main.css
b/public/stylesheets/main.css
index 1ac598a690632ed6400287698997628574713c22..acb8bb294f85eb1d04449a76a84f71ce1b754a18 100644
(file)
--- a/
public/stylesheets/main.css
+++ b/
public/stylesheets/main.css
@@
-36,6
+36,11
@@
label {
font-weight: bold;
}
font-weight: bold;
}
+pre {
+ font-family: monospace;
+ overflow: scroll;
+ background: #d9d9d9;
+}
/* Left column. Includes logo, poll information, and graph. */
/* Left column. Includes logo, poll information, and graph. */
Benjamin Mako Hill
||
Want to submit a patch?