Demo interface improvements

lodel/auth/client.py

@@ -271,6 +271,13 @@ class Client(object, metaclass = ClientMetaclass):
     def is_anonymous(cls):
         return cls._assert_instance()
         #return Client._instance
+        
+    ##@brief Test wether a client is guest or logged in
+    #@return True if client is anonymous
+    #@ TODO : to be improved
+    @classmethod
+    def is_guest(cls):
+        return len(cls._instance.__session.datas) == 1
 
     ##@brief Method to call on authentication failure
     #@throw ClientAuthenticationFailure

plugins/webui/interface/controllers/users.py

@@ -2,7 +2,7 @@
 from .base import get_response
 from ...exceptions import *
 from ...client import WebUiClient as WebUiClient
-from lodel.auth.client import LodelSession as Session
+
 from lodel import logger
 import leapi_dyncode as dyncode
 
@@ -10,13 +10,15 @@ def signin(request):
     msg=''
     if request.method == 'POST':
         WebUiClient.authenticate(request.form['inputLogin'], request.form['inputPassword'])
-        logger.debug(WebUiClient.session().datas)
         uid=WebUiClient.session().datas['__auth_user_infos']['uid']
         leoclass=WebUiClient.session().datas['__auth_user_infos']['leoclass']
         query_filter=list()
-        query_filter.append((leoclass.uid_fieldname()[0],' = ', uid))
-        username = leoclass.get(query_filter)
-        return get_response('users/welcome.html', username = username)
+        query_filter.append((leoclass.uid_fieldname()[0],'=', uid))
+        user = leoclass.get(query_filter)
+        return get_response('users/welcome.html', username = user[0].data('login'))
     else:
         return get_response('users/signin.html')
 
+def signout(request):
+    WebUiClient.destroy()
+    return get_response('users/signin.html')

plugins/webui/interface/template/loader.py

@@ -3,12 +3,12 @@ import jinja2
 import os
 
 from lodel.settings import Settings
+from ...client import WebUiClient as WebUiClient
 import leapi_dyncode
 
 from .api import api_lodel_templates
 from .exceptions.not_allowed_custom_api_key_error import NotAllowedCustomAPIKeyError
-from ...main import root_url
-
+from ...main import root_url as root_url
 from ...main import PLUGIN_PATH
 TEMPLATE_PATH = os.path.realpath(os.path.join(PLUGIN_PATH, 'templates/'))
 
@@ -44,6 +44,8 @@ class TemplateLoader(object):
         template.globals['lodel'] = api_lodel_templates
         template.globals['leapi'] = leapi_dyncode
         template.globals['settings'] = Settings
+        template.globals['client'] = WebUiClient
+        template.globals['root_url'] = root_url()
         template.globals['url'] = lambda sufix='': root_url()\
             + ('' if sufix.startswith('/') else '/')\
             + sufix

plugins/webui/interface/urls.py

@@ -15,5 +15,6 @@ urls = (
     (r'^/list_classes?$', list_classes),
     (r'^/show_object?$', show_object),
     (r'^/show_class?$', show_class),
-    (r'^/signin', signin)
+    (r'^/signin', signin),
+    (r'^/signout', signout)
 )

plugins/webui/templates/admin/admin.html

@@ -1,7 +1,10 @@
 {% extends "base_backend.html" %}
 {% block title %}- Index{% endblock %}
 {% block body %}
-<h1>{{settings.sitename}} administration</h1>
+<ol class="breadcrumb">
+  <li class="active">Home</li>
+</ol>
+<h1 class="h1_lodel">{{settings.sitename}} administration</h1>
 <ul>
     <li><a href="admin/classes_admin">Edit object</a></li>
     <li><a href="admin/object_create">Create object</a></li>

plugins/webui/templates/admin/admin_create.html

@@ -4,14 +4,14 @@
 {% block title %}- Creating a new {{target.__name__}}{% endblock %}
 {% block body %}
 <ol class="breadcrumb">
-  <li><a href="/lodel_i/admin">Home</a></li>
-  <li><a href="/lodel_i/admin/object_create">Creation</a></li>
+  <li><a href="/{{ root_url }}/admin">Home</a></li>
+  <li><a href="/{{ root_url }}/admin/object_create">Creation</a></li>
   <li class="active">Edit</li>
 </ol>
 {% if msg is not none %}
 {% block msg %} <p style="color:red; font-size:20pt; font-weight:bold">{{ msg }}</p> {% endblock %}
 {% endif %}
-<h1 style="padding-bottom:30px;">Creating a new {{target.__name__}}</h1>
+<h1  class="h1_lodel">Creating a new {{target.__name__}}</h1>
  <form class="form-horizontal" action="" method ="post">
      <input type="hidden" name="classname" id="classname" value="{{target.__name__}}" />
 	{% for fieldname, field in target.fields().items() %}

plugins/webui/templates/admin/admin_edit.html

@@ -6,15 +6,15 @@
 {% block title %}Edit Object{% endblock %}
 {% block body %}
 <ol class="breadcrumb">
-  <li><a href="/lodel_i/admin">Home</a></li>
-  <li><a href="/lodel_i/admin/classes_admin">Edition</a></li>
-  <li><a href="/lodel_i/admin/class_admin?classname={{ target.__name__ }}">{{ target.__name__ }}</a></li>
+  <li><a href="/{{ root_url }}/admin">Home</a></li>
+  <li><a href="/{{ root_url }}/admin/classes_admin">Edition</a></li>
+  <li><a href="/{{ root_url }}/admin/class_admin?classname={{ target.__name__ }}">{{ target.__name__ }}</a></li>
   <li class="active">Edit</li>
 </ol>
 {% if msg is not none %}
 {% block msg %} <p style="color:red; font-size:20pt; font-weight:bold">{{ msg }}</p> {% endblock %}
 {% endif %}
-<h1 style="padding-bottom:30px;">Lodel 2 - Edit {{ target.__name__ }} with uid {{ lodel_id }} </h1>
+<h1  class="h1_lodel">Lodel 2 - Edit {{ target.__name__ }} with uid {{ lodel_id }} </h1>
     <form class="form-horizontal" action="" method ="post">
     <input type="hidden" name="uid" value="{{ lodel_id}}" />
     <input type="hidden" name="classname" value={{ target.__name__ }} />

plugins/webui/templates/admin/list_classes_admin.html

@@ -2,10 +2,10 @@
 {% block title %}Lodel 2 - Admin - List of Classes{% endblock %}
 {% block body %} 
 <ol class="breadcrumb">
-  <li><a href="/lodel_i/admin">Home</a></li>
+  <li><a href="/{{ root_url }}/admin">Home</a></li>
   <li class="active">Edit</li>
 </ol>
-<h1>Edition</h1>
+<h1 class="h1_lodel">Edition</h1>
 <h2>Select a class</h2>
 <ul>
 {% for classe in my_classes %}

plugins/webui/templates/admin/list_classes_create.html

@@ -2,10 +2,10 @@
 {% block title %}Lodel 2 - Admin - List of Classes{% endblock %}
 {% block body %}
 <ol class="breadcrumb">
-  <li><a href="/lodel_i/admin">Home</a></li>
+  <li><a href="/{{ root_url }}/admin">Home</a></li>
   <li class="active">Edit</li>
 </ol>
-<h1>Creation</h1>
+<h1 class="h1_lodel">Creation</h1>
 <h2>Choose a type to create an instance</h1>
 <ul>
 {% for classe in my_classes %}
@@ -16,6 +16,6 @@
     {% endfor %}
 </ul>
 <div>
-    <a href="../admin/">Return</a>
+    <a href="{{ root_url }}/admin/">Return</a>
 </div>
 {% endblock %}

plugins/webui/templates/admin/show_class_admin.html

@@ -2,11 +2,11 @@
 {% block title %}Lodel 2 - Admin - Class {{ target.__name__ }} {% endblock %}
 {% block body %} 
 <ol class="breadcrumb">
-  <li><a href="/lodel_i/admin">Home</a></li>
-  <li><a href="/lodel_i/admin/classes_admin">Edition</a></li>
+  <li><a href="/{{ root_url }}/admin">Home</a></li>
+  <li><a href="/{{ root_url }}/admin/classes_admin">Edition</a></li>
   <li class="active">{{target.__name__  }}</li>
 </ol>
-<h1>Edition - {{target.__name__  }} </h1>
+<h1 class="h1_lodel">Edition - {{target.__name__  }} </h1>
 
  {% if not target.is_abstract() %}
     {% set objects = target.get(None) %}

plugins/webui/templates/base.html

@@ -1,4 +1,6 @@
 <!doctype html>
+{% set not_connected = client.is_guest() %}
+
 <html lang="en">
 <head>
     <meta charset="UTF-8" />
@@ -24,18 +26,21 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="#">Lodel 2</a>
+          <a class="navbar-brand" href="/{{ root_url }}/">Lodel 2</a>
         </div>
         <div id="navbar" class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
-            <li class="active"><a href="/lodel_i/">Home</a></li>
+            <li class="active"><a href="/{{ root_url }}/">Home</a></li>
             <li><a href="list_classes">All types</a></li>
           </ul>
           <ul class="nav navbar-nav navbar-right">
-            <li id="backend-nav"><a href="/lodel_i/admin" class="btn btn-link disabled">Back-end</a></li>
-            <li id="backend-nav"><a href="/lodel_i/admin" class="btn btn-link">Back-end</a></li>
-              <li id="signin-nav"><a href="signin">Sign In</a></li>
-              <li id="signout-nav" style="display: none;"><a href="signout">Logout</a>
+             {% if not_connected %}
+                <li id="backend-nav"><a href="/{{ root_url }}/admin" class="btn btn-link disabled">Back-end</a></li>
+                <li id="signin-nav"><a href="signin">Sign In</a></li>
+             {% else %}
+                <li id="backend-nav"><a href="/{{ root_url }}/admin" class="btn btn-link">Back-end</a></li>
+                <li id="signout-nav"><a href="signout">Logout</a>
+              {% endif %}
           </ul>
         </div><!--/.nav-collapse -->
       </div>

plugins/webui/templates/base_backend.html

@@ -25,13 +25,14 @@
         </div>
         <div id="navbar" class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
-            <li class="active"><a href="/lodel_i/admin">Home</a></li>
-            <li><a href="/lodel_i/admin/object_create">Create</a></li>
-            <li><a href="/lodel_i/admin/classes_admin">Edit</a></li>
+            <li class="active"><a href="/{{ root_url }}/admin">Home</a></li>
+            <li><a href="/{{ root_url }}/admin/object_create">Create</a></li>
+            <li><a href="/{{ root_url }}/admin/classes_admin">Edit</a></li>
           </ul>
           <ul class="nav navbar-nav navbar-right">
-            <li><a href="/lodel_i/">Front-End</a></li>
-            <li id="signin-nav"><a href="/lodel_i/signin">Sign In</a></li>
+            <li><a href="/{{ root_url }}/">Front-End</a></li>
+            <li id="signout-nav"><a href="signout">Logout</a>
+            <li id="signin-nav"><a href="/{{ root_url }}/signin">Sign In</a></li>
           </ul>
         </div><!--/.nav-collapse -->
       </div>

plugins/webui/templates/css/template.css

@@ -4,3 +4,7 @@ body {
   padding-left: 70px;
 } 
 
+h1{
+    padding-bottom : 30px;
+}
+

plugins/webui/templates/listing/list_classes.html

@@ -1,7 +1,11 @@
 {% extends "base.html" %}
 {% block title %}Lodel 2 - List of Classes{% endblock %}
 {% block content %} 
-<h1>All types</h1>
+<ol class="breadcrumb">
+  <li><a href="/{{ root_url }}/">Home</a></li>
+  <li class="active">Types</li>
+</ol>
+<h1 class="h1_lodel">All types</h1>
 <ul>
 {% for classe in my_classes %}
     {% if classe.is_abstract() and allclasses == 1 %}

plugins/webui/templates/listing/show_class.html

@@ -2,11 +2,11 @@
 {% block title %}Lodel 2 - Class {{ classname }} {% endblock %}
 {% block content %} 
 <ol class="breadcrumb">
-  <li><a href="/lodel_i/">Home</a></li>
-  <li><a href="/lodel_i/list_classes">Types</a></li>
+  <li><a href="/{{ root_url }}/">Home</a></li>
+  <li><a href="/{{ root_url }}/list_classes">Types</a></li>
   <li class="active">{{ classname }}</li>
 </ol>
-<h1>Type {{ classname }} </h1>
+<h1 class="h1_lodel">Type {{ classname }} </h1>
  {% set my_class  = leapi.name2class(classname) %}
  {% if my_class.child_classes()|length >0 %}
      <h2> Childs types</h2>

plugins/webui/templates/listing/show_object.html

@@ -12,13 +12,12 @@
 {% import "components/components.html" as components %}
 {% block content %}
 <ol class="breadcrumb">
-  <li><a href="/lodel_i/">Home</a></li>
-  <li><a href="/lodel_i/list_classes">Types</a></li>
-  <li><a href="/lodel_i/show_class?classname={{ classname }}">{{ classname }}</a></li>
+  <li><a href="/{{ root_url }}/">Home</a></li>
+  <li><a href="/{{ root_url }}/list_classes">Types</a></li>
+  <li><a href="/{{ root_url }}/show_class?classname={{ classname }}">{{ classname }}</a></li>
   <li class="active">{{ lodel_id }}</li>
 </ol>
-<h1>Lodel 2 - {{ classname }} with uid {{ lodel_id }}</h1>
-    
+<h1 class="h1_lodel">Lodel 2 - {{ classname }} with uid {{ lodel_id }}</h1>
 <ul>
     <!-- To get a component HTML code, it is necessary to call : components.<macro_name>(args) -->
     {% for fieldname, fieldvalue in obj.fields(include_ro = True).items() %}

plugins/webui/templates/users/signin.html

@@ -6,7 +6,7 @@
 {% endblock %}
 {% block content %} 
 <div class="container">
-    <h1>Lodel2 - Sign In</h1>
+    <h1 class="h1_lodel">Lodel2 - Sign In</h1>
 <form class="form-horizontal" method="POST" action="">
   <div class="form-group">
     <label for="inputLogin" class="col-sm-2 control-label">Login</label>

plugins/webui/templates/users/welcome.html

@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% block title %}Lodel 2 - Welcom{% endblock %}
+{% block title %}Lodel 2 - Welcome{% endblock %}
 <!-- Custom styles for this template -->
 {% block style %}
     <link href="http://127.0.0.1/css/signin.css" rel="stylesheet">
@@ -8,10 +8,12 @@
 <div class="container">
     <h1>Lodel2 - Welcome {{ username }}</h1>
     <div class="row">
-        <div class="col-md-6"></div>
         <div class="col-md-6">You are successfully login...</div>
     </div>
-    
+    <div class = "row" style="padding-top:20px;">
+        <a class="btn btn-default" href="/{{ root_url }}/signout" role="button">Logout</a>
+    </div>
+        
 
     </div> <!-- /container -->
 {% endblock %}