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

form styles fixed

This commit is contained in:
Harvey Kandola 2016-11-10 10:15:12 -08:00
parent 8caa53bed7
commit 3965f6e94c
11 changed files with 195 additions and 253 deletions

View file

@ -17,7 +17,7 @@ export default Ember.Component.extend({
didReceiveAttrs() { didReceiveAttrs() {
let editors = this.get('activity.editors'); let editors = this.get('activity.editors');
let viewers = this.get('activity.viewers'); let viewers = this.get('activity.viewers');
let toc = this.get('pages'); let pages = this.get('pages');
let sorted = []; let sorted = [];
if (is.null(editors)) { if (is.null(editors)) {
@ -39,39 +39,28 @@ export default Ember.Component.extend({
Ember.set(item, "changed", item.action === "update-page"); Ember.set(item, "changed", item.action === "update-page");
Ember.set(item, "deleted", item.action === "remove-page"); Ember.set(item, "deleted", item.action === "remove-page");
let page = _.findWhere(toc, { let page = pages.findBy('id', item.pageId);
id: item.pageId
});
let title = ""; let title = "";
if (is.not.undefined(page)) { if (item.deleted || is.undefined(page)) {
title = page.get('title'); title = "removed section";
if (item.added) {
Ember.set(item, 'changeLabel', "added " + title);
}
if (item.changed) {
Ember.set(item, 'changeLabel', "changed " + title);
}
} else { } else {
Ember.set(item, "deleted", true);
if (item.added) { if (item.added) {
Ember.set(item, 'changeLabel', "added section (since removed)"); title = "added " + page.get('title');
} }
if (item.changed) { if (item.changed) {
Ember.set(item, 'changeLabel', "changed section (since removed)"); title = "changed " + page.get('title');
}
if (item.deleted) {
Ember.set(item, 'changeLabel', "removed section");
} }
} }
sorted.pushObject({ date: item.created, item: item }); Ember.set(item, 'changeLabel', title);
let exists = sorted.findBy('item.pageId', item.pageId);
if (is.undefined(exists)) {
sorted.pushObject({ date: item.created, item: item });
}
}); });
this.set('sortedItems', _.sortBy(sorted, 'date').reverse()); this.set('sortedItems', _.sortBy(sorted, 'date').reverse());

View file

@ -10,16 +10,16 @@ export default Ember.Controller.extend(NotifierMixin, {
}, },
onAddSection(section) { onAddSection(section) {
this.audit.record("added-section");
this.audit.record("added-section-" + section.get('contentType')); this.audit.record("added-section-" + section.get('contentType'));
let page = { let page = {
documentId: this.get('model.document.id'), documentId: this.get('model.document.id'),
title: `${section.get('title')} Section`, title: `${section.get('title')}`,
level: 1, level: 1,
sequence: 2048, sequence: 2048,
body: "", body: "",
contentType: section.get('contentType') contentType: section.get('contentType'),
pageType: section.get('pageType')
}; };
let data = this.get('store').normalize('page', page); let data = this.get('store').normalize('page', page);
@ -40,7 +40,7 @@ export default Ember.Controller.extend(NotifierMixin, {
}; };
this.get('documentService').addPage(this.get('model.document.id'), model).then((newPage) => { this.get('documentService').addPage(this.get('model.document.id'), model).then((newPage) => {
this.transitionToRoute('document.edit', this.transitionToRoute('document.section',
this.get('model.folder.id'), this.get('model.folder.id'),
this.get('model.folder.slug'), this.get('model.folder.slug'),
this.get('model.document.id'), this.get('model.document.id'),

View file

@ -29,6 +29,11 @@
> a { > a {
color: $color-gray; color: $color-gray;
@include ease-in();
&:hover {
color: $color-link;
}
} }
> .active { > .active {
@ -44,13 +49,14 @@
.add-tab { .add-tab {
display: inline-block; display: inline-block;
vertical-align: text-top; vertical-align: text-top;
@include ease-in();
> i { > i {
font-size: 1.5rem; font-size: 1.5rem;
color: $color-gray; color: $color-gray;
&:hover { &:hover {
color: $color-green; color: $color-link;
} }
} }
} }
@ -72,6 +78,7 @@
padding: 0; padding: 0;
color: $color-gray; color: $color-gray;
cursor: pointer; cursor: pointer;
@include ease-in();
&:hover { &:hover {
color: $color-link; color: $color-link;

View file

@ -10,8 +10,9 @@
font-size: 1.3rem; font-size: 1.3rem;
list-style: none; list-style: none;
cursor: pointer; cursor: pointer;
@extend .no-select;
color: $color-off-black; color: $color-off-black;
@extend .no-select;
@include ease-in();
&:hover { &:hover {
color: $color-link; color: $color-link;

View file

@ -1,25 +1,26 @@
<div class="document-section"> <div class="document-section">
{{#if viewMode}} {{#if viewMode}}
<div class="toolbar pull-right"> <div class="wysiwyg">
<div class="buttons"> <div>
<div class="round-button-mono" {{action 'onEdit'}}> <h1 class="pull-left">{{model.page.title}}</h1>
<i class="material-icons color-gray">edit</i> <div class="toolbar pull-right">
</div> <div class="buttons">
<div class="button-gap"></div> <div class="round-button-mono" {{action 'onEdit'}}>
<div class="round-button-mono" id="delete-section-button"> <i class="material-icons color-gray">edit</i>
<i class="material-icons color-gray">delete</i> </div>
<div class="button-gap"></div>
<div class="round-button-mono" id="delete-section-button">
<i class="material-icons color-gray">delete</i>
</div>
</div>
</div> </div>
</div> </div>
</div> <div class="clearfix" />
<div class="clearfix"/> {{#dropdown-dialog target="delete-section-button" position="bottom right" button="Delete" color="flat-red" onAction=(action 'onDelete')}}
{{#dropdown-dialog target="delete-section-button" position="bottom right" button="Delete" color="flat-red" onAction=(action 'onDelete')}} <p>Are you sure you want to delete this section?</p>
<p>Are you sure you want to delete this section?</p> <p>There is no undo!</p>
<p>There is no undo!</p> {{/dropdown-dialog}}
{{/dropdown-dialog}}
<div class="wysiwyg">
<h1>{{model.page.title}}</h1>
{{section/base-renderer page=model.page}} {{section/base-renderer page=model.page}}
</div> </div>
{{/if}} {{/if}}
@ -27,5 +28,4 @@
{{#if editMode}} {{#if editMode}}
{{document/document-editor document=model.document folder=model.folder page=model.page meta=model.meta onCancel=(action 'onCancel') onAction=(action 'onAction')}} {{document/document-editor document=model.document folder=model.folder page=model.page meta=model.meta onCancel=(action 'onCancel') onAction=(action 'onAction')}}
{{/if}} {{/if}}
</div> </div>

View file

@ -1,15 +1,8 @@
{{#section/base-editor document=document folder=folder page=page isDirty=(action 'isDirty') onCancel=(action 'onCancel') {{#section/base-editor document=document folder=folder page=page isDirty=(action 'isDirty') onCancel=(action 'onCancel')
onAction=(action 'onAction')}} onAction=(action 'onAction')}}
<div class="input-form"> <div class="input-control">
<form> <label>Airtable embed code</label>
<div class="heading"> <div class="tip">Paste the Airtable embed code snippet</div>
<div class="title">Airtable</div> {{textarea value=data rows="3" id="airtable-embed-code" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"}}
<div class="tip">Paste the Airtable embed code snippet</div>
</div>
<div class="input-control">
<label>Embed Code</label>
{{textarea value=data rows="3" id="airtable-embed-code" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"}}
</div>
</form>
</div> </div>
{{/section/base-editor}} {{/section/base-editor}}

View file

@ -4,7 +4,7 @@
<div class="input-control"> <div class="input-control">
<label>Title</label> <label>Title</label>
<div class="tip">{{tip}}</div> <div class="tip">{{tip}}</div>
{{input type='text' id="page-title" value=page.title class="mousetrap"}} {{focus-input type='text' id="page-title" value=page.title class="mousetrap"}}
</div> </div>
</div> </div>
<div class="buttons pull-right"> <div class="buttons pull-right">

View file

@ -1,53 +1,41 @@
{{#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')}} {{#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')}}
<div class="pull-left" style="width: 45%;"> <div class="pull-left width-45">
<div class="input-form"> <div class="input-control">
<form> <label>Gemini URL</label>
<div class="heading"> <div class="tip">e.g. http://helpdesk.countersoft.com</div>
<div class="title">Credentials</div> {{focus-input id="gemini-url" type="text" value=config.url readonly=isReadonly}}
<div class="tip">URL to the Gemini instance</div>
</div>
<div class="input-control">
<label>Gemini URL</label>
<div class="tip">e.g. http://helpdesk.countersoft.com</div>
{{focus-input id="gemini-url" type="text" value=config.url readonly=isReadonly}}
</div>
<div class="input-control">
<label>Username</label>
<div class="tip">Gemini username</div>
{{input id="gemini-username" type="text" value=config.username readonly=isReadonly}}
</div>
<div class="input-control">
<label>API Key</label>
<div class="tip">Gemini user API key (from user profile)</div>
{{input id="gemini-apikey" type="password" value=config.APIKey readonly=isReadonly}}
</div>
<div class="regular-button button-blue" {{ action 'auth' }}>Authenticate</div>
</form>
</div> </div>
<div class="input-control">
<label>Username</label>
<div class="tip">Gemini username</div>
{{input id="gemini-username" type="text" value=config.username readonly=isReadonly}}
</div>
<div class="input-control">
<label>API Key</label>
<div class="tip">Gemini user API key (from user profile)</div>
{{input id="gemini-apikey" type="password" value=config.APIKey readonly=isReadonly}}
</div>
<div class="regular-button button-blue" {{ action 'auth' }}>Authenticate</div>
</div> </div>
<div class="pull-left margin-left-40" style="width: 45%;"> <div class="pull-left margin-left-40 width-45">
{{#if authenticated}} {{#if authenticated}}
<div class="input-form"> <div class="input-control">
<form> <label>Workspace</label>
<div class="heading"> <div class="tip">Select Gemini workspace for source of items to be displayed</div>
<div class="title">Workspace</div> <ul class="section-gemini-workspaces">
<div class="tip">Select Gemini workspace for source of items to be displayed</div> {{#each workspaces as |card|}}
</div> <li class="section-gemini-workspace" data-tooltip="{{card.Title}}" data-tooltip-position="bottom center" id="gemini-workspace-{{card.Id}}">
<ul class="section-gemini-workspaces"> <div class="section-gemini-card" style="background-color:{{card.Color}};" {{action 'onWorkspaceChange' card.Id}}>{{card.Key}}</div>
{{#each workspaces as |card|}} {{#if card.selected}}
<li class="section-gemini-workspace" data-tooltip="{{card.Title}}" data-tooltip-position="bottom center" id="gemini-workspace-{{card.Id}}"> <div class="section-gemini-selected-card">&#10003;</div>
<div class="section-gemini-card" style="background-color:{{card.Color}};" {{action 'onWorkspaceChange' card.Id}}>{{card.Key}}</div> {{/if}}
{{#if card.selected}} </li>
<div class="section-gemini-selected-card">&#10003;</div> {{/each}}
{{/if}} </ul>
</li>
{{/each}}
</ul>
<div class="clearfix" />
</form>
</div> </div>
<div class="clearfix" />
{{/if}} {{/if}}
</div> </div>

View file

@ -1,74 +1,62 @@
{{#section/base-editor document=document folder=folder page=page busy=busy tip="GitHub is how people build software. (https://github.com)" isDirty=(action 'isDirty') onCancel=(action 'onCancel') onAction=(action 'onAction')}} {{#section/base-editor document=document folder=folder page=page busy=busy tip="GitHub is how people build software. (https://github.com)" isDirty=(action 'isDirty') onCancel=(action 'onCancel') onAction=(action 'onAction')}}
<div class="section-github-editor"> <div class="section-github-editor">
{{#if authenticated}}
{{#if authenticated}} <div class="pull-left width-45">
<div class="input-control">
<div class="pull-left width-45"> <label>Select repository</label>
<div class="input-control"> <div class="tip">Select organization or user whose repository you want to show</div>
<label>Select repository</label> {{ui-select id="owners-dropdown" content=owners action=(action 'onOwnerChange') optionValuePath="id" optionLabelPath="name" selection=config.owner}}
<div class="tip">Select organization or user whose repository you want to show</div> </div>
{{ui-select id="owners-dropdown" content=owners action=(action 'onOwnerChange') optionValuePath="id" optionLabelPath="name" selection=config.owner}} <div class="input-control">
</div> <label>Show items since</label>
<div class="input-control"> <div class="tip">default is 7 days ago</div>
<label>Show items since</label> {{input id="branch-since" value=config.branchSince type="text" }}<br>
<div class="tip">default is 7 days ago</div> </div>
{{input id="branch-since" value=config.branchSince type="text" }}<br> <div class="input-control">
</div> <label>GitHub Views</label>
<div class="input-control"> <div class="tip">Select the views you want to show</div>
<label>GitHub Views</label> <div class="github-view">
<div class="tip">Select the views you want to show</div> {{input id="show-milestone" checked=config.showMilestones type="checkbox"}}
<div class="github-view"> <label>Show Milestones</label>
{{input id="show-milestone" checked=config.showMilestones type="checkbox"}} {{input id="show-issues" checked=config.showIssues type="checkbox"}}
<label>Show Milestones</label> <label>Show Issues</label>
{{input id="show-issues" checked=config.showIssues type="checkbox"}} {{input id="show-commits" checked=config.showCommits type="checkbox" }}
<label>Show Issues</label> <label>Show Commits</label>
{{input id="show-commits" checked=config.showCommits type="checkbox" }} </div>
<label>Show Commits</label>
</div> </div>
</div> </div>
</div>
<div class="pull-left width-10">&nbsp;</div> <div class="pull-left width-10">&nbsp;</div>
<div class="pull-left width-45"> <div class="pull-left width-45">
<div class="input-form"> <div class="input-form">
<div class="input-control"> <div class="input-control">
<label>Repositories</label> <label>Repositories</label>
<div class="tip">Select the repository to show</div> <div class="tip">Select the repository to show</div>
<div class="github-board"> <div class="github-board">
{{#each config.lists as |list|}} {{#each config.lists as |list|}}
<div class="github-list" {{action 'onListCheckbox' list.id}}> <div class="github-list" {{action 'onListCheckbox' list.id}}>
{{#if list.included}} {{#if list.included}}
<i class="material-icons widget-checkbox checkbox-gray github-list-checkbox">check_box</i> <i class="material-icons widget-checkbox checkbox-gray github-list-checkbox">check_box</i>
{{else}} {{else}}
<i class="material-icons widget-checkbox checkbox-gray github-list-checkbox">check_box_outline_blank</i> <i class="material-icons widget-checkbox checkbox-gray github-list-checkbox">check_box_outline_blank</i>
{{/if}} {{/if}}
<span class="github-list-title">{{list.repo}} {{#if list.private}}(private){{/if}}</span> <span class="github-list-title">{{list.repo}} {{#if list.private}}(private){{/if}}</span>
</div> </div>
{{/each}} {{/each}}
<div class="clearfix" />
</div>
</div> </div>
</div> <div class="clearfix" />
</div>
{{else}}
<div class="pull-left width-50">
<div class="input-form">
<form>
<div class="heading">
<div class="title">Authentication</div>
<div class="tip">Click to authenticate with Github</div>
</div> </div>
<div class="regular-button button-blue" {{ action 'auth' }}>Authenticate</div> </div>
</form>
</div> </div>
</div> {{else}}
<div class="pull-left width-45">
{{/if}} <div class="input-control">
<label>Authentication</label>
<div class="tip">Click to authenticate with Github</div>
</div>
<div class="regular-button button-blue" {{ action 'auth' }}>Authenticate</div>
</div>
{{/if}}
</div> </div>
{{/section/base-editor}} {{/section/base-editor}}

View file

@ -1,58 +1,42 @@
{{#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')}} {{#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')}}
<div class="pull-left width-45"> <div class="pull-left width-45">
<div class="input-form"> <form {{ action 'auth' on="submit" }} >
<form {{ action 'auth' on="submit" }} > <div class="input-control">
<div class="heading"> <label>Papertrail API Key</label>
<div class="title">Papertrail Authentication <div class="tip">API Token (from your profile)</div>
{{#if authenticated}} {{focus-input id="papertrail-apitoken" type="password" value=config.APIToken }}
Complete </div>
{{/if}} <div class="regular-button button-blue" {{ action 'auth' }} >
</div> {{#if authenticated}}
<div class="tip">Provide your Papertrail API token</div> Re-Authenticate
</div> {{else}}
<div class="input-control"> Authenticate
<label>API Key</label> {{/if}}
<div class="tip">API Token (from your profile)</div> </div>
{{focus-input id="papertrail-apitoken" type="password" value=config.APIToken }} </form>
</div>
<div class="regular-button button-blue" {{ action 'auth' }} >
{{#if authenticated}}
Re-Authenticate
{{else}}
Authenticate
{{/if}}
</div>
</form>
</div>
</div> </div>
{{#if authenticated}} {{#if authenticated}}
<div class="pull-left width-10">&nbsp;</div> <div class="pull-left width-10">&nbsp;</div>
<div class="pull-left width-45"> <div class="pull-left width-45">
<div class="input-form"> <form {{action 'onAction' on="submit"}}>
<form {{action 'onAction' on="submit"}}> <div class="input-control">
<div class="heading"> <label>Search query</label>
<div class="title">Log Filter</div> <div class="tip">Determine which log entries you want to display e.g. bob OR ("some phrase" AND sally)</div>
<div class="tip">Determine which log entries you want to display</div> {{input id="papertrail-query" type="text" class="mousetrap" value=config.query}}
</div> </div>
<div class="input-control"> <div class="input-control">
<label>Search Query</label> <label>Maximum results</label>
<div class="tip">e.g. bob OR ("some phrase" AND sally)</div> <div class="tip">How many log entries do you want?</div>
{{input id="papertrail-query" type="text" class="mousetrap" value=config.query}} {{input id="papertrail-max" type="number" class="mousetrap" value=config.max}}
</div> </div>
<div class="input-control"> <div class="input-control">
<label>Maximum Results</label> <label>Group</label>
<div class="tip">How many log entries do you want?</div> <div class="tip">Optional Papertrail group</div>
{{input id="papertrail-max" type="number" class="mousetrap" value=config.max}} {{ui-select id="group-dropdown" prompt="<group>" content=options.groups action=(action 'onGroupsChange') optionValuePath="id" optionLabelPath="name" selection=config.group}}
</div> </div>
<div class="input-control"> </form>
<label>Group</label>
<div class="tip">Optional Papertrail group</div>
{{ui-select id="group-dropdown" prompt="<group>" content=options.groups action=(action 'onGroupsChange') optionValuePath="id" optionLabelPath="name" selection=config.group}}
</div>
</form>
</div>
</div> </div>
{{/if}} {{/if}}

View file

@ -49,50 +49,42 @@
<div class="pull-left width-10">&nbsp;</div> <div class="pull-left width-10">&nbsp;</div>
--> -->
<div class="pull-left width-45"> <div class="pull-left width-45">
<div class="input-form"> <div class="input-control">
<div class="input-control"> <label>Individual Board</label>
<label>Individual Board</label> <div class="tip">Select board</div>
<div class="tip">Select board</div> {{ui-select id="boards-dropdown" content=boards action=(action 'onBoardChange') optionValuePath="id" optionLabelPath="namePath" selection=config.board}}
{{ui-select id="boards-dropdown" content=boards action=(action 'onBoardChange') optionValuePath="id" optionLabelPath="namePath" selection=config.board}}
</div>
{{#if config.board.id}}
<div class="input-control">
<label>Lists</label>
<div class="tip">Select lists to include</div>
<div class="section-trello-board" style= {{boardStyle}}>
<div class="section-trello-board-title">{{config.board.name}}</div>
{{#each config.lists as |list|}}
<div class="section-trello-list" {{action 'onListCheckbox' list.id}}>
{{#if list.included}}
<i class="material-icons widget-checkbox checkbox-gray section-trello-list-checkbox">check_box</i>
{{else}}
<i class="material-icons widget-checkbox checkbox-gray section-trello-list-checkbox">check_box_outline_blank</i>
{{/if}}
<span class="trello-list-title">{{list.name}}</span>
</div>
{{/each}}
<div class="clearfix" />
</div>
</div>
{{/if}}
</div>
</div> </div>
{{/if}} {{#if config.board.id}}
<div class="input-control">
{{else}} <label>Lists</label>
<div class="tip">Select lists to include</div>
<div class="pull-left width-50"> <div class="section-trello-board" style= {{boardStyle}}>
<div class="input-form"> <div class="section-trello-board-title">{{config.board.name}}</div>
<form> {{#each config.lists as |list|}}
<div class="heading"> <div class="section-trello-list" {{action 'onListCheckbox' list.id}}>
<div class="title">Authentication</div> {{#if list.included}}
<div class="tip">Click to authenticate with Trello</div> <i class="material-icons widget-checkbox checkbox-gray section-trello-list-checkbox">check_box</i>
{{else}}
<i class="material-icons widget-checkbox checkbox-gray section-trello-list-checkbox">check_box_outline_blank</i>
{{/if}}
<span class="trello-list-title">{{list.name}}</span>
</div>
{{/each}}
</div>
<div class="clearfix" />
</div> </div>
<div class="regular-button button-blue" {{ action 'auth' }}>Authenticate</div> {{/if}}
</form>
</div> </div>
{{/if}}
{{else}}
<div class="pull-left width-50">
<div class="input-control">
<label>Authentication</label>
<div class="tip">Click to authenticate with Trello</div>
</div>
<div class="regular-button button-blue" {{ action 'auth' }}>Authenticate</div>
</div> </div>
{{/if}} {{/if}}
</div> </div>
{{/section/base-editor}} {{/section/base-editor}}