diff --git a/app/src/i18n/locales/en.json b/app/src/i18n/locales/en.json index aea969f0..ce100431 100644 --- a/app/src/i18n/locales/en.json +++ b/app/src/i18n/locales/en.json @@ -144,6 +144,14 @@ "disabled": "Disabled", "dns": "DNS", "domain": { + "cert": { + "types": { + "self-signed": "Self-signed", + "lets-encrypt": "Let's Encrypt", + "other-unknown": "Other/Unknown" + }, + "valid_for": "valid for {days}" + }, "config": { "edit": "Edit domain configuration", "title": "Domain configuration" @@ -153,6 +161,19 @@ "auto_config_ignored": "ignored, won't be changed by YunoHost unless you check the overwrite option", "auto_config_ok": "Automatic configuration seems to be OK!", "auto_config_zone": "Current DNS zone", + "semi_auto_status": { + "activable": "Activable", + "activated": "Activated", + "has_changes": "Has changes", + "unavailable": "Unavailable" + }, + "methods": { + "auto": "Automatic", + "handled_in_parent": "Handled in parent domain", + "manual": "Manual", + "none": "None", + "semi_auto": "Semi-automatic" + }, "edit": "Edit DNS configuration", "info": "The automatic DNS records configuration is an experimental feature.
Consider saving your current DNS zone from your DNS registrar's interface before pushing records from here.", "manual_config": "Suggested DNS records for manual configuration", @@ -161,7 +182,20 @@ "push_force_confirm": "Are you sure you want to force push all suggested dns records? Be aware that it may overwrite manually or important default records set by you or your registrar.", "push_force_warning": "It looks like some DNS records that YunoHost would have set are already in the registrar configuration. You can use the overwrite option if you know what you are doing." }, + "explain": { + "main_domain": "The main domain is the domain from which users can connect to the portal (via \"{domain}/yunohost/sso\").
Therefore, it is not possible to delete it.
If you want to delete \"{domain}\", you will first have to choose or add another domain and set it as the main domain." + }, + "info": { + "apps_on_domain": "Apps installed on domain", + "certificate_authority": "SSL Certification authority", + "dns_config_method": "DNS config method", + "dns_semi_auto_config_feature": "Semi-auto DNS configuration feature", + "domain_type": "Domain type", + "registrar": "Registrar" + }, "types": { + "parent_domain": "Parent domain", + "subdomain": "Subdomain", "main_domain": "Main domain" }, "toggle_subdomains": "Toggle subdomains" @@ -554,8 +588,10 @@ "browse": "Browse", "collapse": "Collapse", "default": "Default", + "link": "Link", "none": "None", - "separator": ", " + "separator": ", ", + "valid": "Valid" }, "wrong_password_or_username": "Wrong password or username", "yes": "Yes", diff --git a/app/src/scss/main.scss b/app/src/scss/main.scss index 4f4faee6..0fde40c0 100644 --- a/app/src/scss/main.scss +++ b/app/src/scss/main.scss @@ -68,7 +68,10 @@ body { display: block; } + +.tooltip { top: 0; } // Descriptive list ( elems with inside) +// FIXME REMOVE when every infos switch to `DescriptionRow` .row-line { @include media-breakpoint-up(md) { &:hover { diff --git a/app/src/store/data.js b/app/src/store/data.js index ef82e457..a0fbf983 100644 --- a/app/src/store/data.js +++ b/app/src/store/data.js @@ -22,6 +22,7 @@ export default { state: () => ({ main_domain: undefined, domains: undefined, // Array + domains_details: {}, users: undefined, // basic user data: Object {username: {data}} users_details: {}, // precise user data: Object {username: {data}} groups: undefined, @@ -33,6 +34,22 @@ export default { state.domains = domains }, + 'SET_DOMAINS_DETAILS' (state, [name, { domains }]) { + Vue.set(state.domains_details, name, domains[name]) + }, + + 'UPDATE_DOMAINS_DETAILS' (state, payload) { + // FIXME use a common function to execute the same code ? + this.commit('SET_DOMAINS_DETAILS', payload) + }, + + 'DEL_DOMAINS_DETAILS' (state, [name]) { + Vue.delete(state.domains_details, name) + if (state.domains) { + Vue.delete(state.domains, name) + } + }, + 'ADD_DOMAINS' (state, [{ domain }]) { state.domains.push(domain) }, diff --git a/app/src/views/domain/DomainInfo.vue b/app/src/views/domain/DomainInfo.vue index 3f52e27a..6054683e 100644 --- a/app/src/views/domain/DomainInfo.vue +++ b/app/src/views/domain/DomainInfo.vue @@ -1,83 +1,221 @@