diff --git a/gui/app/components/onboard/share-folder.js b/gui/app/components/onboard/share-folder.js index 71ba3625..69c44c07 100644 --- a/gui/app/components/onboard/share-folder.js +++ b/gui/app/components/onboard/share-folder.js @@ -95,11 +95,14 @@ export default Component.extend({ } if ($("#stage-2-password-confirm").val() !== $("#stage-2-password").val()) { - $(".mismatch").show(); + $("#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; } + $("#stage-2-password").removeClass("is-invalid"); $("#stage-2-password-confirm").removeClass("is-invalid"); self.set('processing', false); diff --git a/gui/app/components/ui/ui-button.js b/gui/app/components/ui/ui-button.js index f90ea963..e30523fe 100644 --- a/gui/app/components/ui/ui-button.js +++ b/gui/app/components/ui/ui-button.js @@ -16,7 +16,7 @@ export default Component.extend({ tagName: 'button', classNames: [], classNameBindings: ['calcClass'], - attributeBindings: ['calcAttrs:data-dismiss'], + attributeBindings: ['calcAttrs:data-dismiss', 'submitAttrs:type'], label: '', icon: '', @@ -57,6 +57,10 @@ export default Component.extend({ return null; }), + submitAttrs: computed(function() { + return this.submit ? "submit": null; + }), + click(e) { e.preventDefault(); if (is.not.undefined(this.onClick)) { diff --git a/gui/app/constants/constants.js b/gui/app/constants/constants.js index 24d96024..42ad62dd 100644 --- a/gui/app/constants/constants.js +++ b/gui/app/constants/constants.js @@ -197,10 +197,10 @@ let constants = EmberObject.extend({ Icon: { // eslint-disable-line ember/avoid-leaking-state-in-ember-objects All: 'dicon-menu-8', Announce: 'dicon-notification', - ArrowUp: 'dicon-arrow-up', - ArrowDown: 'dicon-arrow-down', - ArrowLeft: 'dicon-arrow-left', - ArrowRight: 'dicon-arrow-right', + ArrowUp: 'dicon-arrow-up-2', + ArrowDown: 'dicon-arrow-down-2', + ArrowLeft: 'dicon-arrow-left-2', + ArrowRight: 'dicon-arrow-right-2', Attachment: 'dicon-attachment', BarChart: 'dicon-chart-bar-2', Bookmark: 'dicon-bookmark', @@ -248,8 +248,11 @@ let constants = EmberObject.extend({ Delete: 'Delete', Export: 'Export', Insert: 'Insert', + Next: 'Next', + Reset: 'Reset', Restore: 'Restore', Save: 'Save', + SignIn: 'Sign In', Update: 'Update', } }); diff --git a/gui/app/pods/auth/login/template.hbs b/gui/app/pods/auth/login/template.hbs index eca653c7..700b935b 100644 --- a/gui/app/pods/auth/login/template.hbs +++ b/gui/app/pods/auth/login/template.hbs @@ -26,7 +26,9 @@ {{input type="password" value=password id="authPassword" class="form-control" autocomplete="current-password"}} {{/if}} - + + {{ui/ui-button color=constants.Color.Green light=true label=constants.Label.SignIn onClick=(action "login")}} +
Invalid credentials
{{#if isAuthProviderDocumize}} {{#link-to "auth.forgot"}}Forgot your password?{{/link-to}} diff --git a/gui/app/pods/auth/share/route.js b/gui/app/pods/auth/share/route.js index 4c4a9797..d7c914c8 100644 --- a/gui/app/pods/auth/share/route.js +++ b/gui/app/pods/auth/share/route.js @@ -37,10 +37,10 @@ export default Route.extend(AuthenticatedRouteMixin, { activate() { this.get('browser').setTitle('Share Space'); - $('body').addClass('background-color-gray-200'); + // $('body').addClass('background-color-gray-200'); }, deactivate() { - $('body').removeClass('background-color-gray-200'); + // $('body').removeClass('background-color-gray-200'); } }); diff --git a/gui/app/styles/core/layout/master-internal.scss b/gui/app/styles/core/layout/master-internal.scss index 59db1839..580c96bb 100644 --- a/gui/app/styles/core/layout/master-internal.scss +++ b/gui/app/styles/core/layout/master-internal.scss @@ -60,7 +60,7 @@ cursor: pointer; } - > .bookmarks { + > .bookmarks, > .login { display: inline-block; >.dicon { @@ -169,7 +169,7 @@ } } - > .bookmarks { + > .bookmarks, > .login { >.dicon { display: block; color: $color-white; diff --git a/gui/app/styles/core/view/auth.scss b/gui/app/styles/core/view/auth.scss index 95b904ad..754687e8 100644 --- a/gui/app/styles/core/view/auth.scss +++ b/gui/app/styles/core/view/auth.scss @@ -13,9 +13,9 @@ max-width: 500px; padding: 20px 50px; background-color: $color-white; - color: $color-black-light-1; + color: map-get($gray-shades, 700); @include border-radius(3px); - @include shadow(); + border: 1px solid map-get($gray-shades, 400); .logo { text-align: center; @@ -29,7 +29,8 @@ > .url { margin: 20px 0; color: map-get($gray-shades, 700); - font-weight: 0.9rem; + font-size: 0.9rem; + font-weight: 500; } } } diff --git a/gui/app/styles/core/view/onboard.scss b/gui/app/styles/core/view/onboard.scss index d4e549c3..ef7469d7 100644 --- a/gui/app/styles/core/view/onboard.scss +++ b/gui/app/styles/core/view/onboard.scss @@ -155,14 +155,14 @@ h2 { font-size: 2rem;; - color: $theme-500; + color: $color-black-light-2; margin-bottom: 30px; } p { font-size: 1.3rem; - color: $theme-500; + color: $color-black-light-2; } p.note @@ -184,7 +184,7 @@ } input[type='email'], input[type='text'], input[type='password'] { - background-color: transparent; + // background-color: transparent; } // input[type='submit'] diff --git a/gui/app/templates/components/customize/change-log.hbs b/gui/app/templates/components/customize/change-log.hbs index 802bb5db..6e39bc99 100644 --- a/gui/app/templates/components/customize/change-log.hbs +++ b/gui/app/templates/components/customize/change-log.hbs @@ -1,7 +1,6 @@
- {{!-- appMeta.updateAvailable --}} - {{#if true}} + {{#if appMeta.updateAvailable }} Documize product update is available :)

To upgrade, replace existing binary and restart Documize. Migrate between Community and Enterprise editions seamlessly. diff --git a/gui/app/templates/components/layout/master-sidebar.hbs b/gui/app/templates/components/layout/master-sidebar.hbs index 4b62075a..707c7ca1 100644 --- a/gui/app/templates/components/layout/master-sidebar.hbs +++ b/gui/app/templates/components/layout/master-sidebar.hbs @@ -90,6 +90,12 @@ {{/attach-popover}}

+ {{else}} + {{#link-to "auth.login" class="login"}} + + {{#attach-tooltip showDelay=1000}}Login{{/attach-tooltip}} + + {{/link-to}} {{/if}}