Merge pull request #6 from pythonhackers/user_man_cont

User man cont

Author: bcambel

src/pyhackers/controllers/main.py

@@ -28,7 +28,7 @@ def render_base_template(*args, **kwargs):
     user_data = dumps({'logged': bool(is_logged),
                        'user': current_user.jsonable()})
 
-    kwargs.update(**{'__v__': int(time.time()), 'user_data': user_data})
+    kwargs.update(**{'__v__': int(time.time()), 'user_data': user_data, 'logged_in': bool(is_logged)})
     return render_template(*args, **kwargs)
 
 
@@ -159,3 +159,7 @@ def logout():
     return render_base_template("logout.html", master="login_master.html")
 
 
+@main_app.route("/profile")
+def profile():
+
+    return render_base_template("profile.html")

src/pyhackers/templates/base.html

@@ -151,8 +151,10 @@
         <ul class='nav navbar-nav pull-right'>
             {% if logged_in %}
                 <li class="dropdown">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span
-                            id='profile_link'>Dropdown </span><b class="caret"></b></a>
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                        <img src='{{ current_user.pic_url }}' height='25px' width="25px" class="img-rounded"/>&nbsp;
+                        &nbsp;
+                        <span id='profile_link'>{{ current_user.nick }} </span><b class="caret"></b></a>
                     <ul class="dropdown-menu">
                         {#                  <li><a href="#">Action</a></li>#}
                         <li><a href="/profile"><i class='icon-user'></i>&nbsp;Account</a></li>
@@ -176,6 +178,7 @@
         {% block content %}{% endblock %}
     </div>
 </div>
+<hr/>
 <div class='container footer'>
     <p>
         Made in Amsterdam
@@ -216,7 +219,7 @@
 <script>
     {% autoescape off %}
     var session = {{ user_data }};
-    document.getElementById("profile_link").innerHTML = "Welcome, " + session.user.nick;
+    {#    document.getElementById("profile_link").innerHTML = "Welcome, " + session.user.nick;#}
     {% endautoescape %}
 
 </script>

src/pyhackers/templates/profile.html

@@ -0,0 +1,13 @@
+{% extends "base.html" %}
+
+
+{% block content %}
+    <div class='container'>
+        <div class='col-lg-4'>
+            <img src='{{ current_user.pic_url }}' class='img-responsive img-rounded' />
+            <h1>{{ current_user.nick }}</h1>
+        </div>
+        <div class='col-lg-8'>
+            </div>
+    </div>
+{% endblock %}