Merge branch 'dev' of http://git.verdnatura.es/salix into dev

client/client/src/sample/create/index.html

@@ -14,7 +14,7 @@
                 vn-id="sampleType"
                 field="$ctrl.clientSample.typeFk"
                 model="ClientSample.typeFk"
-                select-fields="['id','description','code','hasCompany']"
+                select-fields="['code','hasCompany']"
                 url="/client/api/Samples"
                 show-field="description"
                 value-field="id"

services/mailer/application/router.js

@@ -22,9 +22,28 @@ router.use('/static/:template/:image', function(request, response) {
         let readStream = fs.createReadStream(imagePath);
 
         readStream.on('open', function() {
+            let contentType = getContentType(imagePath);
+
+            if (contentType)
+                response.setHeader('Content-type', getContentType(imagePath));
+
             readStream.pipe(response);
         });
     });
 });
 
+function getContentType(path) {
+    let types = {
+        png: 'image/png',
+        svg: 'image/svg+xml',
+        gif: 'image/gif',
+        jpeg: 'image/jpeg',
+        jpg: 'image/jpeg'
+    };
+
+    let extension = path.split('.')[1];
+
+    return types[extension];
+}
+
 module.exports = router;

services/mailer/static/css/component.css

@@ -7,10 +7,6 @@ img {
     margin: 0
 }
 
-p {
-    text-align: justify
-}
-
 .wrapper {
     background-color: #EEE
 }