diff --git a/gui/app/components/onboard/share-folder.js b/gui/app/components/onboard/share-folder.js index 9243614f..4f1c1022 100644 --- a/gui/app/components/onboard/share-folder.js +++ b/gui/app/components/onboard/share-folder.js @@ -20,7 +20,9 @@ export default Component.extend({ slug: "", processing: false, - didRender() { + didRender(...args) { + this._super(...args); + let self = this; $("#stage-1-firstname").focus(); @@ -97,8 +99,6 @@ export default Component.extend({ if ($("#stage-2-password-confirm").val() !== $("#stage-2-password").val()) { $("#stage-2-password").addClass("is-invalid"); $("#stage-2-password-confirm").addClass("is-invalid"); - // $(".mismatch").show(); - // $(".password-status").attr("src", "/assets/img/onboard/lock-red.png"); return; } @@ -115,7 +115,6 @@ export default Component.extend({ self.set('processing', true); $(".stage-3").fadeIn(); - // $("#spinner-1").show(); var payload = '{ "password": "' + $("#stage-2-password").val() + '", "serial": "' + self.serial + '", "firstname": "' + $("#stage-1-firstname").val() + '", "lastname": "' + $("#stage-1-lastname").val() + '" }'; var password = $("#stage-2-password").val(); @@ -126,11 +125,6 @@ export default Component.extend({ self.get('session').authenticate('authenticator:documize', creds).then(() => { window.location.href = '//' + window.location.host + '/s/' + self.folderId + "/" + self.slug; }); - - // var credentials = encodingUtil.Base64.encode(netUtil.getSubdomain() + ":" + user.email + ":" + password); - // self.session.sso(credentials).then(function() { - // window.location.href = 's/' + self.folderId + "/" + self.slug; - // }); }, function() { window.location.href = "/"; }); diff --git a/gui/app/components/setup/first-run.js b/gui/app/components/setup/first-run.js deleted file mode 100644 index 8739194d..00000000 --- a/gui/app/components/setup/first-run.js +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright 2016 Documize Inc. . All rights reserved. -// -// This software (Documize Community Edition) is licensed under -// GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html -// -// You can operate outside the AGPL restrictions by purchasing -// Documize Enterprise Edition and obtaining a commercial license -// by contacting . -// -// https://documize.com - -import { inject as service } from '@ember/service'; -import Modals from '../../mixins/modal'; -import Component from '@ember/component'; - -export default Component.extend(Modals, { - localStorage: service(), - - didInsertElement() { - this._super(...arguments); - - let firstRun = this.get('localStorage').isFirstRun(); - - if (firstRun) { - this.modalOpen('#first-run-modal', {'show': true}); - } - }, - - actions: { - onCloseModal() { - this.modalClose('#first-run-modal'); - } - } -}); diff --git a/gui/app/templates/components/layout/grid/sidebar-go-top.hbs b/gui/app/templates/components/layout/grid/sidebar-go-top.hbs index 4c857054..ffc7ca54 100644 --- a/gui/app/templates/components/layout/grid/sidebar-go-top.hbs +++ b/gui/app/templates/components/layout/grid/sidebar-go-top.hbs @@ -1 +1 @@ - + diff --git a/gui/app/templates/components/layout/master-navigation.hbs b/gui/app/templates/components/layout/master-navigation.hbs index db78e842..fcf0e2c1 100644 --- a/gui/app/templates/components/layout/master-navigation.hbs +++ b/gui/app/templates/components/layout/master-navigation.hbs @@ -3,25 +3,25 @@ {{#unless hideNavigation}}
{{#link-to "folders" class=(if (eq selectedItem "spaces") "option selected" "option")}} - + {{/link-to}} {{#if (eq appMeta.edition constants.Product.EnterpriseEdition)}} {{#if session.viewDashboard}} {{#link-to "action" class=(if (eq selectedItem "actions") "option selected" "option")}} - + {{/link-to}} {{#link-to "activity" class=(if (eq selectedItem "activity") "option selected" "option")}} - + {{/link-to}} {{/if}} {{#if session.viewAnalytics}} {{#link-to "analytics" class=(if (eq selectedItem "analytics") "option selected" "option")}} - + {{/link-to}} {{/if}} {{/if}} {{#link-to "search" class=(if (eq selectedItem "search") "option selected" "option")}} - + {{/link-to}}
@@ -29,29 +29,29 @@ {{#if session.isAdmin}} {{#unless appMeta.valid}}
- +
{{/unless}} {{#unless appMeta.configured}}
- +
{{/unless}} {{/if}} {{#if session.authenticated}} {{#if hasPins}}
- + {{#attach-popover class="ember-attacher-popper" hideOn="clickout click" showOn="click" isShown=false}}
{{#if hasSpacePins}} -
  • Spaces
    • +
  • {{localize 'spaces'}}
    • {{#each spacePins as |pin|}} {{pin.pin}} {{/each}} {{/if}} {{#if hasDocumentPins}} -
  • Content
    • +
  • {{localize 'content'}}
    • {{#each documentPins as |pin|}} {{pin.pin}} {{/each}} @@ -73,25 +73,25 @@ {{/if}} {{#attach-popover class="ember-attacher-popper" hideOn="clickout click" showOn="click" isShown=false}}
    - {{#link-to "profile" class="item"}}Profile{{/link-to}} + {{#link-to "profile" class="item"}}{{localize 'profile'}}{{/link-to}} {{#if session.isAdmin}}
    - {{#link-to "customize.general" class="item"}}Settings{{/link-to}} + {{#link-to "customize.general" class="item"}}{{localize 'settings'}}{{/link-to}} {{#unless appMeta.valid}} - {{#link-to "customize.billing" class="item bold red"}}Update Billing{{/link-to}} + {{#link-to "customize.billing" class="item bold red"}}{{localize 'account_update'}}{{/link-to}} {{/unless}} {{/if}} {{#if session.isGlobalAdmin}} {{#if appMeta.updateAvailable}} - {{#link-to "customize.product" class="item bold yellow"}}Update available{{/link-to}} + {{#link-to "customize.product" class="item bold yellow"}}{{localize 'product_update'}}{{/link-to}} {{/if}} {{/if}}
    - What's New - Help + {{localize 'product_whats_new'}} + {{localize 'help'}} {{#if enableLogout}}
    - {{#link-to "auth.logout" class="item"}}Logout{{/link-to}} + {{#link-to "auth.logout" class="item"}}{{localize 'logout'}}{{/link-to}} {{/if}}
    {{/attach-popover}} diff --git a/gui/app/templates/components/setup/documize-setup.hbs b/gui/app/templates/components/setup/documize-setup.hbs index e4c01e96..67509923 100644 --- a/gui/app/templates/components/setup/documize-setup.hbs +++ b/gui/app/templates/components/setup/documize-setup.hbs @@ -1,7 +1,7 @@
    - Documize Community Setup + {{localize 'setup_title'}} -

    Setup

    +

    {{localize 'setup_title'}}

    Review the installation instructions and recommended database tuning guide diff --git a/gui/app/templates/components/setup/first-run.hbs b/gui/app/templates/components/setup/first-run.hbs deleted file mode 100644 index 44b7f926..00000000 --- a/gui/app/templates/components/setup/first-run.hbs +++ /dev/null @@ -1,13 +0,0 @@ -

    diff --git a/gui/app/templates/components/spaces/space-list.hbs b/gui/app/templates/components/spaces/space-list.hbs index ebecd492..dd3d317f 100644 --- a/gui/app/templates/components/spaces/space-list.hbs +++ b/gui/app/templates/components/spaces/space-list.hbs @@ -1,12 +1,11 @@
    -
    {{#ui/ui-toolbar dark=false light=false raised=false large=false bordered=false}} - {{ui/ui-toolbar-icon icon=constants.Icon.Blocks color=constants.Color.Gray tooltip="Complete" + {{ui/ui-toolbar-icon icon=constants.Icon.Blocks color=constants.Color.Gray tooltip=(localize 'space_density_complete') selected=(eq viewDensity "1") onClick=(action "onSwitchView" "1")}} - {{ui/ui-toolbar-icon icon=constants.Icon.All color=constants.Color.Gray tooltip="Comfort" + {{ui/ui-toolbar-icon icon=constants.Icon.All color=constants.Color.Gray tooltip=(localize 'space_density_comfort') selected=(eq viewDensity "2") onClick=(action "onSwitchView" "2")}} - {{ui/ui-toolbar-label label="—" color=constants.Color.Gray tooltip="Compact" + {{ui/ui-toolbar-label label="—" color=constants.Color.Gray tooltip=(localize 'space_density_compact') selected=(eq viewDensity "3") onClick=(action "onSwitchView" "3")}} {{/ui/ui-toolbar}}
    @@ -57,5 +56,4 @@ {{/each}} -
    diff --git a/gui/public/i18n/en-US.json b/gui/public/i18n/en-US.json index 540a2b03..983b47b7 100644 --- a/gui/public/i18n/en-US.json +++ b/gui/public/i18n/en-US.json @@ -83,6 +83,8 @@ "meta": "Meta", "permissions": "Permissions", "profile": "Profile", + "go_top": "Go top", + "help": "Help", "public": "Public", "protected": "Protected", @@ -102,6 +104,11 @@ "pinned": "Pinned", "unpinned": "Unpinned", "blocks": "Content Blocks", + "actions": "Actions", + "activity": "Activity", + "reports": "Reports", + "bookmarks": "Bookmarks", + "content": "Content", "space_new": "New Space", "space_name": "Space name", @@ -154,6 +161,9 @@ "search_example8": "Show results that contain either word", "search_example9": "Show results that have \"google\", either \"apple\" or \"microsoft\" but not \"ibm\"", "search_example10": "Show results that contain words that start with \"apple\", such as \"applesauce\" or \"applet\"", + "space_density_complete": "Complete", + "space_density_comfort": "Comfort", + "space_density_compact": "Compact", "backup_explain1": "Documize Community is a multi-tenanted application enabling both 'tech.mycompany.com' and 'sales.mycompany.com' to run using the same executable/database. As a Documize Community Global Administrator, you will be performing a complete system-wide backup across all tenants. The Documize Community Tenant Administrator can login to perform a tenant-level backup (e.g. marketing.mycompany.com).", "backup_explain2": "Documize Community is a multi-tenanted application enabling both 'tech.mycompany.com' and 'sales.mycompany.com' to run using the same executable/database. A Documize Community Global Administrator, you will be performing a complete system-wide backup across all tenants. As a Documize Community Tenant Administrator you can perform a tenant-level backup (e.g. marketing.mycompany.com).", @@ -225,6 +235,7 @@ "smtp_ssl": "Use SSL", "smtp_save_test": "Save & Test", "smtp_sent_test_email": "Sending test email to you", + "smtp_missing": "Missing mail server settings", "space_admin_export": "Export All Content", "space_admin_export_running": "Export running....", "space_admin_make_owner": "Add myself as owner", @@ -351,6 +362,10 @@ "product_feedback": "Have a product idea, suggestion or some feedback?", "product_news": "Product News", "product_news_explain": "Latest product news and updates", + "product_update": "Update available", + "product_whats_new": "What's New", + "product_activation_key_missing": "Missing activation key", + "account_update": "Update Account", "404": "Oops! That page couldn't be found.", "404_explain": "Maybe the content you're looking for is no longer available?", "close_account": "Please close my Documize account.",