diff --git a/domain/section/gemini/gemini.go b/domain/section/gemini/gemini.go index cdc99637..23c60444 100644 --- a/domain/section/gemini/gemini.go +++ b/domain/section/gemini/gemini.go @@ -157,7 +157,6 @@ func (p *Provider) Refresh(ctx *provider.Context, config, data string) (newData func auth(ctx *provider.Context, store *store.Store, w http.ResponseWriter, r *http.Request) { defer r.Body.Close() body, err := ioutil.ReadAll(r.Body) - if err != nil { provider.WriteMessage(w, "gemini", "Bad payload") return @@ -165,7 +164,6 @@ func auth(ctx *provider.Context, store *store.Store, w http.ResponseWriter, r *h var config = geminiConfig{} err = json.Unmarshal(body, &config) - if err != nil { provider.WriteMessage(w, "gemini", "Bad payload") return @@ -177,30 +175,26 @@ func auth(ctx *provider.Context, store *store.Store, w http.ResponseWriter, r *h provider.WriteMessage(w, "gemini", "Missing URL value") return } - if len(config.Username) == 0 { provider.WriteMessage(w, "gemini", "Missing Username value") return } - if len(config.APIKey) == 0 { provider.WriteMessage(w, "gemini", "Missing APIKey value") return } creds := []byte(fmt.Sprintf("%s:%s", config.Username, config.APIKey)) - req, err := http.NewRequest("GET", fmt.Sprintf("%s/api/users/username/%s", config.URL, config.Username), nil) req.Header.Set("Authorization", "Basic "+base64.StdEncoding.EncodeToString(creds)) client := &http.Client{} res, err := client.Do(req) - if err != nil { provider.WriteError(w, "gemini", err) + fmt.Println(err) return } - if res.StatusCode != http.StatusOK { provider.WriteForbidden(w) return @@ -213,9 +207,9 @@ func auth(ctx *provider.Context, store *store.Store, w http.ResponseWriter, r *h dec := json.NewDecoder(res.Body) err = dec.Decode(&g) - if err != nil { provider.WriteError(w, "gemini", err) + fmt.Println(err) return } diff --git a/gui/app/constants/constants.js b/gui/app/constants/constants.js index 1242bda7..68a3b9fc 100644 --- a/gui/app/constants/constants.js +++ b/gui/app/constants/constants.js @@ -217,7 +217,8 @@ let constants = EmberObject.extend({ Category: 'dicon-flag', Checkbox: 'dicon-shape-rectangle', CheckboxChecked: 'dicon-i-check', - Copy: 'dicon-single-copy-04', + Copy: 'dicon-copy', + Cross: 'dicon-i-remove', Database: 'dicon-database', Download: 'dicon-download', Delete: 'dicon-bin', @@ -227,9 +228,10 @@ let constants = EmberObject.extend({ Export2: 'dicon-upload', Filter: 'dicon-sort-tool', Grid1: 'dicon-grid-interface', - Handshake: 'handshake', + Handshake: 'dicon-handshake', Index: 'dicon-align-justify', Integrations: 'dicon-geometry', + Link: 'dicon-link', ListBullet: 'dicon-list-bullet-2', Locked: 'dicon-lock', NotAllowed: 'dicon-ban', @@ -238,12 +240,17 @@ let constants = EmberObject.extend({ Plus: 'dicon-e-add', Person: 'dicon-single-01', People: 'dicon-multiple-19', + Preview: 'dicon-preview', Remove: 'dicon-i-remove', RemoveUser: 'dicon-delete-28', Search: 'dicon-magnifier', Send: 'dicon-send', Settings: 'dicon-settings-gear', Tag: 'dicon-delete-key', + TickSmall: 'dicon-d-check', + Tick: 'dicon-check', + TickSingle: 'dicon-check-single', + TickDouble: 'dicon-check-double', TimeBack: 'dicon-time', TriangleSmallUp: 'dicon-small-triangle-up', TriangleSmallDown: 'dicon-small-triangle-down', @@ -263,6 +270,7 @@ let constants = EmberObject.extend({ Label: { // eslint-disable-line ember/avoid-leaking-state-in-ember-objects Add: 'Add', Activate: "Activate", + Authenticate: 'Authenticate', Cancel: 'Cancel', Close: 'Close', Delete: 'Delete', diff --git a/gui/app/pods/document/section/template.hbs b/gui/app/pods/document/section/template.hbs index cb420a84..1bd42bef 100644 --- a/gui/app/pods/document/section/template.hbs +++ b/gui/app/pods/document/section/template.hbs @@ -1,25 +1,14 @@ -{{#layout/top-bar}} -
  • - {{#link-to "folder.index" model.folder.id model.folder.slug class="link"}} - {{model.folder.name}} - {{/link-to}} -
    • -
  • - {{#link-to "document.index" model.folder.id model.folder.slug model.document.id model.document.slug class="link selected"}} - {{model.document.name}} - {{/link-to}} -
    • -{{/layout/top-bar}} +{{#layout/master-sidebar}} + {{ui/ui-spacer size=300}} -
    -
    -
    -
    - {{document/document-editor document=model.document folder=model.folder page=model.page meta=model.meta onCancel=(action "onCancel") onAction=(action "onAction")}} -
    -
    +
    + {{#link-to "document.index" model.folder.id model.folder.slug model.document.id model.document.slug}} + {{ui/ui-button color=constants.Color.Yellow light=true icon=constants.Icon.ArrowLeft label="Document"}} + {{/link-to}}
    -
    +{{/layout/master-sidebar}} -{{#layout/bottom-bar}} -{{/layout/bottom-bar}} \ No newline at end of file +{{#layout/master-content}} + {{document/document-editor document=model.document folder=model.folder page=model.page meta=model.meta + onCancel=(action "onCancel") onAction=(action "onAction")}} +{{/layout/master-content}} diff --git a/gui/app/styles/core/icon.scss b/gui/app/styles/core/icon.scss index e32da72a..d97f1dd9 100644 --- a/gui/app/styles/core/icon.scss +++ b/gui/app/styles/core/icon.scss @@ -379,7 +379,7 @@ icons content: "\ea42"; } - .dicon-single-copy-04::before { + .dicon-copy::before { content: "\ea43"; } @@ -438,3 +438,27 @@ icons .dicon-ban::before { content: "\ea53"; } + + .dicon-check-single::before { + content: "\ea54"; + } + + .dicon-check-double::before { + content: "\ea55"; + } + + .dicon-check::before { + content: "\ea56"; + } + + .dicon-d-check::before { + content: "\ea57"; + } + + .dicon-preview::before { + content: "\ea58"; + } + + .dicon-link::before { + content: "\ea59"; + } diff --git a/gui/app/styles/core/layout/grid.scss b/gui/app/styles/core/layout/grid.scss index 3bcedaa8..e99137e5 100644 --- a/gui/app/styles/core/layout/grid.scss +++ b/gui/app/styles/core/layout/grid.scss @@ -25,6 +25,10 @@ $display-break-5: 1800px; justify-self: self-start; } + .grid-cell-width-100 { + width: 100%; + } + // X-axis alignment .grid-cell-left { justify-self: self-end; diff --git a/gui/app/styles/core/view/document/section-editor.scss b/gui/app/styles/core/view/document/section-editor.scss index 559e170e..b283bcdf 100644 --- a/gui/app/styles/core/view/document/section-editor.scss +++ b/gui/app/styles/core/view/document/section-editor.scss @@ -1,12 +1,8 @@ .section-editor { - > .edit-title { - margin: 16px 0; - } - > .canvas { - // margin: 34px 0 0 0; padding: 30px 20px; box-shadow: 0 0 0 0.75pt map-get($gray-shades, 200),0 0 3pt 0.75pt map-get($gray-shades, 200); + border: 1px solid map-get($gray-shades, 200); } } diff --git a/gui/app/templates/components/section/airtable/type-editor.hbs b/gui/app/templates/components/section/airtable/type-editor.hbs index 74bb0130..f20cf253 100644 --- a/gui/app/templates/components/section/airtable/type-editor.hbs +++ b/gui/app/templates/components/section/airtable/type-editor.hbs @@ -1,3 +1,8 @@ +{{layout/logo-heading + title="Airtable" + desc="Part spreadsheet, part database, and entirely flexible (https://airtable.com)" + icon=constants.Icon.Integrations}} + {{#section/base-editor document=document folder=folder page=page isDirty=(action "isDirty") onCancel=(action "onCancel") onAction=(action "onAction")}}
    diff --git a/gui/app/templates/components/section/base-editor-inline.hbs b/gui/app/templates/components/section/base-editor-inline.hbs index 6ffbd839..1a12de52 100644 --- a/gui/app/templates/components/section/base-editor-inline.hbs +++ b/gui/app/templates/components/section/base-editor-inline.hbs @@ -1,47 +1,46 @@
    -
    -
    - {{#if blockMode}} -
    - {{focus-input id="page-id-{{pageId}}" value=pageTitle class=(if hasNameError "form-control mousetrap form-control-lg edit-title is-invalid" "form-control form-control-lg edit-title mousetrap") placeholder="Enter name"}} -
    -
    - {{textarea id="page-excerpt-{{pageId}}" value=page.excerpt rows="2" class=(if hasDescError "form-control mousetrap form-control-lg edit-title is-invalid" "form-control form-control-lg edit-title mousetrap") placeholder="Enter description"}} -
    - {{else}} -
    - {{focus-input type="text" id=pageId value=pageTitle class=(if hasNameError "form-control mousetrap form-control-lg edit-title is-invalid" "form-control form-control-lg edit-title mousetrap") placeholder="Enter name"}} -
    - {{/if}} -
    -
    -
    - {{#if busy}} - - {{/if}} - - {{#if contentLinkerButton}} - - {{/if}} - - {{#if previewButton}} -
    {{previewText}}
    - {{/if}} - -
    Save
    -
    Cancel
    +
    +
    +
    +
    + {{#if blockMode}} +
    + {{focus-input id="page-id-{{pageId}}" value=pageTitle placeholder="Enter name" + class=(if hasNameError "form-control mousetrap form-control-lg is-invalid" "form-control form-control-lg mousetrap")}} +
    +
    + {{textarea id="page-excerpt-{{pageId}}" value=page.excerpt rows="2" class=(if hasDescError "form-control mousetrap form-control-lg is-invalid" "form-control form-control-lg mousetrap") placeholder="Enter description"}} +
    + {{else}} +
    + {{focus-input type="text" id=pageId value=pageTitle class=(if hasNameError "form-control mousetrap form-control-lg is-invalid" "form-control form-control-lg mousetrap") placeholder="Enter name"}} +
    + {{/if}} +
    -
    -
    -
    -
    -
    - {{yield}} -
    -
    +
    +
    + {{#if busy}} + + {{/if}} + {{#ui/ui-toolbar dark=false light=true raised=true large=true bordered=true}} + {{#if contentLinkerButton}} + {{ui/ui-toolbar-icon icon=constants.Icon.Link color=constants.Color.Gray + tooltip="Insert Link" onClick=(action "onShowLinkModal")}} + {{/if}} + {{#if previewButton}} + {{ui/ui-toolbar-icon icon=constants.Icon.Preview color=constants.Color.Gray + tooltip="Preview changes" onClick=(action "onPreview")}} + {{/if}} + {{ui/ui-toolbar-icon icon=constants.Icon.Tick color=constants.Color.Green tooltip="Save changes" onClick=(action "onAction")}} + {{ui/ui-toolbar-icon icon=constants.Icon.Cross color=constants.Color.Red tooltip="Cancel editing" onClick=(action "onCancel")}} + {{/ui/ui-toolbar}} +
    +
    +
    +
    + {{yield}} +
    @@ -53,8 +52,8 @@

    You have made changes to the section - continue editing or discard changes?

    - - + {{ui/ui-button color=constants.Color.Gray light=true label="Continue editing" dismiss=true}} + {{ui/ui-button color=constants.Color.Red light=true label="Discard changes" onClick=(action "onDiscard")}}
    diff --git a/gui/app/templates/components/section/base-editor.hbs b/gui/app/templates/components/section/base-editor.hbs index e3798186..727714e0 100644 --- a/gui/app/templates/components/section/base-editor.hbs +++ b/gui/app/templates/components/section/base-editor.hbs @@ -1,32 +1,29 @@ -
    -
    -
    +
    +
    +
    - {{focus-input type="text" id="page-title" value=page.title class=(if hasNameError "form-control mousetrap form-control-lg edit-title is-invalid" "form-control form-control-lg edit-title mousetrap") placeholder="Enter name"}} + {{focus-input type="text" id="page-title" value=page.title class=(if hasNameError "form-control mousetrap form-control-lg is-invalid" "form-control form-control-lg mousetrap") placeholder="Enter name"}}
    {{#if hasExcerpt}}
    - {{textarea id="page-excerpt" value=page.excerpt rows="2" class=(if hasDescError "form-control mousetrap form-control-lg edit-title is-invalid" "form-control form-control-lg edit-title mousetrap") placeholder="Enter description"}} + {{textarea id="page-excerpt" value=page.excerpt rows="2" class=(if hasDescError "form-control mousetrap form-control-lg is-invalid" "form-control form-control-lg mousetrap") placeholder="Enter description"}}
    {{/if}} -
    -
    -
    - {{#if busy}} - - {{/if}} - -
    {{actionLabel}}
    -
    {{cancelLabel}}
    -
    -
    -
    -
    - {{yield}} -
    -
    +
    + {{#if busy}} + + {{/if}} + {{ui/ui-button color=constants.Color.Gray light=true label=cancelLabel onClick=(action "onCancel")}} + {{ui/ui-button-gap}} + {{ui/ui-button color=constants.Color.Green light=true label=actionLabel onClick=(action "onAction")}} +
    +
    + +
    +
    + {{yield}}
    @@ -38,8 +35,8 @@

    You have made changes - continue editing or discard changes?

    - - + {{ui/ui-button color=constants.Color.Gray light=true label="Continue editing" dismiss=true}} + {{ui/ui-button color=constants.Color.Red light=true label="Discard changes" onClick=(action "onDiscard")}}
    diff --git a/gui/app/templates/components/section/flowchart/type-editor.hbs b/gui/app/templates/components/section/flowchart/type-editor.hbs index 3dce12a0..271ea7ef 100644 --- a/gui/app/templates/components/section/flowchart/type-editor.hbs +++ b/gui/app/templates/components/section/flowchart/type-editor.hbs @@ -1,14 +1,13 @@ -{{#section/base-editor document=document folder=folder page=page busy=waiting tip="Concise name that describes the diagram" isDirty=(action "isDirty") onCancel=(action "onCancel") onAction=(action "onAction")}} +{{layout/logo-heading + title="Draw.io" + desc="For making flowcharts, process diagrams, org charts, UML, ER diagrams, network diagrams and much more (https://about.draw.io)" + icon=constants.Icon.Integrations}} + +{{#section/base-editor document=document folder=folder page=page busy=waiting isDirty=(action "isDirty") onCancel=(action "onCancel") onAction=(action "onAction")}}
    -
    -
    -
    - -
    -
    -
    +
    {{/section/base-editor}} diff --git a/gui/app/templates/components/section/gemini/type-editor.hbs b/gui/app/templates/components/section/gemini/type-editor.hbs index 8b4f411c..40c754c3 100644 --- a/gui/app/templates/components/section/gemini/type-editor.hbs +++ b/gui/app/templates/components/section/gemini/type-editor.hbs @@ -1,43 +1,45 @@ -{{#section/base-editor document=document folder=folder page=page busy=waiting tip="Gemini enterprise issue and ticketing software (https://www.countersoft.com)" isDirty=(action "isDirty") onCancel=(action "onCancel") onAction=(action "onAction")}} +{{layout/logo-heading + title="Gemini" + desc="Gemini enterprise issue and ticketing software (https://www.countersoft.com)" + icon=constants.Icon.Integrations}} -
    -
    -
    - - {{focus-input id="gemini-url" type="text" value=config.url class="form-control"}} - e.g. http://helpdesk.countersoft.com -
    -
    - - {{input id="gemini-username" type="text" value=config.username class="form-control"}} - Gemini Username -
    -
    - - {{input id="gemini-apikey" type="password" value=config.APIKey class="form-control"}} - Gemini user API key (from user profile) -
    -
    Authenticate
    -
    - -
    - {{#if authenticated}} +{{#section/base-editor document=document folder=folder page=page busy=waiting isDirty=(action "isDirty") onCancel=(action "onCancel") onAction=(action "onAction")}} +
    +
    - -
      - {{#each workspaces as |card|}} -
    • - {{#attach-tooltip showDelay=1000}}{{card.Title}}{{/attach-tooltip}} -
      {{card.Key}}
      - {{#if card.selected}} -
      ✓
      - {{/if}} -
      • - {{/each}} -
    + + {{focus-input id="gemini-url" type="text" value=config.url class="form-control"}} + e.g. http://helpdesk.countersoft.com
    - {{/if}} +
    + + {{input id="gemini-username" type="text" value=config.username class="form-control"}} + Gemini Username +
    +
    + + {{input id="gemini-apikey" type="password" value=config.APIKey class="form-control"}} + Gemini user API key (from user profile) +
    + {{ui/ui-button color=constants.Color.Green light=true label=constants.Label.Authenticate onClick=(action "auth")}} +
    +
    + {{#if authenticated}} +
    + +
      + {{#each workspaces as |card|}} +
    • + {{#attach-tooltip showDelay=1000}}{{card.Title}}{{/attach-tooltip}} +
      {{card.Key}}
      + {{#if card.selected}} +
      ✓
      + {{/if}} +
      • + {{/each}} +
    +
    + {{/if}} +
    -
    - {{/section/base-editor}} diff --git a/gui/app/templates/components/section/jira/type-editor.hbs b/gui/app/templates/components/section/jira/type-editor.hbs index 5fd4098d..3b765fc0 100644 --- a/gui/app/templates/components/section/jira/type-editor.hbs +++ b/gui/app/templates/components/section/jira/type-editor.hbs @@ -1,39 +1,32 @@ -{{#section/base-editor document=document folder=folder page=page busy=waiting tip="Jira issue tracking" isDirty=(action "isDirty") onCancel=(action "onCancel") onAction=(action "onAction")}} +{{layout/logo-heading + title="Jira Software" + desc="Jira provides issue tracking and agile software" + icon=constants.Icon.Integrations}} -
    -
    - {{#if session.isAdmin}} - {{#link-to "customize.integrations" class="btn btn-outline-secondary bold-700"}} - Configure Jira Connector - {{/link-to}} - {{else}} - {{#unless authenticated}} -

    Your Documize administrator needs to provide Jira connection details before usage.

    - {{/unless}} - {{/if}} -
    -
    -{{#if authenticated}} -
    -
    -
    -
    - - {{focus-input id="jira-jql" type="text" value=config.jql class="form-control" placeholder="e.g. (status = resolved AND project = SysAdmin) OR assignee = bobsmith"}} -
    - -
    -
    -
    - -
    -
    - {{{issuesGrid}}} -
    -
    -{{else}} -

    Jira connector not authenticated

    -{{/if}} +{{#section/base-editor document=document folder=folder page=page busy=waiting isDirty=(action "isDirty") onCancel=(action "onCancel") onAction=(action "onAction")}} + {{#if session.isAdmin}} + {{#link-to "customize.integrations"}} + {{ui/ui-button color=constants.Color.Green light=true label="Configure Jira Connector"}} + {{/link-to}} + {{else}} + {{#unless authenticated}} +

    Your Documize administrator needs to provide Jira connection details before usage.

    + {{/unless}} + {{/if}} + {{#if authenticated}} +
    +
    + + {{focus-input id="jira-jql" type="text" value=config.jql class="form-control" placeholder="e.g. (status = resolved AND project = SysAdmin) OR assignee = bobsmith"}} +
    + {{ui/ui-button color=constants.Color.Green light=true label=constants.Label.Preview submit=true onClick=(action "onPreview")}} +
    + {{ui/ui-spacer size=300}} + {{{issuesGrid}}} + {{else}} + {{ui/ui-spacer size=300}} +

    Jira connector not authenticated

    + {{/if}} {{/section/base-editor}} diff --git a/gui/app/templates/components/section/papertrail/type-editor.hbs b/gui/app/templates/components/section/papertrail/type-editor.hbs index 573c2806..dcca381b 100644 --- a/gui/app/templates/components/section/papertrail/type-editor.hbs +++ b/gui/app/templates/components/section/papertrail/type-editor.hbs @@ -1,44 +1,49 @@ -{{#section/base-editor document=document folder=folder page=page busy=waiting tip="Papertrail cloud logging service (https://papertrailapp.com)" isDirty=(action "isDirty") onCancel=(action "onCancel") onAction=(action "onAction")}} +{{layout/logo-heading + title="Papertrail" + desc="Display your cloud-based logs (https://papertrailapp.com)" + icon=constants.Icon.Integrations}} -
    -
    -
    -
    - - {{focus-input id="papertrail-apitoken" type="password" value=config.APIToken class="form-control"}} - API Token (from your profile) -
    -
    - {{#if authenticated}} - Re-Authenticate - {{else}} - Authenticate - {{/if}} -
    -
    -
    +{{#section/base-editor document=document folder=folder page=page busy=waiting + isDirty=(action "isDirty") onCancel=(action "onCancel") onAction=(action "onAction")}} - {{#if authenticated}} -
    -
    +
    +
    +
    - - {{input id="papertrail-query" type="text" class="form-control mousetrap" value=config.query}} - Determine which log entries you want to display e.g. bob OR ("some phrase" AND sally) + + {{focus-input id="papertrail-apitoken" type="password" value=config.APIToken class="form-control"}} + API Token (from your profile)
    -
    - - {{input id="papertrail-max" type="number" class="form-control mousetrap" value=config.max}} - How many log entries do you want? -
    -
    - - {{ui/ui-select id="group-dropdown" prompt="" content=options.groups action=(action "onGroupsChange") optionValuePath="id" optionLabelPath="name" selection=config.group}} - Optional Papertrail group +
    + {{#if authenticated}} + Re-Authenticate + {{else}} + Authenticate + {{/if}}
    - {{/if}} -
    +
    + {{#if authenticated}} +
    +
    + + {{input id="papertrail-query" type="text" class="form-control mousetrap" value=config.query}} + Determine which log entries you want to display e.g. bob OR ("some phrase" AND sally) +
    +
    + + {{input id="papertrail-max" type="number" class="form-control mousetrap" value=config.max}} + How many log entries do you want? +
    +
    + + {{ui/ui-select id="group-dropdown" prompt="" content=options.groups action=(action "onGroupsChange") optionValuePath="id" optionLabelPath="name" selection=config.group}} + Optional Papertrail group +
    +
    + {{/if}} +
    +
    {{/section/base-editor}} diff --git a/gui/app/templates/components/section/plantuml/type-editor.hbs b/gui/app/templates/components/section/plantuml/type-editor.hbs index c3afe0fb..1ddfdeef 100644 --- a/gui/app/templates/components/section/plantuml/type-editor.hbs +++ b/gui/app/templates/components/section/plantuml/type-editor.hbs @@ -1,36 +1,41 @@ -{{#section/base-editor document=document folder=folder page=page busy=waiting tip="Concise name that describes the diagram" isDirty=(action "isDirty") onCancel=(action "onCancel") onAction=(action "onAction")}} +{{layout/logo-heading + title="PlantUML" + desc="Create UML diagrams from a plain text language (http://plantuml.com)" + icon=constants.Icon.Integrations}} + +{{#section/base-editor document=document folder=folder page=page busy=waiting + isDirty=(action "isDirty") onCancel=(action "onCancel") onAction=(action "onAction")}} +
    -
    -
    -
    -
    - -
    -

    Insert sample diagrams:

    -

    - - - - - - - -

    -
    - {{focus-textarea value=diagramText rows=30 id=editorId class="diagram-editor form-control mousetrap"}} -
    -
    -
    -
    -
    -
    - -
    - -
    -
    -
    +
    + + {{ui/ui-spacer size=200}} +
    +

    Insert sample diagrams:

    +

    + {{ui/ui-button color=constants.Color.Gray light=true label="Sequence" onClick=(action "onInsertSequence")}} + {{ui/ui-button color=constants.Color.Gray light=true label="Use Case" onClick=(action "onInsertUseCase")}} + {{ui/ui-button color=constants.Color.Gray light=true label="Class" onClick=(action "onInsertClass")}} + {{ui/ui-button color=constants.Color.Gray light=true label="Activity" onClick=(action "onInsertActivity")}} + {{ui/ui-button color=constants.Color.Gray light=true label="Activity (new syntax)" onClick=(action "onInsertActivityNew")}} + {{ui/ui-button color=constants.Color.Gray light=true label="Component" onClick=(action "onInsertComponent")}} + {{ui/ui-button color=constants.Color.Gray light=true label="State" onClick=(action "onInsertState")}} +

    + {{focus-textarea value=diagramText rows=30 id=editorId class="diagram-editor form-control mousetrap"}}
    + + {{ui/ui-spacer size=200}} + + {{ui/ui-button color=constants.Color.Yellow light=true label=previewButtonCaption onClick=(action "onPreview")}} + + {{ui/ui-spacer size=200}} + +
    + +
    + + {{ui/ui-spacer size=200}} + {{/section/base-editor}} diff --git a/gui/app/templates/components/section/trello/type-editor.hbs b/gui/app/templates/components/section/trello/type-editor.hbs index 17860fb3..2bb5fa75 100644 --- a/gui/app/templates/components/section/trello/type-editor.hbs +++ b/gui/app/templates/components/section/trello/type-editor.hbs @@ -1,5 +1,9 @@ +{{layout/logo-heading + title="Trello" + desc="Trello is the visual way to manage your projects and organize anything (https://trello.com)" + icon=constants.Icon.Integrations}} + {{#section/base-editor document=document folder=folder page=page busy=busy - tip="Trello is the visual way to manage your projects and organize anything (https://trello.com)" isDirty=(action "isDirty") onCancel=(action "onCancel") onAction=(action "onAction")}} {{#if trelloConfigured}} @@ -30,7 +34,8 @@
    {{/if}} {{else}} -
    Authenticate
    + {{ui/ui-button color=constants.Color.Green light=true + label=constants.Label.Authenticate onClick=(action "auth")}} {{/if}} {{else}} {{#if session.isGlobalAdmin}} diff --git a/gui/public/assets/font/dmzui.eot b/gui/public/assets/font/dmzui.eot index 86644037..3a6480d6 100644 Binary files a/gui/public/assets/font/dmzui.eot and b/gui/public/assets/font/dmzui.eot differ diff --git a/gui/public/assets/font/dmzui.svg b/gui/public/assets/font/dmzui.svg index f5069a24..9d9bcfd1 100644 --- a/gui/public/assets/font/dmzui.svg +++ b/gui/public/assets/font/dmzui.svg @@ -172,7 +172,7 @@ - + + + + + + diff --git a/gui/public/assets/font/dmzui.ttf b/gui/public/assets/font/dmzui.ttf index 4a0864ed..905d88b0 100644 Binary files a/gui/public/assets/font/dmzui.ttf and b/gui/public/assets/font/dmzui.ttf differ diff --git a/gui/public/assets/font/dmzui.woff b/gui/public/assets/font/dmzui.woff index 7141380c..a7b6956a 100644 Binary files a/gui/public/assets/font/dmzui.woff and b/gui/public/assets/font/dmzui.woff differ diff --git a/gui/public/assets/font/dmzui.woff2 b/gui/public/assets/font/dmzui.woff2 index cdd3ab77..02d2bc1b 100644 Binary files a/gui/public/assets/font/dmzui.woff2 and b/gui/public/assets/font/dmzui.woff2 differ