diff --git a/css/style.css b/css/style.css index 08e08de9..aa975160 100644 --- a/css/style.css +++ b/css/style.css @@ -6,8 +6,8 @@ html, body { margin-left: auto; margin-right: auto; /*margin-top: 2%;*/ - padding: 15px; - background: #e8e8e8; + padding: 5px; + /*background: #e8e8e8;*/ width: 500px; height: 100%; position: relative; @@ -21,10 +21,8 @@ html, body { } #main { - background: #e8e8e8; + /*background: #e8e8e8;*/ float: left; - width: 500px; - height: 100%; position: relative; overflow: hidden; } @@ -32,4 +30,13 @@ html, body { .block { display: inline-block; height: 100%; + width: 470px; + height: 100%; + padding: 5px; +} + +.panel-title { + font-size: 18px; + font-weight: bold; + line-height: 25px; } diff --git a/index.html b/index.html index a48ebecf..2749ba89 100644 --- a/index.html +++ b/index.html @@ -9,15 +9,19 @@
-

+
+

YunoHost Administration

+ +
+

-
+
- Meh + Login
diff --git a/js/app.js b/js/app.js index 501e7945..b00e0858 100644 --- a/js/app.js +++ b/js/app.js @@ -29,7 +29,11 @@ app = Sammy('#main', function (sam) { html += '
'+ msg +'
'; }); } - $('#flash').html(html); + 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(); }, // API connection helper @@ -37,7 +41,7 @@ app = Sammy('#main', function (sam) { method = typeof method !== 'undefined' ? method : 'GET'; data = typeof data !== 'undefined' ? data : {}; auth = "Basic "+ btoa(store.get('user') +':'+ atob(store.get('password'))); - this.swap(''); + //this.swap(''); jQuery.ajax({ url: store.get('url') + uri, type: method, @@ -53,7 +57,7 @@ app = Sammy('#main', function (sam) { result = data; }) .fail(function() { - alert('fail'); + req.redirect('#/login'); result = false; }) .always(function() { @@ -70,6 +74,7 @@ app = Sammy('#main', function (sam) { $('#slideTo').hide().html(''); rendered.swap(function() { $('.slide').on('click', function() { + $(this).addClass('active'); if ($(this).hasClass('back')) { store.set('slide', 'back'); } else { @@ -90,6 +95,7 @@ app = Sammy('#main', function (sam) { $('#main').css('margin-left', '0'); leSwap(); }); + store.clear('slide'); } else if (store.get('slide') == 'to') { $('#slideTo').show().css('display', 'inline-block'); rendered.appendTo($('#slideTo')); @@ -98,11 +104,10 @@ app = Sammy('#main', function (sam) { $('#main').css('margin-left', '0'); leSwap(); }); + store.clear('slide'); } else { leSwap(); } - - //this.render('views/'+ view +'.ms', data).swap(); } }); @@ -124,7 +129,7 @@ app = Sammy('#main', function (sam) { // Clear flash display if (!store.get('flash')) { - $('#flash').html(''); + $('#flash').fadeOut(function() { $('#flash').html(''); }); } }); @@ -132,8 +137,6 @@ app = Sammy('#main', function (sam) { // Clear flash notifications store.clear('flash'); - // Clear sliding preference - store.clear('slide'); }); @@ -149,17 +152,19 @@ app = Sammy('#main', function (sam) { }); sam.get('#/login', function (c) { + $('#disconnect-button').hide(); c.view('login'); }); sam.post('#/login', function (c) { - store.set('url', c.params['url']); + store.set('url', 'http://'+ c.params['url']); store.set('user', 'admin'); store.set('password', btoa(c.params['password'])); c.api('/users', function(data) { if (data.error) { c.flash('fail', 'Error: '+ data.error); } else { + $('#disconnect-button').fadeIn(); c.flash('success', 'Connected :)'); } if (store.get('path')) { @@ -170,8 +175,14 @@ app = Sammy('#main', function (sam) { }); }); + sam.get('#/users', function (c) { + c.api('/users', function(data) { + console.log(data); + c.view('user_list', data); + }); + }); + sam.get('#/users/:user', function (c) { - c.swap(''); c.api('/users/'+ c.params['user'], function(data) { c.view('user_info', data); }); diff --git a/views/home.ms b/views/home.ms index 11b5cb09..63359dde 100644 --- a/views/home.ms +++ b/views/home.ms @@ -1 +1,28 @@ -Hello :) +
+ +

Users

+ +
+ + +

Domains

+ +
+ + +

Applications

+ +
+ + +

Monitor

+ +
+ + +

Backups

+ +
+ +
+ diff --git a/views/login.ms b/views/login.ms index e8a8f997..3c85cb43 100644 --- a/views/login.ms +++ b/views/login.ms @@ -1,6 +1,14 @@
-
-
- +
+ http:// + +
+
+
+ + +
+
+
diff --git a/views/user_info.ms b/views/user_info.ms index b196b18d..3fbc23e0 100644 --- a/views/user_info.ms +++ b/views/user_info.ms @@ -1,5 +1,11 @@ - +
+
+

{{Username}}

+
+ +
    +
  • Fullname   {{Fullname}}
    • +
  • Username   {{Username}}
    • +
  • Mail   {{Mail}}
    • +
+
diff --git a/views/user_list.ms b/views/user_list.ms new file mode 100644 index 00000000..cf47fd96 --- /dev/null +++ b/views/user_list.ms @@ -0,0 +1,14 @@ +
+
+

Users

+
+
+ {{#Users}} + +

{{Fullname}}

+ +
+ + {{/Users}} +
+