From 8c79176598020449d84e23d432579a9d0717808c Mon Sep 17 00:00:00 2001
From: kyle roux <kyle@level2designs.com>
Date: Sat, 14 Jun 2014 18:32:57 -0700
Subject: [PATCH] fixed sqlalchemy declarative import in base.models file

---
 base/forms.py                           |  5 +++--
 base/models.py                          |  3 ++-
 base/templates/blocks/auth_header.html  |  8 ++++----
 base/templates/blocks/login_form.html   | 14 ++++++++------
 base/templates/blocks/messages.html     |  8 ++++----
 base/templates/blocks/navigation.html   | 16 +++++++++-------
 base/templates/layout.html              | 15 ++++++++++-----
 base/templates/macros/form_helpers.html |  8 ++++----
 ext.py                                  |  2 +-
 9 files changed, 45 insertions(+), 34 deletions(-)

diff --git a/base/forms.py b/base/forms.py
index 188d436..431c01a 100644
--- a/base/forms.py
+++ b/base/forms.py
@@ -10,8 +10,9 @@
     :license: BSD, see LICENSE for more details.
 """
 
-from flask.ext.wtf import Form, TextField, Required, PasswordField
-from wtforms.validators import Email
+from flask.ext.wtf import Form 
+from wtforms.fields import TextField,PasswordField
+from wtforms.validators import Email, Required
 
 
 class LoginForm(Form):
diff --git a/base/models.py b/base/models.py
index 9036cc2..788bc4d 100644
--- a/base/models.py
+++ b/base/models.py
@@ -11,6 +11,7 @@
 """
 
 from flask.ext.login import UserMixin
+from sqlalchemy.ext.declarative import declared_attr
 from werkzeug.security import generate_password_hash, check_password_hash
 from ext import db
 
@@ -18,7 +19,7 @@
 class CRUDMixin(object):
     __table_args__ = {'extend_existing': True}
 
-    id = db.Column(db.Integer, primary_key=True)
+    id = db.Column(db.Integer,db.Sequence('user_id_seq'),primary_key=True)
 
     @classmethod
     def get_by_id(cls, id):
diff --git a/base/templates/blocks/auth_header.html b/base/templates/blocks/auth_header.html
index 2d981d5..bc84fc3 100644
--- a/base/templates/blocks/auth_header.html
+++ b/base/templates/blocks/auth_header.html
@@ -5,9 +5,9 @@
     <section class="login-header">
         <form action="{{ url_for('base.login') }}" method="POST" class="login-form">
             {{ login_form.hidden_tag() }}
-            {{ login_form_field(login_form.email, class_='input login-form__input') }}
-            {{ login_form_field(login_form.password, class_='input login-form__input') }}
-            <input type="submit" class="button login-form__submit" value="Log in">
+            {{ login_form_field(login_form.email, class_='input form-control') }}
+            {{ login_form_field(login_form.password, class_='input form-control') }}
+            <input type="submit" class="btn btn-primary" value="Log in">
         </form>
     </section>
 {% else %}
@@ -17,4 +17,4 @@
             <input type="submit" class="button login-form__submit" value="Logout">
         </form>
     </section>
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/base/templates/blocks/login_form.html b/base/templates/blocks/login_form.html
index ca7e0d0..05ae380 100644
--- a/base/templates/blocks/login_form.html
+++ b/base/templates/blocks/login_form.html
@@ -2,13 +2,15 @@
 
 
 {% if current_user.is_anonymous() %}
-    <form action="{{ url_for('base.login') }}" method="POST" class="common-form">
+    <form action="{{ url_for('base.login') }}" method="POST" class="form">
         {{ form.hidden_tag() }}
-        {{ common_form_field(form.email, class_='input common-form__input') }}
-        {{ common_form_field(form.password, class_='input common-form__input') }}
-        <div class="common-form__field-wrapper">
-            <label class="common-form__label">&nbsp;</label>
-            <input type="submit" class="button common-form__submit" value="Log in">
+        {{ common_form_field(form.email, class_='form-control') }}
+        {{ common_form_field(form.password, class_='form-control') }}
+        <div class="wrapper">
+            <label class="label">&nbsp;</label>
+            <button type="submit" class="btn btn-primary" value="Log in">
+                Login
+            </button>
         </div>
     </form>
 {% else %}
diff --git a/base/templates/blocks/messages.html b/base/templates/blocks/messages.html
index 2e02890..23396c1 100644
--- a/base/templates/blocks/messages.html
+++ b/base/templates/blocks/messages.html
@@ -1,11 +1,11 @@
 {% with messages = get_flashed_messages() %}
     {% if messages %}
-        <div class="l-75-c flash-messages">
-            <ul class="flash-messages__list">
+        <div class="info">
+            <ul class="info">
                 {% for message in messages %}
-                    <li class="flash-messages__item">{{ message }}</li>
+                    <li class="info">{{ message }}</li>
                 {% endfor %}
             </ul>
         </div>
     {% endif %}
-{% endwith %}
\ No newline at end of file
+{% endwith %}
diff --git a/base/templates/blocks/navigation.html b/base/templates/blocks/navigation.html
index 5d33c66..9b9720f 100644
--- a/base/templates/blocks/navigation.html
+++ b/base/templates/blocks/navigation.html
@@ -1,16 +1,18 @@
 {% from "macros/form_helpers.html" import render_field %}
 
 
-<nav class="top-navigation l-75-c">
-    <ul class="top-navigation__list">
+<nav class="nav nav-bar" role="navigation">
+    <ul class="navigation__list">
         {% for nav_item in navigation %}
-            <li class="top-navigation__item{% if nav_item.url in request.path  %} top-navigation__item_active{% endif %}">
+            <li class="nav nav-bar{% if nav_item.url in request.path  %} active{% endif %}">
                 {% if request.path != nav_item.url %}
-                    <a href="{{ nav_item.url }}" class="top-navigation__item-link">
+                    <a href="{{ nav_item.url }}" class="nav">
+                    <span class="nav nav-bar">{{ nav_item.name }}</span>
+                {% else %}
+                    <span class="nav nav-bar disabled">{{ nav_item.name }}</span>
                 {% endif %}
-                <span class="top-navigation__item-link-text">{{ nav_item.name }}</span>
                 {% if nav_item.counter %}
-                    <sup class="top-navigation__item-counter">{{ nav_item.counter }}</sup>
+                    <sup class="nav nav-bar">{{ nav_item.counter }}</sup>
                 {% endif %}
                 {% if request.path != nav_item.url %}
                     </a>
@@ -18,4 +20,4 @@
             </li>
         {% endfor %}
     </ul>
-</nav>
\ No newline at end of file
+</nav>
diff --git a/base/templates/layout.html b/base/templates/layout.html
index 3a51e53..3686b7d 100644
--- a/base/templates/layout.html
+++ b/base/templates/layout.html
@@ -4,15 +4,18 @@
     <meta charset="utf-8" />
     <title>{% block page_title %}Flask Kit{% endblock %}</title>
     {% block css %}
-        {% assets "css_base" %}
+    {#{% assets "css_base" %}
             <link rel="stylesheet" href="{{ ASSET_URL }}">
-        {% endassets %}
+            {% endassets %}#}
+            <link rel="stylesheet" href="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" />
+            <link rel="stylesheet" href="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap-theme.min.css">
+
     {% endblock %}
 
-    {% block js %}
+    {% block js %}{#
         {% assets "js_base" %}
             <script src="{{ ASSET_URL }}" type="text/javascript"></script>
-        {% endassets %}
+            {% endassets %}#}
     {% endblock %}
 </head>
 
@@ -42,6 +45,8 @@ <h2 class="header__site-remark">for great good</h2>
 
 {% block footer %}
     {% include 'blocks/footer.html' %}
+         <script src="http://code.jquery.com/jquery-1.10.2.min.js"></script>
+         <script src="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
 {% endblock %}
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/base/templates/macros/form_helpers.html b/base/templates/macros/form_helpers.html
index 7838ef6..2b77092 100644
--- a/base/templates/macros/form_helpers.html
+++ b/base/templates/macros/form_helpers.html
@@ -1,13 +1,13 @@
 {% macro common_form_field(field) %}
-    <div class="common-form__field-wrapper">
+    <div class="">
         {% if field.label.text %}
-            <label class="common-form__label" for="{{ field.id }}">
-                {{ field.label.text }}: {% if field.flags.required %} *{% endif %}
+            <label class="info" for="{{ field.id }}">
+                {{ field.label.text }}: {% if field.flags.required %} <span style="color:red;">*</span>{% endif %}
             </label>
         {% endif %}
         {{ field(**kwargs) }}
         {% if field.errors %}
-            <div class="form-errors">
+            <div class="error">
                 <ul>
                     {% for error in field.errors %}<li>{{ error }}</li>{% endfor %}
                 </ul>
diff --git a/ext.py b/ext.py
index 23e7896..96f4686 100644
--- a/ext.py
+++ b/ext.py
@@ -11,7 +11,7 @@
 """
 
 from flask.ext.debugtoolbar import DebugToolbarExtension
-from flask.ext.gravatar import Gravatar
+from gravatar import Gravatar
 from flask.ext.login import LoginManager
 from flask.ext.sqlalchemy import SQLAlchemy
 from flask.ext.assets import Environment