Author: buildbot
Date: Mon Oct 12 15:43:44 2015
New Revision: 968639
Log:
Staging update by buildbot for steve
Modified:
websites/staging/steve/trunk/content/ (props changed)
websites/staging/steve/trunk/content/vote_types.html
Propchange: websites/staging/steve/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Oct 12 15:43:44 2015
@@ -1 +1 @@
-1708141
+1708143
Modified: websites/staging/steve/trunk/content/vote_types.html
==============================================================================
--- websites/staging/steve/trunk/content/vote_types.html (original)
+++ websites/staging/steve/trunk/content/vote_types.html Mon Oct 12 15:43:44
2015
@@ -1,7 +1,119 @@
-{% extends "skeleton.html" %}
+<!DOCTYPE html>
+<html lang="en">
+<head>
-{% block title %}Apache STeVe{% endblock %}
-{% block content %}
+ <meta charset="utf-8">
+ <title>Apache STeVe</title>
+ <meta name="description" content="">
+ <meta name="author" content="">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+ <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
+ <!--[if lt IE 9]>
+ <script src="http://html5shim.googlecode.com/svn/trunk/html5.js";></script>
+ <![endif]-->
+
+ <!-- Le styles -->
+ <link href="./resources/css/bootstrap.css" rel="stylesheet">
+ <link href="./resources/css/main.css" rel="stylesheet">
+
+ <!-- Le fav and touch icons -->
+ <link rel="shortcut icon" href="./resources/images/favicon.ico">
+ <link rel="apple-touch-icon" href="./resources/images/apple-touch-icon.png">
+ <link rel="apple-touch-icon" sizes="72x72"
href="./resources/images/apple-touch-icon-72x72.png">
+ <link rel="apple-touch-icon" sizes="114x114"
href="./resources/images/apple-touch-icon-114x114.png">
+
+ <script src="./resources/js/main.js"></script>
+
+ <script type="text/javascript">
+
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-FIXME-1']);
+ _gaq.push(['_setDomainName', 'apache.org']);
+ _gaq.push(['_trackPageview']);
+
+ (function ()
+ {
+ var ga = document.createElement('script');
+ ga.type = 'text/javascript';
+ ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' :
'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0];
+ s.parentNode.insertBefore(ga, s);
+ })();
+
+ </script>
+
+ <script type="text/javascript">
+ function fbshare () {
+ window.open(
+ "http://www.facebook.com/sharer/sharer.php?u="+document.URL,
+ 'Share on Facebook',
+ 'width=640,height=426');
+ };
+ function gpshare () {
+ window.open(
+ "https://plus.google.com/share?url="+document.URL,
+ 'Share on Google+',
+ 'width=584,height=385');
+ };
+ function twshare () {
+ window.open(
+ "https://twitter.com/intent/tweet?url="+document.URL+"&text=";,
+ 'Share on Twitter',
+ 'width=800,height=526');
+ };
+ </script>
+</head>
+
+<body class="steve">
+<div id="wrap">
+
+ <header class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+ <div class="container">
+ <div class="navbar-header">
+ <button type="button" class="navbar-toggle" data-toggle="collapse"
data-target=".navbar-collapse">
+ <span class="sr-only">Toggle navigation</span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ <a class="navbar-brand" href="./index.html">Apache STeVe</a>
+ </div>
+ <div class="navbar-collapse collapse">
+ <ul class="nav navbar-nav">
+ <li class="dropdown">
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">Apache
<b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <li><a href="http://www.apache.org";>Apache Home</a></li>
+ <li><a href="./misc/contact.html">Contact</a></li>
+ <li><a href="./misc/legal.html">Legal</a></li>
+ <li><a
href="http://www.apache.org/foundation/sponsorship.html";>Sponsorship</a></li>
+ <li><a
href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li>
+ </ul>
+ </li>
+ <li><a href="./index.html">Home</a></li>
+ <li><a href="./downloads.html">Downloads</a></li>
+ <li><a href="./documentation.html">Documentation</a></li>
+ <li><a href="./support.html">Support</a></li>
+ <li><a href="./demo.html">Try it out</a></li>
+ </ul>
+ <!-- Google CSE Search Box Begins -->
+ <form class="navbar-form navbar-right" role="form"
id="searchbox_015652626304508016898:osdr2lxru7s"
action="http://www.google.com/cse";>
+ <input type="hidden" name="cx"
value="015652626304508016898:osdr2lxru7s">
+ <input type="hidden" name="cof" value="FORID:0">
+
+ <div class="form-group">
+ <input name="q" type="text" placeholder="Search"
class="form-control input-sm">
+ </div>
+ </form>
+ </div>
+ </div>
+ </header>
+
+ <div class="container">
+
+
<h1>Apache STeVe Vote Types</h1>
@@ -13,4 +125,50 @@
Please see the <a
href="https://en.wikipedia.org/wiki/Single_transferable_vote#Voting";>Wikipedia
article on STV voting</a> for more insight into how STV works.
-{% endblock %}
+
+
+ <div id="edit" class="modal fade" tabindex="-1" role="dialog">
+ <div class="modal-dialog">
+ <div class="modal-content">
+ <div class="modal-header">
+ <a class="close" data-dismiss="modal">x</a>
+
+ <h3>Thank you for contributing to the documention!</h3>
+ </div>
+ <div class="modal-body">
+ <h4>Any help with the documentation is greatly appreciated.</h4>
+
+ <p>All edits are reviewed before going live, so feel free to do
much more than fix typos or links. If you see a page that could benefit from an
entire rewrite, we'd be thrilled to review it. Don't be surprised if we like it
so much we ask you for help with other pages :)</p>
+ <small>NOTICE: unless indicated otherwise on the pages in
question, all editable content available from apache.org is presumed to be
licensed under the Apache License (AL) version 2.0 and hence all submissions to
apache.org treated as formal Contributions under the license terms.</small>
+ <!--[if gt IE 6]>
+ <h4>Internet Explorer Users</h4>
+ <p>If you are not an Apache committer, click the Yes link and
enter a <i>anonymous</i> for the username and leave the password empty</p>
+ <![endif]-->
+
+ </div>
+ <div class="modal-footer">
+ Do you have an Apache ID?
+ <a
href="javascript:void(location.href='https://cms.apache.org/redirect?uri='+escape(location.href))"
class="btn">Yes</a>
+ <a
href="javascript:void(location.href='https://anonymous:@cms.apache.org/redirect?uri='+escape(location.href))"
class="btn">No</a>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+
+<div id="footer">
+ <div class="container">
+ <small class="text-muted small">
+ Copyright © 2013-2015 <a href="http://apache.org";>Apache Software
Foundation</a>, Licensed under the <a
href="http://www.apache.org/licenses/LICENSE-2.0";>Apache License, Version
2.0</a> | <a href="./privacy-policy.html">Privacy Policy</a><br>
+ Apache STeVe, Apache, the Apache feather logo, and the Apache STeVe
project logo are trademarks of The Apache Software Foundation.
+ All other marks mentioned may be trademarks or registered trademarks of
their respective owners.</small>
+ </div>
+</div>
+
+<script src="./resources/js/jquery-1.10.2.min.js"></script>
+<script src="./resources/js/bootstrap.js"></script>
+
+</body>
+</html>
