From eadf1ea4ca047444b5ffcac22c16aec8ead1ebe2 Mon Sep 17 00:00:00 2001 From: Kload Date: Tue, 24 Sep 2013 22:54:48 +0200 Subject: [PATCH] App lists + mobile improvments --- index.html | 10 +++++----- js/app.js | 35 ++++++++++++++++++++++++++++++++++- views/home.ms | 6 ++++++ views/login.ms | 6 ++++++ 4 files changed, 51 insertions(+), 6 deletions(-) diff --git a/index.html b/index.html index c5fe533e..37039ee4 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - + YunoHost admin @@ -11,18 +11,18 @@
-
+ -
- Login +
diff --git a/js/app.js b/js/app.js index fcdbe4e8..a333f8fb 100644 --- a/js/app.js +++ b/js/app.js @@ -71,8 +71,8 @@ app = Sammy('#main', function (sam) { } else { c.flash('fail', 'Server error'); } - c.redirect(store.get('path-1')); store.clear('slide'); + c.redirect(store.get('path-1')); }) .done(function(data) { console.log(data); @@ -297,6 +297,39 @@ app = Sammy('#main', function (sam) { c.redirect('#/domains'); }, 'POST', params); }); + + /** + * Apps + * + */ + + sam.get('#/apps', function (c) { + c.api('/app/list', function(data) { // http://api.yunohost.org/#!/app/app_list_get_8 + // Keep only installed apps + data2 = { 'Apps': [], 'Installed': true } + $.each(data['Apps'], function(k, v) { + if (v['Installed'] !== 'No') data2['Apps'].push(v); + }); + c.view('app_list', data2); + }); + }); + + sam.get('#/apps/install', function (c) { + c.api('/app/list', function(data) { // http://api.yunohost.org/#!/app/app_list_get_8 + // Keep only uninstalled apps + data2 = { 'Apps': [] } + $.each(data['Apps'], function(k, v) { + if (v['Installed'] !== 'Yes') data2['Apps'].push(v); + }); + c.view('app_list', data2); + }); + }); + + sam.get('#/apps/refresh', function (c) { + c.api('/app/lists', function(data) { // http://api.yunohost.org/#!/app/app_fetchlist_put_5 + c.redirect(store.get('path')); + }, 'PUT'); + }); }); diff --git a/views/home.ms b/views/home.ms index 63359dde..68361673 100644 --- a/views/home.ms +++ b/views/home.ms @@ -1,3 +1,9 @@ +
+

YunoHost Administration

+
+
+
+

Users

diff --git a/views/login.ms b/views/login.ms index 61f706d0..99cf111b 100644 --- a/views/login.ms +++ b/views/login.ms @@ -1,3 +1,9 @@ +
+

YunoHost Administration

+
+
+
+
http://