Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-08-02 20:15:26 +02:00
Code Releases Activity

Apply changes backported from Enterprise edition

Browse source
This commit is contained in:
McMatts 2018-12-26 18:13:00 +00:00
parent 3d0a3cecf9
commit 5757b2d36e
24 changed files with 1474 additions and 1378 deletions
Download patch file Download diff file Expand all files Collapse all files

218
gui/app/templates/components/customize/license-key.hbs
View file

@ -1,151 +1,118 @@
<div class="row">
<div class="col">
<div class="view-customize">
<h1 class="admin-heading">Product Billing & Subscription</h1>
<h2 class="sub-heading">Active subscription details</h2>
</div>
</div>
</div>
<div class="view-customize">
<form class="my-5 ">
<div class="form-group row">
<label for="sub-name" class="col-sm-4 col-form-label"></label>
<div class="col-sm-7">
{{#if (eq subscription.status 0)}}
<h3 class="text-danger">Enjoy the Documize free plan!</h3>
<a class="btn btn-success" href="https://documize.com/checkout?ref=app&l={{appMeta.location}}&id={{subscription.id}}&o={{appMeta.orgId}}&u={{subscription.seats}}&a={{subscription.activeUsers}}&e={{subscription.email}}">upgrade now &xrarr;</a>
{{/if}}
{{#if (eq subscription.status 1)}}
<h3 class="text-success">Nice, you have an active product subscription!</h3>
<a class="btn btn-success" href="https://documize.com/checkout?ref=app&l={{appMeta.location}}&id={{subscription.id}}&o={{appMeta.orgId}}&u={{subscription.seats}}&a={{subscription.activeUsers}}&e={{subscription.email}}">
change plan &xrarr;
</a>
{{/if}}
{{#if (eq subscription.status 2)}}
<h3 class="text-danger">Hmm, your product subscription has expired</h3>
<a class="btn btn-success" href="https://documize.com/checkout?ref=app&l={{appMeta.location}}&id={{subscription.id}}&o={{appMeta.orgId}}&u={{subscription.seats}}&a={{subscription.activeUsers}}&e={{subscription.email}}">
renew &xrarr;
</a>
{{/if}}
{{#if (eq subscription.status 3)}}
<h3 class="text-danger">Hmm, {{subscription.activeUsers}} active user count exceeds permitted {{subscription.seats}} user limit</h3>
<a class="btn btn-success" href="https://documize.com/checkout?ref=app&l={{appMeta.location}}&id={{subscription.id}}&o={{appMeta.orgId}}&u={{subscription.seats}}&a={{subscription.activeUsers}}&e={{subscription.email}}">
upgrade &xrarr;
</a>
{{/if}}
{{#if (eq subscription.status 4)}}
<h3 class="text-danger">Hmm, your product subscription is not valid</h3>
<a class="btn btn-success" href="https://documize.com/pricing?ref=app">upgrade &xrarr;</a>
{{/if}}
<br>
<br>
</div>
{{#if (eq subscription.status 0)}}
<h3 class="color-red-600">Enjoy the Documize free plan!</h3>
<a href="https://documize.com/checkout?ref=app&l={{appMeta.location}}&id={{subscription.id}}&o={{appMeta.orgId}}&u={{subscription.seats}}&a={{subscription.activeUsers}}&e={{subscription.email}}">
{{ui/ui-button color=constants.Color.Yellow light=true label="Upgrade Now"}}
</a>
{{/if}}
{{#if (eq subscription.status 1)}}
<h3 class="color-green-600">Nice, you have an active product subscription!</h3>
<a href="https://documize.com/checkout?ref=app&l={{appMeta.location}}&id={{subscription.id}}&o={{appMeta.orgId}}&u={{subscription.seats}}&a={{subscription.activeUsers}}&e={{subscription.email}}">
{{ui/ui-button color=constants.Color.Yellow light=true label="Change Plan"}}
</a>
{{/if}}
{{#if (eq subscription.status 2)}}
<h3 class="color-red-600">Hmm, your product subscription has expired</h3>
<a href="https://documize.com/checkout?ref=app&l={{appMeta.location}}&id={{subscription.id}}&o={{appMeta.orgId}}&u={{subscription.seats}}&a={{subscription.activeUsers}}&e={{subscription.email}}">
{{ui/ui-button color=constants.Color.Yellow light=true label="Renew"}}
</a>
{{/if}}
{{#if (eq subscription.status 3)}}
<h3 class="color-red-600">Hmm, {{subscription.activeUsers}} active user count exceeds permitted {{subscription.seats}} user limit</h3>
<a href="https://documize.com/checkout?ref=app&l={{appMeta.location}}&id={{subscription.id}}&o={{appMeta.orgId}}&u={{subscription.seats}}&a={{subscription.activeUsers}}&e={{subscription.email}}">
{{ui/ui-button color=constants.Color.Yellow light=true label="Upgrade"}}
</a>
{{/if}}
{{#if (eq subscription.status 4)}}
<h3 class="color-red-600">Hmm, your product subscription is not valid</h3>
<a href="https://documize.com/pricing?ref=app">
{{ui/ui-button color=constants.Color.Yellow light=true label="Upgrade"}}
</a>
{{/if}}
{{ui/ui-spacer size=400}}
<form>
<div class="form-group">
<label for="sub-id">Customer ID</label>
{{input id="sub-id" type="text" value=subscription.id class="form-control" readonly=true}}
<small class="form-text text-muted">Quote this ID when contacting us</small>
</div>
<div class="form-group row">
<label for="sub-id" class="col-sm-4 col-form-label">Customer ID</label>
<div class="col-sm-7">
{{input id="sub-id" type="text" value=subscription.id class="form-control" readonly=true}}
<small class="form-text text-muted">Quote this ID when contacting us</small>
</div>
<div class="form-group">
<label for="sub-name">Customer Name</label>
{{input id="sub-name" type="text" value=subscription.name class="form-control" readonly=true}}
<small class="form-text text-muted">The business or personal name of our customer</small>
</div>
<div class="form-group row">
<label for="sub-name" class="col-sm-4 col-form-label">Customer Name</label>
<div class="col-sm-7">
{{input id="sub-name" type="text" value=subscription.name class="form-control" readonly=true}}
<small class="form-text text-muted">The business or personal name of our customer</small>
</div>
<div class="form-group">
<label for="sub-email">Contact Email</label>
{{input id="sub-email" type="email" value=subscription.email class="form-control" readonly=true}}
<small class="form-text text-muted">Where we will send product update and billing notices</small>
</div>
<div class="form-group row">
<label for="sub-email" class="col-sm-4 col-form-label">Contact Email</label>
<div class="col-sm-7">
{{input id="sub-email" type="email" value=subscription.email class="form-control" readonly=true}}
<small class="form-text text-muted">Where we will send product update and billing notices</small>
</div>
</div>
<div class="form-group row">
<label for="sub-seats" class="col-sm-4 col-form-label">Maximum Users</label>
<div class="col-sm-7">
{{input id="sub-seats" type="number" value=subscription.seats class="form-control" readonly=true}}
<small class="form-text text-muted">Your user pack size &mdash; you have {{subscription.activeUsers}} active users at the moment</small>
</div>
<div class="form-group">
<label for="sub-seats">Maximum Users</label>
{{input id="sub-seats" type="number" value=subscription.seats class="form-control" readonly=true}}
<small class="form-text text-muted">Your user pack size &mdash; you have {{subscription.activeUsers}} active users at the moment</small>
</div>
{{#if (eq appMeta.location "selfhost")}}
<div class="form-group row">
<label for="sub-start" class="col-sm-4 col-form-label">Start Date</label>
<div class="col-sm-7">
{{input id="sub-start" type="text" value=(formatted-date subscription.start) class="form-control" readonly=true}}
<small class="form-text text-muted">When you (re)signed up</small>
</div>
<div class="form-group">
<label for="sub-start">Start Date</label>
{{input id="sub-start" type="text" value=(formatted-date subscription.start) class="form-control" readonly=true}}
<small class="form-text text-muted">When you (re)signed up</small>
</div>
<div class="form-group row">
<label for="sub-end" class="col-sm-4 col-form-label">Renewal Date</label>
<div class="col-sm-7">
{{input id="sub-end" type="text" value=(formatted-date subscription.end) class="form-control" readonly=true}}
<small class="form-text text-muted">The renewal date of your annual subscription</small>
</div>
<div class="form-group">
<label for="sub-end">Renewal Date</label>
{{input id="sub-end" type="text" value=(formatted-date subscription.end) class="form-control" readonly=true}}
<small class="form-text text-muted">The renewal date of your annual subscription</small>
</div>
<div class="form-group row">
<label for="sub-price" class="col-sm-4 col-form-label">Annual Billing</label>
<div class="col-sm-7">
{{input id="sub-price" type="text" value=(formatted-price subscription.price) class="form-control" readonly=true}}
<small class="form-text text-muted">What you pay each year</small>
</div>
<div class="form-group">
<label for="sub-price">Annual Billing</label>
{{input id="sub-price" type="text" value=(formatted-price subscription.price) class="form-control" readonly=true}}
<small class="form-text text-muted">What you pay each year</small>
</div>
{{else}}
<div class="form-group row">
<label for="sub-start" class="col-sm-4 col-form-label">Start of Billing</label>
<div class="col-sm-7">
{{input id="sub-start" type="text" value=(formatted-date subscription.start) class="form-control" readonly=true}}
<small class="form-text text-muted">When we first charged your credit card &mdash; charged every 30 days thereafter</small>
</div>
<div class="form-group">
<label for="sub-start">Start of Billing</label>
{{input id="sub-start" type="text" value=(formatted-date subscription.start) class="form-control" readonly=true}}
<small class="form-text text-muted">When we first charged your credit card &mdash; charged every 30 days thereafter</small>
</div>
<div class="form-group row">
<label for="sub-price" class="col-sm-4 col-form-label">Monthly Amount</label>
<div class="col-sm-7">
{{input id="sub-price" type="text" value=(formatted-price subscription.price) class="form-control" readonly=true}}
<small class="form-text text-muted">What you pay us each month</small>
</div>
<div class="form-group">
<label for="sub-price">Monthly Amount</label>
{{input id="sub-price" type="text" value=(formatted-price subscription.price) class="form-control" readonly=true}}
<small class="form-text text-muted">What you pay us each month</small>
</div>
{{/if}}
{{#if subscription.trial}}
<div class="form-group row">
<label for="sub-trial" class="col-sm-4 col-form-label">Trial?</label>
<div class="col-sm-7">
{{input id="sub-trial" type="text" value="Yes" class="form-control" readonly=true}}
</div>
<div class="form-group">
<label for="sub-trial">Trial?</label>
{{input id="sub-trial" type="text" value="Yes" class="form-control" readonly=true}}
</div>
{{/if}}
{{#if (eq appMeta.location "selfhost")}}
<div class="form-group row">
<label for="sub-license" class="col-sm-4 col-form-label">Activation Key</label>
<div class="col-sm-7">
{{focus-textarea id="sub-license" value=license rows="10" class=(if licenseError "form-control is-invalid" "form-control")}}
<small class="form-text text-muted">The activation key you received after sign-up</small>
<div class="btn btn-secondary mt-3" {{action "saveLicense"}}>Activate</div>
</div>
<div class="form-group">
<label for="sub-license">Activation Key</label>
{{textarea id="sub-license" value=license rows="10" class=(if licenseError "form-control is-invalid" "form-control")}}
<small class="form-text text-muted">The activation key you received after sign-up</small>
</div>
{{/if}}
{{ui/ui-button color=constants.Color.Green light=true label="Activate" onClick=(action "saveLicense")}}
</form>
</div>
{{#if (eq appMeta.edition constants.Product.EnterpriseEdition)}}
{{#if (eq appMeta.location "cloud")}}
<div class="row">
<div class="col-sm-4"></div>
<div class="col-sm-7">
<div class="view-customize">
<div class="deactivation-zone">
<p>Let us know if you would like to close your account or cancel your subscription.</p>
<p><span class="bold-700">WARNING: </span>All data will be deleted so please download a complete backup of all your data.</p>
<p>Requests can take up to 24 hours to process.</p>
{{#link-to "customize.backup" class="btn btn-success"}}PERFORM BACKUP{{/link-to}}
<div class="button-gap" />
<button class="btn btn-danger" {{action "onRequestClosure"}}>CLOSE ACCOUNT</button>
</div>
</div>
{{ui/ui-spacer size=400}}
<div class="view-customize">
<div class="deactivation-zone">
<p>Let us know if you would like to close your account or cancel your subscription.</p>
<p>Requests can take up to 24 hours to process.</p>
<p><span class="bold-700">WARNING: </span>All data will be deleted so please download a complete backup of all your data.</p>
{{#link-to "customize.backup"}}
{{ui/ui-button color=constants.Color.Gray light=true label="Run Backup"}}
{{/link-to}}
{{ui/ui-button-gap}}
{{ui/ui-button color=constants.Color.Red light=true label="Close Account" onClick=(action "onRequestClosure")}}
</div>
</div>
{{/if}}
@ -165,8 +132,9 @@
</form>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
<button type="button" class="btn btn-danger" onclick={{action "onDeactivate"}}>Close Account</button>
{{ui/ui-button color=constants.Color.Gray light=true label=constants.Label.Cancel dismiss=true}}
{{ui/ui-button-gap}}
{{ui/ui-button color=constants.Color.Red light=true label="Close Account" onClick=(action "onDeactivate")}}
</div>
</div>
</div>
@ -181,7 +149,7 @@
<p>If you haven"t already, please run a backup to download all your data.</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">ok</button>
{{ui/ui-button color=constants.Color.Gray light=true label=constants.Label.OK dismiss=true}}
</div>
</div>
</div>

31
gui/app/templates/components/document/document-meta.hbs
View file

@ -1,11 +1,6 @@
{{ui/ui-spacer size=300}}
<div class="document-meta">
{{#link-to "folder.index" space.id space.slug class="no-print"}}
{{ui/ui-button light=true color=constants.Color.Yellow uppercase=false
icon=constants.Icon.ArrowLeft label=space.name}}
{{/link-to}}
{{ui/ui-spacer size=300}}
<div class="title {{if permissions.documentEdit "cursor-pointer"}}" {{action "onEditCategory"}}>CATEGORY / TAG</div>
{{#each selectedCategories as |cat|}}
<div class="meta-label">
@ -31,26 +26,4 @@
<div class="empty">Unassigned</div>
{{/if}}
{{/if}}
{{ui/ui-spacer size=200}}
<div class="title">STATUS</div>
<div class="{{if (eq document.lifecycle constants.Lifecycle.Draft) "label-draft"}}
{{if (eq document.lifecycle constants.Lifecycle.Live) "label-live"}}
{{if (eq document.lifecycle constants.Lifecycle.Archived) "label-archived"}}">
{{document.lifecycleLabel}}
{{#attach-tooltip showDelay=1000}}Lifecycle: Draft &middot; Live &middot; Archived{{/attach-tooltip}}
</div>
<div class="label-approval">
{{#if (eq document.protection constants.ProtectionType.None)}}OPEN{{/if}}
{{#if (eq document.protection constants.ProtectionType.Review)}}PROTECTED{{/if}}
{{#if (eq document.protection constants.ProtectionType.Lock)}}LOCKED{{/if}}
{{#attach-tooltip showDelay=1000}}Change Control: Open &middot; Protected &middot; Locked{{/attach-tooltip}}
</div>
{{#if document.template}}
<div class="label-template">
Template
{{#attach-tooltip showDelay=1000}}This is a template{{/attach-tooltip}}
</div>
{{/if}}
</div>

7
gui/app/templates/components/document/document-toolbar.hbs
View file

@ -13,6 +13,11 @@
tooltip="Save as template" onClick=(action "onShowTemplateModal")}}
{{/if}}
{{#if showActivity}}
{{ui/ui-toolbar-icon icon=constants.Icon.Pulse color=constants.Color.Gray
tooltip="See content activity" linkTo="document.activity"}}
{{/if}}
{{#if showRevisions}}
{{ui/ui-toolbar-icon icon=constants.Icon.TimeBack color=constants.Color.Gray
tooltip="Revisions and rollback" linkTo="document.revisions"}}
@ -56,6 +61,7 @@
</div>
<div class="modal-footer">
{{ui/ui-button color=constants.Color.Gray light=true label=constants.Label.Cancel dismiss=true}}
{{ui/ui-button-gap}}
{{ui/ui-button color=constants.Color.Green light=true label=constants.Label.Delete onClick=(action "onSaveTemplate")}}
</div>
</div>
@ -71,6 +77,7 @@
</div>
<div class="modal-footer">
{{ui/ui-button color=constants.Color.Gray light=true label=constants.Label.Cancel dismiss=true}}
{{ui/ui-button-gap}}
{{ui/ui-button color=constants.Color.Red light=true label=constants.Label.Delete onClick=(action "onDocumentDelete")}}
</div>
</div>

24
gui/app/templates/components/document/settings-category.hbs
View file

@ -3,17 +3,17 @@
desc="Assign one or more categories to help organize content within this space"
icon=constants.Icon.Category}}
{{ui/ui-list-picker items=categories nameField="category" singleSelect=false}}
{{#if categories}}
{{ui/ui-list-picker items=categories nameField="category" singleSelect=false}}
{{#unless categories}}
{{ui/ui-spacer size=300}}
{{ui/ui-button
color=constants.Color.Green
icon=constants.Icon.Category
label=constants.Label.Save
light=true
onClick=(action "onSave")}}
{{else}}
<p class="color-green-700">This space has no categories yet</p>
{{/unless}}
{{ui/ui-spacer size=300}}
{{ui/ui-button
color=constants.Color.Green
icon=constants.Icon.Category
label=constants.Label.Save
light=true
onClick=(action "onSave")}}
{{/if}}

59
gui/app/templates/components/document/sidebar-meta.hbs Normal file
View file

@ -0,0 +1,59 @@
<div class="document-meta">
<div class="title">VERSION</div>
{{#if (gt versions.length 0)}}
{{#ui/ui-toolbar dark=false light=true raised=true large=false bordered=true}}
{{ui/ui-toolbar-label label=document.versionId color=constants.Color.Gray}}
{{#attach-popover class="ember-attacher-popper" hideOn="clickout" showOn="click" isShown=false}}
<div class="menu">
<li class="item header">Select document version</li>
{{#each versions as |version|}}
<a class="item" href="#" {{action "onSelectVersion" version}}>{{version.versionId}}</a>
{{/each}}
</div>
{{/attach-popover}}
{{/ui/ui-toolbar}}
{{else}}
{{#if permissions.spaceManage}}
{{#ui/ui-toolbar dark=false light=true raised=true large=false bordered=true}}
{{ui/ui-toolbar-icon icon=constants.Icon.Plus color=constants.Color.Gray linkTo="document.settings"}}
{{/ui/ui-toolbar}}
{{else}}
<div class="empty">Not versioned</div>
{{/if}}
{{/if}}
{{ui/ui-spacer size=200}}
<div class="title {{if permissions.documentEdit "cursor-pointer"}}" {{action "onEditStatus"}}>STATUS</div>
<div class="{{if (eq document.lifecycle constants.Lifecycle.Draft) "label-draft"}}
{{if (eq document.lifecycle constants.Lifecycle.Live) "label-live"}}
{{if (eq document.lifecycle constants.Lifecycle.Archived) "label-archived"}}">
{{document.lifecycleLabel}}
{{#attach-tooltip showDelay=1000}}Lifecycle: Draft &middot; Live &middot; Archived{{/attach-tooltip}}
</div>
{{#if (eq document.protection constants.ProtectionType.None)}}
<div class="label-open">
OPEN
{{#attach-tooltip showDelay=1000}}Change Control: Open &middot; Protected &middot; Locked{{/attach-tooltip}}
</div>
{{/if}}
{{#if (eq document.protection constants.ProtectionType.Review)}}
<div class="label-protected">
PROTECTED
{{#attach-tooltip showDelay=1000}}Change Control: Open &middot; Protected &middot; Locked{{/attach-tooltip}}
</div>
{{/if}}
{{#if (eq document.protection constants.ProtectionType.Lock)}}
<div class="label-locked">
LOCKED
{{#attach-tooltip showDelay=1000}}Change Control: Open &middot; Protected &middot; Locked{{/attach-tooltip}}
</div>
{{/if}}
{{#if document.template}}
<div class="label-template">
Template
{{#attach-tooltip showDelay=1000}}This is a template{{/attach-tooltip}}
</div>
{{/if}}
</div>

6
gui/app/templates/components/folder/settings-permissions.hbs
View file

@ -195,11 +195,9 @@
</form>
</div>
<div class="modal-footer">
{{ui/ui-button color=constants.Color.Gray light=true
label=constants.Label.Close dismiss=true}}
{{ui/ui-button color=constants.Color.Gray light=true label=constants.Label.Close dismiss=true}}
{{ui/ui-button-gap}}
{{ui/ui-button color=constants.Color.Green light=true
label=constants.Label.Invite onClick=(action "onSpaceInvite")}}
{{ui/ui-button color=constants.Color.Green light=true label=constants.Label.Invite onClick=(action "onSpaceInvite")}}
</div>
</div>
</div>

1
gui/app/templates/components/folder/space-toolbar.hbs
View file

@ -46,6 +46,7 @@
</div>
<div class="modal-footer">
{{ui/ui-button color=constants.Color.Gray light=true label=constants.Label.Cancel dismiss=true}}
{{ui/ui-button-gap}}
{{ui/ui-button color=constants.Color.Green light=true label=constants.Label.Add onClick=(action "onAddEmptyDoc")}}
</div>
</div>

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

@ -36,6 +36,14 @@
</div>
<div class="meta">
{{#if session.isAdmin}}
{{#unless appMeta.valid}}
<div class="invalid-plan" {{action "onBilling"}}>
<i class={{concat "dicon " constants.Icon.Handshake}} />
{{#attach-tooltip}}Invalid product plan{{/attach-tooltip}}
</div>
{{/unless}}
{{/if}}
{{#if session.authenticated}}
{{#if hasPins}}
<div class="bookmarks" id="user-pins-button">