diff --git a/web/app/services/__init__.py b/web/app/services/__init__.py index 6732fd88..ef3c3ed2 100644 --- a/web/app/services/__init__.py +++ b/web/app/services/__init__.py @@ -5,7 +5,7 @@ SERVICES = { 'corpus_analysis': { 'name': 'Corpus analysis' }, - 'file-setup': { + 'file_setup': { 'name': 'File setup', 'versions': { 'latest': '1.0.0b', diff --git a/web/app/services/forms.py b/web/app/services/forms.py index 5d9f5ede..aba0b8c3 100644 --- a/web/app/services/forms.py +++ b/web/app/services/forms.py @@ -77,7 +77,7 @@ class AddFileSetupJobForm(AddJobForm): '| .tif') def __init__(self, *args, **kwargs): - version = kwargs.pop('version', SERVICES['file-setup']['versions']['latest']) + version = kwargs.pop('version', SERVICES['file_setup']['versions']['latest']) super().__init__(*args, **kwargs) - self.version.choices = [(x, x) for x in SERVICES['file-setup']['versions'] if x != 'latest'] # noqa + self.version.choices = [(x, x) for x in SERVICES['file_setup']['versions'] if x != 'latest'] # noqa self.version.default = version diff --git a/web/app/services/views.py b/web/app/services/views.py index 4aaac006..d83921d2 100644 --- a/web/app/services/views.py +++ b/web/app/services/views.py @@ -20,18 +20,18 @@ def service(service): if service == 'corpus_analysis': return render_template('services/{}.html.j2'.format(service), title=SERVICES[service]['name']) - elif service == 'file-setup': + elif service == 'file_setup': form = AddFileSetupJobForm(prefix='add-file-setup-job-form') elif service == 'nlp': version = request.args.get('version') - if version is None or version not in SERVICES['nlp']['versions']: + if version is None or version not in SERVICES[service]['versions']: form = AddNLPJobForm(prefix='add-nlp-job-form') else: form = AddNLPJobForm(prefix='add-nlp-job-form', version=version) form.version.data = version elif service == 'ocr': version = request.args.get('version') - if version is None or version not in SERVICES['ocr']['versions']: + if version is None or version not in SERVICES[service]['versions']: form = AddOCRJobForm(prefix='add-ocr-job-form') else: form = AddOCRJobForm(prefix='add-ocr-job-form', version=version) diff --git a/web/app/static/css/material_icons.css b/web/app/static/css/material_icons.css index 0e5303b5..6590c25c 100644 --- a/web/app/static/css/material_icons.css +++ b/web/app/static/css/material_icons.css @@ -4,7 +4,6 @@ font-family: 'Material Icons'; font-style: normal; font-weight: 400; - src: url(../fonts/material_icons/MaterialIcons-Regular.eot); /* For IE6-8 */ src: local('Material Icons'), local('MaterialIcons-Regular'), url(../fonts/material_icons/MaterialIcons-Regular.ttf) format('truetype'), diff --git a/web/app/static/css/materialize.sticky-footer.css b/web/app/static/css/materialize.sticky-footer.css deleted file mode 100644 index 49b8f5b8..00000000 --- a/web/app/static/css/materialize.sticky-footer.css +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Force the footer to always stay on the bottom of the page regardless of how - * little content is on the page. - */ -body { - display: flex; - min-height: 100vh; - flex-direction: column; -} - -main { - flex: 1 0 auto; -} diff --git a/web/app/static/css/nopaque.css b/web/app/static/css/nopaque.css index 3bf1b42c..de92409f 100644 --- a/web/app/static/css/nopaque.css +++ b/web/app/static/css/nopaque.css @@ -1,6 +1,6 @@ /* Fix material icon vertical alignment when nested in various elements */ -h1 .material-icons, h2 .material-icons, h3 .material-icons, h4 .material-icons, -.tab .material-icons { +h1 .nopaque-icons, h2 .nopaque-icons, h3 .nopaque-icons, h4 .nopaque-icons, +.tab .nopaque-icons, .tab .material-icons { line-height: inherit; } @@ -8,12 +8,27 @@ main { margin-top: 48px; } +/* + * Force the footer to always stay on the bottom of the page regardless of how + * little content is on the page. + */ +body { + display: flex; + min-height: 100vh; + flex-direction: column; +} + +main { + flex: 1 0 auto; +} + + table.ressource-list tr { cursor: pointer; } .parallax-container .parallax { - z-index: auto; + z-index: 0; } /* add custom bold class */ @@ -117,66 +132,19 @@ indicator will show up how the column is sorted right now.; */ cursor: pointer; } -/* styles for resource lists */ -.analyse-link[href=""] { - display: none; -} - .btn-scale-x2 { transform: scale(2); } -.btn-scale-x2 .service-icon { +.btn-scale-x2 .nopaque-icons.service-icon { font-size: 2.5rem; } -.service-icon[data-service]:before { - content: "help"; -} -.service-icon[data-service="corpus-analysis"]:before { - content: "H"; -} -.service-icon[data-service="file-setup"]:before { - content: "E"; -} -.service-icon[data-service="nlp"]:before { - content: "G"; -} -.service-icon[data-service="ocr"]:before { - content: "F"; -} +.nopaque-icons.service-icon[data-service="corpus-analysis"]:empty:before {content: "H";} +.nopaque-icons.service-icon[data-service="file-setup"]:empty:before {content: "E";} +.nopaque-icons.service-icon[data-service="nlp"]:empty:before {content: "G";} +.nopaque-icons.service-icon[data-service="ocr"]:empty:before {content: "F";} .status-text[data-status]:before { content: attr(data-status); } - -.status-color[data-status] { - background-color: #f44336 !important; /* ~materialize "red" */ -} -.status-color[data-status="unprepared"] { - background-color: #9e9e9e !important; /* ~materialize grey */ -} -.status-color[data-status="submitted"] { - background-color: #9e9e9e !important; /* ~materialize grey */ -} -.status-color[data-status="queued"] { - background-color: #2196f3 !important; /* ~materialize blue */ -} -.status-color[data-status="running"] { - background-color: #ffc107 !important; /* ~materialize amber */ -} -.status-color[data-status="complete"] { - background-color: #4caf50 !important; /* ~materialize green */ -} -.status-color[data-status="prepared"] { - background-color: #4caf50 !important; /* ~materialize green */ -} -.status-color[data-status="start analysis"] { - background-color: #2196f3 !important; /* ~materialize blue */ -} -.status-color[data-status="analysing"] { - background-color: #4caf50 !important; /* ~materialize green */ -} -.status-color[data-status="stop analysis"] { - background-color: #ff5722 !important; /* ~materialize deep-orange */ -} diff --git a/web/app/static/css/nopaque_icons.css b/web/app/static/css/nopaque_icons.css index 395b8bc6..f3e49752 100644 --- a/web/app/static/css/nopaque_icons.css +++ b/web/app/static/css/nopaque_icons.css @@ -1,5 +1,3 @@ -/* https://google.github.io/material-design-icons/#setup-method-2-self-hosting */ - @font-face { font-family: 'nopaque Icons'; font-style: normal; @@ -33,57 +31,3 @@ /* Support for IE. */ font-feature-settings: 'liga'; } - -.breadcrumb i.nopaque-icons { - display: inline-block; - float: left; - font-size: 24px; -} - -.nopaque-icons { - text-rendering: optimizeLegibility; - -webkit-font-feature-settings: 'liga'; - -moz-font-feature-settings: 'liga'; - font-feature-settings: 'liga'; -} - -nav i.nopaque-icons { - display: block; - font-size: 24px; - height: 56px; - line-height: 56px; -} - -nav .brand-logo i.nopaque-icons { - float: left; - margin-right: 15px; -} - -nav ul a.btn > .nopaque-icons, nav ul a.btn-large > .nopaque-icons, nav ul a.btn-small > .nopaque-icons, nav ul a.btn-large > .nopaque-icons, nav ul a.btn-flat > .nopaque-icons, nav ul a.btn-floating > .nopaque-icons { - height: inherit; - line-height: inherit; -} - -.input-field input[type=search]:focus:not(.browser-default) ~ .nopaque-icons { - color: #444; -} - -.input-field input[type=search] ~ .nopaque-icons { - position: absolute; - top: 0; - right: 1rem; - color: transparent; - cursor: pointer; - font-size: 2rem; - -webkit-transition: .3s color; - transition: .3s color; -} - -.sidenav li > a > i.nopaque-icons { - float: left; - height: 48px; - line-height: 48px; - margin: 0 32px 0 0; - width: 24px; - color: rgba(0, 0, 0, 0.54); -} diff --git a/web/app/static/css/materialize.sidenav-fixed.css b/web/app/static/css/sidenav_fixed.css similarity index 100% rename from web/app/static/css/materialize.sidenav-fixed.css rename to web/app/static/css/sidenav_fixed.css diff --git a/web/app/static/js/nopaque/RessourceLists/CorpusList.js b/web/app/static/js/nopaque/RessourceLists/CorpusList.js index 0d5b2eb7..fadb4fa1 100644 --- a/web/app/static/js/nopaque/RessourceLists/CorpusList.js +++ b/web/app/static/js/nopaque/RessourceLists/CorpusList.js @@ -81,7 +81,7 @@ class CorpusList extends RessourceList { } CorpusList.options = { item: ` - book + book
diff --git a/web/app/static/js/nopaque/RessourceLists/JobList.js b/web/app/static/js/nopaque/RessourceLists/JobList.js index b4c47504..cb88b1e3 100644 --- a/web/app/static/js/nopaque/RessourceLists/JobList.js +++ b/web/app/static/js/nopaque/RessourceLists/JobList.js @@ -82,7 +82,7 @@ class JobList extends RessourceList { } JobList.options = { item: ` - +
diff --git a/web/app/templates/_color.html.j2 b/web/app/templates/_color.html.j2 new file mode 100644 index 00000000..e4f2b1bf --- /dev/null +++ b/web/app/templates/_color.html.j2 @@ -0,0 +1,110 @@ +{% set colors = { + 'primary': '#00426f', + 'primary_variant': '#1A5C89', + 'secondary': '#00426f', + 'secondary_variant': '#1A5C89', + 'background': '#ffffff', + 'surface': '#ffffff', + 'error': '#b00020', + + 'service_corpus_analysis': '#aa9cc9', + 'service_corpus_analysis_darken': '#6b3f89', + 'service_corpus_analysis_lighten': '#ebe8f6', + 'service_file_setup': '#d5dc95', + 'service_file_setup_darken': '#a1b300', + 'service_file_setup_lighten': '#f2f3e1', + 'service_nlp': '#98acd2', + 'service_nlp_darken': '#0064a3', + 'service_nlp_lighten': '#e5e8f5', + 'service_ocr': '#a9d8c8', + 'service_ocr_darken': '#00a58b', + 'service_ocr_lighten': '#e7f4f1', + + 'status_unprepared': '#9e9e9e', + 'status_submitted': '#9e9e9e', + 'status_queued': '#2196f3', + 'status_running': '#ffc107', + 'status_complete': '#4caf50', + 'status_failed': '#f44336', + 'status_prepared': '#4caf50', + 'status_start_analysis': '#2196f3', + 'status_analysing': '#4caf50', + 'status_stop_analysis': '#ff5722' +} %} + + + diff --git a/web/app/templates/_colors.html.j2 b/web/app/templates/_colors.html.j2 deleted file mode 100644 index be667210..00000000 --- a/web/app/templates/_colors.html.j2 +++ /dev/null @@ -1,15 +0,0 @@ -{% set colors = {'primary': '#00426f', - 'secondary': '#1A5C89', - 'footer': '#b1b3b4', - 'corpus_analysis': '#aa9cc9', - 'corpus_analysis_darken': '#6b3f89', - 'corpus_analysis_lighten': '#ebe8f6', - 'file_setup': '#d5dc95', - 'file_setup_darken': '#a1b300', - 'file_setup_lighten': '#f2f3e1', - 'nlp': '#98acd2', - 'nlp_darken': '#0064a3', - 'nlp_lighten': '#e5e8f5', - 'ocr': '#a9d8c8', - 'ocr_darken': '#00a58b', - 'ocr_lighten': '#e7f4f1'} %} diff --git a/web/app/templates/admin/edit_user.html.j2 b/web/app/templates/admin/edit_user.html.j2 index 61ef21da..5f441cf2 100644 --- a/web/app/templates/admin/edit_user.html.j2 +++ b/web/app/templates/admin/edit_user.html.j2 @@ -1,5 +1,5 @@ {% extends "nopaque.html.j2" %} -{% import 'materialize/wtf.html.j2' as wtf %} +{% import "materialize/wtf.html.j2" as wtf %} {% block nav_content %} {% include 'admin/_breadcrumbs.html.j2' %} diff --git a/web/app/templates/auth/login.html.j2 b/web/app/templates/auth/login.html.j2 index db83e8b0..c2133616 100644 --- a/web/app/templates/auth/login.html.j2 +++ b/web/app/templates/auth/login.html.j2 @@ -1,5 +1,5 @@ {% extends "nopaque.html.j2" %} -{% import 'materialize/wtf.html.j2' as wtf %} +{% import "materialize/wtf.html.j2" as wtf %} {% block nav_content %} {% include 'auth/_breadcrumbs.html.j2' %} diff --git a/web/app/templates/auth/register.html.j2 b/web/app/templates/auth/register.html.j2 index 7b8db08d..111b36ad 100644 --- a/web/app/templates/auth/register.html.j2 +++ b/web/app/templates/auth/register.html.j2 @@ -1,5 +1,5 @@ {% extends "nopaque.html.j2" %} -{% import 'materialize/wtf.html.j2' as wtf %} +{% import "materialize/wtf.html.j2" as wtf %} {% block nav_content %} {% include 'auth/_breadcrumbs.html.j2' %} diff --git a/web/app/templates/auth/reset_password.html.j2 b/web/app/templates/auth/reset_password.html.j2 index 4002c158..ec9c6b18 100644 --- a/web/app/templates/auth/reset_password.html.j2 +++ b/web/app/templates/auth/reset_password.html.j2 @@ -1,5 +1,5 @@ {% extends "nopaque.html.j2" %} -{% import 'materialize/wtf.html.j2' as wtf %} +{% import "materialize/wtf.html.j2" as wtf %} {% block nav_content %} {% include 'auth/_breadcrumbs.html.j2' %} diff --git a/web/app/templates/auth/reset_password_request.html.j2 b/web/app/templates/auth/reset_password_request.html.j2 index 07a0808e..1f65091a 100644 --- a/web/app/templates/auth/reset_password_request.html.j2 +++ b/web/app/templates/auth/reset_password_request.html.j2 @@ -1,5 +1,5 @@ {% extends "nopaque.html.j2" %} -{% import 'materialize/wtf.html.j2' as wtf %} +{% import "materialize/wtf.html.j2" as wtf %} {% block nav_content %} {% include 'auth/_breadcrumbs.html.j2' %} diff --git a/web/app/templates/corpora/add_corpus.html.j2 b/web/app/templates/corpora/add_corpus.html.j2 index c5e5e3b9..0785ed11 100644 --- a/web/app/templates/corpora/add_corpus.html.j2 +++ b/web/app/templates/corpora/add_corpus.html.j2 @@ -1,16 +1,12 @@ {% extends "nopaque.html.j2" %} -{% from '_colors.html.j2' import colors %} -{% import 'materialize/wtf.html.j2' as wtf %} +{% import "materialize/wtf.html.j2" as wtf %} -{% set scheme_primary_color = colors.corpus_analysis_darken %} -{% set scheme_secondary_color = colors.corpus_analysis %} +{% block main_attribs %} class="service-scheme" data-service="corpus-analysis"{% endblock main_attribs %} {% block nav_content %} {% include 'corpora/_breadcrumbs.html.j2' %} {% endblock nav_content %} -{% block main_attribs %} class="corpus-analysis-color lighten"{% endblock main_attribs %} - {% block page_content %}
diff --git a/web/app/templates/corpora/add_corpus_file.html.j2 b/web/app/templates/corpora/add_corpus_file.html.j2 index 14b09304..be3e9f71 100644 --- a/web/app/templates/corpora/add_corpus_file.html.j2 +++ b/web/app/templates/corpora/add_corpus_file.html.j2 @@ -1,16 +1,12 @@ {% extends "nopaque.html.j2" %} -{% from '_colors.html.j2' import colors %} -{% import 'materialize/wtf.html.j2' as wtf %} +{% import "materialize/wtf.html.j2" as wtf %} -{% set scheme_primary_color = colors.corpus_analysis_darken %} -{% set scheme_secondary_color = colors.corpus_analysis %} +{% block main_attribs %} class="service-scheme" data-service="corpus-analysis"{% endblock main_attribs %} {% block nav_content %} {% include 'corpora/_breadcrumbs.html.j2' %} {% endblock nav_content %} -{% block main_attribs %} class="corpus-analysis-color lighten"{% endblock main_attribs %} - {% block page_content %}
diff --git a/web/app/templates/corpora/analyse_corpus.html.j2 b/web/app/templates/corpora/analyse_corpus.html.j2 index d7213988..691517b5 100644 --- a/web/app/templates/corpora/analyse_corpus.html.j2 +++ b/web/app/templates/corpora/analyse_corpus.html.j2 @@ -1,16 +1,12 @@ {% extends "nopaque.html.j2" %} -{% from '_colors.html.j2' import colors %} -{% import 'materialize/wtf.html.j2' as wtf %} +{% import "materialize/wtf.html.j2" as wtf %} -{% set scheme_primary_color = colors.corpus_analysis_darken %} -{% set scheme_secondary_color = colors.corpus_analysis %} +{% block main_attribs %} class="service-scheme" data-service="corpus-analysis"{% endblock main_attribs %} {% block nav_content %} {% include 'corpora/_breadcrumbs.html.j2' %} {% endblock nav_content %} -{% block main_attribs %} class="corpus-analysis-color lighten"{% endblock main_attribs %} - {% block page_content %}
diff --git a/web/app/templates/corpora/corpus.html.j2 b/web/app/templates/corpora/corpus.html.j2 index 96da6976..510f2091 100644 --- a/web/app/templates/corpora/corpus.html.j2 +++ b/web/app/templates/corpora/corpus.html.j2 @@ -1,9 +1,6 @@ {% extends "nopaque.html.j2" %} -{% from '_colors.html.j2' import colors %} -{% set scheme_primary_color = colors.corpus_analysis_darken %} -{% set scheme_secondary_color = colors.corpus_analysis_lighten %} -{% block main_attribs %} style="background-color: {{ scheme_secondary_color }};"{% endblock main_attribs %} +{% block main_attribs %} class="service-scheme" data-service="corpus-analysis"{% endblock main_attribs %} {% block nav_content %} {% include 'corpora/_breadcrumbs.html.j2' %} @@ -37,8 +34,8 @@
-
-
+
+
diff --git a/web/app/templates/corpora/corpus_file.html.j2 b/web/app/templates/corpora/corpus_file.html.j2 index d8022303..e5dc31eb 100644 --- a/web/app/templates/corpora/corpus_file.html.j2 +++ b/web/app/templates/corpora/corpus_file.html.j2 @@ -1,16 +1,12 @@ {% extends "nopaque.html.j2" %} -{% from '_colors.html.j2' import colors %} -{% import 'materialize/wtf.html.j2' as wtf %} +{% import "materialize/wtf.html.j2" as wtf %} -{% set scheme_primary_color = colors.corpus_analysis_darken %} -{% set scheme_secondary_color = colors.corpus_analysis %} +{% block main_attribs %} class="service-scheme" data-service="corpus-analysis"{% endblock main_attribs %} {% block nav_content %} {% include 'corpora/_breadcrumbs.html.j2' %} {% endblock nav_content %} -{% block main_attribs %} class="corpus-analysis-color lighten"{% endblock main_attribs %} - {% block page_content %}
diff --git a/web/app/templates/corpora/import_corpus.html.j2 b/web/app/templates/corpora/import_corpus.html.j2 index 1a8caf08..9531e844 100644 --- a/web/app/templates/corpora/import_corpus.html.j2 +++ b/web/app/templates/corpora/import_corpus.html.j2 @@ -1,16 +1,12 @@ - {% extends "nopaque.html.j2" %} -{% from '_colors.html.j2' import colors %} -{% import 'materialize/wtf.html.j2' as wtf %} +{% extends "nopaque.html.j2" %} +{% import "materialize/wtf.html.j2" as wtf %} -{% set scheme_primary_color = colors.corpus_analysis_darken %} -{% set scheme_secondary_color = colors.corpus_analysis %} +{% block main_attribs %} class="service-scheme" data-service="corpus-analysis"{% endblock main_attribs %} {% block nav_content %} {% include 'corpora/_breadcrumbs.html.j2' %} {% endblock nav_content %} -{% block main_attribs %} class="corpus-analysis-color lighten"{% endblock main_attribs %} - {% block page_content %}
diff --git a/web/app/templates/corpora/interactions/display.html.j2 b/web/app/templates/corpora/interactions/display.html.j2 index f6b7b490..8eb96e8e 100644 --- a/web/app/templates/corpora/interactions/display.html.j2 +++ b/web/app/templates/corpora/interactions/display.html.j2 @@ -1,4 +1,4 @@ -{% import 'materialize/wtf.html.j2' as wtf %} +{% import "materialize/wtf.html.j2" as wtf %}
diff --git a/web/app/templates/corpora/query_results/add_query_result.html.j2 b/web/app/templates/corpora/query_results/add_query_result.html.j2 index 6ad4ebd6..04fbb6ef 100644 --- a/web/app/templates/corpora/query_results/add_query_result.html.j2 +++ b/web/app/templates/corpora/query_results/add_query_result.html.j2 @@ -1,16 +1,12 @@ {% extends "nopaque.html.j2" %} -{% from '_colors.html.j2' import colors %} -{% import 'materialize/wtf.html.j2' as wtf %} +{% import "materialize/wtf.html.j2" as wtf %} -{% set scheme_primary_color = colors.corpus_analysis_darken %} -{% set scheme_secondary_color = colors.corpus_analysis %} +{% block main_attribs %} class="service-scheme" data-service="corpus-analysis"{% endblock main_attribs %} {% block nav_content %} {% include 'corpora/query_results/_breadcrumbs.html.j2' %} {% endblock nav_content %} -{% block main_attribs %} class="corpus-analysis-color lighten"{% endblock main_attribs %} - {% block page_content %}
diff --git a/web/app/templates/corpora/query_results/inspect.html.j2 b/web/app/templates/corpora/query_results/inspect.html.j2 index 252dd974..405b6e2a 100644 --- a/web/app/templates/corpora/query_results/inspect.html.j2 +++ b/web/app/templates/corpora/query_results/inspect.html.j2 @@ -1,21 +1,16 @@ {% extends "nopaque.html.j2" %} -{% from '_colors.html.j2' import colors %} -{% set scheme_primary_color = colors.corpus_analysis_darken %} -{% set scheme_secondary_color = colors.corpus_analysis %} +{% block main_attribs %} class="service-scheme" data-service="corpus-analysis"{% endblock main_attribs %} {% block nav_content %} {% include 'corpora/query_results/_breadcrumbs.html.j2' %} {% endblock nav_content %} -{% block main_attribs %} class="corpus-analysis-color lighten"{% endblock main_attribs %} - {% block page_content %}
-
+
diff --git a/web/app/templates/corpora/query_results/query_result.html.j2 b/web/app/templates/corpora/query_results/query_result.html.j2 index 24ce8978..e3d772bb 100644 --- a/web/app/templates/corpora/query_results/query_result.html.j2 +++ b/web/app/templates/corpora/query_results/query_result.html.j2 @@ -1,15 +1,11 @@ {% extends "nopaque.html.j2" %} -{% from '_colors.html.j2' import colors %} -{% set scheme_primary_color = colors.corpus_analysis_darken %} -{% set scheme_secondary_color = colors.corpus_analysis %} +{% block main_attribs %} class="service-scheme" data-service="corpus-analysis"{% endblock main_attribs %} {% block nav_content %} {% include 'corpora/query_results/_breadcrumbs.html.j2' %} {% endblock nav_content %} -{% block main_attribs %} class="corpus-analysis-color lighten"{% endblock main_attribs %} - {% block page_content %}
diff --git a/web/app/templates/jobs/job.html.j2 b/web/app/templates/jobs/job.html.j2 index c35e259b..51a2b8ed 100644 --- a/web/app/templates/jobs/job.html.j2 +++ b/web/app/templates/jobs/job.html.j2 @@ -1,17 +1,6 @@ {% extends "nopaque.html.j2" %} -{% from '_colors.html.j2' import colors %} -{% if job.service == 'file-setup' %} - {% set scheme_primary_color = colors.file_setup_darken %} - {% set scheme_secondary_color = colors.file_setup_lighten %} -{% elif job.service == 'nlp' %} - {% set scheme_primary_color = colors.nlp_darken %} - {% set scheme_secondary_color = colors.nlp_lighten %} -{% elif job.service == 'ocr' %} - {% set scheme_primary_color = colors.ocr_darken %} - {% set scheme_secondary_color = colors.ocr_lighten %} -{% endif %} -{% block main_attribs %} style="background-color: {{ scheme_secondary_color }};"{% endblock main_attribs %} +{% block main_attribs %} class="service-scheme" data-service="{{ job.service }}"{% endblock main_attribs %} {% block nav_content %} {% include 'jobs/_breadcrumbs.html.j2' %} @@ -45,7 +34,7 @@
-
+
diff --git a/web/app/templates/main/dashboard.html.j2 b/web/app/templates/main/dashboard.html.j2 index b131b015..3ae228b8 100644 --- a/web/app/templates/main/dashboard.html.j2 +++ b/web/app/templates/main/dashboard.html.j2 @@ -132,36 +132,36 @@

- +

-

File setup

+

File setup

Digital copies of text based research data (books, letters, etc.) often comprise various files and formats. nopaque converts and merges those files to facilitate further processing and the application of other services.

- Create Job + Create Job

- +

-

Optical Character Recognition

+

Optical Character Recognition

nopaque converts your image data – like photos or scans – into text data through a process called OCR. This step enables you to proceed with further computational analysis of your documents.

- Create Job + Create Job

- +

-

Natural Language Processing

+

Natural Language Processing

By means of computational linguistic data processing (tokenization, lemmatization, part-of-speech tagging and named-entity recognition) nopaque extracts additional information from your text.

- Create Job + Create Job
diff --git a/web/app/templates/main/index.html.j2 b/web/app/templates/main/index.html.j2 index a855aef8..6be76c8e 100644 --- a/web/app/templates/main/index.html.j2 +++ b/web/app/templates/main/index.html.j2 @@ -1,5 +1,5 @@ {% extends "nopaque.html.j2" %} -{% import 'materialize/wtf.html.j2' as wtf %} +{% import "materialize/wtf.html.j2" as wtf %} {% block nav_content %} {% include 'main/_breadcrumbs.html.j2' %} @@ -80,34 +80,34 @@
- +

-

File setup

+

File setup

Digital copies of text based research data (books, letters, etc.) often comprise various files and formats. nopaque converts and merges those files to facilitate further processing and the application of other services.

- +

-

Optical Character Recognition

+

Optical Character Recognition

nopaque converts your image data – like photos or scans – into text data through OCR making it machine readable. This step enables you to proceed with further computational analysis of your documents.

- +

-

Natural Language Processing

+

Natural Language Processing

By means of computational linguistic data processing (tokenization, lemmatization, part-of-speech tagging and named-entity recognition) nopaque extracts additional information from your text.

- +

-

Corpus analysis

+

Corpus analysis

nopaque lets you create and upload as many text corpora as you want. It makes use of CQP Query Language, which allows for complex search requests with the aid of metadata and NLP tags.

diff --git a/web/app/templates/nopaque.html.j2 b/web/app/templates/nopaque.html.j2 index 49e182b7..dba9022e 100644 --- a/web/app/templates/nopaque.html.j2 +++ b/web/app/templates/nopaque.html.j2 @@ -1,5 +1,4 @@ {% extends "materialize/base.html.j2" %} -{% from '_colors.html.j2' import colors %} {% block html_attribs %} lang="en"{% endblock html_attribs %} @@ -18,71 +17,11 @@ {% block styles %} {{ super() }} {% if current_user.is_authenticated %} - + {% endif %} - - +{% include "_color.html.j2" %} {% endblock styles %} {% block navbar %} @@ -100,7 +39,7 @@
  • more_vert
    • -
    +
    {% block nav_content %}{% endblock nav_content %} {% if current_user.is_authenticated %} explore @@ -122,8 +61,8 @@ {% endblock navbar %} {% block sidenav %} -
      - {% if current_user.is_authenticated %} +{% if current_user.is_authenticated %} + +{% endif %} {% endblock sidenav %} -{% block main_attribs %} class="grey lighten-5"{% endblock main_attribs %} - {% block main %} {% block page_content %}{% endblock page_content %} {% if current_user.is_authenticated %} @@ -201,7 +135,7 @@ {% endif %} {% endblock main %} -{% block footer_attribs %} class="page-footer footer-color"{% endblock footer_attribs %} +{% block footer_attribs %} class="page-footer primary-variant-color"{% endblock footer_attribs %} {% block footer %}
      @@ -258,13 +192,13 @@ -{% assets output="js/nopaque/RessourceDisplays.compiled.js", +{% assets filters='rjsmin', output="js/nopaque/RessourceDisplays.min.compiled.js", "js/nopaque/RessourceDisplays/RessourceDisplay.js", "js/nopaque/RessourceDisplays/CorpusDisplay.js", "js/nopaque/RessourceDisplays/JobDisplay.js" %} {% endassets %} -{% assets output="js/nopaque/RessourceLists.compiled.js", +{% assets filters='rjsmin', output="js/nopaque/RessourceLists.min.compiled.js", "js/nopaque/RessourceLists/RessourceList.js", "js/nopaque/RessourceLists/CorpusList.js", "js/nopaque/RessourceLists/CorpusFileList.js", diff --git a/web/app/templates/services/corpus_analysis.html.j2 b/web/app/templates/services/corpus_analysis.html.j2 index 8e2050d8..9e83a71f 100644 --- a/web/app/templates/services/corpus_analysis.html.j2 +++ b/web/app/templates/services/corpus_analysis.html.j2 @@ -1,15 +1,11 @@ {% extends "nopaque.html.j2" %} -{% from '_colors.html.j2' import colors %} -{% set scheme_primary_color = colors.corpus_analysis_darken %} -{% set scheme_secondary_color = colors.corpus_analysis %} +{% block main_attribs %} class="service-scheme" data-service="corpus-analysis"{% endblock main_attribs %} {% block nav_content %} {% include 'services/_breadcrumbs.html.j2' %} {% endblock nav_content %} -{% block main_attribs %} class="corpus-analysis-color lighten"{% endblock main_attribs %} - {% block page_content %}
      @@ -20,7 +16,7 @@
      - +
      diff --git a/web/app/templates/services/file-setup.html.j2 b/web/app/templates/services/file_setup.html.j2 similarity index 85% rename from web/app/templates/services/file-setup.html.j2 rename to web/app/templates/services/file_setup.html.j2 index 98e3591e..d6627861 100644 --- a/web/app/templates/services/file-setup.html.j2 +++ b/web/app/templates/services/file_setup.html.j2 @@ -1,16 +1,12 @@ {% extends "nopaque.html.j2" %} -{% import 'materialize/wtf.html.j2' as wtf %} -{% from '_colors.html.j2' import colors %} +{% import "materialize/wtf.html.j2" as wtf %} -{% set scheme_primary_color = colors.file_setup_darken %} -{% set scheme_secondary_color = colors.file_setup %} +{% block main_attribs %} class="service-scheme" data-service="file-setup"{% endblock main_attribs %} {% block nav_content %} {% include 'services/_breadcrumbs.html.j2' %} {% endblock nav_content %} -{% block main_attribs %} class="file-setup-color lighten"{% endblock main_attribs %} - {% block page_content %}
      @@ -23,13 +19,13 @@

       

       

      - +
      -
      +
      diff --git a/web/app/templates/services/nlp.html.j2 b/web/app/templates/services/nlp.html.j2 index b8f866d5..64d6269f 100644 --- a/web/app/templates/services/nlp.html.j2 +++ b/web/app/templates/services/nlp.html.j2 @@ -1,16 +1,12 @@ {% extends "nopaque.html.j2" %} -{% import 'materialize/wtf.html.j2' as wtf %} -{% from '_colors.html.j2' import colors %} +{% import "materialize/wtf.html.j2" as wtf %} -{% set scheme_primary_color = colors.nlp_darken %} -{% set scheme_secondary_color = colors.nlp %} +{% block main_attribs %} class="service-scheme" data-service="nlp"{% endblock main_attribs %} {% block nav_content %} {% include 'services/_breadcrumbs.html.j2' %} {% endblock nav_content %} -{% block main_attribs %} class="nlp-color lighten"{% endblock main_attribs %} - {% block page_content %}
      @@ -23,13 +19,13 @@

       

       

      - +
      -
      +
      diff --git a/web/app/templates/services/ocr.html.j2 b/web/app/templates/services/ocr.html.j2 index 7de66928..4b641c09 100644 --- a/web/app/templates/services/ocr.html.j2 +++ b/web/app/templates/services/ocr.html.j2 @@ -1,16 +1,12 @@ {% extends "nopaque.html.j2" %} -{% import 'materialize/wtf.html.j2' as wtf %} -{% from '_colors.html.j2' import colors %} +{% import "materialize/wtf.html.j2" as wtf %} -{% set scheme_primary_color = colors.ocr_darken %} -{% set scheme_secondary_color = colors.ocr %} +{% block main_attribs %} class="service-scheme" data-service="ocr"{% endblock main_attribs %} {% block nav_content %} {% include 'services/_breadcrumbs.html.j2' %} {% endblock nav_content %} -{% block main_attribs %} class="ocr-color lighten"{% endblock main_attribs %} - {% block page_content %}
      @@ -23,13 +19,13 @@

       

       

      - +
      -
      +
      diff --git a/web/app/templates/settings/change_password.html.j2 b/web/app/templates/settings/change_password.html.j2 index f1714dc5..c4f76cbd 100644 --- a/web/app/templates/settings/change_password.html.j2 +++ b/web/app/templates/settings/change_password.html.j2 @@ -1,5 +1,5 @@ {% extends 'nopaque.html.j2' %} -{% import 'materialize/wtf.html.j2' as wtf %} +{% import "materialize/wtf.html.j2" as wtf %} {% block nav_content %} {% include 'settings/_breadcrumbs.html.j2' %} diff --git a/web/app/templates/settings/edit_general_settings.html.j2 b/web/app/templates/settings/edit_general_settings.html.j2 index 286983f0..f0e7953d 100644 --- a/web/app/templates/settings/edit_general_settings.html.j2 +++ b/web/app/templates/settings/edit_general_settings.html.j2 @@ -1,5 +1,5 @@ {% extends 'nopaque.html.j2' %} -{% import 'materialize/wtf.html.j2' as wtf %} +{% import "materialize/wtf.html.j2" as wtf %} {% block nav_content %} {% include 'settings/_breadcrumbs.html.j2' %} diff --git a/web/app/templates/settings/edit_notification_settings.html.j2 b/web/app/templates/settings/edit_notification_settings.html.j2 index e6fc7428..64a695c3 100644 --- a/web/app/templates/settings/edit_notification_settings.html.j2 +++ b/web/app/templates/settings/edit_notification_settings.html.j2 @@ -1,5 +1,5 @@ {% extends 'nopaque.html.j2' %} -{% import 'materialize/wtf.html.j2' as wtf %} +{% import "materialize/wtf.html.j2" as wtf %} {% block nav_content %} {% include 'settings/_breadcrumbs.html.j2' %}