From ed139e81ae239ce72390bb3156fc38168edcae58 Mon Sep 17 00:00:00 2001 From: Dave Snider Date: Tue, 25 Mar 2014 13:17:10 -0700 Subject: [PATCH 1/3] add helper for truncate string, start working on list values --- app/helpers/truncate-string.js | 12 ++++++++++++ app/styles/_app_content_list.sass | 6 ++++++ app/templates/wh/content/type/index.hbs | 2 +- app/templates/widgets/value/_audio.hbs | 3 +++ app/templates/widgets/value/_file.hbs | 4 ++++ app/templates/widgets/value/_gallery.hbs | 5 +++++ app/templates/widgets/value/_image.hbs | 2 +- app/templates/widgets/value/_markdown.hbs | 2 +- app/templates/widgets/value/_number.hbs | 1 + config/environment.js | 2 +- 10 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 app/helpers/truncate-string.js diff --git a/app/helpers/truncate-string.js b/app/helpers/truncate-string.js new file mode 100644 index 00000000..e2bf4429 --- /dev/null +++ b/app/helpers/truncate-string.js @@ -0,0 +1,12 @@ +export default Ember.Handlebars.makeBoundHelper(function(str,len) { + if (!str || !len) { return str; } + if (str.length > len && str.length > 0) { + var new_str = str + " "; + new_str = str.substr (0, len); + new_str = str.substr (0, new_str.lastIndexOf(" ")); + new_str = (new_str.length > 0) ? new_str : str.substr (0, len); + + return new Ember.Handlebars.SafeString ( new_str +'...' ); + } + return str; +}); diff --git a/app/styles/_app_content_list.sass b/app/styles/_app_content_list.sass index 552f1575..346663b9 100644 --- a/app/styles/_app_content_list.sass +++ b/app/styles/_app_content_list.sass @@ -39,3 +39,9 @@ margin: 0 line-height: 1 text-transform: capitalize + +.wh-content td + &.gallery + img + border-radius: 50px + margin-right: $base-line-height / 4 diff --git a/app/templates/wh/content/type/index.hbs b/app/templates/wh/content/type/index.hbs index 79797c60..4ab7ac64 100644 --- a/app/templates/wh/content/type/index.hbs +++ b/app/templates/wh/content/type/index.hbs @@ -53,7 +53,7 @@ {{#each item in sortedCmsItems}} {{#link-to 'wh.content.type.edit' contentTypeNav.id item.id tagName="tr"}} {{#each item.cmsControls}} - {{partial this.controlType.valuePartialPath}} + {{partial this.controlType.valuePartialPath}} {{/each}} {{#if item.lockedBy}} diff --git a/app/templates/widgets/value/_audio.hbs b/app/templates/widgets/value/_audio.hbs index e69de29b..311e987a 100644 --- a/app/templates/widgets/value/_audio.hbs +++ b/app/templates/widgets/value/_audio.hbs @@ -0,0 +1,3 @@ +{{#if value.length}} + +{{/if}} diff --git a/app/templates/widgets/value/_file.hbs b/app/templates/widgets/value/_file.hbs index e69de29b..36f8e884 100644 --- a/app/templates/widgets/value/_file.hbs +++ b/app/templates/widgets/value/_file.hbs @@ -0,0 +1,4 @@ +{{#if value.length}} + +{{/if}} + diff --git a/app/templates/widgets/value/_gallery.hbs b/app/templates/widgets/value/_gallery.hbs index e69de29b..54816f35 100644 --- a/app/templates/widgets/value/_gallery.hbs +++ b/app/templates/widgets/value/_gallery.hbs @@ -0,0 +1,5 @@ +{{#if value.length}} + {{resize-image value.0.url height="30" width="30" crop="true"}} + {{ value.length }} images +{{/if}} + diff --git a/app/templates/widgets/value/_image.hbs b/app/templates/widgets/value/_image.hbs index c75d5e0e..587a75c8 100644 --- a/app/templates/widgets/value/_image.hbs +++ b/app/templates/widgets/value/_image.hbs @@ -1 +1 @@ -{{resize-image value height="50"}} +{{resize-image value height="30"}} diff --git a/app/templates/widgets/value/_markdown.hbs b/app/templates/widgets/value/_markdown.hbs index 672f203a..1c67cdce 100644 --- a/app/templates/widgets/value/_markdown.hbs +++ b/app/templates/widgets/value/_markdown.hbs @@ -1 +1 @@ -{{value}} +{{truncate-string value 100}} diff --git a/app/templates/widgets/value/_number.hbs b/app/templates/widgets/value/_number.hbs index e69de29b..672f203a 100644 --- a/app/templates/widgets/value/_number.hbs +++ b/app/templates/widgets/value/_number.hbs @@ -0,0 +1 @@ +{{value}} diff --git a/config/environment.js b/config/environment.js index 1d8da067..40a795d9 100644 --- a/config/environment.js +++ b/config/environment.js @@ -99,7 +99,7 @@ window.ENV = { name: 'Specifics', controlTypes: [ { - name : 'Name', + name : 'Person', widget : 'name', valueType: 'object', iconClass: 'icon-user' From d8c17ae4ba9c63df4ba7372548dbe1d9d6088421 Mon Sep 17 00:00:00 2001 From: Dave Snider Date: Tue, 25 Mar 2014 13:26:48 -0700 Subject: [PATCH 2/3] more widget values --- app/templates/widgets/value/_address.hbs | 6 ++++++ app/templates/widgets/value/_email.hbs | 1 + app/templates/widgets/value/_phone.hbs | 1 + app/templates/widgets/value/_wysiwyg.hbs | 2 +- 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/templates/widgets/value/_address.hbs b/app/templates/widgets/value/_address.hbs index e69de29b..b1a5c908 100644 --- a/app/templates/widgets/value/_address.hbs +++ b/app/templates/widgets/value/_address.hbs @@ -0,0 +1,6 @@ +{{value.street1}} +{{value.street2}} +{{value.city}} +{{value.state}} +{{value.postal}} +{{value.country}} diff --git a/app/templates/widgets/value/_email.hbs b/app/templates/widgets/value/_email.hbs index e69de29b..672f203a 100644 --- a/app/templates/widgets/value/_email.hbs +++ b/app/templates/widgets/value/_email.hbs @@ -0,0 +1 @@ +{{value}} diff --git a/app/templates/widgets/value/_phone.hbs b/app/templates/widgets/value/_phone.hbs index e69de29b..672f203a 100644 --- a/app/templates/widgets/value/_phone.hbs +++ b/app/templates/widgets/value/_phone.hbs @@ -0,0 +1 @@ +{{value}} diff --git a/app/templates/widgets/value/_wysiwyg.hbs b/app/templates/widgets/value/_wysiwyg.hbs index 914cddd3..1c67cdce 100644 --- a/app/templates/widgets/value/_wysiwyg.hbs +++ b/app/templates/widgets/value/_wysiwyg.hbs @@ -1 +1 @@ - <html> content +{{truncate-string value 100}} From 7940e684da2a78299795cd59d37c755e31a95d1d Mon Sep 17 00:00:00 2001 From: Dave Snider Date: Tue, 25 Mar 2014 13:50:12 -0700 Subject: [PATCH 3/3] more widget values --- app/templates/widgets/value/_embedly.hbs | 4 +++- app/templates/widgets/value/_textarea.hbs | 2 +- app/templates/widgets/value/_url.hbs | 3 +++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/templates/widgets/value/_embedly.hbs b/app/templates/widgets/value/_embedly.hbs index 339fec73..6b7b40a0 100644 --- a/app/templates/widgets/value/_embedly.hbs +++ b/app/templates/widgets/value/_embedly.hbs @@ -1 +1,3 @@ -{{value.title}} +{{#if value.title.length}} + {{value.title}} +{{/if}} diff --git a/app/templates/widgets/value/_textarea.hbs b/app/templates/widgets/value/_textarea.hbs index 672f203a..1c67cdce 100644 --- a/app/templates/widgets/value/_textarea.hbs +++ b/app/templates/widgets/value/_textarea.hbs @@ -1 +1 @@ -{{value}} +{{truncate-string value 100}} diff --git a/app/templates/widgets/value/_url.hbs b/app/templates/widgets/value/_url.hbs index e69de29b..9b56b9ff 100644 --- a/app/templates/widgets/value/_url.hbs +++ b/app/templates/widgets/value/_url.hbs @@ -0,0 +1,3 @@ +{{#if value.length}} + {{#link-to value }}{{value}}{{/link-to}} +{{/if}}