diff --git a/apps/maarch_entreprise/js/angular/app/Views/signatureBook.html b/apps/maarch_entreprise/js/angular/app/Views/signatureBook.html
index 62f6f188e987810f205c237b55f800ed2e8ed839..219066eb548a8142ef7f321d71d9a53b9beeab0a 100644
--- a/apps/maarch_entreprise/js/angular/app/Views/signatureBook.html
+++ b/apps/maarch_entreprise/js/angular/app/Views/signatureBook.html
@@ -75,7 +75,7 @@
</div>
<div *ngIf="signatureBook.documents.length - 1 > 0" class="pjDetailsMore" (click)="displayPanel('TOPLEFT')" title="{{signatureBook.documents.length - 1}} pièce(s) complémentaire(s)">
<i *ngIf="!showTopLeftPanel" class="fa fa-envelope-square fa-2x" aria-hidden="true"></i>
- <sup *ngIf="!showTopLeftPanel" class="nbRes" style="position: absolute;right: 6px;top: 5px;}">{{signatureBook.documents.length - 1}}</sup>
+ <sup *ngIf="!showTopLeftPanel" class="nbRes" style="position: absolute;right: 6px;top: 5px;">{{signatureBook.documents.length - 1}}</sup>
<i *ngIf="showTopLeftPanel" class="fa fa-chevron-up" aria-hidden="true"></i>
</div>
<iframe *ngIf="leftViewerLink != ''" id="leftPanelShowDocumentIframe" [src]="leftViewerLink | safeUrl" [ngStyle]="{'height': showTopLeftPanel ? '84%' : '99%'}"></iframe>
@@ -180,23 +180,24 @@
<div *ngIf="signatureBook.attachments" id="rightPanelContent" class="panelRightContent">
<div title="[{{attachment.attachment_type}}] {{attachment.title}}" style="position: relative;" class="item" *ngFor="let attachment of signatureBook.attachments; let i = index" (click)="changeRightViewer(i)" [ngClass]="{'panelSelectedThumbnail': i == rightSelectedThumbnail}">
<span class="fa-stack fa-lg">
- <i class="fa fa-file-o fa-stack-2x"></i><i class="fa {{attachment.icon}} fa-stack-1x"></i>
+ <i class="fa fa-file-o fa-stack-2x"></i><i style="font-weight:bold;letter-spacing: -1px;">{{attachment.icon}}</i>
</span>
<i *ngIf="attachment.sign && attachment.status == 'SIGN'" title="Le document a été signé" style="position: absolute;top: 2px;right: 2px;" class="fa fa-circle"></i>
<i *ngIf="attachment.sign && attachment.status != 'SIGN'" title="Le document n'a pas encore été signé" style="position: absolute;top: 2px;right: 2px;" class="fa fa-circle-o"></i>
</div>
</div>
<div *ngIf="signatureBook.attachments[rightSelectedThumbnail]" style="bottom: 0px;position: absolute;left: 5px;">
- <div [ngClass]="{'visaDisabledButton': !signatureBook.attachments[rightSelectedThumbnail].canDelete}" title="Supprimer la pièce jointe" class="visaPjDel" (click)="delAttachment(signatureBook.attachments[rightSelectedThumbnail])">
- <i class="fa fa-trash fa-2x"></i>
+
+ <div class="item panelRightAddPj" (click)="addAttachmentIframe()" style="padding-left:5px;" title="Créer une pièce jointe">
+ <i class="fa fa-paperclip fa-2x" ></i>
+ <i class="fa fa-plus" style="position:absolute;"></i>
</div>
+ <hr style="background-color:#666;margin-top:0px;"/>
<div [ngClass]="{'visaDisabledButton': !signatureBook.attachments[rightSelectedThumbnail].canModify || signatureBook.attachments[rightSelectedThumbnail].status == 'SIGN'}" title="Modifier la pièce jointe" class="visaPjUp" (click)="editAttachmentIframe(signatureBook.attachments[rightSelectedThumbnail])">
<i class="fa fa-pencil-square-o fa-2x"></i>
</div>
- <hr style="background-color:#666;margin-bottom:0px;"/>
- <div class="item panelRightAddPj" (click)="addAttachmentIframe()" style="padding-left:5px;" title="Créer une pièce jointe">
- <i class="fa fa-paperclip fa-2x" ></i>
- <i class="fa fa-plus" style="position:absolute;"></i>
+ <div [ngClass]="{'visaDisabledButton': !signatureBook.attachments[rightSelectedThumbnail].canDelete}" title="Supprimer la pièce jointe" class="visaPjDel" (click)="delAttachment(signatureBook.attachments[rightSelectedThumbnail])">
+ <i class="fa fa-trash fa-2x"></i>
</div>
</div>
</div>
diff --git a/apps/maarch_entreprise/xml/entreprise.xml b/apps/maarch_entreprise/xml/entreprise.xml
index c36a1746fb874452413fdbf388ca415ba42e57d7..4db2a788845ad3eae3cc083ac1e5291f852d30e0 100644
--- a/apps/maarch_entreprise/xml/entreprise.xml
+++ b/apps/maarch_entreprise/xml/entreprise.xml
@@ -36,12 +36,12 @@
<default_nature>simple_mail</default_nature>
</mail_natures>
<attachment_types>
- <type show="true" with_chrono="true" attach_in_mail="true" icon="fa-reply" sign="true">
+ <type show="true" with_chrono="true" attach_in_mail="true" icon="R" sign="true">
<id>response_project</id>
<label>_RESPONSE_PROJECT</label>
<process_mode></process_mode>
</type>
- <type show="true" with_chrono="true" with_delay="60" icon="fa-paper-plane-o" sign="false">
+ <type show="true" with_chrono="true" with_delay="60" icon="TR" sign="false">
<id>transmission</id>
<label>Transmission</label>
<process_mode></process_mode>
diff --git a/modules/avis/css/module.css b/modules/avis/css/module.css
index 7249f1ff94d24184cba4c611ed00eaa60bad0bc1..811f3db9d63e3bc5bac875e6cde26458dd15c35f 100755
--- a/modules/avis/css/module.css
+++ b/modules/avis/css/module.css
@@ -44,7 +44,7 @@
background-color: #93D1E4;
display: table;
margin: 10px;
- padding: 10px;
+ padding: 5px;
text-align: left;
width: 95%;
cursor: default;
@@ -146,4 +146,8 @@
}
.avisUserAction i{
cursor: pointer;
+}
+
+.chosen-container-single .chosen-default {
+ color: black !important;
}
\ No newline at end of file
diff --git a/modules/visa/css/module.css b/modules/visa/css/module.css
index 8a53ad278cd55829aef4217b5b8245baf4e31aff..961be098d6dbd126bed70795500397be5f4b0e1f 100644
--- a/modules/visa/css/module.css
+++ b/modules/visa/css/module.css
@@ -126,7 +126,7 @@
background-color: #93D1E4;
display: table;
margin: 10px;
- padding: 10px;
+ padding: 5px;
text-align: left;
width: 95%;
cursor: default;
@@ -362,6 +362,8 @@
padding:10px;
padding-left: 5px;
cursor: pointer;
+ padding-top: 20px;
+ padding-bottom: 20px;
}
.panelRight,.contentRight .contentShow{
@@ -844,7 +846,7 @@ img.panelSelectedThumbnail,img:hover.panelSelectedThumbnail{
}
.visaPjUp{
margin: auto;
- margin-top: 10px;
+ margin-bottom: 10px;
font-size: 10px;
height:20px;
width:20px;
@@ -862,7 +864,7 @@ img.panelSelectedThumbnail,img:hover.panelSelectedThumbnail{
.visaPjDel{
margin: auto;
font-size: 10px;
-
+ margin-bottom: 5px;
height:20px;
width:20px;
cursor: pointer;
@@ -908,18 +910,6 @@ img.panelSelectedThumbnail,img:hover.panelSelectedThumbnail{
opacity: 0.3;
}
-/*.showResLeftPanel.contentLeft,.showResLeftPanel.contentRight{*/
- /*width:39%;*/
-/*}*/
-
-/*.hideResLeftPanel.contentLeft,.hideResLeftPanel.contentRight{*/
- /*width:46.5%;*/
-/*}*/
-
-/*.hideLeftPanel.contentRight{*/
- /*width:93%;*/
-/*}*/
-
-/*.showLeftPanel.contentRight{*/
- /*width:46.5%;*/
-/*}*/
+.chosen-container-single .chosen-default {
+ color: black !important;
+}