From 90485ed40e0a3c31e4071bec9eeb26257f7db690 Mon Sep 17 00:00:00 2001
From: Gertjan van den Burg <gertjanvandenburg@gmail.com>
Date: Fri, 7 Jun 2019 13:44:02 +0100
Subject: Reorganise static folder

---
 app/static/annotate.css                         |  33 ------------
 app/static/css/admin/view_annotation.css        |  66 ++++++++++++++++++++++++
 app/static/css/footer.css                       |  20 +++++++
 app/static/css/index.css                        |  16 ++++++
 app/static/css/main/annotate.css                |  33 ++++++++++++
 app/static/done.png                             | Bin 164682 -> 0 bytes
 app/static/img/done.png                         | Bin 0 -> 164682 bytes
 app/static/sticky_footer.css                    |  20 -------
 app/static/user_index.css                       |  16 ------
 app/static/view_annotation.css                  |  66 ------------------------
 app/templates/admin/annotations_by_dataset.html |  14 +++--
 app/templates/annotate/index.html               |   2 +-
 app/templates/base.html                         |   2 +-
 app/templates/index.html                        |   4 +-
 14 files changed, 145 insertions(+), 147 deletions(-)
 delete mode 100644 app/static/annotate.css
 create mode 100644 app/static/css/admin/view_annotation.css
 create mode 100644 app/static/css/footer.css
 create mode 100644 app/static/css/index.css
 create mode 100644 app/static/css/main/annotate.css
 delete mode 100644 app/static/done.png
 create mode 100644 app/static/img/done.png
 delete mode 100644 app/static/sticky_footer.css
 delete mode 100644 app/static/user_index.css
 delete mode 100644 app/static/view_annotation.css

(limited to 'app')

diff --git a/app/static/annotate.css b/app/static/annotate.css
deleted file mode 100644
index 595f2a2..0000000
--- a/app/static/annotate.css
+++ /dev/null
@@ -1,33 +0,0 @@
-#graph {
-	margin: 0 auto;
-	text-align: center;
-}
-
-.line {
-	fill: none;
-	stroke: blue;
-	clip-path: url(#clip);
-}
-
-circle {
-	clip-path: url(#clip);
-	fill: blue;
-}
-
-rect {
-	fill: white;
-	opacity: 0;
-}
-
-#rubric {
-	text-align: left;
-	padding-bottom: 20px;
-	padding-top: 10px;
-	width: 80%;
-	font-size: 16px;
-}
-
-#usage {
-	font-size: 16px;
-	font-style: italic;
-}
diff --git a/app/static/css/admin/view_annotation.css b/app/static/css/admin/view_annotation.css
new file mode 100644
index 0000000..11bf3c8
--- /dev/null
+++ b/app/static/css/admin/view_annotation.css
@@ -0,0 +1,66 @@
+#graph {
+	margin: 0 auto;
+	text-align: center;
+}
+
+.line {
+	fill: none;
+	stroke: blue;
+	clip-path: url(#clip);
+}
+
+.ann-line {
+	fill: none;
+	stroke-dasharray: 5;
+	clip-path: url(#clip);
+}
+
+circle {
+	clip-path: url(#clip);
+	fill: blue;
+}
+
+rect {
+	fill: white;
+	opacity: 0;
+}
+
+.user-1 {
+	fill: #66c2a5;
+	stroke: #66c2a5;
+}
+
+.user-2 {
+	fill: #fc8d62;
+	stroke: #fc8d62;
+}
+
+.user-3 {
+	fill: #8da0cb;
+	stroke: #8da0cb;
+}
+
+.user-4 {
+	fill: #e78ac3;
+	stroke: #e78ac3;
+}
+
+.user-5 {
+	fill: #a6d854;
+	stroke: #a6d854;
+}
+
+.user-6 {
+	fill: #ffd92f;
+	stroke: #ffd92f;
+}
+
+.user-7 {
+	fill: #e5c494;
+	stroke: #e5c494;
+}
+
+.user-8 {
+	fill: #b3b3b3;
+	stroke: #b3b3b3;
+}
diff --git a/app/static/css/footer.css b/app/static/css/footer.css
new file mode 100644
index 0000000..452b6d4
--- /dev/null
+++ b/app/static/css/footer.css
@@ -0,0 +1,20 @@
+/* Sticky footer styles
+-------------------------------------------------- */
+html {
+  position: relative;
+  min-height: 100%;
+}
+
+body {
+  margin-bottom: 40px; /* Margin bottom by footer height */
+}
+
+footer {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  /* Set the fixed height of the footer here */
+  height: 40px;
+  line-height: 40px; /* Vertically center the text there */
+  background-color: #f5f5f5;
+}
diff --git a/app/static/css/index.css b/app/static/css/index.css
new file mode 100644
index 0000000..a91bec3
--- /dev/null
+++ b/app/static/css/index.css
@@ -0,0 +1,16 @@
+
+#done {
+	margin: 0 auto;
+	text-align: center;
+}
+
+#done span {
+	font-size: 18px;
+}
+
+#done img {
+	margin: 0 auto;
+	text-align: center;
+	width: 40%;
+	display: block;
+}
diff --git a/app/static/css/main/annotate.css b/app/static/css/main/annotate.css
new file mode 100644
index 0000000..595f2a2
--- /dev/null
+++ b/app/static/css/main/annotate.css
@@ -0,0 +1,33 @@
+#graph {
+	margin: 0 auto;
+	text-align: center;
+}
+
+.line {
+	fill: none;
+	stroke: blue;
+	clip-path: url(#clip);
+}
+
+circle {
+	clip-path: url(#clip);
+	fill: blue;
+}
+
+rect {
+	fill: white;
+	opacity: 0;
+}
+
+#rubric {
+	text-align: left;
+	padding-bottom: 20px;
+	padding-top: 10px;
+	width: 80%;
+	font-size: 16px;
+}
+
+#usage {
+	font-size: 16px;
+	font-style: italic;
+}
diff --git a/app/static/done.png b/app/static/done.png
deleted file mode 100644
index d7e8bce..0000000
Binary files a/app/static/done.png and /dev/null differ
diff --git a/app/static/img/done.png b/app/static/img/done.png
new file mode 100644
index 0000000..d7e8bce
Binary files /dev/null and b/app/static/img/done.png differ
diff --git a/app/static/sticky_footer.css b/app/static/sticky_footer.css
deleted file mode 100644
index 452b6d4..0000000
--- a/app/static/sticky_footer.css
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Sticky footer styles
--------------------------------------------------- */
-html {
-  position: relative;
-  min-height: 100%;
-}
-
-body {
-  margin-bottom: 40px; /* Margin bottom by footer height */
-}
-
-footer {
-  position: absolute;
-  bottom: 0;
-  width: 100%;
-  /* Set the fixed height of the footer here */
-  height: 40px;
-  line-height: 40px; /* Vertically center the text there */
-  background-color: #f5f5f5;
-}
diff --git a/app/static/user_index.css b/app/static/user_index.css
deleted file mode 100644
index a91bec3..0000000
--- a/app/static/user_index.css
+++ /dev/null
@@ -1,16 +0,0 @@
-
-#done {
-	margin: 0 auto;
-	text-align: center;
-}
-
-#done span {
-	font-size: 18px;
-}
-
-#done img {
-	margin: 0 auto;
-	text-align: center;
-	width: 40%;
-	display: block;
-}
diff --git a/app/static/view_annotation.css b/app/static/view_annotation.css
deleted file mode 100644
index 11bf3c8..0000000
--- a/app/static/view_annotation.css
+++ /dev/null
@@ -1,66 +0,0 @@
-#graph {
-	margin: 0 auto;
-	text-align: center;
-}
-
-.line {
-	fill: none;
-	stroke: blue;
-	clip-path: url(#clip);
-}
-
-.ann-line {
-	fill: none;
-	stroke-dasharray: 5;
-	clip-path: url(#clip);
-}
-
-circle {
-	clip-path: url(#clip);
-	fill: blue;
-}
-
-rect {
-	fill: white;
-	opacity: 0;
-}
-
-.user-1 {
-	fill: #66c2a5;
-	stroke: #66c2a5;
-}
-
-.user-2 {
-	fill: #fc8d62;
-	stroke: #fc8d62;
-}
-
-.user-3 {
-	fill: #8da0cb;
-	stroke: #8da0cb;
-}
-
-.user-4 {
-	fill: #e78ac3;
-	stroke: #e78ac3;
-}
-
-.user-5 {
-	fill: #a6d854;
-	stroke: #a6d854;
-}
-
-.user-6 {
-	fill: #ffd92f;
-	stroke: #ffd92f;
-}
-
-.user-7 {
-	fill: #e5c494;
-	stroke: #e5c494;
-}
-
-.user-8 {
-	fill: #b3b3b3;
-	stroke: #b3b3b3;
-}
diff --git a/app/templates/admin/annotations_by_dataset.html b/app/templates/admin/annotations_by_dataset.html
index 2a609bf..a0e935b 100644
--- a/app/templates/admin/annotations_by_dataset.html
+++ b/app/templates/admin/annotations_by_dataset.html
@@ -1,19 +1,17 @@
 {% extends "base.html" %}
 
 {% block styles %}
-{{ super() }}
-<link rel="stylesheet" href="{{url_for('static', filename='view_annotation.css')}}">{% endblock %}
+  {{ super() }}
+  <link rel="stylesheet" href="{{url_for('static', filename='css/admin/view_annotation.css')}}">
+{% endblock %}
 
 {% block app_content %}
-<h1>View Annotations</h1>
-
-<div id="graph"></div>
+  <h1>View Annotations</h1>
+  <div id="graph"></div>
 {% endblock %}
 
-
-
 {% block scripts %}
-{{ super() }}
+  {{ super() }}
   <script src="//d3js.org/d3.v5.min.js"></script>
   <script src="{{ url_for('static', filename='js/makeChart.js') }}"></script>
   <script>adminViewAnnotations(
diff --git a/app/templates/annotate/index.html b/app/templates/annotate/index.html
index ce9e01a..3b00b75 100644
--- a/app/templates/annotate/index.html
+++ b/app/templates/annotate/index.html
@@ -3,7 +3,7 @@
 
 {% block styles %}
   {{ super() }}
-  <link rel="stylesheet" href="{{url_for('static', filename='annotate.css')}}">
+  <link rel="stylesheet" href="{{url_for('static', filename='css/main/annotate.css')}}">
 {% endblock %}
 
 {% block app_content %}
diff --git a/app/templates/base.html b/app/templates/base.html
index eec1fc2..d798d56 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -4,7 +4,7 @@
 {% block styles %}
   {{ super() }}
   <link rel="stylesheet" href="{{ url_for('static', filename='css/global.css') }}">
-  <link rel="stylesheet" href="{{ url_for('static', filename='sticky_footer.css') }}">
+  <link rel="stylesheet" href="{{ url_for('static', filename='css/footer.css') }}">
 {% endblock %}
 
 {% block title %}
diff --git a/app/templates/index.html b/app/templates/index.html
index 930bfd3..86d2f1a 100644
--- a/app/templates/index.html
+++ b/app/templates/index.html
@@ -2,7 +2,7 @@
 
 {% block styles %}
   {{ super() }}
-  <link rel="stylesheet" href="{{url_for('static', filename='user_index.css')}}">
+  <link rel="stylesheet" href="{{url_for('static', filename='css/index.css')}}">
 {% endblock %}
 
 {% block app_content %}
@@ -70,7 +70,7 @@
       </div>
     {% elif tasks_todo|length == 0 and tasks_done|length > 0 %}
       <div id="done">
-        <img src="{{ url_for('static', filename='done.png') }}">
+        <img src="{{ url_for('static', filename='img/done.png') }}">
         <span>
           No more annotations to do! Thank you so much for your help, 
           <b>you rock!</b>
-- 
cgit v1.2.3