diff --git a/gui/app/components/layout/master-sidebar.js b/gui/app/components/layout/master-sidebar.js index 3ca3a8aa..4887dd33 100644 --- a/gui/app/components/layout/master-sidebar.js +++ b/gui/app/components/layout/master-sidebar.js @@ -11,7 +11,7 @@ import $ from 'jquery'; import { notEmpty } from '@ember/object/computed'; -import { inject as service } from '@ember/service' +import { inject as service } from '@ember/service'; import Modals from '../../mixins/modal'; import Component from '@ember/component'; diff --git a/gui/app/pods/customize/product/template.hbs b/gui/app/pods/customize/product/template.hbs index 0340348a..97f8f683 100644 --- a/gui/app/pods/customize/product/template.hbs +++ b/gui/app/pods/customize/product/template.hbs @@ -1,6 +1,6 @@ {{layout/logo-heading title="Documize Changelog" - desc=(concat "You are running "appMeta.edition " Edition " appMeta.version) + desc=(concat "You are running "appMeta.edition " Edition " appMeta.version " (build " appMeta.revision ")") icon=constants.Icon.Announce}} {{customize/change-log}} diff --git a/gui/app/pods/folders/template.hbs b/gui/app/pods/folders/template.hbs index b761d391..05ae5404 100644 --- a/gui/app/pods/folders/template.hbs +++ b/gui/app/pods/folders/template.hbs @@ -34,12 +34,10 @@
{{#if (or session.isEditor session.isAdmin)}} - {{#ui/ui-toolbar dark=false light=true raised=true large=true bordered=true}} + {{#ui/ui-toolbar dark=false light=true raised=true large=true bordered=true tooltip="New space"}} {{#if session.isEditor}} - {{ui/ui-toolbar-icon icon=constants.Icon.Plus color=constants.Color.Green tooltip="New space" onClick=(action "onShowModal")}} - {{/if}} - {{#if session.isAdmin}} - {{ui/ui-toolbar-icon icon=constants.Icon.Settings tooltip="Settings" linkTo="customize.general"}} + {{ui/ui-toolbar-icon icon=constants.Icon.Plus color=constants.Color.Green onClick=(action "onShowModal")}} + {{ui/ui-toolbar-label label="SPACE" color=constants.Color.Green onClick=(action "onShowModal")}} {{/if}} {{/ui/ui-toolbar}} {{/if}} diff --git a/gui/app/pods/updates/controller.js b/gui/app/pods/updates/controller.js new file mode 100644 index 00000000..47646b7d --- /dev/null +++ b/gui/app/pods/updates/controller.js @@ -0,0 +1,39 @@ +// 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 $ from 'jquery'; +import { inject as service } from '@ember/service'; +import Controller from '@ember/controller'; + +export default Controller.extend({ + appMeta: service(), + session: service(), + newsContent: '', + + init() { + this._super(...arguments); + + let version = this.get('appMeta.version'); + let edition = this.get('appMeta.edition').toLowerCase(); + let self = this; + let cacheBuster = + new Date(); + + $.ajax({ + url: `https://storage.googleapis.com/documize/news/${edition}/${version}.html?cb=${cacheBuster}`, + type: 'GET', + dataType: 'html', + success: function (response) { + if (self.get('isDestroyed') || self.get('isDestroying')) return; + self.set('newsContent', response); + } + }); + } +}); diff --git a/gui/app/pods/updates/route.js b/gui/app/pods/updates/route.js new file mode 100644 index 00000000..86ff885e --- /dev/null +++ b/gui/app/pods/updates/route.js @@ -0,0 +1,15 @@ +// 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 Route from '@ember/routing/route'; + +export default Route.extend({ +}); diff --git a/gui/app/pods/updates/template.hbs b/gui/app/pods/updates/template.hbs new file mode 100644 index 00000000..1117008b --- /dev/null +++ b/gui/app/pods/updates/template.hbs @@ -0,0 +1,26 @@ +{{#layout/master-sidebar}} + {{ui/ui-spacer size=300}} + +
+
SUMMARY
+ {{ui/ui-spacer size=100}} +

Documize {{appMeta.edition}} Edition

+

Version {{appMeta.version}}

+

Build {{appMeta.revision}}

+
+ +{{/layout/master-sidebar}} + +{{#layout/master-content}} + {{layout/logo-heading + title="Product News" + desc="Latest product news and updates from Documize Inc." + icon=constants.Icon.Announce}} + +
+ {{{newsContent}}} +
+ Have an idea? Suggestion or feedback? Get in touch! +
+
+{{/layout/master-content}} diff --git a/gui/app/router.js b/gui/app/router.js index c46b6383..96b79637 100644 --- a/gui/app/router.js +++ b/gui/app/router.js @@ -158,6 +158,10 @@ export default Router.map(function () { path: 'theming' }); + this.route('updates', { + path: 'updates' + }); + this.route('not-found', { path: '/*wildcard' }); diff --git a/gui/app/templates/components/layout/master-sidebar.hbs b/gui/app/templates/components/layout/master-sidebar.hbs index c0e80dea..fd7ad55c 100644 --- a/gui/app/templates/components/layout/master-sidebar.hbs +++ b/gui/app/templates/components/layout/master-sidebar.hbs @@ -71,23 +71,22 @@ {{/if}} {{#attach-popover class="ember-attacher-popper" hideOn="clickout" showOn="click" isShown=false}}
+ {{#link-to "profile" class="item"}}Profile{{/link-to}} {{#if session.isAdmin}} +
{{#link-to "customize.general" class="item"}}Settings{{/link-to}} {{#unless appMeta.valid}} {{#link-to "customize.billing" class="item bold red"}}Update Billing{{/link-to}} {{/unless}} -
{{/if}} - {{#link-to "profile" class="item"}}Profile{{/link-to}} -
{{#if session.isGlobalAdmin}} {{#if appMeta.updateAvailable}} {{#link-to "customize.product" class="item bold yellow"}}Update available{{/link-to}} {{/if}} {{/if}} - What's New +
+ {{#link-to "updates" class=(if hasWhatsNew "item bold green" "item")}}What's New{{/link-to}} Help - About {{#if enableLogout}}
{{#link-to "auth.logout" class="item" }}Logout{{/link-to}} @@ -106,75 +105,10 @@
- {{#if session.authenticated}} - - - - {{/if}}