' + y18n.t('tools_rebooting') + '
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,11 +522,23 @@
c.flash('fail', y18n.t('paste_error'));
})
.always(function(){
- // Remove pacman
- $('div.loader').remove();
+ c.hideLoader();
});
});
+ },
+
+ force_redirect: function(to) {
+ c = this;
+ // This is a copy-pasta of some of the redirect/refresh code of
+ // sammy.js because for some reason calling the origina
+ // redirect/refresh function in some context does not work >.>
+ // (e.g. if you're already on the page)
+ c.trigger('redirect', {to: to});
+ c.app.last_location = c.path;
+ 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..72615a31 100644
--- a/src/js/yunohost/main.js
+++ b/src/js/yunohost/main.js
@@ -181,9 +181,10 @@
sam.store.set('url', window.location.hostname + '/yunohost/api');
if (sam.store.get('connected')) {
- this.api('/diagnosis', function(diagnosis) {
- versions = diagnosis.packages;
- $('#yunohost-version').html(y18n.t('footer_version', [versions.yunohost.version, versions.yunohost.repo]));
+ this.api('GET', '/diagnosis/show?full', {}, function(data) {
+ basesystem = data.reports.filter(function(r) { return r.id == "basesystem"; })[0];
+ version_info = basesystem.items.filter(function(i) { return (i.meta && i.meta.test && i.meta.test == "ynh_versions"); })[0];
+ $('#yunohost-version').html(y18n.t('footer_version', [version_info.data.main_version, version_info.data.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 4ac42be3..61a5c96e 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.",
@@ -36,7 +34,6 @@
"application": "Application",
"applications": "Applications",
"archive_empty": "Empty archive",
- "available": "Available",
"available_apps": "Available apps",
"backup": "Backup",
"backup_action": "Backup",
@@ -52,12 +49,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?",
@@ -86,24 +80,19 @@
"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",
"default": "Default",
"delete": "Delete",
"description": "Description",
+ "details": "Details",
"domain_dns_conf_is_just_a_recommendation": "This page shows you the *recommended* configuration. It does *not* configure the DNS for you. It is your responsability to configure your DNS zone in your DNS registrar according to this recommendation.",
"diagnosis": "Diagnosis",
- "diagnosis_hide_private": "Show diagnostic information without private data",
- "diagnosis_view_private": "Show diagnostic information including private data",
- "diagnosis_with_private": "Diagnosis with private data",
+ "diagnosis_experimental_disclaimer": "Be aware that the diagnosis feature is still experimental and being polished, and it may not be fully reliable.",
"disable": "Disable",
"disabled": "Disabled",
- "disk": "Disk",
"dns": "DNS",
"domain": "Domain",
"domain_add": "Add domain",
@@ -126,21 +115,20 @@
"download": "Download",
"enable": "Enable",
"enabled": "Enabled",
+ "errors": "%s errors",
"error_modify_something": "You should modify something",
"error_retrieve_feed": "Could not retrieve feed: %s. You might have a plugin prevent your browser from performing this request (or the website is down).",
"error_select_domain": "You should indicate a domain",
"error_server": "Server error",
"error_server_unexpected": "Unexpected server error (%s)",
"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",
@@ -173,8 +161,9 @@
"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",
"inactive": "Inactive",
"infos": "Info",
"install": "Install",
@@ -184,18 +173,16 @@
"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",
"label_for_manifestname": "Label for %s",
+ "last_ran": "Last time ran:",
"level": "level",
"license": "License",
"loading": "Loading …",
"local_archives": "Local archives",
- "local_ip": "Local IP",
"log": "Log",
"logged_in": "Logged in",
"logged_out": "Logged out",
@@ -208,7 +195,6 @@
"manage_apps": "Manage apps",
"manage_domains": "Manage domains",
"manage_users": "Manage users",
- "memory": "Memory",
"menu": "Menu",
"migrations": "Migrations",
"migrations_pending": "Pending migrations",
@@ -216,14 +202,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.",
@@ -238,7 +219,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.",
@@ -247,10 +227,6 @@
"passwords_dont_match": "Passwords don't match",
"passwords_too_short": "Password is too short",
"path": "Path",
- "diagnosis": "Diagnosis",
- "diagnosis_with_private": "Diagnosis with private data",
- "diagnosis_view_private": "Show diagnosis with private data",
- "diagnosis_hide_private": "Show diagnosis without private data",
"logs": "Logs",
"logs_operation": "Operations made on system with YunoHost",
"logs_history": "History of command run on system",
@@ -278,20 +254,14 @@
"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",
"request_adoption": "waiting adoption",
"request_adoption_details": "The current maintainer would like to stop maintaining this app. Feel free to propose yourself as the new maintainer!",
"request_help": "need help",
"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",
@@ -312,7 +282,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.",
@@ -324,7 +293,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",
@@ -346,10 +314,9 @@
"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",
"uninstall": "Uninstall",
"unknown_action": "Unknown action %s",
"unknown_argument": "Unknown argument: %s",
@@ -359,10 +326,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",
@@ -378,10 +342,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!",
@@ -413,6 +376,6 @@
"revert_to_selfsigned_cert_message": "If you really want to, you can reinstall a self-signed certificate. (Not recommended)",
"revert_to_selfsigned_cert": "Revert to a self-signed certificate",
"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 @@
-
-
-
-
-{{#if services}}
-
-{{#services}}
-
-
-
-
- {{t 'service_log' name }}
-
-
-
-
-
- {{#logs}}
- {{file_name}}
- {{file_content}}
-
- {{/logs}}
-
-
-
-{{/services}}
-
-
-{{else}}
-
-
- {{t 'app_debug_no_logs'}}
-
-{{/if}}
diff --git a/src/views/app/app_info.ms b/src/views/app/app_info.ms
index 53525c05..7c972a0e 100644
--- a/src/views/app/app_info.ms
+++ b/src/views/app/app_info.ms
@@ -57,9 +57,9 @@
{{t 'app_info_default_desc' settings.domain}}
-
+
+
@@ -79,16 +79,9 @@
{{t 'app_info_uninstall_desc'}}
-
+
-
-
-
- {{t 'app_info_debug_desc'}}
-
- {{t 'app_debug_tab'}}
-
+
diff --git a/src/views/backup/backup.ms b/src/views/backup/backup.ms
index 4da53a75..e4bd4b0c 100644
--- a/src/views/backup/backup.ms
+++ b/src/views/backup/backup.ms
@@ -3,12 +3,6 @@
{{t 'backup'}}
-
-
-
-
diff --git a/src/views/backup/backup_info.ms b/src/views/backup/backup_info.ms
index ae42c67a..117558a7 100644
--- a/src/views/backup/backup_info.ms
+++ b/src/views/backup/backup_info.ms
@@ -83,41 +83,11 @@
-
{{t 'backup_archive_delete'}}
-
+
+
- {{#if other_storages}}
-
-
- {{t 'backup_archive_copy'}}
-
-
- {{/if}}
diff --git a/src/views/backup/storage_create.ms b/src/views/backup/storage_create.ms
deleted file mode 100644
index bc07a003..00000000
--- a/src/views/backup/storage_create.ms
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-
-
-
-
diff --git a/src/views/diagnosis/diagnosis_show.ms b/src/views/diagnosis/diagnosis_show.ms
new file mode 100644
index 00000000..820ac417
--- /dev/null
+++ b/src/views/diagnosis/diagnosis_show.ms
@@ -0,0 +1,57 @@
+
+
+{{t 'last_ran' }} {{formatRelative time day="numeric" month="long" year="numeric" hour="numeric" minute="numeric" }}
+ {{#items}} +{{t 'domain_not_eligible_for_ACME'}}
{{/if}} - + +{{t 'manually_renew_letsencrypt_message'}}
- + +{{t 'regenerate_selfsigned_cert_message'}}
- + +{{t 'revert_to_selfsigned_cert_message'}}
- + +- {{t 'domain_default_longdesc'}} -
- {{/if}} - - -{{t 'domain_visit_url' url}}
- {{t 'domain_visit'}} + {{t 'domain_visit'}}{{t 'domain_default_desc'}}
- + {{#if main}} ++ {{t 'domain_default_longdesc'}} +
+ {{else}} + + {{/if}}{{t 'domain_dns_longdesc'}}
- {{t 'domain_dns_config'}} + {{t 'domain_dns_config'}}{{t 'certificate_manage'}}
- {{#unless enable_cert_management}} -- {{t 'certificate_old_letsencrypt_app_conflict'}} -
- {{/unless}} - - {{t 'ssl_certificate'}} + + {{t 'ssl_certificate'}}{{t 'domain_delete_longdesc' name}}
- - {{t 'delete'}} - +{{ diagnosis }}
- {{#if private}}
- {{t 'diagnosis_hide_private'}}
- {{else}}
- {{t 'diagnosis_view_private'}}
- {{/if}}
-
- {{t 'upnp_enabled'}}
- {{t 'disable'}} + {{else}}{{t 'upnp_disabled'}}
- {{t 'enable'}} + {{/if}}| {{t 'used'}} | -{{humanSize system.memory.ram.used}} ({{system.memory.ram.percent}} %) | -
| {{t 'free'}} | -{{humanSize system.memory.ram.free}} | -
| {{t 'total'}} | -{{humanSize system.memory.ram.total}} | -
| {{t 'used'}} | -{{humanSize system.memory.swap.used}} ({{system.memory.swap.percent}} %) | -
| {{t 'free'}} | -{{humanSize system.memory.swap.free}} | -
| {{t 'total'}} | -{{humanSize system.memory.swap.total}} | -
| {{t 'count_min' "1"}} | -{{system.cpu.load.min1}} | -
| {{t 'count_min' "5"}} | -{{system.cpu.load.min5}} | -
| {{t 'count_min' "15"}} | -{{system.cpu.load.min15}} | -
| {{t 'running'}} | -{{system.process.running}} | -
| {{t 'sleeping'}} | -{{system.process.sleeping}} | -
| {{t 'total'}} | -{{system.process.total}} | -
| {{t 'interface'}} | -{{t 'ipv4'}} | -{{t 'ipv6'}} | -
|---|---|---|
| {{@key}} | -{{ ipv4 }} | -{{ ipv6 }} | -
- - {{@key}} - {{t 'time_since_update'}}{{humanTime time_since_update}} -- |
- {{t 'bit_rate'}} | -{{t 'cumulative_usage'}} | -
|---|---|---|
| {{t 'transmission'}} | -{{bitRate tx time_since_update}} | -{{humanSize cumulative_tx}} | -
| {{t 'reception'}} | -{{bitRate rx time_since_update}} | -{{humanSize cumulative_rx}} | -
| {{t 'fs_type'}} | {{ filesystem.fs_type }} | -
| {{t 'mount_point'}} | {{ filesystem.mnt_point }} | -
| {{t 'size'}} | {{humanSize filesystem.size }} | -
| {{t 'used'}} | {{humanSize filesystem.used }} | -
| {{t 'available'}} | {{humanSize filesystem.avail }} | -
| {{t 'read'}} | {{humanSize io.read_bytes }} | -
| {{t 'write'}} | {{humanSize io.write_bytes }} | -
{{t 'from_to' current_version new_version}}
+ {{t 'from_to' current_version new_version}}
-{{#logs}}
- {{.}}
-{{/logs}}
-
-
-{{else}}
- {{t 'no_log'}}
-{{/if}}
diff --git a/src/views/user/group_list.ms b/src/views/user/group_list.ms
index 7b68e404..a6643f79 100644
--- a/src/views/user/group_list.ms
+++ b/src/views/user/group_list.ms
@@ -17,10 +17,10 @@
{{text}}
-
+
+
{{/inline}}
@@ -35,7 +35,7 @@