Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-24 23:59:47 +02:00
Code Releases Activity

Sync with Enterprise edition changes

Browse source
This commit is contained in:
McMatts 2019-05-29 12:49:20 +01:00
parent c870547fa1
commit bae7909801
5 changed files with 96 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gui/app/components/layout/grid/sidebar-go-top.js
View file

@ -9,7 +9,6 @@
// //
// https://documize.com // https://documize.com
import browser from '../../../services/browser';
import Component from '@ember/component'; import Component from '@ember/component';
export default Component.extend({ export default Component.extend({

39
gui/app/pods/auth/share/template.hbs
View file

@ -1,20 +1,25 @@
{{#layout/master-sidebar hideNavigation=true}} <Layout::MasterNavigation @hideNavigation={{true}} />
<Ui::UiSpacer @size="300" /> <Layout::MasterToolbar />
<div class="section">
<div class="title">welcome to documize</div>
<p>Let's set up your account and you started</p>
</div>
{{/layout/master-sidebar}}
{{#layout/master-content}} <Layout::Grid::Container>
{{layout/logo-heading <Layout::Grid::Sidebar>
title=appMeta.title <div class="sidebar-content">
desc=appMeta.message <div class="section">
logo=true}} <div class="title">welcome to documize</div>
<p>Let's set up your account and you started</p>
</div>
</div>
</Layout::Grid::Sidebar>
{{onboard/share-folder <Layout::Grid::Content>
serial=serial {{layout/logo-heading
folderId=folderId title=appMeta.title
slug=slug}} desc=appMeta.message
{{/layout/master-content}} logo=true}}
{{onboard/share-folder
serial=serial
folderId=folderId
slug=slug}}
</Layout::Grid::Content>
</Layout::Grid::Container>

2
gui/app/pods/document/index/template.hbs
View file

@ -134,5 +134,3 @@
onAttachmentDelete=(action "onAttachmentDelete")}} onAttachmentDelete=(action "onAttachmentDelete")}}
</Layout::Grid::Content> </Layout::Grid::Content>
</Layout::Grid::Container> </Layout::Grid::Container>

2
gui/app/styles/core/layout/toolbar.scss
View file

@ -45,7 +45,7 @@
&:hover { &:hover {
> .dicon { > .dicon {
color: $theme-400 !important; color: $color-white !important;
} }
} }
} }

146
gui/app/templates/components/layout/master-navigation.hbs
View file

@ -1,7 +1,7 @@
<div class="navbar"> <div class="navbar">
<div class="container"> <div class="container">
<div class="options"> {{#unless hideNavigation}}
{{#unless hideNavigation}} <div class="options">
{{#link-to "folders" class=(if (eq selectedItem "spaces") "option selected" "option")}} {{#link-to "folders" class=(if (eq selectedItem "spaces") "option selected" "option")}}
<i class={{concat "dicon " constants.Icon.Grid}}> <i class={{concat "dicon " constants.Icon.Grid}}>
{{#attach-tooltip showDelay=1000}}Spaces{{/attach-tooltip}} {{#attach-tooltip showDelay=1000}}Spaces{{/attach-tooltip}}
@ -33,83 +33,83 @@
{{#attach-tooltip showDelay=1000}}Search{{/attach-tooltip}} {{#attach-tooltip showDelay=1000}}Search{{/attach-tooltip}}
</i> </i>
{{/link-to}} {{/link-to}}
{{/unless}} </div>
</div>
<div class="options"> <div class="options">
{{#if session.isAdmin}} {{#if session.isAdmin}}
{{#unless appMeta.valid}} {{#unless appMeta.valid}}
<div class="option invalid-plan" {{action "onBilling"}}> <div class="option invalid-plan" {{action "onBilling"}}>
<i class={{concat "dicon " constants.Icon.Announce}} /> <i class={{concat "dicon " constants.Icon.Announce}} />
{{#attach-tooltip}}Invalid product plan{{/attach-tooltip}} {{#attach-tooltip}}Invalid product plan{{/attach-tooltip}}
</div> </div>
{{/unless}} {{/unless}}
{{/if}}
{{#if session.authenticated}}
{{#if hasPins}}
<div class="option" id="user-pins-button">
<i class={{concat "dicon " constants.Icon.BookmarkSolid}}></i>
{{#attach-popover class="ember-attacher-popper" hideOn="clickout click" showOn="click" isShown=false}}
<div class="menu">
{{#if hasSpacePins}}
<li class="item header">Spaces</li>
{{#each spacePins as |pin|}}
<a class="item" href="#" {{action "jumpToPin" pin}} data-id= {{pin.id}} id="pin-{{pin.id}}">{{pin.pin}}</a>
{{/each}}
{{/if}}
{{#if hasDocumentPins}}
<li class="item header">Content</li>
{{#each documentPins as |pin|}}
<a class="item" href="#" {{action "jumpToPin" pin}} data-id= {{pin.id}} id="pin-{{pin.id}}">{{pin.pin}}</a>
{{/each}}
{{/if}}
</div>
{{/attach-popover}}
</div>
{{/if}} {{/if}}
<div class="user-gravatar-container"> {{#if session.authenticated}}
<div class="user-gravatar" id="profile-button"> {{#if hasPins}}
{{session.user.initials}} <div class="option" id="user-pins-button">
{{#if hasWhatsNew}} <i class={{concat "dicon " constants.Icon.BookmarkSolid}}></i>
<div class="whats-new-dot" /> {{#attach-popover class="ember-attacher-popper" hideOn="clickout click" showOn="click" isShown=false}}
{{/if}} <div class="menu">
{{#if session.isGlobalAdmin}} {{#if hasSpacePins}}
{{#if appMeta.updateAvailable}} <li class="item header">Spaces</li>
<div class="update-available-dot" /> {{#each spacePins as |pin|}}
{{/if}} <a class="item" href="#" {{action "jumpToPin" pin}} data-id= {{pin.id}} id="pin-{{pin.id}}">{{pin.pin}}</a>
{{/if}} {{/each}}
{{#attach-popover class="ember-attacher-popper" hideOn="clickout click" showOn="click" isShown=false}}
<div class="menu">
{{#link-to "profile" class="item"}}Profile{{/link-to}}
{{#if session.isAdmin}}
<div class="divider"></div>
{{#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}}
{{#if session.isGlobalAdmin}}
{{#if appMeta.updateAvailable}}
{{#link-to "customize.product" class="item bold yellow"}}Update available{{/link-to}}
{{/if}} {{/if}}
{{#if hasDocumentPins}}
<li class="item header">Content</li>
{{#each documentPins as |pin|}}
<a class="item" href="#" {{action "jumpToPin" pin}} data-id= {{pin.id}} id="pin-{{pin.id}}">{{pin.pin}}</a>
{{/each}}
{{/if}}
</div>
{{/attach-popover}}
</div>
{{/if}}
<div class="user-gravatar-container">
<div class="user-gravatar" id="profile-button">
{{session.user.initials}}
{{#if hasWhatsNew}}
<div class="whats-new-dot" />
{{/if}}
{{#if session.isGlobalAdmin}}
{{#if appMeta.updateAvailable}}
<div class="update-available-dot" />
{{/if}} {{/if}}
<div class="divider"></div> {{/if}}
<a class={{if hasWhatsNew "item bold red" "item"}} href="#" {{action "onNew"}}>What's New</a> {{#attach-popover class="ember-attacher-popper" hideOn="clickout click" showOn="click" isShown=false}}
<a href="https://docs.documize.com" target="_blank" class="item">Help</a> <div class="menu">
{{#if enableLogout}} {{#link-to "profile" class="item"}}Profile{{/link-to}}
{{#if session.isAdmin}}
<div class="divider"></div>
{{#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}}
{{#if session.isGlobalAdmin}}
{{#if appMeta.updateAvailable}}
{{#link-to "customize.product" class="item bold yellow"}}Update available{{/link-to}}
{{/if}}
{{/if}}
<div class="divider"></div> <div class="divider"></div>
{{#link-to "auth.logout" class="item"}}Logout{{/link-to}} <a class={{if hasWhatsNew "item bold red" "item"}} href="#" {{action "onNew"}}>What's New</a>
{{/if}} <a href="https://docs.documize.com" target="_blank" class="item">Help</a>
</div> {{#if enableLogout}}
{{/attach-popover}} <div class="divider"></div>
{{#link-to "auth.logout" class="item"}}Logout{{/link-to}}
{{/if}}
</div>
{{/attach-popover}}
</div>
</div> </div>
</div> {{else}}
{{else}} {{#link-to "auth.login" class="option"}}
{{#link-to "auth.login" class="option"}} {{constants.Label.Login}}
{{constants.Label.Login}} {{/link-to}}
{{/link-to}} {{/if}}
{{/if}} </div>
</div> {{/unless}}
</div> </div>
</div> </div>