svn commit: r1668468 - in /steve/trunk/pytest: httpd.conf steve.cfg www/htdocs/admin/edit_election.html www/htdocs/css/steve_interactive.css

[hu...@apache.org]

Author: humbedooh
Date: Sun Mar 22 19:58:38 2015
New Revision: 1668468

URL: http://svn.apache.org/r1668468
Log:
sync with disk:
- add link for tallying votes
- fix httpd conf
- fix demo config

Modified:
    steve/trunk/pytest/httpd.conf
    steve/trunk/pytest/steve.cfg
    steve/trunk/pytest/www/htdocs/admin/edit_election.html
    steve/trunk/pytest/www/htdocs/css/steve_interactive.css

Modified: steve/trunk/pytest/httpd.conf
URL: http://svn.apache.org/viewvc/steve/trunk/pytest/httpd.conf?rev=1668468&r1=1668467&r2=1668468&view=diff
==============================================================================
--- steve/trunk/pytest/httpd.conf (original)
+++ steve/trunk/pytest/httpd.conf Sun Mar 22 19:58:38 2015
@@ -1,7 +1,7 @@
 # Sample httpd configuration for Steve's Python REST API test
 # see http://stv.website/steve/voter/view/foo for an example.
 
-<VirtualHost *80>
+<VirtualHost *:80>
 DocumentRoot /home/voter/pytest/www/htdocs
 ServerName stv.website
 DirectoryIndex index.html

Modified: steve/trunk/pytest/steve.cfg
URL: http://svn.apache.org/viewvc/steve/trunk/pytest/steve.cfg?rev=1668468&r1=1668467&r2=1668468&view=diff
==============================================================================
--- steve/trunk/pytest/steve.cfg (original)
+++ steve/trunk/pytest/steve.cfg Sun Mar 22 19:58:38 2015
@@ -1,7 +1,7 @@
 [general]
 
 homedir:            /home/voter
-rooturl:            http://stv.website
+rooturl:            http://demo.stv.website
 
 [karma]
 admin:            5
@@ -10,6 +10,6 @@ monitorperson:    3
 
 
 [email]
-sender:                     no-reply@stv.website
-signature:                  Apache STEVe
+sender:                     no-reply@demo.stv.website
+signature:                  Apache STeVe
 mta:                        localhost

Modified: steve/trunk/pytest/www/htdocs/admin/edit_election.html
URL: http://svn.apache.org/viewvc/steve/trunk/pytest/www/htdocs/admin/edit_election.html?rev=1668468&r1=1668467&r2=1668468&view=diff
==============================================================================
--- steve/trunk/pytest/www/htdocs/admin/edit_election.html (original)
+++ steve/trunk/pytest/www/htdocs/admin/edit_election.html Sun Mar 22 19:58:38 2015
@@ -28,6 +28,8 @@
         <a href="javascript:void(location.href='edit_basedata.html'+document.location.search);" class="btn"><img style="vertical-align: middle;"  src="/images/icon_edit.png"/> Edit election base data</a>
         &nbsp; 
         <a href="javascript:void(peekAtElection());" class="btn-purple"><img style="vertical-align: middle;"  src="/images/icon_view.png"/> View election</a>
+        &nbsp; 
+        <a href="javascript:void(location.href='tally.html'+document.location.search);" class="btn-black"><img style="vertical-align: middle;"  src="/images/icon_view.png"/> Tally votes</a>
         <br/>
 </fieldset>
 <form>

Modified: steve/trunk/pytest/www/htdocs/css/steve_interactive.css
URL: http://svn.apache.org/viewvc/steve/trunk/pytest/www/htdocs/css/steve_interactive.css?rev=1668468&r1=1668467&r2=1668468&view=diff
==============================================================================
--- steve/trunk/pytest/www/htdocs/css/steve_interactive.css (original)
+++ steve/trunk/pytest/www/htdocs/css/steve_interactive.css Sun Mar 22 19:58:38 2015
@@ -78,6 +78,28 @@ p {
   transition: 0.3s ease;
 }
 
+.btn-black {
+  background: #888888 !important;
+  border: #bd351e solid 1px;
+  border-radius: 3px;
+  color: #fff !important;
+  display: inline-block;
+  font-weight: bold;
+  font-size: 14px;
+  padding: 4px 8px;
+  text-decoration: none;
+  text-align: center;
+  min-width: 30px;
+  position: relative;
+  transition: color .1s ease;
+  cursor: pointer;
+  margin-left: 10px;
+}
+.btn-black:hover {
+  background: #aaaaaa !important;
+  transition: 0.3s ease;
+}
+
 .btn-purple {
   background: #b532bb !important;
   border: #bd351e solid 1px;