1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-24 07:39:43 +02:00

Merge code between editions

This commit is contained in:
Harvey Kandola 2018-11-07 15:56:05 +00:00
parent d1b803b246
commit 6a9ad7f540
20 changed files with 365 additions and 110 deletions

View file

@ -55,12 +55,22 @@
<div class="col col-6 col-md-3">
<div class="top-bar">
<div class="buttons d-flex flex-wrap align-items-center">
{{#unless appMeta.valid}}
<div class="btn-group">
<div class="button-icon-gold animated infinite wobble slow delay-2s"
data-toggle="tooltip" data-placement="bottom" title="Please select product plan"
{{action 'onBilling'}}>
<i class="material-icons">report</i>
</div>
</div>
<div class="button-icon-gap" />
{{/unless}}
<div class="btn-group">
{{#link-to "search" class="button-icon-white" }}
<i class="material-icons">search</i>
{{/link-to}}
</div>
{{#if session.authenticated}}
{{#if hasPins}}
<div class="button-icon-gap" />
@ -100,14 +110,17 @@
</div>
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="profile-button">
{{#if session.isAdmin}}
{{#link-to 'customize.general' class="dropdown-item" }}Settings{{/link-to}}
{{#link-to 'customize.general' class="dropdown-item"}}Settings{{/link-to}}
{{#unless appMeta.valid}}
{{#link-to 'customize.billing' class="dropdown-item font-weight-bold color-red"}}Update Billing{{/link-to}}
{{/unless}}
<div class="dropdown-divider"></div>
{{/if}}
{{#link-to 'profile' class="dropdown-item" }}Profile{{/link-to}}
<div class="dropdown-divider"></div>
{{#if session.isGlobalAdmin}}
{{#if appMeta.updateAvailable}}
{{#link-to 'customize.license' class="dropdown-item font-weight-bold color-orange" }}Update available{{/link-to}}
{{#link-to 'customize.product' class="dropdown-item font-weight-bold color-orange" }}Update available{{/link-to}}
{{/if}}
{{/if}}
<a href="#" class="dropdown-item {{if hasWhatsNew 'color-whats-new font-weight-bold'}}" {{action 'onShowWhatsNewModal'}}>What's New</a>