From 5fffdda9a6868d9a6a46467b83d9b094234edace Mon Sep 17 00:00:00 2001
From: Jerome Lebleu <jerome.lebleu@mailoo.org>
Date: Thu, 19 Dec 2013 02:08:42 +0100
Subject: [PATCH 1/2] Allow different flash level simultaneously

---
 index.html |  2 +-
 js/app.js  | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/index.html b/index.html
index 9748f124..042003d1 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
             <div class="clearfix"></div>
             <br />
         </div>
-        <div id="flash" class="alert" style="display: none">
+        <div id="flash" style="display: none">
         </div>
         <div id="slider-container">
             <div id="slideBack" class="block" style="display: none;"></div>
diff --git a/js/app.js b/js/app.js
index b9a4ff67..408bdb07 100644
--- a/js/app.js
+++ b/js/app.js
@@ -47,14 +47,12 @@ app = Sammy('#main', function (sam) {
             html = '';
             for(lvl in flashs) {
                 flashs[lvl].forEach( function(msg) {
-                    html += '<div class="'+ lvl +'">'+ msg +'</div>';
+                    if (lvl == 'fail') { alertClass = 'alert-danger'; }
+                    else               { alertClass = 'alert-'+ lvl; }
+                    html += '<div class="alert '+ alertClass +'">'+ msg +'</div>';
                 });
             }
-            if      (level == 'fail')    { alertClass = 'alert-danger'; }
-            else if (level == 'success') { alertClass = 'alert-success'; }
-            else                         { alertClass = 'alert-info'; }
-
-            $('#flash').removeClass().addClass('alert '+ alertClass).html(html).fadeIn();
+            $('#flash').html(html).fadeIn();
         },
 
         // API connection helper

From 89e8ec8dc7a9fcbfcfd9d9932bb359094ecb40c7 Mon Sep 17 00:00:00 2001
From: Jerome Lebleu <jerome.lebleu@mailoo.org>
Date: Thu, 19 Dec 2013 02:18:08 +0100
Subject: [PATCH 2/2] Show development note on home page

---
 js/app.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/js/app.js b/js/app.js
index 408bdb07..b9f2a8fe 100644
--- a/js/app.js
+++ b/js/app.js
@@ -231,6 +231,9 @@ app = Sammy('#main', function (sam) {
      *
      */
     sam.get('#/', function (c) {
+        // Show development note
+        c.flash('info', '<b>You are using a development version.</b><br />' +
+            'Please note that you can use the <a href="https://doc.yunohost.org/#/moulinette" target="_blank">moulinette</a>  if you want to access to more YunoHost\'s features.');
         c.view('home');
     });
 
@@ -263,7 +266,7 @@ app = Sammy('#main', function (sam) {
         store.set('user', 'admin');
         store.set('password', btoa(c.params['password']));
         c.api('/api', function(data) {
-            if (data.apiVersion == '0.1') {
+            if (data.apiVersion) {
                 c.api('/users', function(data) {
                     store.set('connected', true);
                     $('#logout-button').fadeIn();
@@ -275,7 +278,7 @@ app = Sammy('#main', function (sam) {
                     }
                 });
             } else {
-                c.flash('fail', 'Non-compatible API (0.1 required)');
+                c.flash('fail', 'Non-compatible API');
                 c.redirect('#/login');
             }
         });