Merge branch 'feature/widget-values' into develop

webhook · Mar 25, 2014 · 95609ec · 95609ec
2 parents d6b8ecd + 7940e68
commit 95609ec
Show file tree

Hide file tree

Showing 17 changed files with 51 additions and 7 deletions.
diff --git a/app/helpers/truncate-string.js 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
@@ -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
@@ -53,7 +53,7 @@
       {{#each item in sortedCmsItems}}
         {{#link-to 'wh.content.type.edit' contentTypeNav.id item.id tagName="tr"}}
           {{#each item.cmsControls}}
-            <td>{{partial this.controlType.valuePartialPath}}</td>
+          <td {{ bind-attr class=this.controlType.widget }}>{{partial this.controlType.valuePartialPath}}</td>
           {{/each}}
           <td class="wy-table-actions">
             {{#if item.lockedBy}}

diff --git 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/_audio.hbs b/app/templates/widgets/value/_audio.hbs
@@ -0,0 +1,3 @@
+{{#if value.length}}
+  <span class="icon icon-music" data-toggle="tooltip" {{ bind-attr title=value }}></span>
+{{/if}}
diff --git 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/_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/_file.hbs b/app/templates/widgets/value/_file.hbs
@@ -0,0 +1,4 @@
+{{#if value.length}}
+  <span class="icon icon-paper-clip" data-toggle="tooltip" {{ bind-attr title=value }}></span>
+{{/if}}
+
diff --git 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
@@ -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
@@ -1 +1 @@
-{{value}}
+{{truncate-string value 100}}
diff --git a/app/templates/widgets/value/_number.hbs b/app/templates/widgets/value/_number.hbs
@@ -0,0 +1 @@
+{{value}}
diff --git 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/_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
@@ -0,0 +1,3 @@
+{{#if value.length}}
+  {{#link-to value }}{{value}}{{/link-to}}
+{{/if}}
diff --git a/app/templates/widgets/value/_wysiwyg.hbs b/app/templates/widgets/value/_wysiwyg.hbs
@@ -1 +1 @@
-<span class="icon icon-html5"> &lt;html&gt; content</span>
+{{truncate-string value 100}}
diff --git 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'
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{{resize-image value height="50"}}
		{{resize-image value height="30"}}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<span class="icon icon-html5"> <html> content</span>
		{{truncate-string value 100}}