diff --git a/LICENSE.txt b/making-markers/LICENSE.txt similarity index 100% rename from LICENSE.txt rename to making-markers/LICENSE.txt diff --git a/README.md b/making-markers/README.md similarity index 100% rename from README.md rename to making-markers/README.md diff --git a/__pycache__/create_index.cpython-37.pyc b/making-markers/__pycache__/create_index.cpython-37.pyc similarity index 100% rename from __pycache__/create_index.cpython-37.pyc rename to making-markers/__pycache__/create_index.cpython-37.pyc diff --git a/__pycache__/functions.cpython-37.pyc b/making-markers/__pycache__/functions.cpython-37.pyc similarity index 100% rename from __pycache__/functions.cpython-37.pyc rename to making-markers/__pycache__/functions.cpython-37.pyc diff --git a/__pycache__/readings.cpython-37.pyc b/making-markers/__pycache__/readings.cpython-37.pyc similarity index 100% rename from __pycache__/readings.cpython-37.pyc rename to making-markers/__pycache__/readings.cpython-37.pyc diff --git a/__pycache__/text.cpython-37.pyc b/making-markers/__pycache__/text.cpython-37.pyc similarity index 100% rename from __pycache__/text.cpython-37.pyc rename to making-markers/__pycache__/text.cpython-37.pyc diff --git a/__pycache__/tfidf.cpython-37.pyc b/making-markers/__pycache__/tfidf.cpython-37.pyc similarity index 100% rename from __pycache__/tfidf.cpython-37.pyc rename to making-markers/__pycache__/tfidf.cpython-37.pyc diff --git a/colors.json b/making-markers/colors.json similarity index 100% rename from colors.json rename to making-markers/colors.json diff --git a/curves.json b/making-markers/curves.json similarity index 100% rename from curves.json rename to making-markers/curves.json diff --git a/functions.py b/making-markers/functions.py similarity index 100% rename from functions.py rename to making-markers/functions.py diff --git a/readings.py b/making-markers/readings.py similarity index 100% rename from readings.py rename to making-markers/readings.py diff --git a/start.py b/making-markers/start.py similarity index 93% rename from start.py rename to making-markers/start.py index af88b31..63eab82 100644 --- a/start.py +++ b/making-markers/start.py @@ -41,16 +41,19 @@ def text(): markertype = request.args.get('marker-type', '').strip() db, x = load_db('text.json') markers = [db[x]['marker'] for x in db.keys()] - if marker: if marker not in markers: x = str(x + 1) db[x] = {} db[x]['marker'] = marker db[x]['type'] = markertype - write_db('text.json', db) - + # write_db('text.json', db) markers.append(marker) + for i in range(1, int(x)): + # description = request.args.get('description-{}'.format(i), '').strip() + description = request.args.get('description-1', '').strip() + db[str(i)]['description'] = description + write_db('text.json', db) return flask.render_template('text.html', tools=tools, tool='text', db=db) diff --git a/static/contributions/BACK.md b/making-markers/static/contributions/BACK.md similarity index 100% rename from static/contributions/BACK.md rename to making-markers/static/contributions/BACK.md diff --git a/static/contributions/COLOPHON.md b/making-markers/static/contributions/COLOPHON.md similarity index 100% rename from static/contributions/COLOPHON.md rename to making-markers/static/contributions/COLOPHON.md diff --git a/static/contributions/COVER.md b/making-markers/static/contributions/COVER.md similarity index 100% rename from static/contributions/COVER.md rename to making-markers/static/contributions/COVER.md diff --git a/static/contributions/EMPTY.md b/making-markers/static/contributions/EMPTY.md similarity index 100% rename from static/contributions/EMPTY.md rename to making-markers/static/contributions/EMPTY.md diff --git a/static/contributions/INDEX.md b/making-markers/static/contributions/INDEX.md similarity index 100% rename from static/contributions/INDEX.md rename to making-markers/static/contributions/INDEX.md diff --git a/static/contributions/README.md b/making-markers/static/contributions/README.md similarity index 100% rename from static/contributions/README.md rename to making-markers/static/contributions/README.md diff --git a/static/contributions/TOC.md b/making-markers/static/contributions/TOC.md similarity index 100% rename from static/contributions/TOC.md rename to making-markers/static/contributions/TOC.md diff --git a/static/contributions/collective-conditions.md b/making-markers/static/contributions/collective-conditions.md similarity index 100% rename from static/contributions/collective-conditions.md rename to making-markers/static/contributions/collective-conditions.md diff --git a/static/contributions/collective-intro-for-publication.md b/making-markers/static/contributions/collective-intro-for-publication.md similarity index 100% rename from static/contributions/collective-intro-for-publication.md rename to making-markers/static/contributions/collective-intro-for-publication.md diff --git a/static/contributions/holding-spell.md b/making-markers/static/contributions/holding-spell.md similarity index 100% rename from static/contributions/holding-spell.md rename to making-markers/static/contributions/holding-spell.md diff --git a/static/contributions/iteration-5.md b/making-markers/static/contributions/iteration-5.md similarity index 100% rename from static/contributions/iteration-5.md rename to making-markers/static/contributions/iteration-5.md diff --git a/static/contributions/rica-rickson.md b/making-markers/static/contributions/rica-rickson.md similarity index 100% rename from static/contributions/rica-rickson.md rename to making-markers/static/contributions/rica-rickson.md diff --git a/static/contributions/score-esc.md b/making-markers/static/contributions/score-esc.md similarity index 100% rename from static/contributions/score-esc.md rename to making-markers/static/contributions/score-esc.md diff --git a/static/contributions/spideralex.md b/making-markers/static/contributions/spideralex.md similarity index 100% rename from static/contributions/spideralex.md rename to making-markers/static/contributions/spideralex.md diff --git a/static/css/curves.css b/making-markers/static/css/curves.css similarity index 100% rename from static/css/curves.css rename to making-markers/static/css/curves.css diff --git a/static/css/stylesheet.css b/making-markers/static/css/stylesheet.css similarity index 100% rename from static/css/stylesheet.css rename to making-markers/static/css/stylesheet.css diff --git a/static/css/text-scan.css b/making-markers/static/css/text-scan.css similarity index 100% rename from static/css/text-scan.css rename to making-markers/static/css/text-scan.css diff --git a/static/curves/014-Loren-Britton-Disclaimer_5000.jpg b/making-markers/static/curves/014-Loren-Britton-Disclaimer_5000.jpg similarity index 100% rename from static/curves/014-Loren-Britton-Disclaimer_5000.jpg rename to making-markers/static/curves/014-Loren-Britton-Disclaimer_5000.jpg diff --git a/static/curves/1.svg b/making-markers/static/curves/1.svg similarity index 100% rename from static/curves/1.svg rename to making-markers/static/curves/1.svg diff --git a/static/curves/10.svg b/making-markers/static/curves/10.svg similarity index 100% rename from static/curves/10.svg rename to making-markers/static/curves/10.svg diff --git a/static/curves/11.svg b/making-markers/static/curves/11.svg similarity index 100% rename from static/curves/11.svg rename to making-markers/static/curves/11.svg diff --git a/static/curves/12.svg b/making-markers/static/curves/12.svg similarity index 100% rename from static/curves/12.svg rename to making-markers/static/curves/12.svg diff --git a/static/curves/13.svg b/making-markers/static/curves/13.svg similarity index 100% rename from static/curves/13.svg rename to making-markers/static/curves/13.svg diff --git a/static/curves/14.svg b/making-markers/static/curves/14.svg similarity index 100% rename from static/curves/14.svg rename to making-markers/static/curves/14.svg diff --git a/static/curves/15.svg b/making-markers/static/curves/15.svg similarity index 100% rename from static/curves/15.svg rename to making-markers/static/curves/15.svg diff --git a/static/curves/16.svg b/making-markers/static/curves/16.svg similarity index 100% rename from static/curves/16.svg rename to making-markers/static/curves/16.svg diff --git a/static/curves/17.svg b/making-markers/static/curves/17.svg similarity index 100% rename from static/curves/17.svg rename to making-markers/static/curves/17.svg diff --git a/static/curves/18.svg b/making-markers/static/curves/18.svg similarity index 100% rename from static/curves/18.svg rename to making-markers/static/curves/18.svg diff --git a/static/curves/2.svg b/making-markers/static/curves/2.svg similarity index 100% rename from static/curves/2.svg rename to making-markers/static/curves/2.svg diff --git a/static/curves/3.svg b/making-markers/static/curves/3.svg similarity index 100% rename from static/curves/3.svg rename to making-markers/static/curves/3.svg diff --git a/static/curves/4.svg b/making-markers/static/curves/4.svg similarity index 100% rename from static/curves/4.svg rename to making-markers/static/curves/4.svg diff --git a/static/curves/5.svg b/making-markers/static/curves/5.svg similarity index 100% rename from static/curves/5.svg rename to making-markers/static/curves/5.svg diff --git a/static/curves/6.svg b/making-markers/static/curves/6.svg similarity index 100% rename from static/curves/6.svg rename to making-markers/static/curves/6.svg diff --git a/static/curves/7.svg b/making-markers/static/curves/7.svg similarity index 100% rename from static/curves/7.svg rename to making-markers/static/curves/7.svg diff --git a/static/curves/8.svg b/making-markers/static/curves/8.svg similarity index 100% rename from static/curves/8.svg rename to making-markers/static/curves/8.svg diff --git a/static/curves/9.svg b/making-markers/static/curves/9.svg similarity index 100% rename from static/curves/9.svg rename to making-markers/static/curves/9.svg diff --git a/static/curves/test.svg b/making-markers/static/curves/test.svg similarity index 100% rename from static/curves/test.svg rename to making-markers/static/curves/test.svg diff --git a/static/fonts/Brazil/.uuid b/making-markers/static/fonts/Brazil/.uuid similarity index 100% rename from static/fonts/Brazil/.uuid rename to making-markers/static/fonts/Brazil/.uuid diff --git a/static/fonts/Brazil/BRAZIL BERN 18.11.2010 SHP.png b/making-markers/static/fonts/Brazil/BRAZIL BERN 18.11.2010 SHP.png similarity index 100% rename from static/fonts/Brazil/BRAZIL BERN 18.11.2010 SHP.png rename to making-markers/static/fonts/Brazil/BRAZIL BERN 18.11.2010 SHP.png diff --git a/static/fonts/Brazil/BRAZIL description and license.rtf b/making-markers/static/fonts/Brazil/BRAZIL description and license.rtf similarity index 100% rename from static/fonts/Brazil/BRAZIL description and license.rtf rename to making-markers/static/fonts/Brazil/BRAZIL description and license.rtf diff --git a/static/fonts/Brazil/Brazil-Regular.otf b/making-markers/static/fonts/Brazil/Brazil-Regular.otf similarity index 100% rename from static/fonts/Brazil/Brazil-Regular.otf rename to making-markers/static/fonts/Brazil/Brazil-Regular.otf diff --git a/static/fonts/Brazil/OFL Brazil.txt b/making-markers/static/fonts/Brazil/OFL Brazil.txt similarity index 100% rename from static/fonts/Brazil/OFL Brazil.txt rename to making-markers/static/fonts/Brazil/OFL Brazil.txt diff --git a/static/fonts/Brazil/OFL-FAQ.txt b/making-markers/static/fonts/Brazil/OFL-FAQ.txt similarity index 100% rename from static/fonts/Brazil/OFL-FAQ.txt rename to making-markers/static/fonts/Brazil/OFL-FAQ.txt diff --git a/static/fonts/go-mono/Go-Mono-Bold-Italic.ttf b/making-markers/static/fonts/go-mono/Go-Mono-Bold-Italic.ttf similarity index 100% rename from static/fonts/go-mono/Go-Mono-Bold-Italic.ttf rename to making-markers/static/fonts/go-mono/Go-Mono-Bold-Italic.ttf diff --git a/static/fonts/go-mono/Go-Mono-Bold.ttf b/making-markers/static/fonts/go-mono/Go-Mono-Bold.ttf similarity index 100% rename from static/fonts/go-mono/Go-Mono-Bold.ttf rename to making-markers/static/fonts/go-mono/Go-Mono-Bold.ttf diff --git a/static/fonts/go-mono/Go-Mono-Italic.ttf b/making-markers/static/fonts/go-mono/Go-Mono-Italic.ttf similarity index 100% rename from static/fonts/go-mono/Go-Mono-Italic.ttf rename to making-markers/static/fonts/go-mono/Go-Mono-Italic.ttf diff --git a/static/fonts/go-mono/Go-Mono.ttf b/making-markers/static/fonts/go-mono/Go-Mono.ttf similarity index 100% rename from static/fonts/go-mono/Go-Mono.ttf rename to making-markers/static/fonts/go-mono/Go-Mono.ttf diff --git a/static/fonts/go-mono/README b/making-markers/static/fonts/go-mono/README similarity index 100% rename from static/fonts/go-mono/README rename to making-markers/static/fonts/go-mono/README diff --git a/static/js/bezpath.js b/making-markers/static/js/bezpath.js similarity index 100% rename from static/js/bezpath.js rename to making-markers/static/js/bezpath.js diff --git a/static/js/curves.js b/making-markers/static/js/curves.js similarity index 100% rename from static/js/curves.js rename to making-markers/static/js/curves.js diff --git a/static/js/splineui.js b/making-markers/static/js/splineui.js similarity index 100% rename from static/js/splineui.js rename to making-markers/static/js/splineui.js diff --git a/static/visual-traces/0033d7f98e0a5c733b16013ecd8005fa.png b/making-markers/static/visual-traces/0033d7f98e0a5c733b16013ecd8005fa.png similarity index 100% rename from static/visual-traces/0033d7f98e0a5c733b16013ecd8005fa.png rename to making-markers/static/visual-traces/0033d7f98e0a5c733b16013ecd8005fa.png diff --git a/static/visual-traces/diversity-2019.png b/making-markers/static/visual-traces/diversity-2019.png similarity index 100% rename from static/visual-traces/diversity-2019.png rename to making-markers/static/visual-traces/diversity-2019.png diff --git a/static/visual-traces/etherpump.png b/making-markers/static/visual-traces/etherpump.png similarity index 100% rename from static/visual-traces/etherpump.png rename to making-markers/static/visual-traces/etherpump.png diff --git a/templates/base.html b/making-markers/templates/base.html similarity index 100% rename from templates/base.html rename to making-markers/templates/base.html diff --git a/templates/color.html b/making-markers/templates/color.html similarity index 100% rename from templates/color.html rename to making-markers/templates/color.html diff --git a/templates/curves.bak.html b/making-markers/templates/curves.bak.html similarity index 100% rename from templates/curves.bak.html rename to making-markers/templates/curves.bak.html diff --git a/templates/curves.html b/making-markers/templates/curves.html similarity index 100% rename from templates/curves.html rename to making-markers/templates/curves.html diff --git a/templates/index.html b/making-markers/templates/index.html similarity index 100% rename from templates/index.html rename to making-markers/templates/index.html diff --git a/templates/text-scans.html b/making-markers/templates/text-scans.html similarity index 100% rename from templates/text-scans.html rename to making-markers/templates/text-scans.html diff --git a/templates/text-specifics.html b/making-markers/templates/text-specifics.html similarity index 100% rename from templates/text-specifics.html rename to making-markers/templates/text-specifics.html diff --git a/templates/text.html b/making-markers/templates/text.html similarity index 52% rename from templates/text.html rename to making-markers/templates/text.html index 18537ad..4588836 100644 --- a/templates/text.html +++ b/making-markers/templates/text.html @@ -22,35 +22,36 @@ - -
-
-

textual markers gathered so far include:

-
- - - - - - - - {% for x in db.keys() %} - - - - - {% endfor %} - -
markerdescriptionstatus
-
({{ db[x]['type'] }}) {{ db[x]['marker'] }}
-
- - - -
+
+
+

textual markers gathered so far include:

+
+ + + + + + + + {% for x in db.keys() %} + + + + + {% endfor %} + +
markerdescriptionstatus
+
({{ db[x]['type'] }}) {{ db[x]['marker'] }}
+
+ + + +
+ +
{% endblock %} \ No newline at end of file diff --git a/templates/visual-traces.html b/making-markers/templates/visual-traces.html similarity index 100% rename from templates/visual-traces.html rename to making-markers/templates/visual-traces.html diff --git a/making-markers/text.json b/making-markers/text.json new file mode 100644 index 0000000..2ba0923 --- /dev/null +++ b/making-markers/text.json @@ -0,0 +1,7 @@ +{ + "1": { + "marker": "test", + "type": "question", + "description": "" + } +} \ No newline at end of file diff --git a/text.py b/making-markers/text.py similarity index 100% rename from text.py rename to making-markers/text.py diff --git a/tfidf.py b/making-markers/tfidf.py similarity index 100% rename from tfidf.py rename to making-markers/tfidf.py diff --git a/visual-traces.json b/making-markers/visual-traces.json similarity index 100% rename from visual-traces.json rename to making-markers/visual-traces.json diff --git a/text.json b/text.json deleted file mode 100644 index e69de29..0000000 diff --git a/xdex b/xdex new file mode 160000 index 0000000..0b76ffb --- /dev/null +++ b/xdex @@ -0,0 +1 @@ +Subproject commit 0b76ffb1503d870586ec70858f8b00ca5ce3f441