Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-19 21:29:42 +02:00
Code Releases Activity

Move What's New into dedicated page

Browse source 
No longer a modal popup.

Also merged About dialog content.
This commit is contained in:
Harvey Kandola 2018-12-17 10:19:16 +00:00
parent 42db78ce14
commit 0cc83c13c8
8 changed files with 94 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gui/app/components/layout/master-sidebar.js
View file

@ -11,7 +11,7 @@
import $ from 'jquery'; import $ from 'jquery';
import { notEmpty } from '@ember/object/computed'; 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 Modals from '../../mixins/modal';
import Component from '@ember/component'; import Component from '@ember/component';

2
gui/app/pods/customize/product/template.hbs
View file

@ -1,6 +1,6 @@
{{layout/logo-heading {{layout/logo-heading
title="Documize Changelog" 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}} icon=constants.Icon.Announce}}
{{customize/change-log}} {{customize/change-log}}

8
gui/app/pods/folders/template.hbs
View file

@ -34,12 +34,10 @@
</div> </div>
<div class="grid-cell-2 grid-cell-right"> <div class="grid-cell-2 grid-cell-right">
{{#if (or session.isEditor session.isAdmin)}} {{#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}} {{#if session.isEditor}}
{{ui/ui-toolbar-icon icon=constants.Icon.Plus color=constants.Color.Green tooltip="New space" onClick=(action "onShowModal")}} {{ui/ui-toolbar-icon icon=constants.Icon.Plus color=constants.Color.Green onClick=(action "onShowModal")}}
{{/if}} {{ui/ui-toolbar-label label="SPACE" color=constants.Color.Green onClick=(action "onShowModal")}}
{{#if session.isAdmin}}
{{ui/ui-toolbar-icon icon=constants.Icon.Settings tooltip="Settings" linkTo="customize.general"}}
{{/if}} {{/if}}
{{/ui/ui-toolbar}} {{/ui/ui-toolbar}}
{{/if}} {{/if}}

39
gui/app/pods/updates/controller.js Normal file
View file

@ -0,0 +1,39 @@
// Copyright 2016 Documize Inc. <legal@documize.com>. 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 <sales@documize.com>.
//
// 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);
}
});
}
});

15
gui/app/pods/updates/route.js Normal file
View file

@ -0,0 +1,15 @@
// Copyright 2016 Documize Inc. <legal@documize.com>. 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 <sales@documize.com>.
//
// https://documize.com
import Route from '@ember/routing/route';
export default Route.extend({
});

26
gui/app/pods/updates/template.hbs Normal file
View file

@ -0,0 +1,26 @@
{{#layout/master-sidebar}}
{{ui/ui-spacer size=300}}
<div class="section">
<div class="title">SUMMARY</div>
{{ui/ui-spacer size=100}}
<p>Documize {{appMeta.edition}} Edition</p>
<p>Version {{appMeta.version}}</p>
<p>Build {{appMeta.revision}}</p>
</div>
{{/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}}
<div class="product-news">
{{{newsContent}}}
<div class="action">
Have an idea? Suggestion or feedback? <a href="mailto:support@documize.com">Get in touch!</a>
</div>
</div>
{{/layout/master-content}}

4
gui/app/router.js
View file

@ -158,6 +158,10 @@ export default Router.map(function () {
path: 'theming' path: 'theming'
}); });
this.route('updates', {
path: 'updates'
});
this.route('not-found', { this.route('not-found', {
path: '/*wildcard' path: '/*wildcard'
}); });

76
gui/app/templates/components/layout/master-sidebar.hbs
View file

@ -71,23 +71,22 @@
{{/if}} {{/if}}
{{#attach-popover class="ember-attacher-popper" hideOn="clickout" showOn="click" isShown=false}} {{#attach-popover class="ember-attacher-popper" hideOn="clickout" showOn="click" isShown=false}}
<div class="menu"> <div class="menu">
{{#link-to "profile" class="item"}}Profile{{/link-to}}
{{#if session.isAdmin}} {{#if session.isAdmin}}
<div class="divider"></div>
{{#link-to "customize.general" class="item"}}Settings{{/link-to}} {{#link-to "customize.general" class="item"}}Settings{{/link-to}}
{{#unless appMeta.valid}} {{#unless appMeta.valid}}
{{#link-to "customize.billing" class="item bold red"}}Update Billing{{/link-to}} {{#link-to "customize.billing" class="item bold red"}}Update Billing{{/link-to}}
{{/unless}} {{/unless}}
<div class="divider"></div>
{{/if}} {{/if}}
{{#link-to "profile" class="item"}}Profile{{/link-to}}
<div class="divider"></div>
{{#if session.isGlobalAdmin}} {{#if session.isGlobalAdmin}}
{{#if appMeta.updateAvailable}} {{#if appMeta.updateAvailable}}
{{#link-to "customize.product" class="item bold yellow"}}Update available{{/link-to}} {{#link-to "customize.product" class="item bold yellow"}}Update available{{/link-to}}
{{/if}} {{/if}}
{{/if}} {{/if}}
<a href="#" class="item {{if hasWhatsNew "bold green"}}" {{action "onShowWhatsNewModal"}}>What's New</a> <div class="divider"></div>
{{#link-to "updates" class=(if hasWhatsNew "item bold green" "item")}}What's New{{/link-to}}
<a href="https://docs.documize.com" target="_blank" class="item">Help</a> <a href="https://docs.documize.com" target="_blank" class="item">Help</a>
<a href="#" class="item" data-toggle="modal" data-target="#about-documize-modal" data-backdrop="static">About</a>
{{#if enableLogout}} {{#if enableLogout}}
<div class="divider"></div> <div class="divider"></div>
{{#link-to "auth.logout" class="item" }}Logout{{/link-to}} {{#link-to "auth.logout" class="item" }}Logout{{/link-to}}
@ -106,75 +105,10 @@
<a class="logo" href="https://documize.com?ref=app"> <a class="logo" href="https://documize.com?ref=app">
<img src="/assets/img/icon-white-64x64.png"> <img src="/assets/img/icon-white-64x64.png">
<div class="documize">Documize</div> <div class="documize">Documize</div>
{{#attach-tooltip showDelay=1000}}Documize {{appMeta.edition}} Edition {{appMeta.version}}{{/attach-tooltip}}
</a> </a>
</div> </div>
</div> </div>
{{#if session.authenticated}}
<div id="whats-new-modal" class="modal" tabindex="-1" role="dialog">
<div class="modal-dialog modal-lg" role="document">
<div class="modal-header modal-header-white">
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true" data-dismiss="modal" aria-label="Close">&times;</span>
</button>
</div>
<div class="modal-content">
<div class="modal-body">
<div class="product-news">
<h2>What's New</h2>
{{{newsContent}}}
<div class="action">
Have an idea? Suggestion or feedback? <a href="mailto:support@documize.com">Get in touch!</a>
</div>
</div>
</div>
<div class="modal-footer">
{{ui/ui-button color=constants.Color.Gray light=true label=constants.Label.Close dismiss=true}}
</div>
</div>
</div>
</div>
<div id="about-documize-modal" class="modal" tabindex="-1" role="dialog">
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
<div class="modal-body">
<div class="product-about">
<div class="edition">
Documize {{appMeta.edition}} Edition
</div>
<div class="version">
{{appMeta.version}}
</div>
<div class="version">
Build {{appMeta.revision}}
</div>
<div class="dotcom">
<a href="https://documize.com">https://documize.com</a>
</div>
{{#if (eq appMeta.edition constants.Product.CommunityEdition)}}
<div class="copyright">
&copy; Documize Inc. All rights reserved.
</div>
<div class="license">
<br>
<br> This software (Documize Community Edition) is licensed under
<a href="http://www.gnu.org/licenses/agpl-3.0.en.html">GNU AGPL v3</a>
You can operate outside the AGPL restrictions by purchasing Documize Enterprise Edition and obtaining a commercial license by
contacting
<a href="mailto:sales@documize.com">sales@documize.com</a>
</div>
{{/if}}
</div>
</div>
<div class="modal-footer">
{{ui/ui-button color=constants.Color.Gray light=true label=constants.Label.Close dismiss=true}}
</div>
</div>
</div>
</div>
{{/if}}
</div> </div>
<div class="master-sidebar"> <div class="master-sidebar">
<div class="sidebar-content"> <div class="sidebar-content">