From 27d06beef15f98124c42aa8271da0df34389d36b Mon Sep 17 00:00:00 2001 From: Francois Zaninotto Date: Mon, 7 Sep 2015 22:42:56 +0200 Subject: [PATCH 1/4] Apply cssClasses both to th and td in listView --- examples/blog/config.js | 12 +++++++++--- src/javascripts/ng-admin/Crud/list/maDatagrid.js | 5 +++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/examples/blog/config.js b/examples/blog/config.js index cd802b99..0b4f1a60 100644 --- a/examples/blog/config.js +++ b/examples/blog/config.js @@ -88,11 +88,14 @@ nga.field('id').label('id'), // The default displayed name is the camelCase field name. label() overrides id nga.field('title'), // the default list field type is "string", and displays as a string nga.field('published_at', 'date'), // Date field type allows date formatting - nga.field('average_note', 'float'), // Float type also displays decimal digits - nga.field('views', 'number'), + nga.field('average_note', 'float') // Float type also displays decimal digits + .cssClasses('hidden-xs'), + nga.field('views', 'number') + .cssClasses('hidden-xs'), nga.field('tags', 'reference_many') // a Reference is a particular type of field that references another entity .targetEntity(tag) // the tag entity is defined later in this file .targetField(nga.field('name')) // the field to be displayed in this list + .cssClasses('hidden-xs') ]) .filters([ nga.field('category', 'choice').choices([ @@ -175,7 +178,8 @@ nga.field('created_at', 'date') .label('Posted'), nga.field('author.name') - .label('Author'), + .label('Author') + .cssClasses('hidden-xs'), nga.field('body', 'wysiwyg') .stripTags(true) .map(truncate), @@ -183,6 +187,7 @@ .label('Post') .targetEntity(post) .targetField(nga.field('title').map(truncate)) + .cssClasses('hidden-xs') ]) .filters([ nga.field('q', 'template') @@ -249,6 +254,7 @@ nga.field('custom', 'template') .label('Upper name') .template('{{ entry.values.name.toUpperCase() }}') + .cssClasses('hidden-xs') ]) .filters([ nga.field('published', 'template') diff --git a/src/javascripts/ng-admin/Crud/list/maDatagrid.js b/src/javascripts/ng-admin/Crud/list/maDatagrid.js index 99f578bd..f6294b83 100644 --- a/src/javascripts/ng-admin/Crud/list/maDatagrid.js +++ b/src/javascripts/ng-admin/Crud/list/maDatagrid.js @@ -25,7 +25,8 @@ define(function (require) { - + @@ -43,7 +44,7 @@ define(function (require) { - + From dfb4b66e46861f4500e76cc955908a738d3c911d Mon Sep 17 00:00:00 2001 From: Francois Zaninotto Date: Mon, 7 Sep 2015 23:01:23 +0200 Subject: [PATCH 2/4] Fix tests --- src/javascripts/test/e2e/ShowViewSpec.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/javascripts/test/e2e/ShowViewSpec.js b/src/javascripts/test/e2e/ShowViewSpec.js index 03f9f035..1db6892a 100644 --- a/src/javascripts/test/e2e/ShowViewSpec.js +++ b/src/javascripts/test/e2e/ShowViewSpec.js @@ -28,9 +28,9 @@ describe('ShowView', function () { $$('.ng-admin-field-comments th').then(function (inputs) { expect(inputs.length).toBe(4); - expect(inputs[0].getAttribute('class')).toBe('ng-scope ng-admin-column-id'); - expect(inputs[1].getAttribute('class')).toBe('ng-scope ng-admin-column-created_at'); - expect(inputs[2].getAttribute('class')).toBe('ng-scope ng-admin-column-body'); + expect(inputs[0].getAttribute('class')).toBe('ng-admin-column-id'); + expect(inputs[1].getAttribute('class')).toBe('ng-admin-column-created_at'); + expect(inputs[2].getAttribute('class')).toBe('ng-admin-column-body'); }); }); }); From 12c7fb21633c1050f16b12394ae165b432efd0f6 Mon Sep 17 00:00:00 2001 From: Francois Zaninotto Date: Tue, 8 Sep 2015 08:47:37 +0200 Subject: [PATCH 3/4] Add field type classes to list, show and edition/creation views --- src/javascripts/ng-admin/Crud/field/maField.js | 2 +- src/javascripts/ng-admin/Crud/list/maDatagrid.js | 4 ++-- src/javascripts/ng-admin/Crud/show/show.html | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/javascripts/ng-admin/Crud/field/maField.js b/src/javascripts/ng-admin/Crud/field/maField.js index 5e1f6ebc..4f6fdc11 100644 --- a/src/javascripts/ng-admin/Crud/field/maField.js +++ b/src/javascripts/ng-admin/Crud/field/maField.js @@ -37,7 +37,7 @@ function maField(FieldViewConfiguration) { scope.datastore = scope.datastore(); scope.getClassesForField = function(field, entry) { - return 'ng-admin-field-' + field.name().replace('.', '_') + ' ' + (field.getCssClasses(entry) || 'col-sm-10 col-md-8 col-lg-7'); + return 'ng-admin-field-' + field.name().replace('.', '_') + ' ' + 'ng-admin-type-' + field.type() + ' ' + (field.getCssClasses(entry) || 'col-sm-10 col-md-8 col-lg-7'); }; scope.getInputForField = function(field) { diff --git a/src/javascripts/ng-admin/Crud/list/maDatagrid.js b/src/javascripts/ng-admin/Crud/list/maDatagrid.js index f6294b83..36f0bc7f 100644 --- a/src/javascripts/ng-admin/Crud/list/maDatagrid.js +++ b/src/javascripts/ng-admin/Crud/list/maDatagrid.js @@ -26,7 +26,7 @@ define(function (require) { + class="ng-admin-column-{{ ::field.name() }} ng-admin-type-{{ ::field.type() }}"> @@ -44,7 +44,7 @@ define(function (require) { - + diff --git a/src/javascripts/ng-admin/Crud/show/show.html b/src/javascripts/ng-admin/Crud/show/show.html index 769a307d..1e939319 100644 --- a/src/javascripts/ng-admin/Crud/show/show.html +++ b/src/javascripts/ng-admin/Crud/show/show.html @@ -22,7 +22,7 @@

-
+
From d9a5fc31737c19ecc209ba84ecb4ae4e98e7a423 Mon Sep 17 00:00:00 2001 From: Francois Zaninotto Date: Tue, 8 Sep 2015 08:55:53 +0200 Subject: [PATCH 4/4] Fix tests (again) --- src/javascripts/test/e2e/ShowViewSpec.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/javascripts/test/e2e/ShowViewSpec.js b/src/javascripts/test/e2e/ShowViewSpec.js index 1db6892a..0b16dd54 100644 --- a/src/javascripts/test/e2e/ShowViewSpec.js +++ b/src/javascripts/test/e2e/ShowViewSpec.js @@ -28,9 +28,9 @@ describe('ShowView', function () { $$('.ng-admin-field-comments th').then(function (inputs) { expect(inputs.length).toBe(4); - expect(inputs[0].getAttribute('class')).toBe('ng-admin-column-id'); - expect(inputs[1].getAttribute('class')).toBe('ng-admin-column-created_at'); - expect(inputs[2].getAttribute('class')).toBe('ng-admin-column-body'); + expect(inputs[0].getAttribute('class')).toBe('ng-admin-column-id ng-admin-type-string'); + expect(inputs[1].getAttribute('class')).toBe('ng-admin-column-created_at ng-admin-type-string'); + expect(inputs[2].getAttribute('class')).toBe('ng-admin-column-body ng-admin-type-string'); }); }); });