');
- }
+ // Rename the page to allow refresh without ask for rebooting
+ window.location.href = window.location.href.split('#')[0] + '#/';
+ // Display reboot or shutdown info
+ // We can't use template because now the webserver is off
+ if (action == 'reboot') {
+ $('#main').replaceWith('
' + y18n.t('tools_rebooting') + '
');
+ }
+ else {
+ $('#main').replaceWith('
' + y18n.t('tools_shuttingdown') + '
');
+ }
- // Remove loader if any
- $('div.loader').remove();
+ c.hideLoader();
- // Force scrollTop on page load
- $('html, body').scrollTop(0);
- store.clear('slide');
- });
-
- },
- function(){
- store.clear('slide');
- c.redirect('#/tools/reboot');
- }
- );
- }
- else {
- c.flash('fail', y18n.t('unknown_action', [action]));
- store.clear('slide');
- c.redirect('#/tools/reboot');
- }
+ // Force scrollTop on page load
+ $('html, body').scrollTop(0);
+ }, false);
+ });
+ });
+ });
});
// Diagnosis
@@ -271,7 +257,7 @@
var private = (c.params.splat[0] == 'private');
var endurl = (private) ? '?private' : '';
- c.api('/diagnosis'+endurl, function(diagnosis) {
+ c.api('GET', '/diagnosis'+endurl, {}, function(diagnosis) {
c.view('tools/tools_diagnosis', {
'diagnosis' : JSON.stringify(diagnosis, undefined, 4),
'raw' : diagnosis,
@@ -280,10 +266,10 @@
});
});
- // Reboot or shutdown button
+ // Migrations
app.get('#/tools/migrations', function (c) {
- c.api('/migrations?pending', function(pending_migrations) {
- c.api('/migrations?done', function(done_migrations) {
+ c.api('GET', '/migrations?pending', {}, function(pending_migrations) {
+ c.api('GET', '/migrations?done', {}, function(done_migrations) {
pending_migrations = pending_migrations.migrations;
done_migrations = done_migrations.migrations;
@@ -302,71 +288,45 @@
c.view('tools/tools_migrations', {
'pending_migrations' : pending_migrations.reverse(),
'done_migrations' : done_migrations.reverse()
+ }, function() {
+
+ // Configure button 'Run'
+ $('button[data-action="run"]').on("click", function() {
+
+ var disclaimerAcks = $(".disclaimer-ack");
+ for (var i = 0 ; i < disclaimerAcks.length ; i++)
+ {
+ if (! $(disclaimerAcks[i]).find("input:checked").val())
+ {
+ // FIXME / TODO i18n
+ c.flash('fail', "Some of these migrations require you to acknowledge a disclaimer before running them.");
+ c.refresh();
+ return;
+ }
+ };
+
+ c.api('POST', '/migrations/migrate?accept_disclaimer', {}, function() { c.refresh(); });
+ });
+
+ // Configure buttons 'Skip'
+ $('button[data-action="skip"]').on("click", function() {
+ var migration_id = $(this).data("migration");
+ c.confirm(
+ y18n.t('migrations'),
+ y18n.t('confirm_migrations_skip'),
+ function(){
+ c.api('POST', '/migrations/migrate?skip&targets=' + migration_id, {}, function() { c.refresh() });
+ }
+ );
+ });
});
});
});
});
- app.get('#/tools/migrations/run', function (c) {
- var disclaimerAcks = $(".disclaimer-ack");
- var withAcceptDisclaimerFlag = false;
- for (var i = 0 ; i < disclaimerAcks.length ; i++)
- {
- console.log($(disclaimerAcks[i]).find("input:checked").val());
- if (! $(disclaimerAcks[i]).find("input:checked").val())
- {
- // FIXME / TODO i18n
- c.flash('fail', "Some of these migrations require you to acknowledge a disclaimer before running them.");
- c.redirect('#/tools/migrations');
- return;
- }
- else
- {
- withAcceptDisclaimerFlag = true;
- }
- };
-
- // Not sure if necessary, but this distinction is to avoid accidentally
- // triggering a migration with a disclaimer if one goes to the
- // /tools/migrations/run page "directly" somehow ...
- if (withAcceptDisclaimerFlag)
- {
- c.api('/migrations/migrate?accept_disclaimer',
- function (data) {
- store.clear('slide');
- c.redirect('#/tools/migrations');
- }, 'POST')
- }
- else
- {
- c.api('/migrations/migrate',
- function (data) {
- store.clear('slide');
- c.redirect('#/tools/migrations');
- }, 'POST')
- }
- });
-
- app.get('#/tools/migrations/skip/:migration_id', function (c) {
- c.confirm(
- y18n.t('migrations'),
- y18n.t('confirm_migrations_skip'),
- function(){
- c.api('/migrations/migrate?skip&targets=' + c.params['migration_id'], function(data) {
- store.clear('slide');
- c.redirect('#/tools/migrations');
- }, 'POST');
- },
- function(){
- store.clear('slide');
- c.redirect('#/tools/migrations');
- }
- );
- });
-
// List available apps lists
app.get('#/tools/appslists', function (c) {
- c.api('/appslists', function(data) {
+ c.api('GET', '/appslists', {}, function(data) {
list = [];
$.each(data, function(listname, listinfo) {
list.push({
@@ -379,7 +339,7 @@
c.view('tools/tools_appslists_list', {
appslists: list
});
- }, 'GET');
+ });
});
// Add a new apps list
@@ -389,15 +349,14 @@
'url' : c.params['appslist_url']
}
- c.api('/appslists', function(data) {
- store.clear('slide');
- c.redirect('#/tools/appslists/' + list.name);
- }, 'PUT', list);
+ c.api('PUT', '/appslists', list, function(data) {
+ c.redirect_to('#/tools/appslists/' + list.name);
+ });
});
// Show appslist info and operations
app.get('#/tools/appslists/:appslist', function (c) {
- c.api('/appslists', function(data) {
+ c.api('GET', '/appslists', {}, function(data) {
if (typeof data[c.params['appslist']] !== 'undefined') {
list = {
'name' : c.params['appslist'],
@@ -409,25 +368,23 @@
}
else {
c.flash('warning', y18n.t('appslists_unknown_list', [c.params['appslist']]));
- store.clear('slide');
- c.redirect('#/tools/appslists');
+ c.redirect_to('#/tools/appslists', {slide: false});
}
- }, 'GET');
+ });
});
// Refresh available apps list
app.get('#/tools/appslists/refresh', function (c) {
- c.api('/appslists', function(data) {
- // c.redirect(store.get('path'));
- c.redirect('#/apps/install');
- }, 'PUT');
+ c.api('PUT', '/appslists', {}, function(data) {
+ c.redirect_to('#/apps/install', {slide: false});
+ });
});
// Refresh specific apps list
app.get('#/tools/appslists/:appslist/refresh', function (c) {
- c.api('/appslists', function(data) {
- c.redirect('#/tools/appslists');
- }, 'PUT', {'name' : c.params['appslist']});
+ c.api('PUT', '/appslists', {'name' : c.params['appslist']}, function(data) {
+ c.redirect_to('#/tools/appslists', {slide: false});
+ });
});
// Remove apps list
@@ -436,13 +393,9 @@
y18n.t('appslist'),
y18n.t('appslists_confirm_remove', [c.params['app']]),
function() {
- c.api('/appslists', function() {
- c.redirect('#/tools/appslists');
- }, 'DELETE', {'name' : c.params['appslist']});
- },
- function() {
- store.clear('slide');
- c.redirect('#/tools/appslists/'+ c.params['appslist']);
+ c.api('DELETE', '/appslists', {'name' : c.params['appslist']}, function() {
+ c.redirect_to('#/tools/appslists');
+ });
}
);
});
diff --git a/src/js/yunohost/controllers/users.js b/src/js/yunohost/controllers/users.js
index 655ff4c5..7da1bcb6 100644
--- a/src/js/yunohost/controllers/users.js
+++ b/src/js/yunohost/controllers/users.js
@@ -31,20 +31,20 @@
* @param.item Name of the user or the permission to add or remove
* @param.group Name of the group affected
*
- * This function is built to be apply with params generated by the use of
+ * This function is built to be apply with params generated by the use of
* HTML dataset attributes (e.g. link in the partial inline view "label" in group_list.ms)
*
* @return void
**/
function updateGroup(model, params) {
var type = params.type;
- var operation = params.operation;
+ var action = params.action;
var item = params.item;
var groupname = params.group;
var group = data.groups[groupname];
- var to = (operation == 'add')?group[type]:group[type + 'Inv'];
- var from = (operation == 'add')?group[type+'Inv']:group[type];
- // Do nothing, if array of destination already contains the item
+ var to = (action == 'add')?group[type]:group[type + 'Inv'];
+ var from = (action == 'add')?group[type+'Inv']:group[type];
+ // Do nothing, if array of destination already contains the item
if (from.indexOf(item) === -1) return;
// Hack to disable pacman loader if any
@@ -52,22 +52,22 @@
$('#main').append('');
}
$('div.loader').css('display', 'none');
-
+
// Update group
var params = {}; var url;
if (type == 'members') {
url = '/users/groups/' + groupname;
- params[operation] = [item];
+ params[action] = [item];
}
else {
url = '/users/permissions/' + item;
- params[operation] = [groupname];
+ params[action] = [groupname];
}
- c.api(url, function(data_update) {
+ c.api('PUT', url, params, function(data_update) {
to.push(item);
from.splice(from.indexOf(item), 1);
updateView(data);
- }, 'PUT', params);
+ });
}
/**
@@ -85,29 +85,41 @@
model.groups[group].members.sort();
model.groups[group].membersInv.sort();
}
-
- // Manual render, we don't use c.view to avoid scrollTop and other
+
+ // Manual render, we don't use c.view to avoid scrollTop and other
// uneeded behaviour
var rendered = c.render('views/user/group_list.ms', model);
rendered.swap(function () {
// Add click event to get a nice "reactive" interface
- jQuery(".group-update").on('click', function (e) {
- updateGroup(model, jQuery(this)[0].dataset);
+ $("button[data-action='add'], button[data-action='remove']").on('click', function (e) {
+ updateGroup(model, $(this)[0].dataset);
return false;
});
- jQuery(".group-add-user").on('click', function (e) {
- data.groups[$(this)[0].dataset.user].display = true;
+ $('button[data-action="add-user-specific-permission"]').on('click', function (e) {
+ data.groups[$(this).data("user")].display = true;
updateView(data);
return false;
});
+ $('button[data-action="delete-group"]').on('click', function (e) {
+
+ var group = $(this).data("group");
+
+ c.confirm(
+ y18n.t('groups'),
+ $('
'+ y18n.t('confirm_delete', [group]) +'
'),
+ function() {
+ c.api('DELETE', '/users/groups/'+ group, {}, function(data) { c.refresh(); });
+ }
+ );
+ });
});
}
app.get('#/groups', function (c) {
- c.api('/users/groups?full&include_primary_groups', function(data_groups) {
- c.api('/users', function(data_users) {
- c.api('/users/permissions?short', function(data_permissions) {
+ c.api('GET', '/users/groups?full&include_primary_groups', {}, function(data_groups) {
+ c.api('GET', '/users', {}, function(data_users) {
+ c.api('GET', '/users/permissions?short', {}, function(data_permissions) {
//var perms = data_permissions.permissions;
var specific_perms = {};
var all_perms = data_permissions.permissions;
@@ -129,7 +141,7 @@
// Declare all_users and visitors has special
data_groups.groups['all_users'].special = true;
data_groups.groups['visitors'].special = true;
-
+
// Data given to the view with 2 functions to convert technical
// permission id to display names
data = {
@@ -166,33 +178,9 @@
app.post('#/groups/create', function (c) {
c.params['groupname'] = c.params['groupname'].replace(' ', '_').toLowerCase();
- c.api('/users/groups', function(data) {
- c.redirect('#/groups');
- }, 'POST', c.params.toHash());
- });
-
- app.get('#/groups/:group/delete', function (c) {
-
- var params = {};
-
- // make confirm content
- var confirmModalContent = $('
');
-
- // display confirm modal
- c.confirm(
- y18n.t('users'),
- confirmModalContent,
- function(){
- c.api('/users/'+ c.params['user'], function(data) { // http://api.yunohost.org/#!/user/user_delete_delete_4
- c.redirect('#/users');
- }, 'DELETE', params);
- },
- function(){
- store.clear('slide');
- c.redirect('#/users/'+ c.params['user']);
- }
- );
-
- // toggle purge warning and parameter
- confirmModalContent.find("input").click(function(){
-
- if (confirmModalContent.find("input").is(':checked')) {
- params.purge = "";
- confirmModalContent.find(".warning").show();
- }
- else {
- delete params.purge;
- confirmModalContent.find(".warning").hide();
- };
-
});
-
});
-
-
-
})();
diff --git a/src/js/yunohost/events.js b/src/js/yunohost/events.js
index 8b9abb4c..5cfb10c4 100644
--- a/src/js/yunohost/events.js
+++ b/src/js/yunohost/events.js
@@ -8,7 +8,7 @@
*
*/
app.bind('login', function(e, data) {
- c.api('/users', function(data) {
+ c.api('GET', '/users', {}, function(data) {
// Warn admin if no users are created.
if (typeof data.users !== 'undefined' && data.users.length === 0) {
c.flash('warning', y18n.t('warning_first_user'));
@@ -69,13 +69,13 @@
c.flash('fail', y18n.t('error_retrieve_feed', [securityFeed]));
});
- c.api("/diagnosis", function(data) {
+ c.api("GET", "/diagnosis", {}, function(data) {
versions = data.packages;
$('#yunohost-version').html(y18n.t('footer_version', [versions.yunohost.version, versions.yunohost.repo]));
if (data.security["CVE-2017-5754"].vulnerable) {
c.flash('danger', y18n.t('meltdown'));
}
- $('div.loader').remove();
+ c.hideLoader();
});
});
});
diff --git a/src/js/yunohost/filters.js b/src/js/yunohost/filters.js
index 0b793580..c35a9450 100644
--- a/src/js/yunohost/filters.js
+++ b/src/js/yunohost/filters.js
@@ -12,7 +12,7 @@
function prefetchDomains(req) {
// Preload domains list.
req.params.domains = [];
- req.api('/domains', function(data) {
+ req.api('GET', '/domains', {}, function(data) {
req.params.domains = data.domains;
});
}
@@ -20,7 +20,7 @@
function prefetchUsers(req){
// Preload users lists.
req.params.users = [];
- req.api('/users', function(data) {
+ req.api('GET', '/users', {}, function(data) {
req.params.users = data.users;
});
}
diff --git a/src/js/yunohost/helpers.js b/src/js/yunohost/helpers.js
index 918a6cee..59e70ed0 100644
--- a/src/js/yunohost/helpers.js
+++ b/src/js/yunohost/helpers.js
@@ -3,20 +3,64 @@
var app = Sammy.apps['#main'];
var store = app.store;
+ // The logic used to temporily disable transition is from
+ // https://stackoverflow.com/a/16575811
+ function whichTransitionEvent(){
+ var t;
+ var el = document.createElement('fakeelement');
+ var transitions = {
+ 'transition':'transitionend',
+ 'OTransition':'oTransitionEnd',
+ 'MozTransition':'transitionend',
+ 'WebkitTransition':'webkitTransitionEnd'
+ }
+
+ for(t in transitions){
+ if( el.style[t] !== undefined ){
+ return transitions[t];
+ }
+ }
+ };
+ var transitionEvent = whichTransitionEvent();
+
+ function resetSliders()
+ {
+ // Disable transition effects
+ $('#slider-container').addClass('notransition');
+ // Delete the left/right temporary stuff only used during animation
+ $('#slideTo').css('display', 'none');
+ $('#slideTo').html("");
+ $('#slideBack').css('display', 'none');
+ $('#slideBack').html("");
+ // Set the margin-left back to 0
+ $('#slider-container').css('margin-left', '0');
+ // c.f. the stackoverflow thread
+ $('#slider-container')[0].offsetHeight;
+ // Remove the binding to this event handler for next times
+ // Re-enable transition effects
+ $('#slider-container').removeClass('notransition');
+ }
+
/**
* Helpers
*
*/
app.helpers({
- // Serialize an object
- serialize : function(obj) {
- var str = [];
- for(var p in obj)
- if (obj.hasOwnProperty(p)) {
- str.push(encodeURIComponent(p) + "=" + encodeURIComponent(obj[p]));
+ //
+ // Pacman loader management
+ //
+
+ showLoader: function() {
+ app.loaded = false; // Not sure if that's really useful ... this is from old code with no explanation what it really does ...
+ if ($('div.loader').length === 0) {
+ $('#main').append('');
}
- return str.join("&");
+ },
+
+ hideLoader: function() {
+ app.loaded = true; // Not sure if that's really useful ... this is from old code with no explanation what it really does ...
+ $('div.loader').remove();
},
// Flash helper to diplay instant notifications
@@ -85,7 +129,7 @@
},
// API call
- api: function(uri, callback, method, data, websocket, callbackOnFailure) {
+ api: function(method, uri, data, callback, callbackOnFailure, websocket) {
c = this;
method = typeof method !== 'undefined' ? method : 'GET';
@@ -93,96 +137,69 @@
if (window.navigator && window.navigator.language && (typeof data.locale === 'undefined')) {
data.locale = y18n.locale || window.navigator.language.substr(0, 2);
}
- app.loaded = false;
- if ($('div.loader').length === 0) {
- $('#main').append('');
- }
+
+ c.showLoader();
+
call = function(uri, callback, method, data, callbackOnFailure) {
- var args = data;
- // TODO: change this code
- if (uri === '/postinstall') {
- var post_installing = false;
- setInterval(function () {
- post_installing = true;
- }, 1500);
- }
-
+ // Define default callback for failures
if (typeof callbackOnFailure !== 'function') {
callbackOnFailure = function(xhr) {
- // Postinstall is a custom case, we have to wait that
- // operation is done before doing anything
- if ((uri === '/postinstall') && (post_installing)) {
- interval = window.location.hostname === args.domain ? 20000 : 5000;
- checkInstall = setInterval(function () {
- c.checkInstall(function(isInstalled) {
- if (isInstalled || typeof isInstalled === 'undefined') {
- c.flash('success', y18n.t('installation_complete'));
- clearInterval(checkInstall);
- window.location.href = 'https://'+ window.location.hostname +'/yunohost/admin/';
- }
- });
- }, interval);
+ if (xhr.status == 200) {
+ // Fail with 200, WTF
+ callback({});
}
- // Regular errors
+ // Unauthorized or wrong password
+ else if (xhr.status == 401) {
+ if (uri === '/login') {
+ c.flash('fail', y18n.t('wrong_password'));
+ } else {
+ c.flash('fail', y18n.t('unauthorized'));
+ c.redirect('#/login');
+ }
+ }
+ // 500
+ else if (xhr.status == 500) {
+ try {
+ error_log = JSON.parse(xhr.responseText);
+ error_log.route = error_log.route.join(' ') + '\n';
+ error_log.arguments = JSON.stringify(error_log.arguments);
+ }
+ catch (e)
+ {
+ error_log = {};
+ error_log.route = "Failed to parse route";
+ error_log.arguments = "Failed to parse arguments";
+ error_log.traceback = xhr.responseText;
+ }
+ c.flash('fail', y18n.t('internal_exception', [error_log.route, error_log.arguments, error_log.traceback]));
+ }
+ // 502 Bad gateway means API is down
+ else if (xhr.status == 502) {
+ c.flash('fail', y18n.t('api_not_responding'));
+ }
+ // More verbose error messages first
+ else if (typeof xhr.responseText !== 'undefined') {
+ c.flash('fail', xhr.responseText);
+ }
+ // 0 mean "the connexion has been closed" apparently
+ else if (xhr.status == 0) {
+ var errorMessage = xhr.status+' '+xhr.statusText;
+ c.flash('fail', y18n.t('error_connection_interrupted', [errorMessage]));
+ console.log(xhr);
+ }
+ // Return HTTP error code at least
else {
- if (xhr.status == 200) {
- // Fail with 200, WTF
- callback({});
- }
- // Unauthorized or wrong password
- else if (xhr.status == 401) {
- if (uri === '/login') {
- c.flash('fail', y18n.t('wrong_password'));
- } else {
- c.flash('fail', y18n.t('unauthorized'));
- c.redirect('#/login');
- }
- }
- // 500
- else if (xhr.status == 500) {
- try {
- error_log = JSON.parse(xhr.responseText);
- error_log.route = error_log.route.join(' ') + '\n';
- error_log.arguments = JSON.stringify(error_log.arguments);
- }
- catch (e)
- {
- error_log = {};
- error_log.route = "Failed to parse route";
- error_log.arguments = "Failed to parse arguments";
- error_log.traceback = xhr.responseText;
- }
- c.flash('fail', y18n.t('internal_exception', [error_log.route, error_log.arguments, error_log.traceback]));
- }
- // 502 Bad gateway means API is down
- else if (xhr.status == 502) {
- c.flash('fail', y18n.t('api_not_responding'));
- }
- // More verbose error messages first
- else if (typeof xhr.responseText !== 'undefined') {
- c.flash('fail', xhr.responseText);
- }
- // 0 mean "the connexion has been closed" apparently
- else if (xhr.status == 0) {
- var errorMessage = xhr.status+' '+xhr.statusText;
- c.flash('fail', y18n.t('error_connection_interrupted', [errorMessage]));
- console.log(xhr);
- }
- // Return HTTP error code at least
- else {
- var errorMessage = xhr.status+' '+xhr.statusText;
- c.flash('fail', y18n.t('error_server_unexpected', [errorMessage]));
- console.log(xhr);
- }
-
- // Remove loader if any
- $('div.loader').remove();
-
- // Force scrollTop on page load
- $('html, body').scrollTop(0);
- store.clear('slide');
+ var errorMessage = xhr.status+' '+xhr.statusText;
+ c.flash('fail', y18n.t('error_server_unexpected', [errorMessage]));
+ console.log(xhr);
}
+
+ c.hideLoader();
+
+ // Force scrollTop on page load
+ $('html, body').scrollTop(0);
+ store.clear('slide');
};
}
@@ -237,78 +254,17 @@
},
- // Render view (cross-browser)
- view: function (view, data, callback, enableSlide) {
+
+ // Ask confirmation to the user through the modal window
+ confirm: function(title, content, confirmCallback, cancelCallback) {
c = this;
- // Default
- callback = typeof callback !== 'undefined' ? callback : function() {};
- enableSlide = (typeof enableSlide !== 'undefined') ? enableSlide : true; // Change to false to disable animation
-
- app.loaded = true;
-
- // Hide loader and modal
- $('div.loader').remove();
- $('#modal').modal('hide');
-
- // Render content
- var 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) {
- store.set('slide', 'back');
- } else {
- store.set('slide', 'to');
- }
- });
- }
-
- // Paste
helper
- c.prePaste();
-
- // Run callback
- callback();
-
- // Force scrollTop on page load
- $('html, body').scrollTop(0);
- });
- };
-
- // 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();
- }
- },
-
- confirm: function(title, content, confirmCallback, cancelCallback) {
// Default callbacks
confirmCallback = typeof confirmCallback !== 'undefined' ? confirmCallback : function() {};
cancelCallback = typeof cancelCallback !== 'undefined' ? cancelCallback : function() {};
+ c.hideLoader();
+
// Get modal element
var box = $('#modal');
@@ -335,12 +291,10 @@
$('#modal footer button').unbind( "click" );
// Reset & Hide modal
- box
- .removeClass('no-title')
- .modal('hide');
+ box.removeClass('no-title').modal('hide');
// Do corresponding callback
- if ($(this).data('action') == 'confirm') {
+ if ($(this).data('modal-action') == 'confirm') {
confirmCallback();
}
else {
@@ -352,19 +306,165 @@
return box.modal('show');
},
- selectAllOrNone: function () {
- // Remove active style from buttons
- $(".select_all-none input").click(function(){ $(this).toggleClass("active"); });
- // Select all checkbox in this panel
- $(".select_all").click(function(){
- $(this).parents(".panel").children(".list-group").find("input").prop("checked", true);
- });
- // Deselect all checkbox in this panel
- $(".select_none").click(function(){
- $(this).parents(".panel").children(".list-group").find("input").prop("checked", false);
- });
+
+ // Render view (cross-browser)
+ view: function (view, data, callback) {
+ c = this;
+
+ // Default
+ callback = typeof callback !== 'undefined' ? callback : function() {};
+
+ // Hide loader and modal
+ c.hideLoader();
+ $('#modal').modal('hide');
+
+ // Render content
+ var rendered = this.render('views/'+ view +'.ms', data);
+
+ // Update content helper
+ var leSwap = function() {
+ rendered.swap(function() {
+ // Clicking on those kind of CSS elements will trigger a
+ // slide effect i.e. the next view rendering will have
+ // store.get('slide') set to 'back' or 'to'
+ $('.slide, .btn-breadcrumb a:not(:last-child)').on('click', function() {
+ $(this).addClass('active');
+ if ($(this).hasClass('back') || $(this).parent('.btn-breadcrumb').length) {
+ store.set('slide', 'back');
+ } else {
+ store.set('slide', 'to');
+ }
+ });
+
+ // Paste
helper
+ c.prePaste();
+
+ // Run callback
+ callback();
+
+ // Force scrollTop on page load
+ $('html, body').scrollTop(0);
+ });
+ };
+
+ // Slide back effect
+ if (store.get('slide') == 'back') {
+
+ store.clear('slide');
+ // Disable transition while we tweak CSS
+ $('#slider-container').addClass('notransition');
+ // "Delete" the left part of the slider
+ $('#slideBack').css('display', 'none');
+
+ // Push the slider to the left
+ $('#slider-container').css('margin-left', '-100%');
+ // slideTo is the right part, and should contain the old view,
+ // so we copypasta what's in the "center" slider (#main)
+ $('#slideTo').show().html($('#main').html());
+ // leSwap will put the new view in the "center" slider (#main)
+ leSwap();
+
+ // So now things look like:
+ // | |
+ // | the screen |
+ // | |
+ //
+ // . #main . #slideTo .
+ // . the new view . the old view .
+ // ^ ^
+ // margin-left: -100% currently shown
+ //
+ // =====>>> sliiiiide =====>>>
+
+ // Re-add transition effect
+ $('#slider-container').removeClass('notransition');
+
+ // add the transition event to detect the end of the transition effect
+ transitionEvent
+ && $("#slider-container").off(transitionEvent)
+ && $("#slider-container").on(transitionEvent, resetSliders);
+
+ // And actually play the transition effect that will move the container from left to right
+ $('#slider-container').css('margin-left', '0px');
+ }
+ // Slide to effect
+ else if (store.get('slide') == 'to') {
+
+ // Disable transition while we tweak CSS
+ $('#slider-container').addClass('notransition');
+ // "Delete" the right part of the slider
+ $('#slideTo').css('display', 'none');
+ // Push the slider to the right
+ $('#slider-container').css('margin-left', '0px');
+ // slideBack should contain the old view,
+ // so we copypasta what's in the "center" slider (#main)
+ $('#slideBack').show().html($('#main').html());
+ leSwap();
+
+ // So now things look like:
+ //
+ // | |
+ // | the screen |
+ // | |
+ //
+ // . . #slideBack . #main .
+ // . . the old view . the new view .
+ // ^ ^ ^
+ // margin-left: -100% currently shown
+ //
+ // <<<===== sliiiiide <<<=======
+
+
+ // Re-add transition effect
+ $('#slider-container').removeClass('notransition');
+
+ // add the transition event to detect the end of the transition effect
+ var transitionEvent = whichTransitionEvent();
+ transitionEvent
+ && $("#slider-container").off(transitionEvent)
+ && $("#slider-container").on(transitionEvent, resetSliders);
+
+ // And actually play the transition effect that will move the container from right to left
+ $('#slider-container').css('margin-left', '-100%');
+ }
+ // No slideing effect
+ else {
+ leSwap();
+ }
},
+ redirect_to: function(destination, options) {
+ c = this;
+
+ options = options !== undefined ? options : {};
+
+ // If destination if the same as current url,
+ // we don't want to display the slide animation
+ // (or if the code explicitly state to disable slide animation)
+ if ((c.path.split("#")[1] == destination.split("#")[1]) || (options.slide == false))
+ {
+ store.clear('slide');
+ }
+
+ // This is a copy-pasta of some of the redirect/refresh code of
+ // sammy.js because for some reason calling the original
+ // redirect/refresh function in some context does not work >.>
+ // (e.g. if you're already on the page)
+ c.trigger('redirect', {to: destination});
+ c.app.last_location = c.path;
+ c.app.setLocation(destination);
+ c.app.trigger('location-changed');
+ },
+
+ refresh: function() {
+ c = this;
+ c.redirect_to(c.path, {slide: false});
+ },
+
+ //
+ // Array / object helpers
+ //
+
arraySortById: function(arr) {
arr.sort(function(a, b){
if (a.id > b.id) {
@@ -385,74 +485,20 @@
});
},
- groupHooks: function(hooks, raw_infos){
- var data = {};
- var rules = [
- {
- id:'configuration',
- isIn:function (hook) {
- return hook.indexOf('conf_')==0
- }
- }
- ];
-
- $.each(hooks, function(i, hook) {
- var group_id=hook;
- var hook_size=(raw_infos && raw_infos[hook] && raw_infos[hook].size)?raw_infos[hook].size:0;
- $.each(rules, function(i, rule) {
- if (rule.isIn(hook)) {
- group_id = 'adminjs_group_'+rule.id;
- return false;
- }
- });
-
- if(group_id in data) {
- data[group_id] = {
- name:y18n.t('hook_'+group_id),
- value:data[group_id].value+','+hook,
- description:data[group_id].description+', '+y18n.t('hook_'+hook),
- size:data[group_id].size + hook_size
- };
- }
- else {
- data[group_id] = {
- name:y18n.t('hook_'+group_id),
- value:hook,
- description:(group_id==hook)?y18n.t('hook_'+hook+'_desc'):y18n.t('hook_'+hook),
- size:hook_size
- };
- }
- });
- return data;
+ // Serialize an object
+ serialize : function(obj) {
+ var str = [];
+ for(var p in obj)
+ if (obj.hasOwnProperty(p)) {
+ str.push(encodeURIComponent(p) + "=" + encodeURIComponent(obj[p]));
+ }
+ return str.join("&");
},
- ungroupHooks: function(system_parts,apps) {
- var data = {};
- data['apps'] = apps || [];
- data['system'] = system_parts || [];
- if (data['system'].constructor !== Array) {
- data['system'] = [data['system']];
- }
- if (data['apps'].constructor !== Array) {
- data['apps'] = [data['apps']];
- }
-
- // Some hook value contains multiple hooks separated by commas
- var split_hooks = [];
- $.each(data['system'], function(i, hook) {
- split_hooks = split_hooks.concat(hook.split(','));
- });
- data['system'] = split_hooks;
-
- if (data['system'].length == 0) {
- delete data['system'];
- }
- if (data['apps'].length == 0) {
- delete data['apps'];
- }
- return data;
- },
+ //
+ // Misc helpers used in views etc..
+ //
// Paste
prePaste: function() {
@@ -461,8 +507,7 @@
// Get paste content element
var preElement = $($(this).data('paste-content'));
- // Add pacman loader
- $('#main').append('');
+ c.showLoader();
// Send to paste.yunohost.org
$.ajax({
@@ -477,8 +522,7 @@
c.flash('fail', y18n.t('paste_error'));
})
.always(function(){
- // Remove pacman
- $('div.loader').remove();
+ c.hideLoader();
});
});
},
@@ -494,6 +538,7 @@
c.app.setLocation(to);
c.app.trigger('location-changed');
}
+
});
})();
diff --git a/src/js/yunohost/main.js b/src/js/yunohost/main.js
index 4d6ef4e4..5219715b 100644
--- a/src/js/yunohost/main.js
+++ b/src/js/yunohost/main.js
@@ -181,7 +181,7 @@
sam.store.set('url', window.location.hostname + '/yunohost/api');
if (sam.store.get('connected')) {
- this.api('/diagnosis', function(diagnosis) {
+ this.api('GET', '/diagnosis', {}, function(diagnosis) {
versions = diagnosis.packages;
$('#yunohost-version').html(y18n.t('footer_version', [versions.yunohost.version, versions.yunohost.repo]));
});
diff --git a/src/locales/ca.json b/src/locales/ca.json
index e9d0a8de..edd9af72 100644
--- a/src/locales/ca.json
+++ b/src/locales/ca.json
@@ -18,7 +18,7 @@
"app_change_url": "Canvia l'URL",
"app_debug_no_logs": "Els registres de l'aplicació no estan disponibles",
"app_debug_tab": "Mostra la informació de depuració",
- "app_info_access_desc": "Administrar l'accés d'usuaris. Usuaris permesos: %s",
+ "app_info_access_desc": "Grups / usuaris autoritzats actualment a accedir a aquesta aplicació:",
"app_info_changelabel_desc": "Canvia l'etiqueta de l'aplicació al portal.",
"app_info_debug_desc": "Mostrar la informació de depuració per aquesta aplicació.",
"app_info_default_desc": "Redirigeix l'arrel del domini a aquesta aplicació (%s).",
@@ -437,5 +437,20 @@
"request_help": "ajuda necessària",
"request_help_details": "El desenvolupador actual necessita ajuda per mantenir aquesta aplicació. Podeu contribuir-hi!",
"advanced": "Avançat",
- "from_to": "de %s fins a %s"
+ "from_to": "de %s fins a %s",
+ "group": "Grup",
+ "group_name": "Nom del grup",
+ "group_all_users": "Tots els usuaris",
+ "group_visitors": "Visitants",
+ "group_format_name_help": "Podeu utilitzar caràcters alfanumèrics i l'espai",
+ "group_add_member": "Afegir usuari",
+ "group_explain_all_users": "Aquest és un grup especial que conté tots els comptes d'usuari del servidor",
+ "group_add_permission": "Afegir permís",
+ "group_new": "Nou grup",
+ "group_explain_visitors": "Aquest és un grup especial que representa els visitants anònims",
+ "group_specific_permissions": "Permisos específics de l'usuari",
+ "groups_and_permissions": "Grups i permisos",
+ "groups_and_permissions_manage": "Gestionar grups i usuaris",
+ "permissions": "Permisos",
+ "nobody": "Ningú"
}
diff --git a/src/locales/en.json b/src/locales/en.json
index 18f0b13e..a585514e 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -9,8 +9,6 @@
"api_not_responding": "The YunoHost API is not responding. Maybe 'yunohost-api' is down or got restarted?",
"app_change_label": "Change Label",
"app_change_url": "Change URL",
- "app_debug_no_logs": "Application's logs are not available",
- "app_debug_tab": "Display debug information",
"app_info_access_desc": "Groups / users currently allowed to access this app:",
"app_info_changelabel_desc": "Change app label in the portal.",
"app_info_debug_desc": "Display debugging information for this application.",
@@ -37,7 +35,6 @@
"application": "Application",
"applications": "Applications",
"archive_empty": "Empty archive",
- "available": "Available",
"available_apps": "Available apps",
"backup": "Backup",
"backup_action": "Backup",
@@ -53,12 +50,9 @@
"backup_type": "Type",
"backups_no": "No backup",
"begin": "Begin",
- "bit_rate": "Bit rate",
"both": "Both",
"cancel": "Cancel",
"check": "Check",
- "check_mx": "MX record",
- "check_stmp": "port 25 access",
"close": "Close",
"confirm_app_change_url": "Are you sure you want to change the app access URL?",
"confirm_app_default": "Are you sure you want to make this app default?",
@@ -87,10 +81,7 @@
"confirm_reboot_action_shutdown": "Are you sure you want to shutdown your server?",
"connection": "Connection",
"copy": "Copy",
- "count_min": "%s min",
- "cpu_load": "CPU Load",
"created_at": "Created at",
- "cumulative_usage": "Cumulative usage",
"current_maintainer_title": "Current maintainer of this package",
"custom_app_install": "Install custom app",
"custom_app_url_only_github": "Currently only from GitHub",
@@ -105,7 +96,6 @@
"diagnosis_with_private": "Diagnosis with private data",
"disable": "Disable",
"disabled": "Disabled",
- "disk": "Disk",
"dns": "DNS",
"domain": "Domain",
"domain_add": "Add domain",
@@ -137,14 +127,11 @@
"error_connection_interrupted": "The server closed the connection instead of answering it. Has nginx or the yunohost-api been restarted or stoppted for some reason? (Error code/message: %s)",
"everything_good": "Everything good!",
"experimental_warning": "Warning: this feature is experimental and not consider stable, you shouldn't be using it except if you know what you are doing.",
- "filesystem": "Filesystem",
"firewall": "Firewall",
"footer_version": "Powered by YunoHost %s (%s).",
"form_input_example": "Example: %s",
"free": "Free",
"from_to": "from %s to %s",
- "fs_type": "FS Type",
- "gateway": "Gateway: ",
"good_practices_about_admin_password": "You are now about to define a new admin password. The password should be at least 8 characters - though it is good practice to use longer password (i.e. a passphrase) and/or to use various kind of characters (uppercase, lowercase, digits and special characters).",
"good_practices_about_user_password": "You are now about to define a new user password. The password should be at least 8 characters - though it is good practice to use longer password (i.e. a passphrase) and/or to use various kind of characters (uppercase, lowercase, digits and special characters).",
"group": "Group",
@@ -177,7 +164,6 @@
"hook_data_home_desc": "User data located in /home/USER",
"hook_data_mail": "Mail",
"hook_data_mail_desc": "Raw emails stored on the server",
- "hostname": "Hostname",
"id": "ID",
"ignore": "Ignore",
"ignored": "%s ignored",
@@ -190,9 +176,7 @@
"installed": "Installed",
"installed_apps": "Installed apps",
"installing": "Installing",
- "interface": "Interface",
"internal_exception": "Yunohost encountered an internal error:/ Really sorry about that. You should look for help on the forum or the chat to fix the situation, or report the bug on the bugtracker. The following information might be useful for the person helping you:
Action
%s%s
Traceback
%s
",
- "io": "I/O",
"ipv4": "IPv4",
"ipv6": "IPv6",
"label": "Label",
@@ -202,7 +186,6 @@
"license": "License",
"loading": "Loading …",
"local_archives": "Local archives",
- "local_ip": "Local IP",
"log": "Log",
"logged_in": "Logged in",
"logged_out": "Logged out",
@@ -215,7 +198,6 @@
"manage_apps": "Manage apps",
"manage_domains": "Manage domains",
"manage_users": "Manage users",
- "memory": "Memory",
"menu": "Menu",
"migrations": "Migrations",
"migrations_pending": "Pending migrations",
@@ -223,14 +205,9 @@
"migrations_no_pending": "No pending migrations",
"migrations_no_done": "No previous migrations",
"mode": "Mode",
- "monitoring": "Monitoring",
- "monitoring_check_glances": "Check glances service status.",
- "monitoring_disabled": "Monitoring is not enabled.",
- "mount_point": "Mount point",
"multi_instance": "Multi instance",
"myserver": "myserver",
"myserver_org": "myserver.org",
- "network": "Network",
"next": "Next",
"no": "No",
"no_installed_apps": "No installed apps.",
@@ -245,7 +222,6 @@
"operations": "Operations",
"orphaned": "not maintained",
"orphaned_details": "This app is not maintained anymore. It may still be working but won't receive any upgrade. Feel free to come and revive it!",
- "os": "OS",
"password": "Password",
"password_confirmation": "Password confirmation",
"password_description": "Password must be at least %s characters long.",
@@ -285,13 +261,8 @@
"postinstall_intro_3": "You can obtain more information by visiting the appropriate documentation page",
"postinstall_password": "This password will be used to manage everything on your server. Take the time to choose it wisely.",
"previous": "Previous",
- "process": "Process",
"protocol": "Protocol",
- "public_ip": "Public IP: ",
- "ram": "RAM",
- "read": "Read",
"read_more": "Read more",
- "reception": "Reception",
"rerun_diagnosis": "Rerun diagnosis",
"refresh_app_list": "Refresh list",
"request_adoption": "waiting adoption",
@@ -300,7 +271,6 @@
"request_help_details": "The current maintainer would like some help with the maintainance of this app. Feel free to come contribute on it!",
"restore": "Restore",
"run": "Run",
- "running": "Running",
"save": "Save",
"search_for_apps": "Search for apps...",
"select_all": "Select all",
@@ -321,7 +291,6 @@
"storage_create": "Add remote storage",
"storages_new": "New remote storage",
"storages_no": "No storages.",
- "swap": "Swap",
"system": "System",
"system_apps": "Apps",
"system_apps_nothing": "There are no apps to upgrade.",
@@ -333,7 +302,6 @@
"system_upgrade_all_applications_btn": "Upgrade all applications",
"system_upgrade_all_packages_btn": "Upgrade all packages",
"tcp": "TCP",
- "time_since_update": "Time since update: ",
"tools": "Tools",
"tools_adminpw": "Change administration password",
"tools_adminpw_confirm_placeholder": "Confirm the new password",
@@ -355,8 +323,6 @@
"tools_shutdown_done": "Shutting down...",
"tools_shuttingdown": "Your server is powering off. As long as your server is off, you won't be able to use the web administration.",
"tools_shutdown_reboot": "Shutdown/Reboot",
- "total": "Total",
- "transmission": "Transmission",
"udp": "UDP",
"unauthorized": "Unauthorized",
"unignore": "Unignore",
@@ -369,10 +335,7 @@
"upnp": "UPnP",
"upnp_disabled": "UPnP is disabled.",
"upnp_enabled": "UPnP is enabled.",
- "uptime": "Uptime",
"url": "URL",
- "usage": "Usage",
- "used": "Used",
"user_email": "Email",
"user_emailaliases": "Mail aliases",
"user_emailforward": "Mail forward",
@@ -388,11 +351,9 @@
"users_list": "User list",
"users_new": "New user",
"users_no": "No users.",
- "versions": "Versions",
"version": "Version",
"warnings": "%s warnings",
"warning_first_user": "You probably need to create a user first.",
- "write": "Write",
"wrong_password": "Wrong password",
"yes": "Yes",
"certificate_alert_not_valid": "CRITICAL: Current certificate is not valid! HTTPS won't work at all!",
@@ -433,6 +394,6 @@
"appslists_last_update": "Last update",
"appslists_unknown_list": "Unknown apps list: %s",
"name": "Name",
- "purge_user_data_checkbox": "Purge %s's data? (This will remove the content of it's home and mail directories.)",
+ "purge_user_data_checkbox": "Purge %s's data? (This will remove the content of its home and mail directories.)",
"purge_user_data_warning": "Purging user's data is not reversible. Be sure you know what you're doing!"
}
diff --git a/src/locales/eo.json b/src/locales/eo.json
index 98d15947..9457a628 100644
--- a/src/locales/eo.json
+++ b/src/locales/eo.json
@@ -124,7 +124,7 @@
"domain_dns_config": "Agordo DNS",
"cpu_load": "CPU Ŝarĝo",
"form_input_example": "Ekzemplo: %s",
- "app_info_access_desc": "Administri la aliron de uzanto. Permesitaj uzantoj : %s",
+ "app_info_access_desc": "Grupoj/uzantoj nuntempe rajtas aliri ĉi tiun programon:",
"diagnosis_with_private": "Diagnozo kun privataj datumoj",
"install_name": "Instalu %s",
"domain_default": "Defaŭlta domajno",
@@ -425,5 +425,20 @@
"name": "Nomo",
"udp": "UDP",
"swap": "Interŝanĝu",
- "user_interface_link": "Uzantinterfaco"
+ "user_interface_link": "Uzantinterfaco",
+ "group_format_name_help": "Vi povas uzi alfa-numerikajn signojn kaj spacon",
+ "group_add_member": "Aldonu uzanton",
+ "group": "Grupo",
+ "group_name": "Grupo nomo",
+ "group_all_users": "Ĉiuj uzantoj",
+ "groups_and_permissions": "Grupoj kaj permesoj",
+ "groups_and_permissions_manage": "Administri grupojn kaj permesojn",
+ "group_visitors": "Vizitantoj",
+ "group_explain_all_users": "Jen speciala grupo enhavanta ĉiujn uzantajn kontojn en la servilo",
+ "group_add_permission": "Aldonu permeson",
+ "group_new": "Nova grupo",
+ "group_explain_visitors": "Ĉi tio estas speciala grupo reprezentanta anonimajn vizitantojn",
+ "group_specific_permissions": "Uzaj specifaj permesoj",
+ "permissions": "Permesoj",
+ "nobody": "Neniu"
}
diff --git a/src/locales/es.json b/src/locales/es.json
index 99a4f2cb..e543f4b0 100644
--- a/src/locales/es.json
+++ b/src/locales/es.json
@@ -14,7 +14,7 @@
"app_access_title": "Acceso %s 4",
"app_debug_no_logs": "Los registros de la aplicación no están disponibles",
"app_debug_tab": "Mostrar información de depuración",
- "app_info_access_desc": "Administrar el acceso de usuarios. Usuarios permitidos: %s 5",
+ "app_info_access_desc": "Grupos / usuarios actualmente autorizados a acceder a esta aplicación:",
"app_info_debug_desc": "Mostrar información de depuración para esta aplicación.",
"app_info_default_desc": "Redirigir la raíz del dominio para esta aplicación (%s 6).",
"app_info_uninstall_desc": "Eliminar a esta aplicación.",
@@ -440,5 +440,20 @@
"appslists_confirm_remove": "¿Seguro que quiere eliminar esta lista de aplicaciones?",
"level": "nivel",
"system_upgrade_all_applications_btn": "Actualizar todas las aplicaciones",
- "select_all": "Seleccionar todo"
+ "select_all": "Seleccionar todo",
+ "group_explain_all_users": "Este es un grupo especial que contiene todas las cuentas de usuarios en el servidor",
+ "group": "Grupo",
+ "group_name": "Nombre del grupo",
+ "group_all_users": "Todos los usuarios",
+ "group_visitors": "Visitantes",
+ "group_format_name_help": "Puede usar caracteres alfanuméricos y espacio",
+ "group_add_member": "Añadir un usuario",
+ "group_add_permission": "Añadir permiso",
+ "group_new": "Nuevo grupo",
+ "group_explain_visitors": "Este es un grupo especial que representa a los visitantes anónimos",
+ "group_specific_permissions": "Permisos específicos de usuario",
+ "groups_and_permissions": "Grupos y permisos",
+ "groups_and_permissions_manage": "Gestionar grupos y permisos",
+ "permissions": "Permisos",
+ "nobody": "Nadie"
}
diff --git a/src/locales/eu.json b/src/locales/eu.json
index 0967ef42..74824cde 100644
--- a/src/locales/eu.json
+++ b/src/locales/eu.json
@@ -1 +1,6 @@
-{}
+{
+ "password": "Pasahitza",
+ "ok": "Ados",
+ "cancel": "Utzi",
+ "logged_out": "Saioa amaitu"
+}
diff --git a/src/locales/fr.json b/src/locales/fr.json
index 3b0964ba..fb4550c4 100644
--- a/src/locales/fr.json
+++ b/src/locales/fr.json
@@ -14,7 +14,7 @@
"app_access_title": "Accès à %s",
"app_debug_no_logs": "Les journaux de cette application ne sont pas disponibles",
"app_debug_tab": "Afficher les informations de débogage",
- "app_info_access_desc": "Gestion des droits d'accès. Utilisateurs autorisés : %s",
+ "app_info_access_desc": "Groupes / utilisateurs actuellement autorisés à accéder à cette application :",
"app_info_debug_desc": "Afficher les informations de débogage pour cette application.",
"app_info_default_desc": "Redirige la racine du domaine vers cette application (%s).",
"app_info_uninstall_desc": "Supprimer cette application.",
@@ -444,5 +444,20 @@
"request_help": "besoin d'assistance",
"request_help_details": "Le responsable actuel aimerait de l'aide pour la maintenance de cette application. N'hésitez pas à y contribuer !",
"advanced": "Avancée",
- "from_to": "de %s à %s"
+ "from_to": "de %s à %s",
+ "group_name": "Nom du groupe",
+ "nobody": "Personne",
+ "group": "Groupe",
+ "group_all_users": "Tous les utilisateurs",
+ "group_visitors": "Visiteurs",
+ "group_format_name_help": "Vous pouvez utiliser des caractères alphanumériques et des espaces",
+ "group_add_member": "Ajouter un utilisateur",
+ "group_add_permission": "Ajouter une permission",
+ "group_new": "Nouveau groupe",
+ "group_explain_all_users": "Ceci est un groupe spécial contenant tous les comptes d'utilisateurs sur le serveur",
+ "group_explain_visitors": "Ceci est un groupe spécial représentant les visiteurs anonymes",
+ "group_specific_permissions": "Autorisations spécifiques à l'utilisateur",
+ "groups_and_permissions": "Groupes et autorisations",
+ "groups_and_permissions_manage": "Gérer les groupes et les autorisations",
+ "permissions": "Permissions"
}
diff --git a/src/locales/tr.json b/src/locales/tr.json
index e50ea99e..696dcc83 100644
--- a/src/locales/tr.json
+++ b/src/locales/tr.json
@@ -3,7 +3,7 @@
"administration_password": "Yönetici parolası",
"api_not_responding": "API cevap vermiyor",
"both": "İkisi birden",
- "cancel": "İptal et",
+ "cancel": "İptal etmek",
"close": "Kapat",
"confirm_access_add": "%s için bütünn kullanıcılara erişim vermek istediğinizden emin misiniz ?",
"confirm_access_remove_all": "%s'e bütün erişimleri kaldırmak istediğinizden emin misiniz ?",
@@ -70,5 +70,6 @@
"url": "URL",
"warning_first_user": "Büyük ihtimalle önce kullanıcı oluşturmanız gerekiyor.",
"wrong_password": "Yanlış parola",
- "yes": "Evet"
+ "yes": "Evet",
+ "ok": "Tamam"
}
diff --git a/src/views/app/app_debug.ms b/src/views/app/app_debug.ms
deleted file mode 100644
index d233f1be..00000000
--- a/src/views/app/app_debug.ms
+++ /dev/null
@@ -1,39 +0,0 @@
-