Skip to content
Snippets Groups Projects
Commit a1d33077 authored by Patrick Jentsch's avatar Patrick Jentsch
Browse files

Small changes everywhere

parent 4de2fdf6
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 23 additions and 1019 deletions
app/templates/403.html.j2
+ 2
− 5
View file @ a1d33077
{% extends "nopaque.html.j2" %}
{% set full_width = False %}
{% set roadmap = False %}
{% block page_content %}
<div class="page-header">
<p>This site is forbidden for you.</p>
<div class="col s12">
<p>This site is forbidden for you.</p>
</div>
{% endblock %}
app/templates/404.html.j2
+ 2
− 5
View file @ a1d33077
{% extends "nopaque.html.j2" %}
{% set full_width = False %}
{% set roadmap = False %}
{% block page_content %}
<div class="page-header">
<p>Site has not been found.</p>
<div class="col s12">
<p>Site has not been found.</p>
</div>
{% endblock %}
app/templates/500.html.j2
+ 2
− 5
View file @ a1d33077
{% extends "nopaque.html.j2" %}
{% set full_width = False %}
{% set roadmap = False %}
{% block page_content %}
<div class="page-header">
<p>Internal Server Error. We are Sorry!</p>
<div class="col s12">
<p>Internal Server Error. We are Sorry!</p>
</div>
{% endblock %}
app/templates/admin/edit_user.html.j2
+ 0
− 3
View file @ a1d33077
{% extends "nopaque.html.j2" %}
{% set full_width = False %}
{% set roadmap = False %}
{% block page_content %}
<div class="col s12 m4">
<h3 id="title">{{ user.username }}</h3>
......
app/templates/admin/index.html.j2
+ 0
− 1
View file @ a1d33077
{% extends "nopaque.html.j2" %}
{% set full_width = True %}
{% set roadmap = False %}
{% block page_content %}
<div class="col s12">
......
app/templates/admin/user.html.j2
+ 0
− 3
View file @ a1d33077
{% extends "nopaque.html.j2" %}
{% set full_width = False %}
{% set roadmap = False %}
{% block page_content %}
<div class="col s12 m4">
<h3 id="title">{{ user.username }}</h3>
......
app/templates/auth/register.html.j2
+ 0
− 3
View file @ a1d33077
{% extends "nopaque.html.j2" %}
{% set full_width = False %}
{% set roadmap = False %}
{% block page_content %}
<div class="col s12 m4">
<h3>DSGVO</h3>
......
app/templates/auth/reset_password.html.j2
+ 0
− 3
View file @ a1d33077
{% extends "nopaque.html.j2" %}
{% set full_width = False %}
{% set roadmap = False %}
{% block page_content %}
<div class="col s12 m4">
<h3>Lorem ipsum</h3>
......
app/templates/auth/reset_password_request.html.j2
+ 0
− 3
View file @ a1d33077
{% extends "nopaque.html.j2" %}
{% set full_width = False %}
{% set roadmap = False %}
{% block page_content %}
<div class="col s12 m4">
<h3>Lost password?</h3>
......
app/templates/auth/unconfirmed.html.j2
+ 0
− 3
View file @ a1d33077
{% extends "nopaque.html.j2" %}
{% set full_width = False %}
{% set roadmap = False %}
{% block title %}Opaque - Confirm your account{% endblock %}
{% block page_content %}
......
app/templates/corpora/add_corpus.html.j2
+ 0
− 3
View file @ a1d33077
{% extends "nopaque.html.j2" %}
{% set full_width = False %}
{% set roadmap = True %}
{% block page_content %}
<div class="col s12 m4">
<h3>...</h3>
......
app/templates/corpora/add_corpus_file.html.j2
+ 0
− 3
View file @ a1d33077
{% extends "nopaque.html.j2" %}
{% set full_width = False %}
{% set roadmap = False %}
{% block page_content %}
<div class="col s12 m4">
<h3>{{ corpus.title }}</h3>
......
app/templates/corpora/analyse_corpus.bak.html.j2 deleted 100644 → 0
+ 0
− 543
View file @ 4de2fdf6
This diff is collapsed.
app/templates/corpora/analyse_corpus.html.j2
+ 0
− 1
View file @ a1d33077
{% extends "nopaque.html.j2" %}
{% set full_width = True %}
{% set roadmap = False %}
{% block page_content %}
<!-- Query Form -->
......
app/templates/corpora/analyse_corpus_pjentsch.html.j2 deleted 100644 → 0
+ 0
− 423
View file @ 4de2fdf6
{% extends "full_width.html.j2" %}
{% block page_content %}
<!-- Query Form -->
<div class="col s12">
<form id="query-form">
{{ query_form.hidden_tag() }}
<ul class="collapsible expandable" id="query-form-collapsible">
<li class="active">
<div class="collapsible-body" style="padding-top: 10px; padding-right: 2rem; padding-bottom: 0px; padding-left: 2rem;">
<div class="row">
<div class="col s12 m11 input-field">
<i class="material-icons prefix">search</i>
{{ query_form.query() }}
{{ query_form.query.label }}
<span class="helper-text">
<a href="http://cwb.sourceforge.net/files/CQP_Tutorial/"><i class="material-icons" style="font-size: inherit;">help</i> CQP query language tutorial</a>
</span>
</div>
<div class="col s12 m1 right-align">
<p class="hide-on-small-only" style="margin: 0px;">&nbsp;</p>
<button class="btn-small waves-effect waves-light" type="submit">Send<i class="material-icons right">send</i></button>
</div>
</div>
</div>
</li>
<li>
<div class="collapsible-header"><i class="material-icons">settings</i>Display Options</div>
<div class="collapsible-body">
<div class="row">
<div class="col s12 m6 input-field">
<i class="material-icons prefix">format_list_numbered</i>
{{ query_form.hits_per_page() }}
{{ query_form.hits_per_page.label }}
</div>
<div class="col s12 m6 input-field">
<i class="material-icons prefix">short_text</i>
{{ query_form.context() }}
{{ query_form.context.label }}
</div>
</div>
<div class="col s12">
<div class="switch">
<label>
{{ query_form.expert_mode.label.text }}
{{ query_form.expert_mode() }}
<span class="lever"></span>
</label>
</div>
</div>
</div>
</li>
</ul>
</form>
</div>
<!-- Loading animation card when query results are being loaded -->
<div class="col s12">
<div class="card hide" id="query-loading-card">
<div class="card-content">
<span class="card-title">Fetching your results!</span>
<div>
<div class="progress">
<div class="indeterminate"></div>
</div>
</div>
</div>
</div>
</div>
<div class="col s12">
<div class="card" id="query-results-card">
<div class="card-content" id="result-list">
<span class="card-title">Query Results</span>
<p id="query-results-metadata">
<button id="export-query-results" class="waves-effect waves-light btn-small right" type="submit">Export Results<i class="material-icons right">file_download</i></button>
</p>
<ul class="pagination pagination-top"></ul>
<table class="responsive-table highlight">
<thead>
<tr>
<th style="width: 5%">Title</th>
<th style="width: 25%">Left context</th>
<th style="width: 45%">Match</th>
<th style="width: 25%">Right Context</th>
</tr>
</thead>
<tbody class="list" id="query-results"></tbody>
</table>
<ul class="pagination pagination-bottom"></ul>
</div>
</div>
</div>
<!-- Context modal used for detailed information about one match -->
<div class="modal modal-fixed-footer" id="context-modal">
<div class="modal-content">
<h4>Match context and information</h4>
<div id="context-modal-loading">
<div class="progress">
<div class="indeterminate"></div>
</div>
</div>
<div id="context-modal-ready" class="hide">
<div id="context-results"></div>
</div>
</div>
<div class="modal-footer">
<a href="#!" class="left waves-effect waves-green btn">Export</a>
<a href="#!" class="modal-close waves-effect waves-green red btn">Close</a>
</div>
</div>
<!-- Export query results modal -->
<div class="modal modal-fixed-footer" id="export-modal">
<div class="modal-content">
{{ query_download_form.hidden_tag() }}
<h4>Download current query Results</h4>
<p>The results of the current query can be downlaoded as several files like csv or json. Those files can be used in other software like excel. Also it is easy to publish your results as raw data like this!</p>
<table>
<tr>
<td>JSON</td>
<td>
<a class="btn waves-effect waves-light" id="download-results">Download
<i class="material-icons right">file_download</i>
</a>
</td>
</tr>
<tr>
<td>CSV</td>
<td>
<a class="btn waves-effect waves-light disabled">Download
<i class="material-icons right">file_download</i>
</a>
</td>
</tr>
<tr>
<td>EXCEL</td>
<td>
<a class="btn waves-effect waves-light disabled">Download
<i class="material-icons right">file_download</i>
</a>
</td>
</tr>
<tr>
<td>HTML</td>
<td>
<a class="btn waves-effect waves-light disabled">Download
<i class="material-icons right">file_download</i>
</a>
</td>
</tr>
</table>
</div>
<div class="modal-footer">
<a href="#!" class="modal-close waves-effect waves-green red btn">Close</a>
</div>
</div>
<div id="init-modal" class="modal no-autoinit">
<div class="modal-content">
<h4>Initializing analysis</h4>
<div class="progress">
<div class="indeterminate"></div>
</div>
</div>
</div>
<script>
// Modal objects (initialized after DOM content is loaded)
var contextModal, exportModal, initModal;
// Query form elements
var queryFormElement = document.getElementById("query-form"),
queryElement = document.getElementById("query");
// Display option elements
var contextElement = document.getElementById("context"),
expertModeElement = document.getElementById("expert_mode"),
hitsPerPageElement = document.getElementById("hits_per_page");
var queryLoadingCardElement = document.getElementById("query-loading-card"),
queryResultsCardElement = document.getElementById("query-results-card"),
exportQueryResultsElement = document.getElementById("export-query-results"),
resultListElement = document.getElementById("resultList"),
resultList = new List('result-list',
{"pagination": [{"name": "paginationTop",
"paginationClass": "pagination-top",
"innerWindow": 8,
"outerWindow": 1},
{"name": "paginationBottom",
"paginationClass": "pagination-bottom",
"innerWindow": 8,
"outerWindow": 1}],
"valueNames": ["titles", "lc", "hit", "rc"],
"item": `<tr>
<td class="titles"></td>
<td class="lc"></td>
<td class="hit"></td>
<td class="rc"></td>
</tr>`});
// Query result data store
var result = {"lookup": {"cpos": {}, "s": {}, "text": {}}, "matches": []};
var tokenElements = [];
document.addEventListener("DOMContentLoaded", function() {
contextModal = M.Modal.getInstance(document.getElementById("context-modal"));
exportQueryResultsModal = M.Modal.getInstance(document.getElementById("export-modal"));
initModal = M.Modal.init(document.getElementById("init-modal"), {"dismissible": false});
M.Collapsible.init(document.getElementById("query-form-collapsible"), {"accordion": false});
initModal.open();
nopaque.socket.emit("corpus_analysis_init", {{ corpus_id }});
});
// close loading modal if container for analysis has started
nopaque.socket.on("corpus_analysis_init", function(response) {
if (response.code === 201) {
initModal.close();
} else {
console.log("[ERROR] corpus_analysis_init");
console.log(response);
}
});
expertModeElement.addEventListener("change", function(event) {
var tooltip;
if (expertModeElement.checked) {
for (let tokenElement of tokenElements) {
tokenElement.classList.add("chip");
token = lookup["cpos"][tokenElement.dataset.cpos];
addToolTipToTokenElement(tokenElement, token);
}
} else {
for (let tokenElement of tokenElements) {
tooltip = M.Tooltip.getInstance(tokenElement);
tooltip.destroy();
tokenElement.classList.remove("chip");
}
}
});
exportQueryResultsElement.addEventListener("click", function() {
exportModal.open();
});
// Get query form element and save its data on submit and send this data via
// socket.io to the CQP server
queryFormElement.addEventListener("submit", function(event) {
event.preventDefault();
let queryData = {"context": contextElement.value,
"hits_per_page": hitsPerPageElement.value,
"query": queryElement.value};
nopaque.socket.emit("corpus_analysis", queryData);
nopaque.toast("Query has been sent!");
// Unhide (show) loading card and hide result card
queryLoadingCardElement.classList.remove("hide");
queryResultsCardElement.classList.add("hide");
resultList.clear();
lookup = {"cpos": {}, "s": {}, "text": {}};
matches = [];
tokenElements = [];
});
// socket.on triggered when result chunks are recieved
nopaque.socket.on("corpus_analysis", function(chunk) {
console.log("### Recieved query results chunk ###");
console.log(chunk);
// Sanity checks
if (!chunk) {
// No results for this query
nopaque.toast("No results!");
return;
} else if (chunk === "CQI_CQP_ERROR_GENERAL") {
// Invalid query
queryResultsTableElement.classList.add("hide");
nopaque.toast("Invalid query!", "red");
return;
}
// Add chunk to the query result data stores
matches.push(...chunk["matches"]);
lookup["cpos"] = {...lookup["cpos"], ...chunk["cpos_lookup"]};
lookup["text"] = {...lookup["text"], ...chunk["text_lookup"]};
console.log("### Updated query result data stores ###");
console.log(matches);
console.log(lookup);
// Hide loading card and Unhide (show) result card
queryLoadingCardElement.classList.add("hide");
queryResultsCardElement.classList.remove("hide");
// write metadata query information into HTML elements
// like nr. of all matches in how many files etc.
// TODO: count_corpus_files müssen aus full results genommen werden.
let count_corpus_files = Object.keys(lookup["text"]).length;
queryResultsMetadataElement.innerHTML = chunk["total_nr_matches"] + " matches in " + count_corpus_files + " corpus files.";
queryResultsMetadataElement.appendChild(exportQueryResults);
var toAdd = [];
for (let [index, match] of chunk["matches"].entries()) {
lc_tokens = "";
for (cpos of match["lc"]) {
word = chunk["cpos_lookup"][cpos]["word"];
lc_tokens += " " + word;
}
// console.log(lc_tokens);
hit_tokens = "";
for (cpos of match["hit"]) {
word = chunk["cpos_lookup"][cpos]["word"];
hit_tokens += " " + word;
}
// console.log(hit_tokens);
rc_tokens = "";
for (cpos of match["rc"]) {
word = chunk["cpos_lookup"][cpos]["word"];
rc_tokens += " " + word;
}
// console.log(rc_tokens);
item = { titles: "test", lc: lc_tokens, hit: hit_tokens, rc: rc_tokens };
toAdd.push(item);
}
resultList.add(toAdd, function(toAdd) {console.log('All ' + toAdd.length + 'results were added!')});
});
// Function to download data to a file
function download(downloadElem, data, filename, type) {
var file = new Blob([data], {type: type});
if (window.navigator.msSaveOrOpenBlob) // IE10+
window.navigator.msSaveOrOpenBlob(file, filename);
else { // Others
var url = URL.createObjectURL(file);
downloadElem.href = url;
downloadElem.download = filename;
}
// create json filename for download
var today = new Date();
var currentDate = today.getUTCFullYear() + '-' + (today.getUTCMonth() +1) + '-' + today.getUTCDate();
var currentTime = today.getUTCHours() + ":" + today.getUTCMinutes() + ":" + today.getUTCSeconds();
var safeFilename = message['query'].replace(/[^a-z0-9_-]/gi, "_");
var resultFilename = "UTC-" + currentDate + "_" + currentTime + "_" + safeFilename + ".json";
// get a where download is served
var downloadResults = document.getElementById("download-results");
// stringify JSON object for json download
var dataStr = JSON.stringify(message, undefined, 2);
downloadResults.onclick = download(downloadResults,
dataStr,
resultFilename,
"text/json");
};
function addToolTipToTokenElement(tokenElement, token) {
M.Tooltip.init(tokenElement,
{"html": `<table>
<tr>
<th>Token information</th>
<th>Source information</th>
</tr>
<tr>
<td class="left-align">
Word: ${token["word"]}<br>
Lemma: ${token["lemma"]}<br>
POS: ${token["pos"]}<br>
Simple POS: ${token["simple_pos"]}<br>
NER: ${token["ner"]}
</td>
<td class="left-align">
Title: ${lookup["text"][token["text"]]["title"]}<br>
Author: ${lookup["text"][token["text"]]["author"]}<br>
Publishing year: ${lookup["text"][token["text"]]["publishing_year"]}
</td>
</tr>
</table>`,
"inDuration": 1500,
"margin": 15,
"position": "top",
"transitionMovement": 0});
}
nopaque.socket.on("match_context", function(message) {
console.log("### match_context ###");
console.log(message);
contextResultsElement.innerHTML = "<p>&nbsp;</p>";
document.getElementById("context-modal-loading").classList.add("hide");
document.getElementById("context-modal-ready").classList.remove("hide");
var sentenceElement;
var token;
var tokenElement;
lookup["cpos"] = {...lookup["cpos"], ...message["cpos_lookup"]};
lookup["s"] = message["context_s_cpos"];
lookup["text"] = {...lookup["text"], ...message["text_lookup"]};
for (let [key, value] of Object.entries(message['context_s_cpos'])) {
sentenceElement = document.createElement("p");
for (cpos of value) {
token = lookup["cpos"][cpos];
tokenElement = document.createElement("span");
tokenElement.classList.add("token");
if (message["match_cpos_list"].includes(cpos)) {
tokenElement.classList.add("bold");
}
tokenElement.dataset.cpos = cpos;
tokenElement.innerText = token["word"];
if (expertModeSwitchElement.checked) {
tokenElement.classList.add("chip");
addToolTipToTokenElement(tokenElement, token);
}
tokenElements.add(tokenElement);
sentenceElement.append(tokenElement);
sentenceElement.append(document.createTextNode(" "));
}
contextResultsElement.append(sentenceElement);
}
});
// collapsible display options
var elem = document.querySelector('.collapsible.expandable');
</script>
{% endblock %}
app/templates/corpora/corpus.html.j2
+ 0
− 3
View file @ a1d33077
{% extends "nopaque.html.j2" %}
{% set full_width = False %}
{% set roadmap = False %}
{% block page_content %}
<div class="col s12 m4">
<h3 id="title">{{ corpus.title }}</h3>
......
app/templates/corpora/edit_corpus_file.html.j2
+ 0
− 3
View file @ a1d33077
{% extends "nopaque.html.j2" %}
{% set full_width = False %}
{% set roadmap = False %}
{% block page_content %}
<div class="col s12 m4">
<h3 id="title">...</h3>
......
app/templates/jobs/job.html.j2
+ 0
− 3
View file @ a1d33077
{% extends "nopaque.html.j2" %}
{% set full_width = False %}
{% set roadmap = False %}
<!-- Override title -->
{% set title = '<i class="material-icons left service" data-service="{service}" style="font-size: inherit;"></i>Job'.format(service=job.service) %}
{% block page_content %}
......
app/templates/main/dashboard.html.j2
+ 0
− 3
View file @ a1d33077
{% extends "nopaque.html.j2" %}
{% set full_width = False %}
{% set roadmap = False %}
{% block page_content %}
<div class="col s12" id="corpora">
<h3>My Corpora</h3>
......
app/templates/main/index.html.j2
+ 17
− 0
View file @ a1d33077
......@@ -4,6 +4,23 @@
{% block page_content %}
{% if current_user.is_anonymous %}
<script>
document.getElementById("sidenav-main").classList.add("hide");
</script>
<style>
header, main, footer {
padding-left: 0;
}
.modal:not(.bottom-sheet) {
left: 0;
}
.navbar-fixed > nav {
width: 100%;
}
</style>
<div class="parallax-container">
<div class="parallax">
<img src="{{ url_for('static', filename='images/bible_text.jpg') }}" alt="">
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment