#5: Sorting out merge horror
This commit is contained in:
commit
3795f4e0fe
109 changed files with 3648 additions and 1436 deletions
54
resources/templates/app.html
Normal file
54
resources/templates/app.html
Normal file
|
|
@ -0,0 +1,54 @@
|
|||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<link rel="stylesheet" type="text/css" href="css/yyy-common.css" />
|
||||
<link rel="stylesheet" type="text/css" href="css/yyy-app.css" />
|
||||
<link rel="stylesheet" type="text/css" href="css/spinner.css" />
|
||||
<link href="https://fonts.googleapis.com/css?family=Archivo+Black|Archivo+Narrow" rel="stylesheet"/>
|
||||
<title>You Yes Yet?</title>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<div id="app">
|
||||
<div class="splash-screen">
|
||||
<div class="sk-fading-circle">
|
||||
<div class="sk-circle1 sk-circle"></div>
|
||||
<div class="sk-circle2 sk-circle"></div>
|
||||
<div class="sk-circle3 sk-circle"></div>
|
||||
<div class="sk-circle4 sk-circle"></div>
|
||||
<div class="sk-circle5 sk-circle"></div>
|
||||
<div class="sk-circle6 sk-circle"></div>
|
||||
<div class="sk-circle7 sk-circle"></div>
|
||||
<div class="sk-circle8 sk-circle"></div>
|
||||
<div class="sk-circle9 sk-circle"></div>
|
||||
<div class="sk-circle10 sk-circle"></div>
|
||||
<div class="sk-circle11 sk-circle"></div>
|
||||
<div class="sk-circle12 sk-circle"></div>
|
||||
</div>
|
||||
</div>
|
||||
<p class="footer">
|
||||
You Yes Yet is loading.
|
||||
You must enable JavaScript to use the You Yes Yet app.
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<!-- scripts and styles -->
|
||||
<!-- ATTENTION \/ -->
|
||||
<!-- Leaflet -->
|
||||
<link rel="stylesheet" href="vendor/leaflet/dist/leaflet.css" />
|
||||
<script src="vendor/leaflet/dist/leaflet.js"></script>
|
||||
<!-- ATTENTION /\ -->
|
||||
|
||||
<script type="text/javascript">
|
||||
var context = "{{servlet-context}}";
|
||||
var csrfToken = "{{csrf-token}}";
|
||||
</script>
|
||||
{% script "/js/app.js" %}
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -6,13 +6,10 @@
|
|||
<link rel="stylesheet" type="text/css" href="css/yyy-static.css" />
|
||||
<link rel="stylesheet" type="text/css" href="css/spinner.css" />
|
||||
<link href="https://fonts.googleapis.com/css?family=Archivo+Black|Archivo+Narrow" rel="stylesheet"/>
|
||||
<title>{% block title %}{% endblock %}{{title}}</title>
|
||||
<title>{{title}}</title>
|
||||
</head>
|
||||
<body>
|
||||
<header>
|
||||
<div id="canvasser">
|
||||
You are logged in as {{username}}
|
||||
</div>
|
||||
<div id="nav">
|
||||
<img id="nav-icon" src="img/threelines.png" alt="Menu"/>
|
||||
<menu id="nav-menu" class="nav">
|
||||
|
|
@ -25,47 +22,18 @@
|
|||
</div>
|
||||
|
||||
<h1>
|
||||
{% block title %}
|
||||
{% endblock %}
|
||||
{{title}}
|
||||
</h1>
|
||||
</header>
|
||||
|
||||
<div id="main-container" class="container">
|
||||
<div id="big-links">
|
||||
{% block big-links %}
|
||||
{% endblock %}
|
||||
{{big-links}}
|
||||
</div>
|
||||
<div if="#content">
|
||||
{{content}}
|
||||
</div>
|
||||
<div id="back-link-container">
|
||||
<a href="javascript:history.back()" id="back-link">Back</a>
|
||||
</div>
|
||||
<div id="logout-link-container">
|
||||
<a href="logout" id="back-link">Logout</a>
|
||||
</div>
|
||||
</div>
|
||||
<footer>
|
||||
<div id="credits">
|
||||
<div>
|
||||
<img src="img/ric-logo.png" width="24" height="24"/>
|
||||
A project of the
|
||||
<a href="https://radical.scot/">Radical Independence Campaign</a> ||
|
||||
Version {{version}}
|
||||
</div>
|
||||
<div>
|
||||
<img height="16" width="16" alt="Clojure" src="img/luminus-logo.png"/>Built with <a href="http://www.luminusweb.net/">LuminusWeb</a> ||
|
||||
<img height="16" width="16" alt="Clojure" src="img/clojure-icon.gif"/> Powered by <a href="http://clojure.org">Clojure</a> ||
|
||||
<img height="16" width="16" alt="GitHub" src="img/github-logo-transparent.png"/>Find me/fork me on <a href="https://github.com/simon-brooke/smeagol">Github</a> ||
|
||||
<img height="16" width="16" alt="Free Software Foundation" src="img/gnu.small.png"/>Licensed under the <a href="http://www.gnu.org/licenses/gpl-2.0.html">GNU General Public License version 2.0</a>
|
||||
</div>
|
||||
</div>
|
||||
</footer>
|
||||
<script type="text/javascript">
|
||||
var context = "{{servlet-context}}";
|
||||
var csrfToken = "{{csrf-token}}";
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
|
|
|||
|
|
@ -37,16 +37,16 @@
|
|||
<footer>
|
||||
<div id="credits">
|
||||
<div>
|
||||
<img src="img/ric-logo.png" width="24" height="24"/>
|
||||
<img src="img/credits/ric-logo.png" width="24" height="24"/>
|
||||
A project of the
|
||||
<a href="https://radical.scot/">Radical Independence Campaign</a> ||
|
||||
Version {{version}}
|
||||
</div>
|
||||
<div>
|
||||
<img height="16" width="16" alt="Clojure" src="img/luminus-logo.png"/>Built with <a href="http://www.luminusweb.net/">LuminusWeb</a> ||
|
||||
<img height="16" width="16" alt="Clojure" src="img/clojure-icon.gif"/> Powered by <a href="http://clojure.org">Clojure</a> ||
|
||||
<img height="16" width="16" alt="GitHub" src="img/github-logo-transparent.png"/>Find me/fork me on <a href="https://github.com/simon-brooke/smeagol">Github</a> ||
|
||||
<img height="16" width="16" alt="Free Software Foundation" src="img/gnu.small.png"/>Licensed under the <a href="http://www.gnu.org/licenses/gpl-2.0.html">GNU General Public License version 2.0</a>
|
||||
<img height="16" width="16" alt="Clojure" src="img/credits/luminus-logo.png"/>Built with <a href="http://www.luminusweb.net/">LuminusWeb</a> ||
|
||||
<img height="16" width="16" alt="Clojure" src="img/credits/clojure-icon.gif"/> Powered by <a href="http://clojure.org">Clojure</a> ||
|
||||
<img height="16" width="16" alt="GitHub" src="img/credits/github-logo-transparent.png"/>Find me/fork me on <a href="https://github.com/simon-brooke/smeagol">Github</a> ||
|
||||
<img height="16" width="16" alt="Free Software Foundation" src="img/credits/gnu.small.png"/>Licensed under the <a href="http://www.gnu.org/licenses/gpl-2.0.html">GNU General Public License version 2.0</a>
|
||||
</div>
|
||||
</div>
|
||||
</footer>
|
||||
|
|
|
|||
41
resources/templates/call-me-accepted.html
Normal file
41
resources/templates/call-me-accepted.html
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
{% extends "base-unauthenticated.html" %}
|
||||
{% block big-links %}
|
||||
<div id="back-link-container">
|
||||
<a href="javascript:history.back()" id="back-link">Back</a>
|
||||
</div>
|
||||
<div class="big-link-container">
|
||||
<a href="library" class="big-link" id="library-link">Browse the issues</a>
|
||||
</div>
|
||||
{% endblock %}
|
||||
{% block content %}
|
||||
<p>
|
||||
Thank you, {{name}}. Someone will call you shortly on {{phone}} to talk to you about
|
||||
{{concern}}.
|
||||
</p>
|
||||
<form action="call-me" method="post">
|
||||
<p class="widget">
|
||||
<label for="name">Your name</label>
|
||||
<input type="text" id="name" name="name"/>
|
||||
</p>
|
||||
<p class="widget">
|
||||
<label for="postcode">Your post-code</label>
|
||||
<input type="text" id="postcode" name="postcode"/>
|
||||
</p>
|
||||
<p class="widget">
|
||||
<label for="phone">Your phone number</label>
|
||||
<input type="text" id="phone" name="phone"/>
|
||||
</p>
|
||||
<p class="widget">
|
||||
<label for="concern">Your concerns</label>
|
||||
<select name="concern" id="concern">
|
||||
{% for concern in concerns %}
|
||||
<option>{{concern.title}}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
</p>
|
||||
<p class="widget">
|
||||
<label for="submit"> </label>
|
||||
<input name="submit" id="submit" type="submit" class="action" value="Call me!"/>
|
||||
</p>
|
||||
</form>
|
||||
{% endblock %}
|
||||
37
resources/templates/call-me.html
Normal file
37
resources/templates/call-me.html
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
{% extends "base-unauthenticated.html" %}
|
||||
{% block big-links %}
|
||||
<div id="back-link-container">
|
||||
<a href="javascript:history.back()" id="back-link">Back</a>
|
||||
</div>
|
||||
{% endblock %}
|
||||
{% block content %}
|
||||
<p>
|
||||
Use this form to request someone to phone you to discuss your concerns about independence.
|
||||
</p>
|
||||
<form action="call-me" method="post">
|
||||
<p class="widget">
|
||||
<label for="name">Your name</label>
|
||||
<input type="text" id="name" name="name"/>
|
||||
</p>
|
||||
<p class="widget">
|
||||
<label for="postcode">Your post-code</label>
|
||||
<input type="text" id="postcode" name="postcode"/>
|
||||
</p>
|
||||
<p class="widget">
|
||||
<label for="phone">Your phone number</label>
|
||||
<input type="text" id="phone" name="phone"/>
|
||||
</p>
|
||||
<p class="widget">
|
||||
<label for="concern">Your concerns</label>
|
||||
<select name="concern" id="concern">
|
||||
{% for concern in concerns %}
|
||||
<option>{{concern.title}}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
</p>
|
||||
<p class="widget">
|
||||
<label for="submit"> </label>
|
||||
<input name="submit" id="submit" type="submit" class="action" value="Call me!"/>
|
||||
</p>
|
||||
</form>
|
||||
{% endblock %}
|
||||
|
|
@ -1,53 +1,9 @@
|
|||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<link rel="stylesheet" type="text/css" href="css/yyy-static.css" />
|
||||
<link rel="stylesheet" type="text/css" href="css/spinner.css" />
|
||||
<link href="https://fonts.googleapis.com/css?family=Archivo+Black|Archivo+Narrow" rel="stylesheet"/>
|
||||
<title>You Yes Yet?</title>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<div id="app">
|
||||
<div class="splash-screen">
|
||||
<div class="sk-fading-circle">
|
||||
<div class="sk-circle1 sk-circle"></div>
|
||||
<div class="sk-circle2 sk-circle"></div>
|
||||
<div class="sk-circle3 sk-circle"></div>
|
||||
<div class="sk-circle4 sk-circle"></div>
|
||||
<div class="sk-circle5 sk-circle"></div>
|
||||
<div class="sk-circle6 sk-circle"></div>
|
||||
<div class="sk-circle7 sk-circle"></div>
|
||||
<div class="sk-circle8 sk-circle"></div>
|
||||
<div class="sk-circle9 sk-circle"></div>
|
||||
<div class="sk-circle10 sk-circle"></div>
|
||||
<div class="sk-circle11 sk-circle"></div>
|
||||
<div class="sk-circle12 sk-circle"></div>
|
||||
</div>
|
||||
{% extends "base-unauthenticated.html" %}
|
||||
{% block big-links %}
|
||||
<div class="big-link-container">
|
||||
<a href="supporter" class="big-link" id="yes-link">Yes</a>
|
||||
</div>
|
||||
<p class="footer">
|
||||
You Yes Yet is loading.
|
||||
You must enable JavaScript to use the You Yes Yet app.
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<!-- scripts and styles -->
|
||||
<!-- ATTENTION \/ -->
|
||||
<!-- Leaflet -->
|
||||
<link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7.3/leaflet.css" />
|
||||
<script src="http://cdn.leafletjs.com/leaflet-0.7.3/leaflet.js"></script>
|
||||
<!-- ATTENTION /\ -->
|
||||
|
||||
<script type="text/javascript">
|
||||
var context = "{{servlet-context}}";
|
||||
var csrfToken = "{{csrf-token}}";
|
||||
</script>
|
||||
{% script "/js/app.js" %}
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="big-link-container">
|
||||
<a href="notyet" class="big-link" id="not-yet-link">No</a>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
|
|
|||
27
resources/templates/login.html
Normal file
27
resources/templates/login.html
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
{% extends "base-unauthenticated.html" %}
|
||||
{% block big-links %}
|
||||
<div id="back-link-container">
|
||||
<a href="javascript:history.back()" id="back-link">Back</a>
|
||||
</div>
|
||||
{% endblock %}
|
||||
{% block content %}
|
||||
<p>
|
||||
We're not going to do login in the long term; we're going to use oauth.
|
||||
This is a temporary login form.
|
||||
</p>
|
||||
<form action="auth" method="post">
|
||||
{% csrf-field %}
|
||||
<p class="widget">
|
||||
<label for="username">Username</label>
|
||||
<input type="text" id="username" name="username"/>
|
||||
</p>
|
||||
<p class="widget">
|
||||
<label for="password">Your password</label>
|
||||
<input type="password" id="password" name="password"/>
|
||||
</p>
|
||||
<p class="widget">
|
||||
<label for="submit"> </label>
|
||||
<input name="submit" id="submit" type="submit" class="action" value="Log in!"/>
|
||||
</p>
|
||||
</form>
|
||||
{% endblock %}
|
||||
12
resources/templates/notyet.html
Normal file
12
resources/templates/notyet.html
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
{% extends "base-unauthenticated.html" %}
|
||||
{% block big-links %}
|
||||
<div id="back-link-container">
|
||||
<a href="javascript:history.back()" id="back-link">Back</a>
|
||||
</div>
|
||||
<div class="big-link-container">
|
||||
<a href="library" class="big-link" id="library-link">Browse the issues</a>
|
||||
</div>
|
||||
<div class="big-link-container">
|
||||
<a href="call-me" class="big-link" id="call-me-link">Get us to talk to you</a>
|
||||
</div>
|
||||
{% endblock %}
|
||||
12
resources/templates/supporter.html
Normal file
12
resources/templates/supporter.html
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
{% extends "base-unauthenticated.html" %}
|
||||
{% block big-links %}
|
||||
<div id="back-link-container">
|
||||
<a href="javascript:history.back()" id="back-link">Back</a>
|
||||
</div>
|
||||
<div class="big-link-container">
|
||||
<a href="auth" class="big-link" id="yes-link">Yes</a>
|
||||
</div>
|
||||
<div class="big-link-container">
|
||||
<a href="register" class="big-link" id="signup-link">No</a>
|
||||
</div>
|
||||
{% endblock %}
|
||||
Loading…
Add table
Add a link
Reference in a new issue