diff --git a/front/salix/components/layout/style.scss b/front/salix/components/layout/style.scss index b66c620ad5..1a483ab961 100644 --- a/front/salix/components/layout/style.scss +++ b/front/salix/components/layout/style.scss @@ -87,8 +87,7 @@ vn-layout { & > * { display: block; padding: $spacing-md; - box-sizing: border-box; - height: 100% + box-sizing: border-box } &.ng-enter { vn-side-menu { diff --git a/front/salix/components/module-card/style.scss b/front/salix/components/module-card/style.scss index 0ae943efc9..cc3c5b81bf 100644 --- a/front/salix/components/module-card/style.scss +++ b/front/salix/components/module-card/style.scss @@ -2,4 +2,5 @@ .vn-module-card { padding: 0; + height: 100% } \ No newline at end of file diff --git a/front/salix/components/module-main/style.scss b/front/salix/components/module-main/style.scss index d9bdbd940a..cab874d686 100644 --- a/front/salix/components/module-main/style.scss +++ b/front/salix/components/module-main/style.scss @@ -2,4 +2,5 @@ .vn-module-main { padding: 0; + height: 100% } \ No newline at end of file diff --git a/modules/claim/front/index.js b/modules/claim/front/index.js index 4ea9ac6cc3..b6c39196e9 100644 --- a/modules/claim/front/index.js +++ b/modules/claim/front/index.js @@ -10,4 +10,4 @@ import './descriptor'; import './development'; import './search-panel'; import './summary'; -import './dms/index'; +import './photos'; diff --git a/modules/claim/front/dms/index/index.html b/modules/claim/front/photos/index.html similarity index 100% rename from modules/claim/front/dms/index/index.html rename to modules/claim/front/photos/index.html diff --git a/modules/claim/front/dms/index/index.js b/modules/claim/front/photos/index.js similarity index 97% rename from modules/claim/front/dms/index/index.js rename to modules/claim/front/photos/index.js index e832040004..61256aad1d 100644 --- a/modules/claim/front/dms/index/index.js +++ b/modules/claim/front/photos/index.js @@ -1,4 +1,4 @@ -import ngModule from '../../module'; +import ngModule from '../module'; import './style.scss'; class Controller { @@ -108,7 +108,7 @@ class Controller { Controller.$inject = ['$stateParams', '$scope', '$http', '$translate', 'vnToken', 'vnApp', 'vnConfig']; -ngModule.component('vnClaimDmsIndex', { +ngModule.component('vnClaimPhotos', { template: require('./index.html'), controller: Controller, bindings: { diff --git a/modules/claim/front/dms/index/index.spec.js b/modules/claim/front/photos/index.spec.js similarity index 96% rename from modules/claim/front/dms/index/index.spec.js rename to modules/claim/front/photos/index.spec.js index cbb24ac758..731988a843 100644 --- a/modules/claim/front/dms/index/index.spec.js +++ b/modules/claim/front/photos/index.spec.js @@ -2,7 +2,7 @@ import './index'; import crudModel from 'core/mocks/crud-model'; describe('Claim', () => { - describe('Component vnClaimDmsIndex', () => { + describe('Component vnClaimPhotos', () => { let $componentController; let $scope; let $httpBackend; @@ -16,7 +16,7 @@ describe('Claim', () => { $httpParamSerializer = _$httpParamSerializer_; $httpBackend = _$httpBackend_; $scope = $rootScope.$new(); - controller = $componentController('vnClaimDmsIndex', {$: $scope}); + controller = $componentController('vnClaimPhotos', {$: $scope}); controller.$.model = crudModel; controller.claim = { id: 1, diff --git a/modules/claim/front/dms/locale/es.yml b/modules/claim/front/photos/locale/es.yml similarity index 100% rename from modules/claim/front/dms/locale/es.yml rename to modules/claim/front/photos/locale/es.yml diff --git a/modules/claim/front/dms/index/style.scss b/modules/claim/front/photos/style.scss similarity index 93% rename from modules/claim/front/dms/index/style.scss rename to modules/claim/front/photos/style.scss index 28f9db6fca..35f5485603 100644 --- a/modules/claim/front/dms/index/style.scss +++ b/modules/claim/front/photos/style.scss @@ -1,6 +1,8 @@ @import "./variables"; -vn-claim-dms-index { +vn-claim-photos { + height: 100%; + .drop-zone { color: $color-font-secondary; box-sizing: border-box; @@ -19,7 +21,6 @@ vn-claim-dms-index { } .photo-list { - padding: $spacing-md; min-height: 100%; diff --git a/modules/claim/front/routes.json b/modules/claim/front/routes.json index 80bc77c492..571ca09328 100644 --- a/modules/claim/front/routes.json +++ b/modules/claim/front/routes.json @@ -11,7 +11,7 @@ "card": [ {"state": "claim.card.basicData", "icon": "settings"}, {"state": "claim.card.detail", "icon": "icon-details"}, - {"state": "claim.card.dms.index", "icon": "image"}, + {"state": "claim.card.photos", "icon": "image"}, {"state": "claim.card.development", "icon": "icon-traceability"}, {"state": "claim.card.action", "icon": "icon-actions"} ] @@ -81,14 +81,9 @@ }, "acl": ["salesAssistant"] }, { - "url": "/dms", - "state": "claim.card.dms", - "abstract": true, - "component": "ui-view" - }, { - "url" : "/index", - "state": "claim.card.dms.index", - "component": "vn-claim-dms-index", + "url": "/photos", + "state": "claim.card.photos", + "component": "vn-claim-photos", "description": "Photos", "params": { "claim": "$ctrl.claim"