From 9e2f91c111636fe18acee3def7c98590e76ffb2a Mon Sep 17 00:00:00 2001
From: manetta <mail@manettaberends.nl>
Date: Thu, 28 Mar 2019 16:05:53 +0100
Subject: [PATCH] changing manifesto displays from iframes to plain text

---
 start.py                    |  3 ++-
 static/css/stylesheet.css   |  1 -
 templates/en/base.html      |  7 +++----
 templates/en/index.html     |  4 ++--
 templates/en/manifesto.html | 20 +++-----------------
 templates/fr/manifesto.html | 20 +++-----------------
 6 files changed, 13 insertions(+), 42 deletions(-)

diff --git a/start.py b/start.py
index f3385c8..d967d2b 100644
--- a/start.py
+++ b/start.py
@@ -81,8 +81,9 @@ def manifesto(lang, name):
 	"""
 	index = readings.load_index()
 	filenames = sorted([manifesto for manifesto, _ in index.items()])
+	manifesto = open('txt/'+name+'.txt', 'r').readlines()
 	link = manifestos[name]
-	return flask.render_template(lang+'/manifesto.html', filenames=filenames, name=name, link=link, lang=lang)
+	return flask.render_template(lang+'/manifesto.html', filenames=filenames, name=name, manifesto=manifesto, link=link, lang=lang)
 
 @APP.route('/<lang>/mappings', methods=['GET', 'POST'])
 def contrast_mappings(lang):
diff --git a/static/css/stylesheet.css b/static/css/stylesheet.css
index 7e1c195..04551cd 100644
--- a/static/css/stylesheet.css
+++ b/static/css/stylesheet.css
@@ -33,7 +33,6 @@ body{
 	margin:20px;
 	font-family: mono, sans-serif;
 	font-size: 8px;
-	/*background-color: #f0dfff;*/
 	overflow-x: hidden;
 	z-index: -1;
 }
diff --git a/templates/en/base.html b/templates/en/base.html
index c4cb768..4f4715f 100644
--- a/templates/en/base.html
+++ b/templates/en/base.html
@@ -32,14 +32,15 @@
 		</div>
 		{% block search %}
 		<div id="search">
-			<form action="" method="GET">
+			<form id="submitform" action="" method="GET" onsubmit="this.setAttribute('isSubmitting', 'true');">
 				<input id="query" name="q" value="{{query}}"/>
 				<input id="submit" type="submit" value="search"/>
 			</form>		
 			<script>
 				(function () {
 					var searching = false,
-						button = document.querySelector('#search #submit');
+						button = document.querySelector('#search #submit'),
+						submitting = document.querySelector('#submitform').getAttribute('isSubmitting');
 
 					button.addEventListener('click', function (e) {
 						if (!searching) {
@@ -75,7 +76,6 @@
 	$(document.body).bind("mousemove keypress", function(e) {
 		time = new Date().getTime();
 	});
-
 	function refresh() {
 		if(new Date().getTime() - time >= 300000){
 			console.log('refresh!');
@@ -84,7 +84,6 @@
 			setTimeout(refresh, 300000);
 		}
 	}
-
 	setTimeout(refresh, 300000);
 
 	// prevent links from opening in new tab
diff --git a/templates/en/index.html b/templates/en/index.html
index adc214d..89178e3 100644
--- a/templates/en/index.html
+++ b/templates/en/index.html
@@ -26,7 +26,7 @@
 <h1>Cross-reading suggestions (manual selection):</h1>
 <div>
 	{% for word in suggestions %}
-		<strong class="query"><a href="/{{ lang}}/?q={{word}}">{{ word.strip() }}</a></strong>
+		<strong class="query"><a href="/{{ lang }}/?q={{word}}">{{ word.strip() }}</a></strong>
 	{% endfor %}
 </div>
 <br>
@@ -37,7 +37,7 @@
 	{% endfor %}
 </div>
 <br>
-<p>Read more about the <a href="/{{ lang}}/mappings/{{ filenames[0] }}">TF-IDF algorithm and contrast mappings</a>.</p>
+<p>Read more about the <a href="/{{ lang }}/mappings/{{ filenames[0] }}">TF-IDF algorithm and contrast mappings</a>.</p>
 <br>
 <br>
 {% endblock %}
diff --git a/templates/en/manifesto.html b/templates/en/manifesto.html
index cd768e8..7e715a8 100644
--- a/templates/en/manifesto.html
+++ b/templates/en/manifesto.html
@@ -9,23 +9,9 @@
 
 {% block manifesto %}
 <div id="manifesto_content_wrapper">
-	{% if '.jpg' in link['iframe'] %}
-		<img src="{{ link }}" />
-		<br>
-	{% elif 'vimeo' in link['iframe'] %}
-		<iframe src="{{ link }}" width="600" height="360" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
-		<div><em>
-			every day, you willingly exchange personal data for custom convenience <br>
-			lurking behind these transactions, the corporatocracy maps out your every move in the name of security <br>
-			don't worry, we're on your side <br>
-			the hors will help you reclaim your life and reprogram the 1s and 0s that build our world <br>
-			to hack is to create <br>
-			what we do is self defense, self determin- [end of transmission] <br>
-		</em></div>
-	{% else %}
-		<iframe id="manifesto_content" src="{{ link['iframe'] }}"></iframe>
-	{% endif%}
+	{% for line in manifesto %}
+		<p>{{ line | replace(' •', ' ') }}<br></p>
+	{% endfor %}
 	<br>
-	<div><small style="font-size: 85%;">{{ link['display'] }}</small></div>
 </div>
 {% endblock %}
diff --git a/templates/fr/manifesto.html b/templates/fr/manifesto.html
index ea55b10..9069d83 100644
--- a/templates/fr/manifesto.html
+++ b/templates/fr/manifesto.html
@@ -9,23 +9,9 @@
 
 {% block manifesto %}
 <div id="manifesto_content_wrapper">
-	{% if '.jpg' in link['iframe'] %}
-		<img src="{{ link }}" />
-		<br>
-	{% elif 'vimeo' in link['iframe'] %}
-		<iframe src="{{ link }}" width="600" height="360" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
-		<div><em>
-			every day, you willingly exchange personal data for custom convenience <br>
-			lurking behind these transactions, the corporatocracy maps out your every move in the name of security <br>
-			don't worry, we're on your side <br>
-			the hors will help you reclaim your life and reprogram the 1s and 0s that build our world <br>
-			to hack is to create <br>
-			what we do is self defense, self determin- [end of transmission] <br>
-		</em></div>
-	{% else %}
-		<iframe id="manifesto_content" src="{{ link['iframe'] }}"></iframe>
-	{% endif%}
+	{% for line in manifesto %}
+		<p>{{ line | replace(' •', ' ') }}<br></p>
+	{% endfor %}
 	<br>
-	<div><small style="font-size: 85%;">{{ link['display'] }}</small></div>
 </div>
 {% endblock %}