From 23441dab2e4c4005c1a1a9eddc0d064a598848e7 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Fri, 23 Oct 2020 08:51:46 +0200 Subject: [PATCH 01/31] intermediate --- .../css/materialize.fix.sidenav-fixed.css | 12 + .../css/materialize.fix.sticky-footer.css | 13 + web/app/static/css/nopaque.css | 16 - web/app/static/js/nopaque.js | 185 +++---- web/app/templates/_variables.html.j2 | 19 + web/app/templates/auth/login.html.j2 | 70 +-- web/app/templates/auth/register.html.j2 | 60 ++- web/app/templates/auth/reset_password.html.j2 | 38 +- .../auth/reset_password_request.html.j2 | 35 +- web/app/templates/auth/unconfirmed.html.j2 | 35 +- web/app/templates/main/about_and_faq.html.j2 | 508 +++++++++--------- web/app/templates/main/dashboard.html.j2 | 265 ++++----- web/app/templates/main/index.html.j2 | 11 +- web/app/templates/main/news.html.j2 | 23 +- web/app/templates/main/privacy_policy.html.j2 | 285 +++++----- web/app/templates/main/terms_of_use.html.j2 | 198 +++---- web/app/templates/materialize/base.html.j2 | 35 ++ web/app/templates/materialize/wtf.html.j2 | 101 ++++ web/app/templates/nopaque.html.j2 | 489 +++++++---------- 19 files changed, 1249 insertions(+), 1149 deletions(-) create mode 100644 web/app/static/css/materialize.fix.sidenav-fixed.css create mode 100644 web/app/static/css/materialize.fix.sticky-footer.css create mode 100644 web/app/templates/_variables.html.j2 create mode 100644 web/app/templates/materialize/base.html.j2 create mode 100644 web/app/templates/materialize/wtf.html.j2 diff --git a/web/app/static/css/materialize.fix.sidenav-fixed.css b/web/app/static/css/materialize.fix.sidenav-fixed.css new file mode 100644 index 00000000..7cf789da --- /dev/null +++ b/web/app/static/css/materialize.fix.sidenav-fixed.css @@ -0,0 +1,12 @@ +/* + * The sidenav-fixed class is used which causes the sidenav to be fixed and open + * on large screens and hides to the regular functionality on smaller screens. + * In order to prevent the sidenav to overlap the content, the content (in our + * case header, main and footer) gets an offset equal to the width of the + * sidenav. + */ +@media only screen and (min-width : 993px) { + header, main, footer {padding-left: 300px;} + .modal:not(.bottom-sheet) {left: 300px;} + .navbar-fixed > nav {width: calc(100% - 300px)} +} diff --git a/web/app/static/css/materialize.fix.sticky-footer.css b/web/app/static/css/materialize.fix.sticky-footer.css new file mode 100644 index 00000000..49b8f5b8 --- /dev/null +++ b/web/app/static/css/materialize.fix.sticky-footer.css @@ -0,0 +1,13 @@ +/* + * 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 66421a7d..f97cede4 100644 --- a/web/app/static/css/nopaque.css +++ b/web/app/static/css/nopaque.css @@ -1,19 +1,3 @@ -/* - * ### Start sticky footer ### - * 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; -} -/* ### End sticky footer ### */ - /* add custom bold class */ .bold { font-weight: bold; diff --git a/web/app/static/js/nopaque.js b/web/app/static/js/nopaque.js index 35ceac83..b006ec25 100644 --- a/web/app/static/js/nopaque.js +++ b/web/app/static/js/nopaque.js @@ -4,12 +4,8 @@ */ var nopaque = {}; -// nopaque ressources -nopaque.socket = undefined; - // User data nopaque.user = {}; -nopaque.user.isAuthenticated = undefined; nopaque.user.settings = {}; nopaque.user.settings.darkMode = undefined; nopaque.corporaSubscribers = []; @@ -25,81 +21,76 @@ nopaque.foreignCorporaSubscribers = []; nopaque.foreignJobsSubscribers = []; nopaque.foreignQueryResultsSubscribers = []; -nopaque.flashedMessages = undefined; - // nopaque functions -nopaque.socket = {}; -nopaque.socket.init = function() { - nopaque.socket = io({transports: ['websocket']}); - // Add event handlers - nopaque.socket.on("user_data_stream_init", function(msg) { - nopaque.user = JSON.parse(msg); - for (let subscriber of nopaque.corporaSubscribers) { - subscriber._init(nopaque.user.corpora); - } - for (let subscriber of nopaque.jobsSubscribers) { - subscriber._init(nopaque.user.jobs); - } - for (let subscriber of nopaque.queryResultsSubscribers) { - subscriber._init(nopaque.user.query_results); - } - }); +nopaque.socket = io({transports: ['websocket']}); +// Add event handlers +nopaque.socket.on("user_data_stream_init", function(msg) { + nopaque.user = JSON.parse(msg); + for (let subscriber of nopaque.corporaSubscribers) { + subscriber._init(nopaque.user.corpora); + } + for (let subscriber of nopaque.jobsSubscribers) { + subscriber._init(nopaque.user.jobs); + } + for (let subscriber of nopaque.queryResultsSubscribers) { + subscriber._init(nopaque.user.query_results); + } +}); - nopaque.socket.on("user_data_stream_update", function(msg) { - var patch; +nopaque.socket.on("user_data_stream_update", function(msg) { + var patch; - patch = JSON.parse(msg); - nopaque.user = jsonpatch.apply_patch(nopaque.user, patch); - corpora_patch = patch.filter(operation => operation.path.startsWith("/corpora")); - jobs_patch = patch.filter(operation => operation.path.startsWith("/jobs")); - query_results_patch = patch.filter(operation => operation.path.startsWith("/query_results")); - for (let subscriber of nopaque.corporaSubscribers) { - subscriber._update(corpora_patch); - } - for (let subscriber of nopaque.jobsSubscribers) { - subscriber._update(jobs_patch); - } - for (let subscriber of nopaque.queryResultsSubscribers) { - subscriber._update(query_results_patch); - } - if (["all", "end"].includes(nopaque.user.settings.job_status_site_notifications)) { - for (operation of jobs_patch) { - /* "/jobs/{jobId}/..." -> ["{jobId}", ...] */ - pathArray = operation.path.split("/").slice(2); - if (operation.op === "replace" && pathArray[1] === "status") { - if (nopaque.user.settings.job_status_site_notifications === "end" && !["complete", "failed"].includes(operation.value)) {continue;} - nopaque.flash(`[${nopaque.user.jobs[pathArray[0]].title}] New status: ${operation.value}`, "job"); - } + patch = JSON.parse(msg); + nopaque.user = jsonpatch.apply_patch(nopaque.user, patch); + corpora_patch = patch.filter(operation => operation.path.startsWith("/corpora")); + jobs_patch = patch.filter(operation => operation.path.startsWith("/jobs")); + query_results_patch = patch.filter(operation => operation.path.startsWith("/query_results")); + for (let subscriber of nopaque.corporaSubscribers) { + subscriber._update(corpora_patch); + } + for (let subscriber of nopaque.jobsSubscribers) { + subscriber._update(jobs_patch); + } + for (let subscriber of nopaque.queryResultsSubscribers) { + subscriber._update(query_results_patch); + } + if (["all", "end"].includes(nopaque.user.settings.job_status_site_notifications)) { + for (operation of jobs_patch) { + /* "/jobs/{jobId}/..." -> ["{jobId}", ...] */ + pathArray = operation.path.split("/").slice(2); + if (operation.op === "replace" && pathArray[1] === "status") { + if (nopaque.user.settings.job_status_site_notifications === "end" && !["complete", "failed"].includes(operation.value)) {continue;} + nopaque.flash(`[${nopaque.user.jobs[pathArray[0]].title}] New status: ${operation.value}`, "job"); } } - }); + } +}); - nopaque.socket.on("foreign_user_data_stream_init", function(msg) { - nopaque.foreignUser = JSON.parse(msg); - for (let subscriber of nopaque.foreignCorporaSubscribers) { - subscriber._init(nopaque.foreignUser.corpora); - } - for (let subscriber of nopaque.foreignJobsSubscribers) { - subscriber._init(nopaque.foreignUser.jobs); - } - for (let subscriber of nopaque.foreignQueryResultsSubscribers) { - subscriber._init(nopaque.foreignUser.query_results); - } - }); +nopaque.socket.on("foreign_user_data_stream_init", function(msg) { + nopaque.foreignUser = JSON.parse(msg); + for (let subscriber of nopaque.foreignCorporaSubscribers) { + subscriber._init(nopaque.foreignUser.corpora); + } + for (let subscriber of nopaque.foreignJobsSubscribers) { + subscriber._init(nopaque.foreignUser.jobs); + } + for (let subscriber of nopaque.foreignQueryResultsSubscribers) { + subscriber._init(nopaque.foreignUser.query_results); + } +}); - nopaque.socket.on("foreign_user_data_stream_update", function(msg) { - var patch; +nopaque.socket.on("foreign_user_data_stream_update", function(msg) { + var patch; - patch = JSON.parse(msg); - nopaque.foreignUser = jsonpatch.apply_patch(nopaque.foreignUser, patch); - corpora_patch = patch.filter(operation => operation.path.startsWith("/corpora")); - jobs_patch = patch.filter(operation => operation.path.startsWith("/jobs")); - query_results_patch = patch.filter(operation => operation.path.startsWith("/query_results")); - for (let subscriber of nopaque.foreignCorporaSubscribers) {subscriber._update(corpora_patch);} - for (let subscriber of nopaque.foreignJobsSubscribers) {subscriber._update(jobs_patch);} - for (let subscriber of nopaque.foreignQueryResultsSubscribers) {subscriber._update(query_results_patch);} - }); -} + patch = JSON.parse(msg); + nopaque.foreignUser = jsonpatch.apply_patch(nopaque.foreignUser, patch); + corpora_patch = patch.filter(operation => operation.path.startsWith("/corpora")); + jobs_patch = patch.filter(operation => operation.path.startsWith("/jobs")); + query_results_patch = patch.filter(operation => operation.path.startsWith("/query_results")); + for (let subscriber of nopaque.foreignCorporaSubscribers) {subscriber._update(corpora_patch);} + for (let subscriber of nopaque.foreignJobsSubscribers) {subscriber._update(jobs_patch);} + for (let subscriber of nopaque.foreignQueryResultsSubscribers) {subscriber._update(query_results_patch);} +}); nopaque.Forms = {}; nopaque.Forms.init = function() { @@ -173,32 +164,10 @@ nopaque.Forms.init = function() { } } -nopaque.Navigation = {}; -nopaque.Navigation.init = function() { - /* ### Initialize sidenav-main ### */ - for (let entry of document.querySelectorAll("#sidenav-main a")) { - if (entry.href === window.location.href) { - entry.parentNode.classList.add("active"); - } - } -} - -nopaque.flash = function() { - var classes, toast, toastActionElement; - - switch (arguments.length) { - case 1: - category = "message"; - message = arguments[0]; - break; - case 2: - message = arguments[0]; - category = arguments[1]; - break; - default: - console.error("Usage: nopaque.flash(message) or nopaque.flash(message, category)") - } +nopaque.flash = function(message, category) { + let toast; + let toastActionElement; switch (category) { case "corpus": @@ -219,27 +188,5 @@ nopaque.flash = function() { close `}); toastActionElement = toast.el.querySelector('.toast-action[data-action="close"]'); - if (toastActionElement) { - toastActionElement.addEventListener('click', function() { - toast.dismiss(); - }); - } + toastActionElement.addEventListener('click', () => {toast.dismiss();}); } - - -document.addEventListener('DOMContentLoaded', () => { - // Disable all option elements with no value - for (let optionElement of document.querySelectorAll('option[value=""]')) { - optionElement.disabled = true; - } - M.AutoInit(); - M.CharacterCounter.init(document.querySelectorAll('input[data-length][type="text"]')); - M.Dropdown.init(document.querySelectorAll('#nav-notifications, #nav-account'), - {alignment: 'right', constrainWidth: false, coverTrigger: false}); - nopaque.Forms.init(); - nopaque.Navigation.init(); - while (nopaque.flashedMessages.length) { - flashedMessage = nopaque.flashedMessages.shift(); - nopaque.flash(flashedMessage[1], flashedMessage[0]); - } -}); diff --git a/web/app/templates/_variables.html.j2 b/web/app/templates/_variables.html.j2 new file mode 100644 index 00000000..95bf1953 --- /dev/null +++ b/web/app/templates/_variables.html.j2 @@ -0,0 +1,19 @@ +{% set colors = {'primary': '#00426f', + 'secondary': '#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'} %} + + +{% if main_class is not defined %} +{% set main_class = 'grey lighten-5' %} +{% endif %} diff --git a/web/app/templates/auth/login.html.j2 b/web/app/templates/auth/login.html.j2 index 69ccbe57..a477da4f 100644 --- a/web/app/templates/auth/login.html.j2 +++ b/web/app/templates/auth/login.html.j2 @@ -1,8 +1,8 @@ {% extends "nopaque.html.j2" %} +{% import 'materialize/wtf.html.j2' as wtf %} -{% set headline = ' ' %} - -{% block page_content %} +{% block styles %} +{{ super() }} +{% endblock styles %} -
-
-
-

Log in

-

Want to boost your research and get going? nopaque is free and no download is needed. Register now!

-
-
- person_addRegister -
-
-
- -
-
-
-
- {{ login_form.hidden_tag() }} - {{ M.render_field(login_form.user, material_icon='person') }} - {{ M.render_field(login_form.password, material_icon='vpn_key') }} -
-
- Forgot your password? -
-
- {{ M.render_field(login_form.remember_me) }} -
+{% block page_content %} +
+
+
+
+
+

{{ title }}

+

Want to boost your research and get going? nopaque is free and no download is needed. Register now!

+
+
+ person_addRegister
-
- {{ M.render_field(login_form.submit, material_icon='send') }} +
+ +
+
+ +
+ {{ login_form.hidden_tag() }} + {{ wtf.render_field(login_form.user, material_icon='person') }} + {{ wtf.render_field(login_form.password, material_icon='vpn_key') }} +
+
+ Forgot your password? +
+
+ {{ wtf.render_field(login_form.remember_me) }} +
+
+
+
+ {{ wtf.render_field(login_form.submit, material_icon='send') }} +
+
- +
{% endblock %} diff --git a/web/app/templates/auth/register.html.j2 b/web/app/templates/auth/register.html.j2 index af8a0b95..db4ef2c0 100644 --- a/web/app/templates/auth/register.html.j2 +++ b/web/app/templates/auth/register.html.j2 @@ -1,8 +1,8 @@ {% extends "nopaque.html.j2" %} +{% import 'materialize/wtf.html.j2' as wtf %} -{% set headline = ' ' %} - -{% block page_content %} +{% block styles %} +{{ super() }} +{% endblock styles %} -
-
-
-

Register

-

Simply enter a username and password to receive your registration email. After that you can start right away.

-

It goes without saying that the General Data Protection Regulation applies, only necessary data is stored.

-

Please also read our terms of use before signing up for nopaque!

+{% block page_content %} +
+
+
+
+
+

Register

+

Simply enter a username and password to receive your registration email. After that you can start right away.

+

It goes without saying that the General Data Protection Regulation applies, only necessary data is stored.

+

Please also read our terms of use before signing up for nopaque!

+
+
+
+ +
+
+
+
+ {{ registration_form.hidden_tag() }} + {{ wtf.render_field(registration_form.username, data_length='64', material_icon='person') }} + {{ wtf.render_field(registration_form.password, data_length='128', material_icon='vpn_key') }} + {{ wtf.render_field(registration_form.password_confirmation, data_length='128', material_icon='vpn_key') }} + {{ wtf.render_field(registration_form.email, class_='validate', material_icon='email', type='email') }} +
+
+ {{ wtf.render_field(registration_form.submit, material_icon='send') }} +
+
+
- -
-
-
-
- {{ registration_form.hidden_tag() }} - {{ M.render_field(registration_form.username, data_length='64', material_icon='person') }} - {{ M.render_field(registration_form.password, data_length='128', material_icon='vpn_key') }} - {{ M.render_field(registration_form.password_confirmation, data_length='128', material_icon='vpn_key') }} - {{ M.render_field(registration_form.email, class_='validate', material_icon='email', type='email') }} -
-
- {{ M.render_field(registration_form.submit, material_icon='send') }} -
-
-
-
{% endblock %} diff --git a/web/app/templates/auth/reset_password.html.j2 b/web/app/templates/auth/reset_password.html.j2 index 6bd93f56..414a2d10 100644 --- a/web/app/templates/auth/reset_password.html.j2 +++ b/web/app/templates/auth/reset_password.html.j2 @@ -1,23 +1,31 @@ {% extends "nopaque.html.j2" %} +{% import 'materialize/wtf.html.j2' as wtf %} {% block page_content %} -
-

Lorem ipsum

-

dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren,

-
+
+
+
+

{{ title }}

+
-
-
-
-
- {{ reset_password_form.hidden_tag() }} - {{ M.render_field(reset_password_form.password, data_length='128') }} - {{ M.render_field(reset_password_form.password_confirmation, data_length='128') }} +
+

dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren,

+
+ +
+
+ +
+ {{ reset_password_form.hidden_tag() }} + {{ wtf.render_field(reset_password_form.password, data_length='128') }} + {{ wtf.render_field(reset_password_form.password_confirmation, data_length='128') }} +
+
+ {{ wtf.render_field(reset_password_form.submit, material_icon='send') }} +
+
-
- {{ M.render_field(reset_password_form.submit, material_icon='send') }} -
- +
{% endblock %} diff --git a/web/app/templates/auth/reset_password_request.html.j2 b/web/app/templates/auth/reset_password_request.html.j2 index cb8f23c8..549af6cd 100644 --- a/web/app/templates/auth/reset_password_request.html.j2 +++ b/web/app/templates/auth/reset_password_request.html.j2 @@ -1,21 +1,30 @@ {% extends "nopaque.html.j2" %} +{% import 'materialize/wtf.html.j2' as wtf %} {% block page_content %} -
-

After entering your email address you will receive instructions on how to reset your password.

-
+
+
+
+

{{ title }}

+
-
-
-
-
- {{ reset_password_request_form.hidden_tag() }} - {{ M.render_field(reset_password_request_form.email, class_='validate', material_icon='email', type='email') }} +
+

After entering your email address you will receive instructions on how to reset your password.

+
+ +
+
+ +
+ {{ reset_password_request_form.hidden_tag() }} + {{ wtf.render_field(reset_password_request_form.email, class_='validate', material_icon='email', type='email') }} +
+
+ {{ wtf.render_field(reset_password_request_form.submit, material_icon='send') }} +
+
-
- {{ M.render_field(reset_password_request_form.submit, material_icon='send') }} -
- +
{% endblock %} diff --git a/web/app/templates/auth/unconfirmed.html.j2 b/web/app/templates/auth/unconfirmed.html.j2 index f3d26dc9..98ce4de4 100644 --- a/web/app/templates/auth/unconfirmed.html.j2 +++ b/web/app/templates/auth/unconfirmed.html.j2 @@ -1,20 +1,25 @@ {% extends "nopaque.html.j2" %} -{% block title %}Opaque - Confirm your account{% endblock %} - {% block page_content %} -
-

- Hello, {{ current_user.username }}! -

-

You have not confirmed your account yet.

-

- Before you can access this site you need to confirm your account. - Check your inbox, you should have received an email with a confirmation link. -

-

- Need another confirmation email? - Click here -

+
+
+
+

{{ title }}

+
+ +
+
+
+ Hello, {{ current_user.username }}! +

You have not confirmed your account yet.

+

Before you can access this site you need to confirm your account. Check your inbox, you should have received an email with a confirmation link.

+

Need another confirmation email? Click here

+
+
+ person_addRegister +
+
+
+
{% endblock %} diff --git a/web/app/templates/main/about_and_faq.html.j2 b/web/app/templates/main/about_and_faq.html.j2 index c3b2ee76..b94a4d64 100644 --- a/web/app/templates/main/about_and_faq.html.j2 +++ b/web/app/templates/main/about_and_faq.html.j2 @@ -1,259 +1,265 @@ {% extends "nopaque.html.j2" %} {% block page_content %} +
+
+
+

{{ title }}

+
-
-
-
- What is nopaque -

- Our web application nopaque combines coordinated tools such as Optical - Character Recognition (OCR), Natrual Language Processing (NLP) and a - powerful Keyword In Context Search (KWIC) with the CQP query language. -

-
-

- nopaque offers the possibility to use all tools individually or as a - workflow. All work steps are coordinated in such a way that individual - services can be used on top of each other. The platform supports - researchers in converting their files into formats that can be further - processed, automatically enriching them with information and then - analyzing them, so that nopaque maps a large part of the research - processes in the humanities. With this toolbox we address researchers - in the humanities from all disciplines and levels of knowledge. - The data generated during the processes can be downloaded after each - step in order to evaluate or further process them with other (external) tools. -

+
+
+
+ What is nopaque +

+ Our web application nopaque combines coordinated tools such as Optical + Character Recognition (OCR), Natrual Language Processing (NLP) and a + powerful Keyword In Context Search (KWIC) with the CQP query language. +

+
+

+ nopaque offers the possibility to use all tools individually or as a + workflow. All work steps are coordinated in such a way that individual + services can be used on top of each other. The platform supports + researchers in converting their files into formats that can be further + processed, automatically enriching them with information and then + analyzing them, so that nopaque maps a large part of the research + processes in the humanities. With this toolbox we address researchers + in the humanities from all disciplines and levels of knowledge. + The data generated during the processes can be downloaded after each + step in order to evaluate or further process them with other (external) tools. +

+
+
+
+ +
+
    +
  • +
    1. Who is developing nopaque?
    +
    + +

    + nopaque is developed by a small, interdisciplinary Team at + University Bielefeld called Data Infrastructure and + Digital Humanities (INF). We are part of the SFB 1288 - + Practices of comparing. Ordering and changing the world. +

    +

    For mor information + visit the SFB1288 web site or + + our team page. +

    +     +
    +
    • +
  • +
    2. Is nopaque free to use for everyone?
    +
    + +

    + Yes nopaque is free to use for everyone! It does not matter if you + are a researcher in the humanities, a student or just someone who + wants to learn something new. Just + sign up for it and try it out! +

    +     +
    +
    • +
  • +
    3. How much does it cost to use nopaque?
    +
    + nopaque and the services provided by it are free of charge. +
    +
  • +
  • +
    4. Why is nopaque written in lower case?
    +
    + We just think that nopaque with a lower case first letter looks + better than Nopaque with an upper case first letter. Simple as that! + +
    +
  • +
  • +
    5. Why the name nopaque?
    +
    + +

    + When we started developing nopaque we wanted to have a cool name + like voyant which can be translated + to light or seeing. So we choose opaque thinking that it means that + something is transparent. After a while we realized that we misunderstood + the meaning of the word (opaque means non-transparent) and simply + negated it ending up with nopaque. +

    +

    + We also think nopaque fits pretty nicley because we want you to be + able to make your texts transparent and see through them with our + analysis tool to gain knew knowledge about them. +

    +     +
    +
  • +
    6. Is nopaque FOSS/Open Source?
    +
    + Yes nopaque only uses free and open source software (FOSS). You + can find the + source code in our gitlab repository. + +
    +
    • +
  • +
    7. What software/technologies is nopaque using/build with?
    +
    + +

    + nopaques frontend (what the user sees) is written in HTML 5 + and Javascript. The backend (stuff that happens on our servers) + is realized with + Flask, a python based lightweight WSGI web application + framework. We utilize Docker + to easily deploy nopaque on our servers. +

    +

    + The client server real time comminication is implemented using + Flask-SocketIO. +

    +

    Every service (e.g. OCR or NLP) provided by nopaque is using + established opensource software. Take a look at their related + questions to learn more about them.

    +

    + For more details take a look at the + source code. +

    +     +
    +
    • +
  • +
    8. What software/technology is used for the File Setup service?
    +
    + +

    + The File Setup service uses ImageMagick + to merge your images into one file. +

    +

    + For more details take a look at the + source code. +

    +     +
  • +
    9. What software/technology is used for the OCR service?
    +
    + +

    + The OCR service uses Tesseract OCR. +

    +

    + For more details take a look at the + source code. +

    +     +
    +
    • +
  • +
    10. What software/technology is used for the NLP service?
    +
    + +

    + The NLP service uses spaCy. +

    +

    + For more details take a look at the + source code. +

    +     +
    +
    • +
  • +
    11. What software/technology is used for the Analysis service?
    +
    + +

    + The Corpus Analysis service uses the + IMS Open Corpus Workbench (CWB). We developed a Python + library for the IMS Open Corpus Workbench (CWB) corpus query + interface (CQi) API to be able to request query results from the CWB + server using simple Python code. The library is + avilable on PyPi. +

    +

    + For more details take a look at the + source code. +

    +     +
    +
  • +
    12. Can I download/export my results and processed files?
    +
    + +

    + Yes. You can download everything that is the result of a service + and save it somwhere else. You can download your results depending + on the service in easily reusable formats like TXT, PDF, JSON, XML + and many more. This also empowers you to use your results in other + third party software to continue you research beyond the capabiltiys + of nopaque. +

    +     +
    +
    • +
  • +
    13. Is my research data private?
    +
    + +

    + Your uploaded research data cannot be accessed by any third party. + Take a look at our GDPR + statement and terms of use + if you want to learn more about how we handle your data. +

    + +

    +
    • +
  • +
    14. Could I use nopaque as a permant storage for my research data?
    +
    + +

    + nopaque saves your research data in theory as long as your account + exists. But nopaque is not a cloud storage solution! We encourage + you to permanently save your data somwhere else. +

    +     +
    +
    • +
  • +
    15. What does OCR mean?
    +
    + +

    + OCR stands for Optical Character Recognition. OCR is the automatical + conversion of images of handwritten or printed text into machine-encoded text. +

    +     +
    +
    • +
  • +
    16. What does NLP mean?
    +
    + +

    + NLP stands for natural language processing wich is a subfield of + linguistics, computer science and artificial intelligence concerned + with the interactions between computers and human language. + For example nopaque uses spaCy to automtically tag every word with + its part of speech tag which describes its grammatical property. +

    +     +
    +
    • +
- -
-
    -
  • -
    1. Who is developing nopaque?
    -
    - -

    - nopaque is developed by a small, interdisciplinary Team at - University Bielefeld called Data Infrastructure and - Digital Humanities (INF). We are part of the SFB 1288 - - Practices of comparing. Ordering and changing the world. -

    -

    For mor information - visit the SFB1288 web site or - - our team page. -

    -     -
    -
    • -
  • -
    2. Is nopaque free to use for everyone?
    -
    - -

    - Yes nopaque is free to use for everyone! It does not matter if you - are a researcher in the humanities, a student or just someone who - wants to learn something new. Just - sign up for it and try it out! -

    -     -
    -
    • -
  • -
    3. How much does it cost to use nopaque?
    -
    - nopaque and the services provided by it are free of charge. -
    -
  • -
  • -
    4. Why is nopaque written in lower case?
    -
    - We just think that nopaque with a lower case first letter looks - better than Nopaque with an upper case first letter. Simple as that! - -
    -
  • -
  • -
    5. Why the name nopaque?
    -
    - -

    - When we started developing nopaque we wanted to have a cool name - like voyant which can be translated - to light or seeing. So we choose opaque thinking that it means that - something is transparent. After a while we realized that we misunderstood - the meaning of the word (opaque means non-transparent) and simply - negated it ending up with nopaque. -

    -

    - We also think nopaque fits pretty nicley because we want you to be - able to make your texts transparent and see through them with our - analysis tool to gain knew knowledge about them. -

    -     -
    -
  • -
    6. Is nopaque FOSS/Open Source?
    -
    - Yes nopaque only uses free and open source software (FOSS). You - can find the - source code in our gitlab repository. - -
    -
    • -
  • -
    7. What software/technologies is nopaque using/build with?
    -
    - -

    - nopaques frontend (what the user sees) is written in HTML 5 - and Javascript. The backend (stuff that happens on our servers) - is realized with - Flask, a python based lightweight WSGI web application - framework. We utilize Docker - to easily deploy nopaque on our servers. -

    -

    - The client server real time comminication is implemented using - Flask-SocketIO. -

    -

    Every service (e.g. OCR or NLP) provided by nopaque is using - established opensource software. Take a look at their related - questions to learn more about them.

    -

    - For more details take a look at the - source code. -

    -     -
    -
    • -
  • -
    8. What software/technology is used for the File Setup service?
    -
    - -

    - The File Setup service uses ImageMagick - to merge your images into one file. -

    -

    - For more details take a look at the - source code. -

    -     -
  • -
    9. What software/technology is used for the OCR service?
    -
    - -

    - The OCR service uses Tesseract OCR. -

    -

    - For more details take a look at the - source code. -

    -     -
    -
    • -
  • -
    10. What software/technology is used for the NLP service?
    -
    - -

    - The NLP service uses spaCy. -

    -

    - For more details take a look at the - source code. -

    -     -
    -
    • -
  • -
    11. What software/technology is used for the Analysis service?
    -
    - -

    - The Corpus Analysis service uses the - IMS Open Corpus Workbench (CWB). We developed a Python - library for the IMS Open Corpus Workbench (CWB) corpus query - interface (CQi) API to be able to request query results from the CWB - server using simple Python code. The library is - avilable on PyPi. -

    -

    - For more details take a look at the - source code. -

    -     -
    -
  • -
    12. Can I download/export my results and processed files?
    -
    - -

    - Yes. You can download everything that is the result of a service - and save it somwhere else. You can download your results depending - on the service in easily reusable formats like TXT, PDF, JSON, XML - and many more. This also empowers you to use your results in other - third party software to continue you research beyond the capabiltiys - of nopaque. -

    -     -
    -
    • -
  • -
    13. Is my research data private?
    -
    - -

    - Your uploaded research data cannot be accessed by any third party. - Take a look at our GDPR - statement and terms of use - if you want to learn more about how we handle your data. -

    - -

    -
    • -
  • -
    14. Could I use nopaque as a permant storage for my research data?
    -
    - -

    - nopaque saves your research data in theory as long as your account - exists. But nopaque is not a cloud storage solution! We encourage - you to permanently save your data somwhere else. -

    -     -
    -
    • -
  • -
    15. What does OCR mean?
    -
    - -

    - OCR stands for Optical Character Recognition. OCR is the automatical - conversion of images of handwritten or printed text into machine-encoded text. -

    -     -
    -
    • -
  • -
    16. What does NLP mean?
    -
    - -

    - NLP stands for natural language processing wich is a subfield of - linguistics, computer science and artificial intelligence concerned - with the interactions between computers and human language. - For example nopaque uses spaCy to automtically tag every word with - its part of speech tag which describes its grammatical property. -

    -     -
    -
    • -
-
- {% endblock %} diff --git a/web/app/templates/main/dashboard.html.j2 b/web/app/templates/main/dashboard.html.j2 index 194bdecb..467aee30 100644 --- a/web/app/templates/main/dashboard.html.j2 +++ b/web/app/templates/main/dashboard.html.j2 @@ -1,29 +1,109 @@ {% extends "nopaque.html.j2" %} {% block page_content %} -
-

My Corpora and Query results

-

Create a corpus to interactively perform linguistic analysis or import query results to save interesting passages.

+
- +

{{ title }}

-
+ +
+

My Corpora and Query results

+

Create a corpus to interactively perform linguistic analysis or import query results to save interesting passages.

+
+
+ +
+
+
+
+
+ search + + +
+
    + + + + + + + + + + +
    + Title + Description + Status
    +
      +
      +
      + New corpusadd +
      +
      +
      +
      +
      +
      +
      + search + + +
      +
        + + + + + + + + + + + + + +
        + Title and
        + Description +         		+ Corpus and
        + Query +         		{# Actions #}
        + folderNothing here... +

        No query results yet imported.

        +
        +
          +
          +
          + Add query resultfile_upload +
          +
          +
          +
          +
          + +
          +

          My Jobs

          +

          A job is the execution of a service provided by nopaque. You can create any number of jobs and let them be processed simultaneously.

          search - - + +
            - +
            Service Title Description @@ -37,135 +117,66 @@
              - New corpusadd +

              addNew job

              - -
              -
              -
              -
              - search - - +
              +{% endblock %} -
              -

              My Jobs

              -

              A job is the execution of a service provided by nopaque. You can create any number of jobs and let them be processed simultaneously.

              -
              -
              -
              - search - - -
              -
                - - - - - - - - - - -
                Service - Title - Description - Status
                -
                  -
                  -
                  -

                  addNew job

                  -
                  -
                  - -
                  +{% block scripts %} +{{ super() }} - -{% endblock %} +{% endblock scripts %} diff --git a/web/app/templates/main/index.html.j2 b/web/app/templates/main/index.html.j2 index 59817520..aec0ecb3 100644 --- a/web/app/templates/main/index.html.j2 +++ b/web/app/templates/main/index.html.j2 @@ -1,6 +1,5 @@ {% extends "nopaque.html.j2" %} - -{% set parallax = True %} +{% import 'materialize/wtf.html.j2' as wtf %} {% block page_content %}
                  @@ -157,19 +156,19 @@
                  Log in {{ login_form.hidden_tag() }} - {{ M.render_field(login_form.user, material_icon='person') }} - {{ M.render_field(login_form.password, material_icon='vpn_key') }} + {{ wtf.render_field(login_form.user, material_icon='person') }} + {{ wtf.render_field(login_form.password, material_icon='vpn_key') }}
                  Forgot your password?
                  - {{ M.render_field(login_form.remember_me) }} + {{ wtf.render_field(login_form.remember_me) }}
                  - {{ M.render_field(login_form.submit, material_icon='send') }} + {{ wtf.render_field(login_form.submit, material_icon='send') }}
                  diff --git a/web/app/templates/main/news.html.j2 b/web/app/templates/main/news.html.j2 index f6ed5ba4..cf3d9653 100644 --- a/web/app/templates/main/news.html.j2 +++ b/web/app/templates/main/news.html.j2 @@ -1,14 +1,21 @@ {% extends "nopaque.html.j2" %} {% block page_content %} -
                  -
                  -
                  - nopaque's beta launch -

                  Dear users

                  -
                  -

                  A few days ago we went live with nopaque. Right now nopaque is still in its Beta phase. So some bugs are to be expected. If you encounter any bugs or some feature is not working as expected please send as an email using the feedback button at the botton of the page in the footer!

                  -

                  We are happy to help you with any issues and will use the feedback to fix all mentioned bugs!

                  +
                  +
                  +
                  +

                  {{ title }}

                  +
                  +
                  +
                  +
                  + nopaque's beta launch +

                  Dear users

                  +
                  +

                  A few days ago we went live with nopaque. Right now nopaque is still in its Beta phase. So some bugs are to be expected. If you encounter any bugs or some feature is not working as expected please send as an email using the feedback button at the botton of the page in the footer!

                  +

                  We are happy to help you with any issues and will use the feedback to fix all mentioned bugs!

                  +
                  +
                  diff --git a/web/app/templates/main/privacy_policy.html.j2 b/web/app/templates/main/privacy_policy.html.j2 index 22c23421..db1561c8 100644 --- a/web/app/templates/main/privacy_policy.html.j2 +++ b/web/app/templates/main/privacy_policy.html.j2 @@ -1,147 +1,154 @@ {% extends "nopaque.html.j2" %} {% block page_content %} -
                  -

                  With these data protection notices, Bielefeld University fulfils its obligation to provide information in accordance with Articles 13 & 14 of the EU General Data Protection Regulation (GDPR) on the above-mentioned processing of personal data. Terms such as "personal data", "processing", "data controller", "third party", etc. are used as defined in Article 4 GDPR.

                  -
                  +
                  +
                  +
                  +

                  {{ title }}

                  +
                  -
                  -
                  -
                  - § 1 Contact Details -

                  Bielefeld University, a legal entity under public law established by the state of North Rhine-Westphalia (NRW), is responsible for processing the data. It is represented by its rector, Prof. Dr. Ing. Gerhard Sagerer.

                  -
                  § 1.1. Contact details of the data controller
                  - -
                  § 1.2. Technical contact person
                  - -
                  § 1.2. Contact details of the data protection officer
                  - +
                  +

                  With these data protection notices, Bielefeld University fulfils its obligation to provide information in accordance with Articles 13 & 14 of the EU General Data Protection Regulation (GDPR) on the above-mentioned processing of personal data. Terms such as "personal data", "processing", "data controller", "third party", etc. are used as defined in Article 4 GDPR.

                  +
                  + +
                  +
                  +
                  + § 1 Contact Details +

                  Bielefeld University, a legal entity under public law established by the state of North Rhine-Westphalia (NRW), is responsible for processing the data. It is represented by its rector, Prof. Dr. Ing. Gerhard Sagerer.

                  +
                  § 1.1. Contact details of the data controller
                  + +
                  § 1.2. Technical contact person
                  + +
                  § 1.2. Contact details of the data protection officer
                  + +
                  +
                  +
                  + +
                  +
                  +
                  + § 2 General information on data processing and its purpose +

                  We process the personal data of our users only to the extent necessary to provide a functioning website and its functionalities.

                  +

                  The following personal data is collected and stored within the system:

                  +
                  Master Data
                  +

                  Within the scope of user authentication the following personal data is collected and processed:

                  +
                    +
                  • User name
                    • +
                  • E-Mail
                    • +
                  +

                  Registration of the user is required for the provision of certain content and services within nopaque.

                  +
                  Protocol Data
                  +

                  In general, when a website is visited, for technical reasons information is automatically sent from the browser to the server and stored there in access protocols. When using a web application, additional protocol data is also generated, which is necessary for tracking technical errors. This information includes:

                  +
                    +
                  • IP address
                    • +
                  • User account
                    • +
                  • Complete HTTP request URL
                    • +
                  • HTTP action (e.g. GET: call up a page, POST: send form data)
                    • +
                  • Access status (HTTP status code)
                    • +
                  • data volume retrieved
                    • +
                  • Date and time of the action
                    • +
                  • User-Agent string
                    • +
                  +

                  Locally logged data will be used by the development team in order to debug and improve tools. This data can only be viewed by the technical administration and by the employees responsible for the nopaque platform. Data is stored for seven days to ensure proper technical operation and to find the cause of errors and is deleted afterwards.

                  +

                  Logged data may be used to understand how researchers are using the nopaque platform. To be able to use the data for research purposes, we reserve the right to store it in an anonymous and aggregated form for a longer period of time (up to two years after completion of the SFB 1288 INF project).

                  +
                  Cookies
                  +

                  Browsers store so-called cookies. Cookies are files that can be stored by the provider of a website in the directory of the browser program on the user's computer. These files contain text information and can be read again by the provider when the page is called up again. The provider can use these cookies, for example, to always deliver pages in the theme selected by the user.

                  +

                  The storage of cookies can be switched off in the browser settings or provided with an expiry time. By deactivating cookies, however, some functions that are controlled by cookies can then only be used to a limited extent or not at all.

                  +

                  NOPAQUE uses cookies for the following purposes:

                  +
                    +
                  • Recognition of a user during a session in order to assign personal content and other user-defined settings.
                    • +
                  • Login Script with ‘Remember Me’ feature allows the user to preserve their logged in status. When the user checks the Remember Me option, then the logged in status is serialized in the session and stored in cookies in an encrypted way.
                    • +
                  +
                  Content Data
                  +

                  The content data includes all data that is entered or created by users themselves in the system. This data is listed here because it is assigned to individual authors and may contain personal data. This may include: uploaded files, images, texts or other media files. Please note that files and scans submitted to NOPAQUE are stored in order to allow persistent access during a work session and between work sessions.

                  +

                  According to § 4 paragraph 2 of the General Terms of Use for the use of NOPAQUE at Bielefeld University, the users themselves are responsible for the content they post and must comply with the legal provisions of data protection. This includes in particular the deletion of personal data that may no longer be processed.

                  +
                  +
                  +
                  + +
                  +
                  +
                  + § 3 Legal basis of the data processing +

                  The legal basis for the processing of personal data for user authentication is Article 6 (1) letter e GDPR. The processing is carried out within the framework of the fulfilment of the tasks of Bielefeld University in accordance with HG NRW (NRW Higher Education Act), if necessary in connection with an order of the university to be named or by a special law, e.g. University Statistics Act, State Civil Servants Act, Staff Representation Act, Equal Opportunities Act.

                  +

                  The collection of personal data for user authentication is based on the consent of the data subjects as stated in Article 6 (1) letter a GDPR. The legal basis for the transmission of personal data is Article 6 (1) letter c GDPR.

                  +
                  +
                  +
                  + +
                  +
                  +
                  + § 4 Data transmissions +

                  Your personal data, which are processed by Bielefeld University for the purposes mentioned under 2. will not be transferred to third parties.

                  +

                  In individual cases, data may also be legally transmitted to third parties, for example, to law enforcement authorities for the investigation of criminal offences within the framework of the Code of Criminal Procedure (StPO). If technical service providers are given access to personal data, this is done on the basis of a contract in accordance with Article 28 GDPR.

                  +
                  +
                  +
                  + +
                  +
                  +
                  + § 5 Duration of processing / data deletion +

                  Data processed for user authentication are deleted immediately after account deletion.

                  +
                  +
                  +
                  + +
                  +
                  +
                  + § 6 Your rights as a data subject +

                  As a data subject, you have certain rights under GDPR that you may assert at any time:

                  +
                    +
                  • the right to access information about whether or not personal data concerning you is processed, and if so, what categories of data are being processed (Article 15 GDPR),
                    • +
                  • the right to demand the rectification or completion of data concerning you (Article 16 GDPR),
                    • +
                  • the right to erasure of your personal data in accordance with Article 17 GDPR,
                    • +
                  • the right to demand the restriction of the processing of your data per Article 18 GDPR,
                    • +
                  • the right to withdraw your consent at any time. The withdrawal of consent does not affect the lawfulness of the processing based on consent before its withdrawal (Article 7 (3) GDPR),
                    • +
                  • the right to object to the future processing of your data in accordance of Article 21 GDPR,
                    • +
                  • the right to receive personal data concerning you and your account in a structured, common and machine-readable format in accordance of Article 20 GDPR.
                    • +
                  +

                  In addition to the aforementioned rights, you have the right to lodge a complaint with the data protection supervisory authority (Article 77 GDPR); for example, the university is under the supervision of the

                  +
                    +
                  • North Rhine-Westphalia State Commissioner
                    • +
                  • for Data Protection and Freedom of Information
                    • +
                  • (Landesbeauftragte für Datenschutz und
                    • +
                  • Informationsfreiheit Nordrhein-Westfalen)
                    • +
                  • Kavalleriestraße 2-4
                    • +
                  • 40213 Düsseldorf, German
                    • +
                  +
                  +
                  - -
                  -
                  -
                  - § 2 General information on data processing and its purpose -

                  We process the personal data of our users only to the extent necessary to provide a functioning website and its functionalities.

                  -

                  The following personal data is collected and stored within the system:

                  -
                  Master Data
                  -

                  Within the scope of user authentication the following personal data is collected and processed:

                  -
                    -
                  • User name
                    • -
                  • E-Mail
                    • -
                  -

                  Registration of the user is required for the provision of certain content and services within nopaque.

                  -
                  Protocol Data
                  -

                  In general, when a website is visited, for technical reasons information is automatically sent from the browser to the server and stored there in access protocols. When using a web application, additional protocol data is also generated, which is necessary for tracking technical errors. This information includes:

                  -
                    -
                  • IP address
                    • -
                  • User account
                    • -
                  • Complete HTTP request URL
                    • -
                  • HTTP action (e.g. GET: call up a page, POST: send form data)
                    • -
                  • Access status (HTTP status code)
                    • -
                  • data volume retrieved
                    • -
                  • Date and time of the action
                    • -
                  • User-Agent string
                    • -
                  -

                  Locally logged data will be used by the development team in order to debug and improve tools. This data can only be viewed by the technical administration and by the employees responsible for the nopaque platform. Data is stored for seven days to ensure proper technical operation and to find the cause of errors and is deleted afterwards.

                  -

                  Logged data may be used to understand how researchers are using the nopaque platform. To be able to use the data for research purposes, we reserve the right to store it in an anonymous and aggregated form for a longer period of time (up to two years after completion of the SFB 1288 INF project).

                  -
                  Cookies
                  -

                  Browsers store so-called cookies. Cookies are files that can be stored by the provider of a website in the directory of the browser program on the user's computer. These files contain text information and can be read again by the provider when the page is called up again. The provider can use these cookies, for example, to always deliver pages in the theme selected by the user.

                  -

                  The storage of cookies can be switched off in the browser settings or provided with an expiry time. By deactivating cookies, however, some functions that are controlled by cookies can then only be used to a limited extent or not at all.

                  -

                  NOPAQUE uses cookies for the following purposes:

                  -
                    -
                  • Recognition of a user during a session in order to assign personal content and other user-defined settings.
                    • -
                  • Login Script with ‘Remember Me’ feature allows the user to preserve their logged in status. When the user checks the Remember Me option, then the logged in status is serialized in the session and stored in cookies in an encrypted way.
                    • -
                  -
                  Content Data
                  -

                  The content data includes all data that is entered or created by users themselves in the system. This data is listed here because it is assigned to individual authors and may contain personal data. This may include: uploaded files, images, texts or other media files. Please note that files and scans submitted to NOPAQUE are stored in order to allow persistent access during a work session and between work sessions.

                  -

                  According to § 4 paragraph 2 of the General Terms of Use for the use of NOPAQUE at Bielefeld University, the users themselves are responsible for the content they post and must comply with the legal provisions of data protection. This includes in particular the deletion of personal data that may no longer be processed.

                  -
                  -
                  -
                  - -
                  -
                  -
                  - § 3 Legal basis of the data processing -

                  The legal basis for the processing of personal data for user authentication is Article 6 (1) letter e GDPR. The processing is carried out within the framework of the fulfilment of the tasks of Bielefeld University in accordance with HG NRW (NRW Higher Education Act), if necessary in connection with an order of the university to be named or by a special law, e.g. University Statistics Act, State Civil Servants Act, Staff Representation Act, Equal Opportunities Act.

                  -

                  The collection of personal data for user authentication is based on the consent of the data subjects as stated in Article 6 (1) letter a GDPR. The legal basis for the transmission of personal data is Article 6 (1) letter c GDPR.

                  -
                  -
                  -
                  - -
                  -
                  -
                  - § 4 Data transmissions -

                  Your personal data, which are processed by Bielefeld University for the purposes mentioned under 2. will not be transferred to third parties.

                  -

                  In individual cases, data may also be legally transmitted to third parties, for example, to law enforcement authorities for the investigation of criminal offences within the framework of the Code of Criminal Procedure (StPO). If technical service providers are given access to personal data, this is done on the basis of a contract in accordance with Article 28 GDPR.

                  -
                  -
                  -
                  - -
                  -
                  -
                  - § 5 Duration of processing / data deletion -

                  Data processed for user authentication are deleted immediately after account deletion.

                  -
                  -
                  -
                  - -
                  -
                  -
                  - § 6 Your rights as a data subject -

                  As a data subject, you have certain rights under GDPR that you may assert at any time:

                  -
                    -
                  • the right to access information about whether or not personal data concerning you is processed, and if so, what categories of data are being processed (Article 15 GDPR),
                    • -
                  • the right to demand the rectification or completion of data concerning you (Article 16 GDPR),
                    • -
                  • the right to erasure of your personal data in accordance with Article 17 GDPR,
                    • -
                  • the right to demand the restriction of the processing of your data per Article 18 GDPR,
                    • -
                  • the right to withdraw your consent at any time. The withdrawal of consent does not affect the lawfulness of the processing based on consent before its withdrawal (Article 7 (3) GDPR),
                    • -
                  • the right to object to the future processing of your data in accordance of Article 21 GDPR,
                    • -
                  • the right to receive personal data concerning you and your account in a structured, common and machine-readable format in accordance of Article 20 GDPR.
                    • -
                  -

                  In addition to the aforementioned rights, you have the right to lodge a complaint with the data protection supervisory authority (Article 77 GDPR); for example, the university is under the supervision of the

                  -
                    -
                  • North Rhine-Westphalia State Commissioner
                    • -
                  • for Data Protection and Freedom of Information
                    • -
                  • (Landesbeauftragte für Datenschutz und
                    • -
                  • Informationsfreiheit Nordrhein-Westfalen)
                    • -
                  • Kavalleriestraße 2-4
                    • -
                  • 40213 Düsseldorf, German
                    • -
                  -
                  -
                  -
                  - {% endblock %} diff --git a/web/app/templates/main/terms_of_use.html.j2 b/web/app/templates/main/terms_of_use.html.j2 index 9e3593f0..a763fbf0 100644 --- a/web/app/templates/main/terms_of_use.html.j2 +++ b/web/app/templates/main/terms_of_use.html.j2 @@ -1,105 +1,111 @@ {% extends "nopaque.html.j2" %} {% block page_content %} +
                  +
                  +
                  +

                  {{ title }}

                  +
                  -
                  -

                  With the usage of the nopaque platform you declare your acceptance of the General Terms of Use and that you have taken note of the legal framework and the data protection declaration.

                  -
                  +
                  +

                  With the usage of the nopaque platform you declare your acceptance of the General Terms of Use and that you have taken note of the legal framework and the data protection declaration.

                  +
                  -
                  -
                  -
                  - § 1 Scope -

                  The General Terms of Use for the nopaque platform apply to everyone who uses the system as an authorised user in the sense of § 2 (1) of the General Terms of Use. By using the system and with your consent you accept these terms of use.

                  +
                  +
                  +
                  + § 1 Scope +

                  The General Terms of Use for the nopaque platform apply to everyone who uses the system as an authorised user in the sense of § 2 (1) of the General Terms of Use. By using the system and with your consent you accept these terms of use.

                  +
                  +
                  +
                  + +
                  +
                  +
                  + § 2 Right of use +

                  (1) The nopaque platform is available to users exclusively for the purposes of teaching and research. Any other use, especially for business, commercial is not permitted. The following groups shall be entitled to use the nopaque platform:

                  +
                    +
                  • students, teaching staff and employees at Bielefeld University
                    • +
                  • external researchers from outside the University Bielefeld
                    • +
                  +

                   

                  +

                  (2) The use of the system is free of charge.

                  +

                   

                  +

                  (3) The duration of the right of use ends with the deletion of the user account by the user (see § 7)

                  +
                  +
                  +
                  + +
                  +
                  +
                  + § 3 Purpose of the Services +

                  nopaque custom-built web application which serves as a platform for preprocessing and analysing digital copies of various text based research data (books, letters, etc.) in different files and formats. nopaque converts image data – like photos or scans – into text data through OCR making it machine readable. This step enables to proceed with further computational analysis of the documents. By means of computational linguistic data processing (tokenization, lemmatization, part-of-speech tagging and named-entity recognition) nopaque extracts additional information from texts.

                  +

                   

                  +

                  (1) Change of service

                  +

                  The provider of the nopaque platform is entitled to change and supplement the scope of functions of nopaque without prior notice. This could result from a thematic and scientific reorientation of the project.

                  +

                   

                  +

                  (2) Support

                  +

                  On nopaque, a contact form is available. As far as possible the SFB 1288 INF staff will try to provide user support.

                  +
                  +
                  +
                  + +
                  +
                  +
                  + § 4 Obligations of the User +

                  (1) The system is suitable for normal security requirements. Data with a high need for protection (e.g. health data) may not be stored or processed in the nopaque platform.

                  +

                   

                  +

                  (2) Users of nopaque are responsible for their own entered contents. The uploading of illegal content, especially content that violates criminal, personal, data protection or copyright regulations (including § 60a) is not permitted.

                  +

                   

                  +

                  (3) Users undertake to indemnify Bielefeld University from all claims by third parties based on the data they use and to reimburse Bielefeld University for any costs incurred by the latter due to possible infringements of rights. This also includes the costs incurred by Bielefeld University in defending itself against such claims in and out of court.

                  +

                   

                  +

                  (4) Exclusion from use

                  +

                  Bielefeld University is entitled to immediately block access to the service if there are reasonable grounds to suspect that the stored data is unlawful (e.g upload harmful files via file upload) and/or violates the rights of third parties. Other infringements of the provisions of these Terms of Use, in particular the obligations under §6 also entitle Bielefeld University to block the user. Bielefeld University shall immediately notify the user of the block and the reason for the block. The block must be lifted as soon as the suspicion is invalidated.

                  +

                   

                  +

                  (5) Usage of Data

                  +

                  The data stored by the user on the storage space intended for him may be legally protected, the responsibility for the processing of the data from these points of view lies solely with the user. By using nopaque, the user grants Bielefeld the right to process the data with the corresponding tools. At all times during processing in nopaque, data remains in the user's private storage location and will not passed on to third parties.

                  +

                   

                  +

                  (6) Release of Bielefeld University from Third-Party Claims

                  +

                  The user is responsible for the data stored by him/her in nopaque. Furthermore he/she is responsible for entering and maintaining the data and information required to use nopaque.

                  +

                   

                  +

                  The user is obliged to indemnify Bielefeld University against all claims by third parties based on the data stored by him/her and to reimburse Bielefeld University for any costs incurred as a result of possible legal infringements. This also includes the costs incurred by Bielefeld University for extrajudicial and judicial defense against these claims.

                  +
                  +
                  +
                  + +
                  +
                  +
                  + § 5 Liability of Bielefeld University +

                  Claims for damages against Bielefeld University are excluded irrespective of the legal grounds. Bielefeld University shall not be liable for loss of data and information or other „indirect“ damages, e.g. loss of profit, loss of production, or other indirect damages. Bielefeld University shall not be liable for the loss of data to the extent that the damage is due to the fact that the user has failed to back up the data and thereby ensure that lost data can be restored with justifiable effort.

                  +

                   

                  +

                  nopaque is available in accordance with normal operational care based on the "Best Effort" practice. No liability is assumed for the consequences of failures or errors of the nopaque platform. Bielefeld University does not guarantee that the systems will run error-free and without interruption at all times. Bielefeld University accepts no responsibility for technical quality. Nor is it liable for the content, in particular for the accuracy, completeness, and timeliness of information to which it merely provides access for use.

                  +
                  +
                  +
                  + +
                  +
                  +
                  + § 6 Data Protection +

                  Information on the handling of personal data during the operation of the service can be found in the separate data protection policy.

                  +
                  +
                  +
                  + +
                  +
                  +
                  + § 7 Duration and Termination +

                  The user may terminate the use nopaque by deleting his/her account at any time without giving reasons. After deletion of the account, all users‘ data will be automatically deleted and access to the service blocked. This does not affect the user's right to delete data under data protection law.

                  +

                   

                  +

                  Bielefeld University may exclude the user from using the service without notice for an important reason. Important reasons include, in particular, repeated violations of the provisions of these Terms of Use or of applicable laws.

                  +
                  +
                  - -
                  -
                  -
                  - § 2 Right of use -

                  (1) The nopaque platform is available to users exclusively for the purposes of teaching and research. Any other use, especially for business, commercial is not permitted. The following groups shall be entitled to use the nopaque platform:

                  -
                    -
                  • students, teaching staff and employees at Bielefeld University
                    • -
                  • external researchers from outside the University Bielefeld
                    • -
                  -

                   

                  -

                  (2) The use of the system is free of charge.

                  -

                   

                  -

                  (3) The duration of the right of use ends with the deletion of the user account by the user (see § 7)

                  -
                  -
                  -
                  - -
                  -
                  -
                  - § 3 Purpose of the Services -

                  nopaque custom-built web application which serves as a platform for preprocessing and analysing digital copies of various text based research data (books, letters, etc.) in different files and formats. nopaque converts image data – like photos or scans – into text data through OCR making it machine readable. This step enables to proceed with further computational analysis of the documents. By means of computational linguistic data processing (tokenization, lemmatization, part-of-speech tagging and named-entity recognition) nopaque extracts additional information from texts.

                  -

                   

                  -

                  (1) Change of service

                  -

                  The provider of the nopaque platform is entitled to change and supplement the scope of functions of nopaque without prior notice. This could result from a thematic and scientific reorientation of the project.

                  -

                   

                  -

                  (2) Support

                  -

                  On nopaque, a contact form is available. As far as possible the SFB 1288 INF staff will try to provide user support.

                  -
                  -
                  -
                  - -
                  -
                  -
                  - § 4 Obligations of the User -

                  (1) The system is suitable for normal security requirements. Data with a high need for protection (e.g. health data) may not be stored or processed in the nopaque platform.

                  -

                   

                  -

                  (2) Users of nopaque are responsible for their own entered contents. The uploading of illegal content, especially content that violates criminal, personal, data protection or copyright regulations (including § 60a) is not permitted.

                  -

                   

                  -

                  (3) Users undertake to indemnify Bielefeld University from all claims by third parties based on the data they use and to reimburse Bielefeld University for any costs incurred by the latter due to possible infringements of rights. This also includes the costs incurred by Bielefeld University in defending itself against such claims in and out of court.

                  -

                   

                  -

                  (4) Exclusion from use

                  -

                  Bielefeld University is entitled to immediately block access to the service if there are reasonable grounds to suspect that the stored data is unlawful (e.g upload harmful files via file upload) and/or violates the rights of third parties. Other infringements of the provisions of these Terms of Use, in particular the obligations under §6 also entitle Bielefeld University to block the user. Bielefeld University shall immediately notify the user of the block and the reason for the block. The block must be lifted as soon as the suspicion is invalidated.

                  -

                   

                  -

                  (5) Usage of Data

                  -

                  The data stored by the user on the storage space intended for him may be legally protected, the responsibility for the processing of the data from these points of view lies solely with the user. By using nopaque, the user grants Bielefeld the right to process the data with the corresponding tools. At all times during processing in nopaque, data remains in the user's private storage location and will not passed on to third parties.

                  -

                   

                  -

                  (6) Release of Bielefeld University from Third-Party Claims

                  -

                  The user is responsible for the data stored by him/her in nopaque. Furthermore he/she is responsible for entering and maintaining the data and information required to use nopaque.

                  -

                   

                  -

                  The user is obliged to indemnify Bielefeld University against all claims by third parties based on the data stored by him/her and to reimburse Bielefeld University for any costs incurred as a result of possible legal infringements. This also includes the costs incurred by Bielefeld University for extrajudicial and judicial defense against these claims.

                  -
                  -
                  -
                  - -
                  -
                  -
                  - § 5 Liability of Bielefeld University -

                  Claims for damages against Bielefeld University are excluded irrespective of the legal grounds. Bielefeld University shall not be liable for loss of data and information or other „indirect“ damages, e.g. loss of profit, loss of production, or other indirect damages. Bielefeld University shall not be liable for the loss of data to the extent that the damage is due to the fact that the user has failed to back up the data and thereby ensure that lost data can be restored with justifiable effort.

                  -

                   

                  -

                  nopaque is available in accordance with normal operational care based on the "Best Effort" practice. No liability is assumed for the consequences of failures or errors of the nopaque platform. Bielefeld University does not guarantee that the systems will run error-free and without interruption at all times. Bielefeld University accepts no responsibility for technical quality. Nor is it liable for the content, in particular for the accuracy, completeness, and timeliness of information to which it merely provides access for use.

                  -
                  -
                  -
                  - -
                  -
                  -
                  - § 6 Data Protection -

                  Information on the handling of personal data during the operation of the service can be found in the separate data protection policy.

                  -
                  -
                  -
                  - -
                  -
                  -
                  - § 7 Duration and Termination -

                  The user may terminate the use nopaque by deleting his/her account at any time without giving reasons. After deletion of the account, all users‘ data will be automatically deleted and access to the service blocked. This does not affect the user's right to delete data under data protection law.

                  -

                   

                  -

                  Bielefeld University may exclude the user from using the service without notice for an important reason. Important reasons include, in particular, repeated violations of the provisions of these Terms of Use or of applicable laws.

                  -
                  -
                  -
                  - {% endblock %} diff --git a/web/app/templates/materialize/base.html.j2 b/web/app/templates/materialize/base.html.j2 new file mode 100644 index 00000000..1a4eb866 --- /dev/null +++ b/web/app/templates/materialize/base.html.j2 @@ -0,0 +1,35 @@ +{% block doc %} + + +{% block html %} + + {% block head %} + {% block title %}{{title|default}}{% endblock title %} + + {% block metas %} + + {% endblock metas %} + + {% block styles %} + + + {% endblock styles %} + {% endblock head %} + + + {% block body %} + {% block navbar %} + {% endblock navbar %} + {% block sidenav %} + {% endblock sidenav %} + {% block content %} + {% endblock content %} + + {% block scripts %} + + {% endblock scripts %} + {% endblock body %} + +{% endblock html %} + +{% endblock doc %} diff --git a/web/app/templates/materialize/wtf.html.j2 b/web/app/templates/materialize/wtf.html.j2 new file mode 100644 index 00000000..428a4ee8 --- /dev/null +++ b/web/app/templates/materialize/wtf.html.j2 @@ -0,0 +1,101 @@ +{% macro render_field(field) %} + {% if field.type == 'BooleanField' %} + {{ render_boolean_field(field, *args, **kwargs) }} + {% elif field.type == 'DecimalRangeField' %} + {{ render_decimal_range_field(field, *args, **kwargs) }} + {% elif field.type == 'SubmitField' %} + {{ render_submit_field(field, *args, **kwargs) }} + {% elif field.type in ['FileField', 'MultipleFileField'] %} + {{ render_file_field(field, *args, **kwargs) }} + {% else %} + {% if 'class_' in kwargs and 'validate' not in kwargs['class_'] %} + {% set tmp = kwargs.update({'class_': kwargs['class_'] + ' validate'}) %} + {% else %} + {% set tmp = kwargs.update({'class_': 'validate'}) %} + {% endif %} + {{ render_generic_field(field, *args, **kwargs) }} + {% endif %} +{% endmacro %} + +{% macro render_boolean_field(field) %} + {% set label = kwargs.pop('label', True) %} +
                  + {% if 'material_icon' in kwargs %} + {{ kwargs.pop('material_icon') }} + {% endif %} + + {% for error in field.errors %} + {{ error }} + {% endfor %} +
                  +{% endmacro %} + +{% macro render_file_field(field) %} + {% set placeholder = kwargs.pop('placeholder', '') %} +
                  +
                  + {{ field.label.text }} + {{ field(*args, **kwargs) }} +
                  +
                  + +
                  + {% for error in field.errors %} + {{ error }} + {% endfor %} +
                  +{% endmacro %} + +{% macro render_generic_field(field) %} + {% if field.type == 'TextAreaField' and 'materialize-textarea' not in kwargs['class_'] %} + {% set tmp = kwargs.update({'class_': kwargs['class_'] + ' materialize-textarea'}) %} + {% elif field.type == 'IntegerField' %} + {% set tmp = kwargs.update({'type': 'number'}) %} + {% endif %} + {% set label = kwargs.pop('label', True) %} +
                  + {% if 'material_icon' in kwargs %} + {{ kwargs.pop('material_icon') }} + {% endif %} + {{ field(*args, **kwargs) }} + {% if label %} + {{ field.label }} + {% endif %} + {% for error in field.errors %} + {{ error }} + {% endfor %} +
                  +{% endmacro %} + +{% macro render_submit_field(field) %} + {% if 'class_' in kwargs and 'btn' not in kwargs['class_'] %} + {% set tmp = kwargs.update({'class_': kwargs['class_'] + ' btn'}) %} + {% else %} + {% set tmp = kwargs.update({'class_': 'btn'}) %} + {% endif %} + {% if 'waves-effect' not in kwargs['class_'] %} + {% set tmp = kwargs.update({'class_': kwargs['class_'] + ' waves-effect'}) %} + {% endif %} + {% if 'waves-light' not in kwargs['class_'] %} + {% set tmp = kwargs.update({'class_': kwargs['class_'] + ' waves-light'}) %} + {% endif %} + +{% endmacro %} diff --git a/web/app/templates/nopaque.html.j2 b/web/app/templates/nopaque.html.j2 index 65853474..0437c29a 100644 --- a/web/app/templates/nopaque.html.j2 +++ b/web/app/templates/nopaque.html.j2 @@ -1,300 +1,219 @@ -{% import "utils/macros.html.j2" as Macros %} -{% import "utils/materialize.html.j2" as M %} +{% extends "materialize/base.html.j2" %} +{% from '_variables.html.j2' import colors %} +{% block html_attribs %} lang="en"{% endblock html_attribs %} -{% if title is not defined %} - {% set title = None %} +{% block head %} +{{ super() }} + +{% endblock head %} + +{% block metas %} + +{{ super() }} +{% endblock metas %} + +{% block title %}{% if request.path != url_for('main.index') and title is defined %}{{title}} | {% endif %}nopaque{% endblock title %} + +{% block styles %} +{{ super() }} +{% if current_user.is_authenticated %} + {% endif %} + + + +{% endblock styles %} -{% set file_setup_color = '#d5dc95' %} -{% set file_setup_color_darken = '#a1b300' %} -{% set file_setup_color_lighten = '#f2f3e1' %} - -{% set nlp_color = '#98acd2' %} -{% set nlp_color_darken = '#0064a3' %} -{% set nlp_color_lighten = '#e5e8f5' %} - -{% set ocr_color = '#a9d8c8' %} -{% set ocr_color_darken = '#00a58b' %} -{% set ocr_color_lighten = '#e7f4f1' %} - -{%- macro insert_content() -%} - {% block page_content %}{% endblock %} -{%- endmacro -%} - - - - - - - - - - nopaque - {% if request.path != url_for('main.index') %} – {{ title }}{% endif %} - - - - - - - - - - -
                  -
                  - -
                  - - -
                  -
                • - error_outlinenopaque's beta launch -
                  • -
                  - - - -
                  - - {% if parallax %} -
                  - {{ insert_content() }} -
                  - {% else %} -
                  - {% if not full_width %} -
                  - {% endif %} -
                  -
                  -

                  {{ headline }}

                  -
                  - {{ insert_content() }} -
                  - {% if not full_width %} -
                  + menu {% endif %} + + +
                  - {% endif %} - +
                  + {% block nav_content %}{% endblock nav_content %} +
                  + +
                  - +{% endblock content %} + +{% block scripts %} +{{ super() }} + + + + + + +{% endblock scripts %} From b840746fed7659956654d9fb663c5fd7b58a39c5 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Fri, 23 Oct 2020 10:17:14 +0200 Subject: [PATCH 02/31] Rework admin package --- web/app/admin/views.py | 20 +++--- web/app/static/js/nopaque.lists.js | 4 +- web/app/templates/admin/edit_user.html.j2 | 46 +++++++------ web/app/templates/admin/index.html.j2 | 42 ------------ web/app/templates/admin/user.html.j2 | 80 +++++++++++++---------- web/app/templates/admin/users.html.j2 | 48 ++++++++++++++ web/app/templates/main/news.html.j2 | 1 + web/app/templates/nopaque.html.j2 | 2 +- 8 files changed, 132 insertions(+), 111 deletions(-) delete mode 100644 web/app/templates/admin/index.html.j2 create mode 100644 web/app/templates/admin/users.html.j2 diff --git a/web/app/admin/views.py b/web/app/admin/views.py index e8d0d916..3046a63c 100644 --- a/web/app/admin/views.py +++ b/web/app/admin/views.py @@ -8,10 +8,10 @@ from ..models import Role, User from ..profile import tasks as profile_tasks -@admin.route('/') +@admin.route('/users') @login_required @admin_required -def index(): +def users(): users = User.query.all() users = [dict(username=u.username, email=u.email, @@ -19,21 +19,18 @@ def index(): confirmed=u.confirmed, id=u.id) for u in users] - return render_template('admin/index.html.j2', - title='Administration tools', - users=users) + return render_template('admin/users.html.j2', title='Users', users=users) -@admin.route('/user/') +@admin.route('/users/') @login_required @admin_required def user(user_id): user = User.query.get_or_404(user_id) - return render_template('admin/user.html.j2', title='Administration: User', - user=user) + return render_template('admin/user.html.j2', title='Edit user', user=user) -@admin.route('/user//delete') +@admin.route('/users//delete') @login_required @admin_required def delete_user(user_id): @@ -42,7 +39,7 @@ def delete_user(user_id): return redirect(url_for('admin.index')) -@admin.route('/user//edit', methods=['GET', 'POST']) +@admin.route('/users//edit', methods=['GET', 'POST']) @login_required @admin_required def edit_user(user_id): @@ -63,4 +60,5 @@ def edit_user(user_id): edit_user_form.role.data = user.role_id return render_template('admin/edit_user.html.j2', edit_user_form=edit_user_form, - title='Administration: Edit user', user=user) + title='Edit user', + user=user) diff --git a/web/app/static/js/nopaque.lists.js b/web/app/static/js/nopaque.lists.js index d91186dc..603f81b1 100644 --- a/web/app/static/js/nopaque.lists.js +++ b/web/app/static/js/nopaque.lists.js @@ -131,11 +131,11 @@ RessourceList.dataMappers = { confirmed: user.confirmed, email: user.email, id: user.id, - link: `user/${user.id}`, + link: `users/${user.id}`, role_id: user.role_id, username: user.username, username2: user.username, - "delete-link": `/admin/user/${user.id}/delete`, + "delete-link": `/admin/users/${user.id}/delete`, "delete-modal": `delete-user-${user.id}-modal`, "delete-modal-trigger": `delete-user-${user.id}-modal`, }), diff --git a/web/app/templates/admin/edit_user.html.j2 b/web/app/templates/admin/edit_user.html.j2 index 3a48adf8..6e47db5f 100644 --- a/web/app/templates/admin/edit_user.html.j2 +++ b/web/app/templates/admin/edit_user.html.j2 @@ -1,27 +1,35 @@ {% extends "nopaque.html.j2" %} +{% import 'materialize/wtf.html.j2' as wtf %} {% block page_content %} -
                  -

                  {{ user.username }}

                  -

                  Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren,

                  - arrow_backBack to user administration -
                  +
                  +
                  +
                  +

                  Edit user

                  +
                  -
                  -
                  -
                  -
                  - {{ edit_user_form.hidden_tag() }} - {{ M.render_field(edit_user_form.username, data_length='64', material_icon='account_circle') }} - {{ M.render_field(edit_user_form.email, class_='validate', material_icon='email', type='email') }} - {{ M.render_field(edit_user_form.role, material_icon='swap_vert') }} - {{ M.render_field(edit_user_form.confirmed, material_icon='check') }} +
                  +

                  {{ user.username }}

                  +

                  Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren,

                  + arrow_backBack to user administration +
                  + +
                  +
                  + +
                  + {{ edit_user_form.hidden_tag() }} + {{ wtf.render_field(edit_user_form.username, data_length='64', material_icon='account_circle') }} + {{ wtf.render_field(edit_user_form.email, class_='validate', material_icon='email', type='email') }} + {{ wtf.render_field(edit_user_form.role, material_icon='swap_vert') }} + {{ wtf.render_field(edit_user_form.confirmed, material_icon='check') }} +
                  +
                  + {{ wtf.render_field(edit_user_form.submit, material_icon='send') }} +
                  +
                  -
                  - {{ M.render_field(edit_user_form.submit, material_icon='send') }} -
                  - +
                  - {% endblock %} diff --git a/web/app/templates/admin/index.html.j2 b/web/app/templates/admin/index.html.j2 deleted file mode 100644 index 9fca5b58..00000000 --- a/web/app/templates/admin/index.html.j2 +++ /dev/null @@ -1,42 +0,0 @@ -{% extends "nopaque.html.j2" %} - -{% set full_width = True %} - -{% block page_content %} -
                  -
                  -
                  - User list -
                  - search - - -
                  -
                    - - - - - - - - - - - - - -
                    UsernameEmailRoleConfirmed StatusId{# Actions #}
                    -
                      -
                      -
                      -
                      - - -{% endblock %} diff --git a/web/app/templates/admin/user.html.j2 b/web/app/templates/admin/user.html.j2 index c1e53a18..c66d1fdc 100644 --- a/web/app/templates/admin/user.html.j2 +++ b/web/app/templates/admin/user.html.j2 @@ -1,34 +1,40 @@ {% extends "nopaque.html.j2" %} {% block page_content %} -
                      -

                      {{ user.username }}

                      -

                      Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren,

                      - arrow_backBack to admin board -
                      +
                      +
                      +
                      +

                      {{ title }}

                      +
                      -
                      -
                      -
                      - User information -
                        -
                      • Username: {{ user.username }}
                        • -
                      • Email: {{ user.email }}
                        • -
                      • ID: {{ user.id }}
                        • -
                      • Member since: {{ user.member_since.strftime('%m/%d/%Y, %H:%M:%S %p') }}
                        • -
                      • Confirmed status: {{ user.confirmed }}
                        • -
                      • Last seen: {{ user.last_seen.strftime('%m/%d/%Y, %H:%M:%S %p') }}
                        • -
                      • Role ID: {{ user.role_id }}
                        • -
                      • Permissions as Int: {{ user.role.permissions }}
                        • -
                      • Role name: {{ user.role.name }}
                        • -
                      +
                      +

                      {{ user.username }}

                      +

                      Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren,

                      + arrow_backBack to Users
                      -
                      - editEdit - deleteDelete + +
                      +
                      +
                      + User information +
                        +
                      • Username: {{ user.username }}
                        • +
                      • Email: {{ user.email }}
                        • +
                      • ID: {{ user.id }}
                        • +
                      • Member since: {{ user.member_since.strftime('%m/%d/%Y, %H:%M:%S %p') }}
                        • +
                      • Confirmed status: {{ user.confirmed }}
                        • +
                      • Last seen: {{ user.last_seen.strftime('%m/%d/%Y, %H:%M:%S %p') }}
                        • +
                      • Role ID: {{ user.role_id }}
                        • +
                      • Permissions as Int: {{ user.role.permissions }}
                        • +
                      • Role name: {{ user.role.name }}
                        • +
                      +
                      +
                      + editEdit + deleteDelete +
                      +
                      -
                      -

                      Corpora

                      @@ -92,21 +98,23 @@ - - {% endblock %} + + +{% block scripts %} +{{ super() }} + +{% endblock scripts %} diff --git a/web/app/templates/admin/users.html.j2 b/web/app/templates/admin/users.html.j2 new file mode 100644 index 00000000..022f7e5c --- /dev/null +++ b/web/app/templates/admin/users.html.j2 @@ -0,0 +1,48 @@ +{% extends "nopaque.html.j2" %} + +{% block page_content %} +
                      +
                      +
                      +

                      {{ title }}

                      +
                      + +
                      +
                      +
                      +
                      + search + + +
                      +
                        + + + + + + + + + + + + + +
                        UsernameEmailRoleConfirmed StatusId{# Actions #}
                        +
                          +
                          +
                          +
                          +
                          +
                          +{% endblock %} + +{% block scripts %} +{{ super() }} + +{% endblock scripts %} diff --git a/web/app/templates/main/news.html.j2 b/web/app/templates/main/news.html.j2 index cf3d9653..968e0f1b 100644 --- a/web/app/templates/main/news.html.j2 +++ b/web/app/templates/main/news.html.j2 @@ -6,6 +6,7 @@

                          {{ title }}

                          +
                          diff --git a/web/app/templates/nopaque.html.j2 b/web/app/templates/nopaque.html.j2 index 0437c29a..c9097dd1 100644 --- a/web/app/templates/nopaque.html.j2 +++ b/web/app/templates/nopaque.html.j2 @@ -136,7 +136,7 @@ {% if current_user.is_administrator() %}
                        • Administration
                          • -
                        • buildAdministration tools
                          • +
                        • buildAdministration tools
                          • {% endif %} {% endblock sidenav %} From 780de62db22619582d6b1bffabd1a08862d00d9d Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Fri, 23 Oct 2020 10:26:04 +0200 Subject: [PATCH 03/31] Rework auth package --- web/app/templates/auth/login.html.j2 | 2 +- web/app/templates/auth/register.html.j2 | 2 +- web/app/templates/auth/reset_password.html.j2 | 4 ++-- web/app/templates/auth/reset_password_request.html.j2 | 2 +- web/app/templates/auth/unconfirmed.html.j2 | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/web/app/templates/auth/login.html.j2 b/web/app/templates/auth/login.html.j2 index a477da4f..657da25f 100644 --- a/web/app/templates/auth/login.html.j2 +++ b/web/app/templates/auth/login.html.j2 @@ -18,7 +18,7 @@
                          -

                          {{ title }}

                          +

                          {{ title }}

                          Want to boost your research and get going? nopaque is free and no download is needed. Register now!

                          diff --git a/web/app/templates/auth/register.html.j2 b/web/app/templates/auth/register.html.j2 index db4ef2c0..9909cd60 100644 --- a/web/app/templates/auth/register.html.j2 +++ b/web/app/templates/auth/register.html.j2 @@ -18,7 +18,7 @@
                          -

                          Register

                          +

                          {{ title }}

                          Simply enter a username and password to receive your registration email. After that you can start right away.

                          It goes without saying that the General Data Protection Regulation applies, only necessary data is stored.

                          Please also read our terms of use before signing up for nopaque!

                          diff --git a/web/app/templates/auth/reset_password.html.j2 b/web/app/templates/auth/reset_password.html.j2 index 414a2d10..f3e4f26e 100644 --- a/web/app/templates/auth/reset_password.html.j2 +++ b/web/app/templates/auth/reset_password.html.j2 @@ -5,11 +5,11 @@
                          -

                          {{ title }}

                          +

                          {{ title }}

                          -

                          dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren,

                          +

                          Enter a new password and confirm it! After that, the entered password is your new one!

                          diff --git a/web/app/templates/auth/reset_password_request.html.j2 b/web/app/templates/auth/reset_password_request.html.j2 index 549af6cd..403f1388 100644 --- a/web/app/templates/auth/reset_password_request.html.j2 +++ b/web/app/templates/auth/reset_password_request.html.j2 @@ -5,7 +5,7 @@
                          -

                          {{ title }}

                          +

                          {{ title }}

                          diff --git a/web/app/templates/auth/unconfirmed.html.j2 b/web/app/templates/auth/unconfirmed.html.j2 index 98ce4de4..613c51a4 100644 --- a/web/app/templates/auth/unconfirmed.html.j2 +++ b/web/app/templates/auth/unconfirmed.html.j2 @@ -4,7 +4,7 @@
                          -

                          {{ title }}

                          +

                          {{ title }}

                          @@ -13,10 +13,10 @@ Hello, {{ current_user.username }}!

                          You have not confirmed your account yet.

                          Before you can access this site you need to confirm your account. Check your inbox, you should have received an email with a confirmation link.

                          -

                          Need another confirmation email? Click here

                          +

                          Need another confirmation email? Click the button below!

                          - person_addRegister + Resend confirmation mail
                          From 310809cc51f81714261e42258ddbc8fc22b2549d Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Fri, 23 Oct 2020 10:26:36 +0200 Subject: [PATCH 04/31] Add missing title ids to admin pages --- web/app/templates/admin/user.html.j2 | 2 +- web/app/templates/admin/users.html.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/app/templates/admin/user.html.j2 b/web/app/templates/admin/user.html.j2 index c66d1fdc..81fc243a 100644 --- a/web/app/templates/admin/user.html.j2 +++ b/web/app/templates/admin/user.html.j2 @@ -4,7 +4,7 @@
                          -

                          {{ title }}

                          +

                          {{ title }}

                          diff --git a/web/app/templates/admin/users.html.j2 b/web/app/templates/admin/users.html.j2 index 022f7e5c..539ce0f1 100644 --- a/web/app/templates/admin/users.html.j2 +++ b/web/app/templates/admin/users.html.j2 @@ -4,7 +4,7 @@
                          -

                          {{ title }}

                          +

                          {{ title }}

                          From e14f397ec3d81a1be2d8912c8ed187f07913a6e4 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Fri, 23 Oct 2020 10:30:56 +0200 Subject: [PATCH 05/31] Rework error package --- web/app/templates/errors/403.html.j2 | 4 ++-- web/app/templates/errors/404.html.j2 | 4 ++-- web/app/templates/errors/413.html.j2 | 4 ++-- web/app/templates/errors/500.html.j2 | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/web/app/templates/errors/403.html.j2 b/web/app/templates/errors/403.html.j2 index 7a4eca4e..0ebbea86 100644 --- a/web/app/templates/errors/403.html.j2 +++ b/web/app/templates/errors/403.html.j2 @@ -2,14 +2,14 @@ {% block page_content %}
                          -

                          {{ title }}

                          +

                          {{ title }}

                          {{ request.path }}

                          Alternatively, you can visit the Main Page or read more information about this type of error.