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

.gitignore

@@ -4,3 +4,7 @@ __pycache__/
 app/uploads/**
 !app/uploads/cover
 app/mydatabase.db
+pyrqlite/
+whoosh/
+sqlalchemy-rqlite/
+rqlite*

app/forms.py

@@ -51,6 +51,7 @@ class ChatForm(FlaskForm):
 class StackForm(FlaskForm):
     stack_name = StringField('Stack', validators=[InputRequired()])
     stack_description = StringField('Description', validators=[InputRequired()])
+    stack_author = StringField('Who made this', validators=[InputRequired()])
     create = SubmitField(label='Create')
 
 class AddtoStackForm(FlaskForm):
@@ -71,7 +72,3 @@ class SearchForm(FlaskForm):
     grid = SubmitField('Grid')
     listview = SubmitField('List')
     randomize = SubmitField('Order differently')
-
-
-
-

app/models.py

@@ -100,11 +100,14 @@ class Stack(db.Model):
     __tablename__ = 'stacks'
     id = db.Column(db.Integer, primary_key = True)
     stack_name = db.Column(db.String(50))
-    stack_description = db.Column(db.String(500))
+    stack_description = db.Column(db.String(1000))
+    stack_author = db.Column(db.String(255))
 
-    def __init__(self, stack_name, stack_description):
+
+    def __init__(self, stack_name, stack_description, stack_author):
         self.stack_name = stack_name
         self.stack_description = stack_description
+        self.stack_author = stack_author
 
     def __repr__(self):
         return '<Stack %r>' % self.stack_name

app/static/css/style.css

@@ -205,7 +205,11 @@ font-size: 12px;
 .ui-tabs-vertical .ui-tabs-nav li.ui-tabs-active { padding-bottom: 0; padding-right: .1em; border-right-width: 0; background-color: yellow !important; list-style-type: none;}
 .ui-tabs-vertical .ui-tabs-panel { padding: 1em; float: left; width: 50em; font-size: 12px; list-style-type: none;}
 
+#creator{
+  font-size: 12px;
+  color: grey;
 
+}
 
 #newstext{
   width: 100%;

app/templates/add_stack.html

@@ -16,14 +16,14 @@
         </ul>
       </div>
     {% endif %}
-  {% endwith %} 
+  {% endwith %}
 
   <form method="POST" action="{{ url_for('add_stack') }}" enctype=multipart/form-data>
   {{form.hidden_tag()}}
 <br>
 {{ render_field(form.stack_name)}}
 {{ render_field(form.stack_description)}}
-
+{{ render_field(form.stack_author)}}
 <button type="submit" class='button'>Create</button>
 
 

app/templates/show_books.html

@@ -63,7 +63,7 @@
 
               <li><a href="{{url_for('show_stack_by_id', id=stack.id)}}">  </a>
 
-                {{ stack.stack_name }}
+                {{ stack.stack_name }} 
                   </li>
 
       {% endfor %}

app/templates/show_stack_detail.html

@@ -6,6 +6,12 @@
   <h1 class="header">{{ stack.stack_name }}</h1>
 
   <p>{{ stack.stack_description }} </p>
+  <p id='creator'>Created by: 
+{%  if stack.stack_author == None %} anon</p>
+{% else %}
+
+    {{ stack.stack_author }}
+{% endif %}
   <h2>Books in this stack:</h2>
 <p>
   {% for book in stack.books %}

app/templates/show_stack_detail_tab.html

@@ -10,6 +10,13 @@
 
 
   <p>{{ stack.stack_description }} </p>
+  <p id='creator'>Created by:
+{%  if stack.stack_author == None %} anon</p>
+{% else %}
+
+    {{ stack.stack_author }}
+{% endif %}
+
 
   <p style='font-weight:bold;'>Books in this stack: {% for book in stack.books %}
 

app/templates/show_stacks.html

@@ -4,8 +4,6 @@
 <div class="container">
   <h1 class="page-header">Stacks</h1>
 <p>These are all the stacks that have been built so far.</p>
-<p><a href= {{ url_for('add_stack') }}>Add a new stack</a></p>
-
 
 <table style="width:100%">
 
@@ -26,6 +24,8 @@
 
 </div>
 <br>
+<p><a href= {{ url_for('add_stack') }}>Add a new stack</a></p>
+<br>
 <br>
 
 

app/views.py

@@ -327,9 +327,10 @@ def add_stack():
     if form.validate_on_submit():
         stack_name = form.stack_name.data
         stack_description = form.stack_description.data
-        stack = Stack(stack_name, stack_description)
+        stack_author = form.stack_author.data
+        stack = Stack(stack_name, stack_description, stack_author)
         if form.stack_name.data:
-            stack = Stack(stack_name, stack_description)
+            stack = Stack(stack_name, stack_description, stack_author)
             db.session.add(stack)
         stacks = db.session.query(Stack).all()
         return redirect(url_for('show_stacks'))