diff --git a/apps/maarch_entreprise/js/angular/app/Views/signatureBook.html b/apps/maarch_entreprise/js/angular/app/Views/signatureBook.html
index 629f7cb79e0c672bac6aa02c10dbdaeba1b80306..eeba89a9bca6d4694de0fe78fdbe23e12d8b3f87 100644
--- a/apps/maarch_entreprise/js/angular/app/Views/signatureBook.html
+++ b/apps/maarch_entreprise/js/angular/app/Views/signatureBook.html
@@ -150,18 +150,6 @@
</div>
</div>
</div>
- <a *ngIf="signatureBook.attachments[rightSelectedThumbnail].status != 'SIGN'" title="Télécharger la pièce jointe" class="visaPjView" href="index.php?display=true&module=attachments&page=view_attachment&res_id_master={{resId}}&id={{signatureBook.attachments[rightSelectedThumbnail].res_id}}" target="_blank">
- <i class="fa fa-download fa-2x"></i>
- </a>
- <a *ngIf="signatureBook.attachments[rightSelectedThumbnail].status == 'SIGN'" title="Télécharger la pièce jointe" class="visaPjView" href="index.php?display=true&module=attachments&page=view_attachment&res_id_master={{resId}}&id={{signatureBook.attachments[rightSelectedThumbnail].idToDl}}" target="_blank">
- <i class="fa fa-download fa-2x"></i>
- </a>
- <div *ngIf="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>
- <div *ngIf="signatureBook.attachments[rightSelectedThumbnail].canDelete" title="Supprimer la pièce jointe" [ngStyle]="{'top': showTopRightPanel ? '150px' : '70px'}" class="visaPjDel" (click)="delAttachment(signatureBook.attachments[rightSelectedThumbnail])">
- <i class="fa fa-trash fa-2x"></i>
- </div>
<div class="pjDetailsMore" (click)="displayPanel('TOPRIGHT')">
<i *ngIf="!showTopRightPanel" class="fa fa-chevron-down" aria-hidden="true"></i>
<i *ngIf="showTopRightPanel" class="fa fa-chevron-up" aria-hidden="true"></i>
@@ -249,9 +237,6 @@
<!--</div>-->
</div>
<div *ngIf="signatureBook.hasWorkflow" class="panelRight">
- <div class="item panelRightAddPj" (click)="addAttachmentIframe()">
- <i class="fa fa-plus fa-2x" title="Créer une pièce jointe"></i>
- </div>
<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">
@@ -261,6 +246,28 @@
<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 style="bottom: 0px;position: absolute;left: 5px;">
+ <div *ngIf="signatureBook.attachments[rightSelectedThumbnail].canDelete" title="Supprimer la pièce jointe" [ngStyle]="{'top': showTopRightPanel ? '150px' : '70px'}" class="visaPjDel" (click)="delAttachment(signatureBook.attachments[rightSelectedThumbnail])">
+ <i class="fa fa-trash fa-2x"></i>
+ </div>
+ <!--<div class="visaPjView" *ngIf="signatureBook.attachments[rightSelectedThumbnail].status != 'SIGN'">
+ <a title="Télécharger la pièce jointe" href="index.php?display=true&module=attachments&page=view_attachment&res_id_master={{resId}}&id={{signatureBook.attachments[rightSelectedThumbnail].res_id}}" target="_blank">
+ <i class="fa fa-download fa-2x"></i>
+ </a>
+ </div>
+ <div class="visaPjView" *ngIf="signatureBook.attachments[rightSelectedThumbnail].status == 'SIGN'">
+ <a title="Télécharger la pièce jointe" href="index.php?display=true&module=attachments&page=view_attachment&res_id_master={{resId}}&id={{signatureBook.attachments[rightSelectedThumbnail].idToDl}}" target="_blank">
+ <i class="fa fa-download fa-2x"></i>
+ </a>
+ </div>-->
+ <div *ngIf="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:10px;">
+ <i class="fa fa-plus fa-2x" title="Créer une pièce jointe"></i>
+ </div>
+ </div>
</div>
</div>
</div>
diff --git a/modules/visa/css/module.css b/modules/visa/css/module.css
index d26fb0f73b621c686a9bfe30467487226dff44e0..64b40b0de19b3caaf55e82011891f6833ff6a466 100644
--- a/modules/visa/css/module.css
+++ b/modules/visa/css/module.css
@@ -350,7 +350,7 @@
.panelRightContent{
width: 100%;
- height: 93%;
+ height: 72%;
overflow: auto;
}
@@ -378,7 +378,7 @@
position: relative;
vertical-align: top;
padding : 5px;
- width:90%;
+ width:100%;
}
.pjDetails,.pjSign,.pjCreate{
@@ -465,6 +465,7 @@ img.panelSelectedThumbnail,img:hover.panelSelectedThumbnail{
padding: 5px;
vertical-align: middle;
text-align: right;
+ text-transform: initial;
}
.actions i{
width:5%;
@@ -817,9 +818,13 @@ img.panelSelectedThumbnail,img:hover.panelSelectedThumbnail{
transition: height 0.5s;
}
.visaPjView{
+ margin: auto;
+ margin-top: 10px;
+
+ font-size: 10px;
+ height:20px;
+ width:20px;
cursor: pointer;
- position: absolute;
- right: -30px;bottom: 130px;
padding: 10px;
background-color: green;
color: white !important;
@@ -831,10 +836,13 @@ img.panelSelectedThumbnail,img:hover.panelSelectedThumbnail{
filter: progid:DXImageTransform.Microsoft.Shadow(color=#656565, Direction=NaN, Strength=10);
}
.visaPjUp{
+ margin: auto;
+ margin-top: 10px;
+
+ font-size: 10px;
+ height:20px;
+ width:20px;
cursor: pointer;
- position: absolute;
- right: -30px;
- bottom: 70px;
padding: 10px;
background-color: #009DC5;
color: white;
@@ -845,10 +853,16 @@ img.panelSelectedThumbnail,img:hover.panelSelectedThumbnail{
box-shadow: 0px 0px 10px 0px #656565;
filter: progid:DXImageTransform.Microsoft.Shadow(color=#656565, Direction=NaN, Strength=10);
}
+.visaPjView a{
+ color: white !important;
+}
.visaPjDel{
+ margin: auto;
+ font-size: 10px;
+
+ height:20px;
+ width:20px;
cursor: pointer;
- position: absolute;
- right: -30px;
padding: 10px;
background-color: red;
color: white;