Remove manual-modal references

README.md

@@ -35,7 +35,7 @@ username@hostname:~$ sudo mount --types cifs --options gid=${USER},password=nopa
 # Clone the nopaque repository
 username@hostname:~$ git clone https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git
 # Create data directories
-username@hostname:~$ mkdir volumes/{db,mq}
+username@hostname:~$ mkdir -p volumes/{db,mq}
 username@hostname:~$ cp db.env.tpl db.env
 username@hostname:~$ cp .env.tpl .env
 # Fill out the variables within these files.

app/namespaces/users/__init__.py

@@ -11,7 +11,7 @@ class UsersNamespace(Namespace):
         user_id = hashids.decode(user_hashid)
 
         if not isinstance(user_id, int):
-            return {'code': 400, 'msg': 'Bad Request'}
+            return {'status': 400, 'statusText': 'Bad Request'}
 
         user = User.query.get(user_id)
 
@@ -38,7 +38,7 @@ class UsersNamespace(Namespace):
         user_id = hashids.decode(user_hashid)
 
         if not isinstance(user_id, int):
-            return {'code': 400, 'msg': 'Bad Request'}
+            return {'status': 400, 'statusText': 'Bad Request'}
 
         user = User.query.get(user_id)
 
@@ -60,7 +60,7 @@ class UsersNamespace(Namespace):
         user_id = hashids.decode(user_hashid)
 
         if not isinstance(user_id, int):
-            return {'code': 400, 'msg': 'Bad Request'}
+            return {'status': 400, 'statusText': 'Bad Request'}
 
         user = User.query.get(user_id)
 

app/templates/corpora/_analysis/query_builder/_expert_mode.html.j2

@@ -5,9 +5,9 @@
       <i class="material-icons prefix">search</i>
       <input class="validate corpus-analysis-action" id="corpus-analysis-concordance-form-query" name="query" type="text" required pattern=".*\S+.*" placeholder="Type in your query via CQL"></input>
       <span class="error-color-text helper-text hide" id="corpus-analysis-concordance-error"></span>
-      <a class="modal-trigger" data-manual-modal-chapter="manual-modal-cqp-query-language" href="#manual-modal" style="margin-left: 40px;"><i class="material-icons" style="font-size: inherit;">help</i> Corpus Query Language tutorial</a>
+      <a href="{{ url_for('main.manual', _anchor='manual-cqp-query-language') }}" target="manual" style="margin-left: 40px;"><i class="material-icons" style="font-size: inherit;">help</i> Corpus Query Language tutorial</a>
       <span> | </span>
-      <a class="modal-trigger" data-manual-modal-chapter="manual-modal-tagsets" href="#manual-modal"><i class="material-icons" style="font-size: inherit;">info</i> Tagsets</a>
+      <a href="{{ url_for('main.manual', _anchor='manual-tagsets') }}" target="manual"><i class="material-icons" style="font-size: inherit;">info</i> Tagsets</a>
     </div>
     <div class="input-field col s12 m3">
       <i class="material-icons prefix">arrow_forward</i>
@@ -17,7 +17,7 @@
     <div class="col s12 m3 l3 right-align">
       <p class="hide-on-small-only">&nbsp;</p>
       <button class="btn waves-effect waves-light corpus-analysis-action" id="corpus-analysis-concordance-form-submit" type="submit" name="submit">
-        Send 
+        Send
         <i class="material-icons right">send</i>
       </button>
     </div>

app/templates/corpora/_analysis/query_builder/_query_builder.html.j2

@@ -22,9 +22,9 @@
   <div class="row">
     <div class="col s12">
       <span class="error-color-text helper-text hide" id="corpus-analysis-concordance-error"></span>
-      <a class="modal-trigger" data-manual-modal-chapter="manual-modal-cqp-query-language" href="#manual-modal"><i class="material-icons" style="font-size: inherit;">help</i> Corpus Query Language tutorial</a>
+      <a href="{{ url_for('main.manual', _anchor='manual-cqp-query-language') }}" target="manual"><i class="material-icons" style="font-size: inherit;">help</i> Corpus Query Language tutorial</a>
       <span> | </span>
-      <a class="modal-trigger" data-manual-modal-chapter="manual-modal-tagsets" href="#manual-modal"><i class="material-icons" style="font-size: inherit;">info</i> Tagsets</a>
+      <a href="{{ url_for('main.manual', _anchor='manual-tagsets') }}" target="manual"><i class="material-icons" style="font-size: inherit;">info</i> Tagsets</a>
     </div>
   </div>
   <div class="row">
@@ -40,14 +40,14 @@
       <a class="btn-small waves-effect waves-light tooltipped modal-trigger" href="#corpus-analysis-concordance-positional-attr-modal" data-position="bottom" data-tooltip="Search for any token, for example a word, a lemma or a part-of-speech tag">Add new token to your query</a>
       <a class="btn-small waves-effect waves-light tooltipped modal-trigger" href="#corpus-analysis-concordance-structural-attr-modal" data-position="bottom" data-tooltip="Structure your query with structural attributes, for example sentences, entities or annotate the text">Add structural attributes to your query</a>
       <a class="btn-small waves-effect waves-light tooltipped dropdown-trigger disabled" data-target="corpus-analysis-concordance-token-incidence-modifiers-dropdown" data-toggle-area="token-incidence-modifiers" data-position="top" data-tooltip="Incidence Modifiers are special characters or patterns, <br>which determine how often a character represented previously should occur.">incidence modifiers</a>
-      <a class="modal-trigger" data-manual-modal-chapter="manual-modal-query-builder" href="#manual-modal"><i class="material-icons left" style="color:black">help_outline</i></a>
+      <a href="{{ url_for('main.manual', _anchor='manual-query-builder') }}" target="manual"><i class="material-icons left" style="color:black">help_outline</i></a>
     </div>
   </div>
   <div class="row">
     <div class="col s12 right-align">
       <p class="hide-on-small-only">&nbsp;</p>
       <button class="btn waves-effect waves-light corpus-analysis-action" type="submit" name="submit">
-        Send 
+        Send
         <i class="material-icons right">send</i>
       </button>
     </div>
@@ -67,7 +67,7 @@
 <div id="corpus-analysis-concordance-structural-attr-modal" class="modal">
   <div class="modal-content">
     <div class="attr-modal-header">
-      <h5>Which structural attribute do you want to add to your query?<a class="modal-trigger" data-manual-modal-chapter="manual-modal-query-builder" data-manual-modal-chapter-anchor="add-structural-attribute-tutorial" href="#manual-modal"><i class="material-icons left" id="corpus-analysis-concordance-add-structural-attribute-tutorial-info-icon">help_outline</i></a></h5>
+      <h5>Which structural attribute do you want to add to your query?<a href="{{ url_for('main.manual', _anchor='add-structural-attribute-tutorial') }}" target="manual"><i class="material-icons left" id="corpus-analysis-concordance-add-structural-attribute-tutorial-info-icon">help_outline</i></a></h5>
     </div>
     <p></p>
     <br>
@@ -128,7 +128,7 @@
     <div class="row attr-modal-header">
       <p></p>
       <div class="col s12">
-        <h5>Which kind of token are you looking for? <a class="modal-trigger" data-manual-modal-chapter="manual-modal-query-builder" data-manual-modal-chapter-anchor="add-new-token-tutorial" href="#manual-modal"><i class="material-icons left" id="corpus-analysis-concordance-token-tutorial-info-icon">help_outline</i></a></h5>
+        <h5>Which kind of token are you looking for? <a href="{{ url_for('main.manual', _anchor='add-new-token-tutorial') }}" target="manual"><i class="material-icons left" id="corpus-analysis-concordance-token-tutorial-info-icon">help_outline</i></a></h5>
       </div>
       <div class="input-field col s3" style="margin-left:42px;">
         <select id="corpus-analysis-concordance-positional-attr-selection">
@@ -234,7 +234,7 @@
           <label>Part-of-speech tags</label>
         </div>
       </template>
-      
+
       <template class="token-builder-section" data-token-builder-section="german-pos">
         <div class= "input-field col s4" data-kind-of-token="german-pos">
           <select name="germanpos">
@@ -337,7 +337,7 @@
     </div>
     <div id="corpus-analysis-concordance-token-edit-options" data-toggle-area="input-field-options">
       <div class="row">
-        <h6>Options to edit your token: <a class="modal-trigger" data-manual-modal-chapter="manual-modal-query-builder" href="#manual-modal" data-manual-modal-chapter-anchor="edit-options-tutorial"><i class="material-icons left" id="corpus-analysis-concordance-edit-options-tutorial-info-icon">help_outline</i></a></h6>
+        <h6>Options to edit your token: <a href="{{ url_for('main.manual', _anchor='edit-options-tutorial') }}" target="manual"><i class="material-icons left" id="corpus-analysis-concordance-edit-options-tutorial-info-icon">help_outline</i></a></h6>
       </div>
       <p></p>
       <div class="row">
@@ -359,10 +359,10 @@
 
       </div>
     </div>
-    
+
     {{ exactly_n_modal_content("character") }}
     {{ exactly_nm_modal_content("character") }}
-      
+
   </div>
 </div>
 {% endmacro %}

app/templates/main/social_area.html.j2

@@ -1,43 +1,20 @@
 {% extends "base.html.j2" %}
 {% import "wtf.html.j2" as wtf %}
 
-{% block main_attribs %} class="social-area-color-lighten" {% endblock main_attribs %}
-
 {% block page_content %}
 <div class="container">
   <div class="row">
     <div class="col s12">
       <h1 id="title">{{ title }}</h1>
-    </div>
+      <p>Here you can network with your team and other users. You can find corpora that are public and request them or just see what other users are working on.</p>
-
-    <div class="col s12 m3 push-m9">
-      <div class="center-align">
-        <p class="hide-on-small-only">&nbsp;</p>
-        <p class="hide-on-small-only">&nbsp;</p>
-        <a class="btn-floating btn-large btn-scale-x2 waves-effect waves-light social-area-color-darken">
-          <i class="left material-icons">group</i>
-        </a>
-      </div>
-    </div>
-
-    <div class="col s12 m9 pull-m3">
-      <div class="card social-area-color-border-darken" style="border-top: 10px solid">
-        <div class="card-content">
-          <div class="row">
-            <div class="col s12">
-              <div class="card-panel z-depth-0">
-                <span class="card-title"><i class="left material-icons">layers</i>Your social area</span>
-                <p>Here you can network with your team and other users. You can find corpora that are public and request them or just see what other users are working on.</p>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
     </div>
 
     <div class="col s12" id="public-users">
-      <h3>Public Users</h3>
+      <h2>Public Users</h2>
       <p>Find other users and see what corpora they have made public.</p>
+    </div>
+
+    <div class="col s12">
       <div class="card">
         <div class="card-content">
           <div id="public-user-list"></div>
@@ -46,8 +23,11 @@
     </div>
 
     <div class="col s12" id="public-corpora">
-      <h3>Public Corpora</h3>
+      <h2>Public Corpora</h2>
       <p>Find public corpora.</p>
+    </div>
+
+    <div class="col s12">
       <div class="card">
         <div class="card-content">
           <div id="public-corpus-list"></div>