Merge branch 'master' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib

app/static/js/app.js

@@ -63,10 +63,31 @@ function generateTitle(elem) {
 }
 
 $(function() {
-  $("#tabs").tabs().addClass("ui-tabs-vertical ui-helper-clearfix");
+  var index = 'ui-tabs-active';
-  $("#tabs li").removeClass("ui-corner-top").addClass("ui-corner-left");
+//  Define friendly data store name
+var dataStore = window.sessionStorage;
+var oldIndex = 0;
+//  Start magic!
+try {
+    // getter: Fetch previous value
+    oldIndex = dataStore.getItem(index);
+} catch(e) {}
+
+  $("#tabs").tabs({
+     active: oldIndex,
+        activate: function(event, ui) {
+            //  Get future value
+            var newIndex = ui.newTab.parent().children().index(ui.newTab);
+            //  Set future value
+            try {
+                dataStore.setItem( index, newIndex );
+            } catch(e) {}
+        }
     });
 
+  $("#tabs").addClass("ui-tabs-vertical ui-helper-clearfix");
+  $("#tabs li").removeClass("ui-corner-top").addClass("ui-corner-left");
+});
 
 
 

app/templates/about.html

@@ -6,13 +6,14 @@
 XPPL is a project aimed at people who are studying the field of media culture, or as we like to call them: knowledge comrades.
 <br>
 <br>
-This digital library gathers all the books and articles floating around on the shelves of the Piet Zwart Institute, and our hard drives and memory sticks, so that they can be shared, annotated and grouped together into stacks...
+This digital library gathers all the books and articles floating around on the shelves of the Piet Zwart Institute, and our hard drives and memory sticks, so that they can be shared, annotated and grouped together into stacks... Its web interface hosts a curated catalogue of books and articles, and its distributed architecture provides instances for uploading and downloading.
 <br>
 <br>
- Its web interface hosts a curated catalogue of books and articles, and its distributed architecture provides instances for uploading and downloading.
+ It starts at XPUB, but can go anywhere we want it to.
 <br>
 <br>
- It starts at XPUB, but can go anywhere we want it to.</p>
+Are you interested in how this library works? Have a look at the source code in <a href 'https://git.xpub.nl/xpub-lib/log.html'> our git. </a>
+</p>
 
 
 <h2> What's the deal with the stacks? </h2>

app/templates/add_book.html

@@ -36,7 +36,7 @@ function outputUpdate3(gender) {
     <div class="form-group">Title:* <br> {{ form.title (size=50, class="form-control") }}</div>
     <br>
     <div data-toggle="fieldset" id="phone-fieldset">
-         Author(s):*  <button type="button" data-toggle="fieldset-add-row data-target="#phone-fieldset">+</button>
+         Author(s):*  <button type="button" data-toggle="fieldset-add-row" data-target="#phone-fieldset">+</button>
         <table>
             <tr>
                 <th></th>

app/templates/add_stack.html

@@ -22,12 +22,26 @@
   {{form.hidden_tag()}}
 <br>
 {{ render_field(form.stack_name)}}
-{{ render_field(form.stack_description)}}
+<div style="width: 40%;">
+Add a nice description: {{ form.stack_description(size=90, class="form-control") }}
+</div>
 {{ render_field(form.stack_author)}}
+<br>
 <button type="submit" class='button'>Create</button>
+</form>
+<br>
+<hr>
+<br>
+<h1> Stacks currently in the library </h1>
+<ul>
+  {% for stack in stacks %}
 
+  <li> <a href="stacks/tab/{{ stack.id }}">
 
-                </form>
+    {{ stack.stack_name }}
+  </a></td>
+{% endfor %}
+</ul>
 
 
 

app/templates/home.html

@@ -3,10 +3,10 @@
 {% block main %}
 <div id="home_content">
 <h1 class="header" id="title_xppl">XPPL</h1>
-<p class="lead">This is the awesome library of Experimental Publishing. <br>
+<p class="lead"> Welcome to our digital library. <br>
 On instance: {{server}} / From: {{client}}
 <br>
-This might only be one interface to this library:
+Feel free to browse our catalogue, interfaced in many different ways.
 </p>
 
 <a href="{{url_for('scape')}}">Scape</a>

app/templates/show_books.html

@@ -66,9 +66,9 @@
         {% else %}
         <li style='font-size:10px;'>
 
-          |----------| <br>
+          XXXXXXXXXX <br>
-          |----------| <br>
+          XXXXXXXXXX <br>
-          |----------| <br>
+          XXXXXXXXXX <br>
 
 
       {% endfor %}