diff --git a/src/js/yunohost/controllers/apps.js b/src/js/yunohost/controllers/apps.js
index 911b03ae..30104d4b 100644
--- a/src/js/yunohost/controllers/apps.js
+++ b/src/js/yunohost/controllers/apps.js
@@ -103,14 +103,22 @@
// Input with choices becomes select list
if (typeof data.manifest.arguments.install[k].choices !== 'undefined') {
- // Update choices values with key and checked data
+ // Update choices values with key and checked data
+ var choices = []
$.each(data.manifest.arguments.install[k].choices, function(ck, cv){
- data.manifest.arguments.install[k].choices[ck] = {
- value: cv,
+ // Non key/value choices have numeric key, that we don't want.
+ if (typeof ck == "number") {
+ // Key is Value in this case.
+ ck = cv;
+ }
+
+ choices.push({
+ value: ck,
label: cv,
- selected: (cv == data.manifest.arguments.install[k].default) ? true : false,
- };
+ selected: (ck == data.manifest.arguments.install[k].default) ? true : false,
+ });
});
+ data.manifest.arguments.install[k].choices = choices;
}
// Special case for domain input.
diff --git a/src/js/yunohost/helpers.js b/src/js/yunohost/helpers.js
index 4b10707f..b4279360 100644
--- a/src/js/yunohost/helpers.js
+++ b/src/js/yunohost/helpers.js
@@ -180,18 +180,24 @@
view: function (view, data, callback, enableSlide) {
c = this;
+ // Default
callback = typeof callback !== 'undefined' ? callback : function() {};
- rendered = this.render('views/'+ view +'.ms', data);
-
enableSlide = (typeof enableSlide !== 'undefined') ? enableSlide : true; // Change to false to disable animation
loaded = true;
+
+ // Hide loader and modal
$('div.loader').remove();
$('#modal').modal('hide');
- if (enableSlide) {
- var leSwap = function() {
- rendered.swap(function() {
+ // Render content
+ rendered = this.render('views/'+ view +'.ms', data);
+
+ // Update content helper
+ var leSwap = function() {
+ rendered.swap(function() {
+ // Slide direction
+ if (enableSlide) {
$('.slide, .btn-breadcrumb a:not(:last-child)').on('click', function() {
$(this).addClass('active');
if ($(this).hasClass('back') || $(this).parent('.btn-breadcrumb').length) {
@@ -200,54 +206,40 @@
store.set('slide', 'to');
}
});
- // Paste
helper
- c.prePaste();
- // Run callback
- callback();
- // Force scrollTop on page load
- $('html, body').scrollTop(0);
+ }
- // Resize body after the animation finishes (0.2s css transition)
- // https://github.com/YunoHost/yunohost-admin/blob/231aac076a3aa836409b0d33fe02e48975990b7a/src/css/style.less#L92
- setTimeout(function() {
- $('body').resize();
- }, 210);
- });
- };
-
- blockSize = $('#slider').width();
-
- // Slide back effect
- if (store.get('slide') == 'back') {
- store.clear('slide');
- $('#slideBack').css('display', 'none');
- $('#slider-container').removeClass('move').css('margin-left', '-100%');
- $('#slideTo').show().html($('#main').html());
- leSwap();
- $('#slider-container').addClass('move').css('margin-left', '0px');
-
- // Slide to effect
- } else if (store.get('slide') == 'to') {
- store.clear('slide');
- $('#slideTo').css('display', 'none');
- $('#slider-container').removeClass('move').css('margin-left', '0px');
- $('#slideBack').show().html($('#main').html());
- leSwap();
- $('#slider-container').addClass('move').css('margin-left', '-100%');
-
- } else {
- leSwap();
- }
- } else {
- rendered.swap(function(){
// Paste helper
c.prePaste();
+
// Run callback
callback();
+
// Force scrollTop on page load
$('html, body').scrollTop(0);
- $('body').resize();
});
+ };
+
+ // Slide back effect
+ if (enableSlide && store.get('slide') == 'back') {
+ store.clear('slide');
+ $('#slideBack').css('display', 'none');
+ $('#slider-container').css('margin-left', '-100%');
+ $('#slideTo').show().html($('#main').html());
+ leSwap();
+ $('#slider-container').css('margin-left', '0px');
+ }
+ // Slide to effect
+ else if (enableSlide && store.get('slide') == 'to') {
+ store.clear('slide');
+ $('#slideTo').css('display', 'none');
+ $('#slider-container').css('margin-left', '0px');
+ $('#slideBack').show().html($('#main').html());
+ leSwap();
+ $('#slider-container').css('margin-left', '-100%');
+ }
+ // No slideing effect
+ else {
+ leSwap();
}
},
diff --git a/src/js/yunohost/main.js b/src/js/yunohost/main.js
index 4c741efd..735f326f 100644
--- a/src/js/yunohost/main.js
+++ b/src/js/yunohost/main.js
@@ -70,6 +70,11 @@
// Store url
sam.store.set('url', window.location.hostname + '/yunohost/api');
+ // Get YunoHost version
+ this.api('/version', function(versions) {
+ $('#yunohost-version').html(y18n.t('footer_version', [versions.yunohost]));
+ });
+
// Flash messages
var flashMessage = $('#flashMessage');
$('#toggle-btn', flashMessage).click(function(e) {
diff --git a/src/locales/en.json b/src/locales/en.json
index 4ac4aab5..7344d36a 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -120,6 +120,7 @@
"everyone_has_access": "Everyone has access.",
"filesystem": "Filesystem",
"firewall": "Firewall",
+ "footer_version" : "Powered by YunoHost %s.",
"form_input_example" : "Example: %s",
"free": "Free",
"fs_type": "FS Type",
diff --git a/src/package.json b/src/package.json
index cdd430d1..e233a204 100644
--- a/src/package.json
+++ b/src/package.json
@@ -5,6 +5,13 @@
"type": "git",
"url": "https://github.com/YunoHost/yunohost-admin"
},
+ "scripts": {
+ "postinstall": "bower install",
+ "build": "gulp build",
+ "build-dev": "gulp build --dev",
+ "watch": "gulp watch",
+ "watch-dev": "gulp watch --dev"
+ },
"author": "Yunohost",
"license": "AGPL-3.0",
"bugs": {