Skip to content

Commit

Permalink
Merge pull request #100 from AdFabConnect/issue_94
Browse files Browse the repository at this point in the history 
Issue 94
  • Loading branch information
@gregorybesson
gregorybesson committed Dec 25, 2016
2 parents 8a87b46 + 3089c72 commit a8a5f84
Show file tree
Hide file tree
Showing 4 changed files with 72 additions and 16 deletions.
1 change: 1 addition & 0 deletions src/cli/cms/data/attributes.js
View file
Expand Up @@ -15,6 +15,7 @@ export function getAll(str, json) {
var attrs = {
autocomplete: null,
desc: '',
hint: '',
display: null,
editable: true,
key: '',
Expand Down
2 changes: 1 addition & 1 deletion src/cli/cms/data/source.js
View file
Expand Up @@ -157,7 +157,7 @@ export function nextDataList(tplPath, jsonPage, match, onlyDynamicSelect) {
obj = cmsData.attributes.sanitizeSourceAttribute(obj, jsonPage)

var type = cmsData.sql.getSourceType(obj.sourceString)

switch (type) {
case 'request':
if (onlyDynamicSelect && obj.editable) {
Expand Down
61 changes: 46 additions & 15 deletions src/cli/cms/editor/handlebars/printInput.js
View file
Expand Up @@ -31,13 +31,23 @@ export function getLabel(params) {
</label>`
}

export function hint(params) {
if (params.hint) {
return `<p class="abe-hint help-block">
<span class="glyphicon glyphicon-info-sign"></span>&nbsp;<em>${params.hint}</em>
</p>`
}

return ''
}

export function createInputSource(attributes, inputClass, params) {
var inputSource = ''
var inputSource = `<div class="parent-${params.type} parent-${params.key}" data-parent="${params.key}">`
var lastValues
if(params.autocomplete != null && params.autocomplete === 'true') {
if(params.sourceString.indexOf('http') === 0) lastValues = params.source
else lastValues = JSON.stringify(params.source).replace(/\'/g, '&quote;')
inputSource += '<div class="autocomplete-result-wrapper">'
inputSource += `<div class="autocomplete-result-wrapper">`
if(params.autocomplete != null && params.autocomplete === 'true' && params.prefill === 'true') {
inputSource += `<div class="autocomplete-refresh" value=''
data-autocomplete-refresh="true"
Expand Down Expand Up @@ -77,6 +87,8 @@ export function createInputSource(attributes, inputClass, params) {

inputSource += '</select>'
}
inputSource += `${hint(params)}</div>`

return inputSource
}

Expand Down Expand Up @@ -105,7 +117,8 @@ export function createInputRich(attributes, inputClass, params) {
{ icon: 'ti-face-smile', title: 'smiley', action: 'smiley', param: '', popup: 'smiley' },
]
if(params.toolbar !== '*') params.toolbar = params.toolbar.split(',')
var inputRich = `<div class="wysiwyg-container rich">
var inputRich = `<div class="parent-${params.type} parent-${params.key}" data-parent="${params.key}">
<div class="wysiwyg-container rich">
<div class="wysiwyg-toolbar wysiwyg-toolbar-top">`

buttons.forEach(function (button) {
Expand All @@ -128,14 +141,17 @@ export function createInputRich(attributes, inputClass, params) {

inputRich += `</div>
<textarea class="${inputClass} form-rich" ${attributes} rows="4">${params.value}</textarea>
</div>`
</div>
${hint(params)}
</div>`

return inputRich
}

export function createInputFile(attributes, inputClass, params) {

return `<div class="input-group file-upload">
return `<div class="parent-${params.type} parent-${params.key}" data-parent="${params.key}">
<div class="input-group file-upload">
<div class="input-group-addon image">
<span class="glyphicon glyphicon-file" aria-hidden="true"></span>
</div>
Expand All @@ -147,24 +163,33 @@ export function createInputFile(attributes, inputClass, params) {
</span>
</div>
</div>
<div class="input-error"></div>`
<div class="input-error"></div>
${hint(params)}
</div>`
}

export function createInputTextarea(attributes, inputClass, params) {
return `<textarea class="${inputClass}" ${attributes} rows="4">${params.value}</textarea>`
return `<div class="parent-${params.type} parent-${params.key}" data-parent="${params.key}">
<textarea class="${inputClass}" ${attributes} rows="4">${params.value}</textarea>
${hint(params)}
</div>`
}

export function createInputLink(attributes, inputClass) {
return `<div class="input-group">
return `<div class="parent-${params.type} parent-${params.key}" data-parent="${params.key}">
<div class="input-group">
<div class="input-group-addon link">
<span class="glyphicon glyphicon-link" aria-hidden="true"></span>
</div>
<input type="text" ${attributes} class="${inputClass}" />
</div>`
</div>
${hint(params)}
</div>`
}

export function createInputImage(attributes, inputClass, params) {
return `<div class="input-group img-upload">
return `<div class="parent-${params.type} parent-${params.key}" data-parent="${params.key}">
<div class="input-group img-upload">
<div class="input-group-addon image">
<span class="glyphicon glyphicon-picture" aria-hidden="true"></span>
</div>
Expand All @@ -176,15 +201,21 @@ export function createInputImage(attributes, inputClass, params) {
</span>
</div>
</div>
<div class="input-error"></div>`
<div class="input-error">
</div>
${hint(params)}
</div>`
}

export function createInputText(attributes, inputClass) {
return `<div class="input-group">
<div class="input-group-addon">
<span class="glyphicon glyphicon-font" aria-hidden="true"></span>
export function createInputText(attributes, inputClass, params) {
return `<div class="parent-${params.type} parent-${params.key}" data-parent="${params.key}">
<div class="input-group">
<div class="input-group-addon">
<span class="glyphicon glyphicon-font" aria-hidden="true"></span>
</div>
<input type="text" ${attributes} class="${inputClass}" />
</div>
${hint(params)}
</div>`
}

Expand Down
24 changes: 24 additions & 0 deletions src/server/sass/modules/_editor.scss
View file
Expand Up @@ -159,4 +159,28 @@ form.text-i18n{
background-color: inherit;
border-color: inherit;
}
}

.abe-hint.help-block {
font-style: italic;
font-size: 12px;
color: #ccc;
margin: 0px 0px 5px 0px;
border: 1px solid #ccc;
border-radius: 3px;
display: block;
padding: 5px 5px 2px 5px;
margin-top: -6px;
border-radius: 3px;
border-top: 0px;
line-height: 20px;
}

.abe-hint.help-block .glyphicon {
color: #5bc0de;
margin-right: 5px;
}

.parent-image .abe-hint.help-block {
width: calc(100% - 42px);
}

0 comments on commit a8a5f84

Please sign in to comment.