diff --git a/front/core/directives/droppable.scss b/front/core/directives/droppable.scss
index 97e6f8a197..f2e18a3ad6 100644
--- a/front/core/directives/droppable.scss
+++ b/front/core/directives/droppable.scss
@@ -11,11 +11,9 @@
.vn-droppable,
[vn-droppable] {
- display: block;
-
&.dropping {
background-color: $color-hover-cd;
- border-color: $color-bg-dark;
+ border-color: $color-font-secondary;
}
}
diff --git a/front/salix/components/app/style.scss b/front/salix/components/app/style.scss
index aab37c8a35..96d6a6193e 100644
--- a/front/salix/components/app/style.scss
+++ b/front/salix/components/app/style.scss
@@ -7,7 +7,7 @@ vn-app {
ui-view {
display: block;
box-sizing: border-box;
- height: inherit;
+ height: 100%;
&.ng-enter {
animation-name: nothing, slideIn;
diff --git a/front/salix/components/layout/style.scss b/front/salix/components/layout/style.scss
index 9a9d903a68..b66c620ad5 100644
--- a/front/salix/components/layout/style.scss
+++ b/front/salix/components/layout/style.scss
@@ -87,6 +87,8 @@ vn-layout {
& > * {
display: block;
padding: $spacing-md;
+ box-sizing: border-box;
+ height: 100%
}
&.ng-enter {
vn-side-menu {
diff --git a/front/salix/styles/photo-list.scss b/front/salix/styles/photo-list.scss
index 3737c508a4..b0c926def7 100644
--- a/front/salix/styles/photo-list.scss
+++ b/front/salix/styles/photo-list.scss
@@ -11,7 +11,6 @@
transition: all 0.5s;
padding: $spacing-sm;
position: relative;
- opacity: 0.7;
width: 28em;
.image {
@@ -20,6 +19,7 @@
0 1px 5px 0 rgba(0,0,0,.12);
background: no-repeat center center fixed;
background-size: cover !important;
+ border: 2px solid transparent;
overflow: hidden;
cursor: zoom-in;
height: 100%;
@@ -34,7 +34,7 @@
top: 1em
}
}
- .photo:hover {
- opacity: 1
+ .photo:hover .image {
+ border: 2px solid $color-primary
}
}
\ No newline at end of file
diff --git a/modules/claim/front/dms/index/index.html b/modules/claim/front/dms/index/index.html
index bd6b9a21dc..447538bd1f 100644
--- a/modules/claim/front/dms/index/index.html
+++ b/modules/claim/front/dms/index/index.html
@@ -5,31 +5,28 @@
data="$ctrl.photos">
-
-
- Drag & Drop files here...
-
-
-
-
-
-
+
+
+
+ Drag & Drop photos here...
+
+
-
+
+
+
+
@@ -38,4 +35,10 @@
message="This file will be deleted"
question="Are you sure you want to continue?"
on-response="$ctrl.deleteDms($response)">
-
\ No newline at end of file
+
+
+
diff --git a/modules/claim/front/dms/index/index.js b/modules/claim/front/dms/index/index.js
index 20eba62a39..e832040004 100644
--- a/modules/claim/front/dms/index/index.js
+++ b/modules/claim/front/dms/index/index.js
@@ -68,6 +68,19 @@ class Controller {
});
}
+ openUploadDialog() {
+ const element = document.createElement('input');
+ element.setAttribute('type', 'file');
+ element.setAttribute('multiple', true);
+ element.click();
+
+ element.addEventListener('change', () =>
+ this.setDefaultParams().then(() => {
+ this.dms.files = element.files;
+ this.create();
+ })
+ );
+ }
create() {
const query = `claims/${this.claim.id}/uploadFile`;
diff --git a/modules/claim/front/dms/index/style.scss b/modules/claim/front/dms/index/style.scss
index e7e957cd86..28f9db6fca 100644
--- a/modules/claim/front/dms/index/style.scss
+++ b/modules/claim/front/dms/index/style.scss
@@ -2,13 +2,16 @@
vn-claim-dms-index {
.drop-zone {
- border: 2px dashed $color-font-secondary;
color: $color-font-secondary;
box-sizing: border-box;
- padding: 2em $spacing-md;
border-radius: 0.5em;
text-align: center;
- font-size: 1.4em;
+ min-height: 100%;
+
+ .empty-rows {
+ padding: 5em $spacing-md;
+ font-size: 1.4em
+ }
vn-icon {
font-size: 3em
diff --git a/modules/claim/front/dms/locale/en.yml b/modules/claim/front/dms/locale/en.yml
deleted file mode 100644
index a202e8bf27..0000000000
--- a/modules/claim/front/dms/locale/en.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-FileDescription: Ticket id {{ticketId}} from client {{clientName}} id {{clientId}}
-ContentTypesInfo: Allowed file types {{allowedContentTypes}}
\ No newline at end of file
diff --git a/modules/claim/front/dms/locale/es.yml b/modules/claim/front/dms/locale/es.yml
index 3e765ae78c..8ccc1dba45 100644
--- a/modules/claim/front/dms/locale/es.yml
+++ b/modules/claim/front/dms/locale/es.yml
@@ -1,4 +1,5 @@
Are you sure you want to continue?: ¿Seguro que quieres continuar?
-Drag & Drop files here...: Arrastra y suelta archivos aquí...
+Drag & Drop photos here...: Arrastra y suelta fotos aquí...
Photo deleted: Foto eliminada
-Photo uploaded!: Foto subida!
\ No newline at end of file
+Photo uploaded!: Foto subida!
+Select photo: Seleccionar foto
\ No newline at end of file
diff --git a/modules/claim/front/summary/style.scss b/modules/claim/front/summary/style.scss
index 38136f24ad..afd3838be2 100644
--- a/modules/claim/front/summary/style.scss
+++ b/modules/claim/front/summary/style.scss
@@ -1,12 +1,10 @@
@import "./variables";
vn-claim-summary {
- .photo {
- height: 15.5em;
+ section.photo {
+ height: 15.5em
}
- .photo .image {
- border: 2px solid $color-bg-dark;
- border-radius: 0.2em;
+ .photo .image {
+ border-radius: 0.2em
}
-
}
\ No newline at end of file