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

app/static/css/style.css

@@ -93,7 +93,8 @@ background-color: #E8E8E8!important;
 
 .library_table .title_col{
   font-size: 20px;
-  padding-left: 10px;
+  padding-left: 90px;
+  padding-right: 20px;
 }
 
 .library_table .author_col{

app/templates/show_book_detail.html

@@ -25,6 +25,8 @@
   <br>
   <br>
     <a href="{{ url_for('edit_book_by_id', id=book.id )}}">edit</a>
+    <br>
+    <a href="{{ url_for('remove_book_by_id', id=book.id)}}">delete</a>
 
 </div>
 {% endblock %}

app/templates/show_books.html

@@ -35,7 +35,7 @@
       <th width="100px;">Filetype</th>
       <th width="100px;">Category</th>
       <th width="100px;">Stack</th>
-      <th width="100px;">Add to stack</th>
+      <th width="100px;">Add to a stack</th>
     </tr>
     </thead>
     <tbody>

app/templates/show_stack_detail_tab.html

@@ -11,7 +11,7 @@
 
   <p>{{ stack.stack_description }} </p>
 
-  <p>Books in this stack: {% for book in stack.books %}
+  <p style='font-weight:bold;'>Books in this stack: {% for book in stack.books %}
 
           <li style="font-size: 18px;">  <a href="{{url_for('show_book_by_id', id=book.id)}}">{{book.title}}</a> </li>
 

app/views.py

@@ -175,15 +175,15 @@ def edit_book_by_id(id):
                     flash('No selected file')
                     return redirect(request.url)
                 if file and allowed_file(file.filename):
-                    filename = secure_filename(file.filename)
                     allbooks = db.session.query(Book).all()
                     id = book.id
-                    new_filename = str(id) +"_"+ filename
-                    fullpath = os.path.join(app.config['UPLOAD_FOLDER'], new_filename)
-                    name, file_extension = os.path.splitext(new_filename)
+
+                    filename = str(id) + "_" + secure_filename(file.filename)
+                    fullpath = os.path.join(app.config['UPLOAD_FOLDER'], filename)
+                    name, file_extension = os.path.splitext(filename)
                     file.save(fullpath)
                     book.cover = get_cover(fullpath, name)
-                    book.file = new_filename
+                    book.file = filename
                 else:
                     flash('allowed file formats: %s' % ALLOWED_EXTENSIONS)
 
@@ -221,12 +221,12 @@ def add_book():
                     flash('No selected file')
                     return redirect(request.url)
                 if file and allowed_file(file.filename):
-                    filename = secure_filename(file.filename)
                     allbooks = db.session.query(Book).all()
                     id = len(allbooks)+1
-                    new_filename = str(id) +"_"+ filename
-                    fullpath = os.path.join(app.config['UPLOAD_FOLDER'], new_filename)
-                    name, file_extension = os.path.splitext(new_filename)
+                    filename = str(id) + "_" + secure_filename(file.filename)
+
+                    fullpath = os.path.join(app.config['UPLOAD_FOLDER'], filename)
+                    name, file_extension = os.path.splitext(filename)
                     file.save(fullpath)
                     cover = get_cover(fullpath, name)
                 else:
@@ -386,7 +386,7 @@ def show_books():
         return render_template ('show_books.html', books=books, form=search)
 
     if request.method == 'POST':
-        newmsg = 'searched for: ' + search.search.data 
+        newmsg = 'searched for: ' + search.search.data
         # message = search.search.data
         # newmessage = Chat(message)
         # db.session.add(newmessage)
@@ -439,7 +439,7 @@ def search_results(searchtype, query, viewby):
 
     count = results.count()
     whole = Book.query.count()
-    percentage = float(count / whole * 100) 
+    percentage = float(count / whole * 100)
 
     if search.listview.data:
         view.append('1')
@@ -450,7 +450,7 @@ def search_results(searchtype, query, viewby):
         return render_template('results_grid.html', books=results, form=search, query=query, books_all=random_order, searchtype=search.select.data, count = count, whole = whole, percentage = percentage)
 
     if request.method == 'POST':
-        newmsg = 'searched for: ' + search.search.data 
+        newmsg = 'searched for: ' + search.search.data
         socketio.emit('channel-' + str(1), {
         'username': 'Search form',
         'text': search.search.data,
@@ -462,7 +462,7 @@ def search_results(searchtype, query, viewby):
             db.session.commit()
         except:
             db.session.rollback()
-            
+
         query = search.search.data
         results = []
         if viewby == '1':
@@ -470,7 +470,7 @@ def search_results(searchtype, query, viewby):
             return redirect((url_for('search_results', searchtype=search.select.data, query=search.search.data, viewby=viewby)))
         else:
             return redirect((url_for('search_results', searchtype=search.select.data, query=search.search.data, viewby=viewby)))
-   
+
     if viewby == '2':
         return render_template('results_grid.html', form=search, books=results, books_all=random_order, searchtype=search.select.data, query=query, count = count, whole = whole, percentage = percentage)