From be1bc417140706a6ec44c336c655926f6d986477 Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Tue, 21 Mar 2017 12:24:07 +0100
Subject: [PATCH] update css
---
.../js/angular/app/Views/signatureBook.html | 41 ++++++-------
modules/visa/css/module.css | 60 ++++++++++++++-----
2 files changed, 63 insertions(+), 38 deletions(-)
diff --git a/apps/maarch_entreprise/js/angular/app/Views/signatureBook.html b/apps/maarch_entreprise/js/angular/app/Views/signatureBook.html
index 80e036a015c..629f7cb79e0 100644
--- a/apps/maarch_entreprise/js/angular/app/Views/signatureBook.html
+++ b/apps/maarch_entreprise/js/angular/app/Views/signatureBook.html
@@ -3,28 +3,24 @@
</div>
<div *ngIf="!loading" class='visaContent'>
<div class="titleSignatureBook">
- <span>{{signatureBook.currentAction.actionLabel}}</span>
- <span><i style="cursor: pointer" (click)="backToBasket()" class="fa fa-times-circle fa-2x"></i></span>
- </div>
- <div class="headerSignatureBook">
- <div class="item" [ngClass]="{'activeTabSignatureBook': headerTab == 1}" (click)="changeSignatureBookLeftContent(1)">
- <i class="fa fa-dashboard fa-2x"></i>
- <i class="itemLabel">Document principal</i>
- </div>
- <div class="item" [ngClass]="{'activeTabSignatureBook': headerTab == 2}" (click)="changeSignatureBookLeftContent(2)">
- <i class="fa fa-pencil fa-2x">
- <sup *ngIf="signatureBook.nbNotes > 0" class="nbRes" style="font-size: 12px;font-weight: bold;">{{signatureBook.nbNotes}}</sup>
- </i>
- <i class="itemLabel">Note(s)</i>
- </div>
- <div class="item" [ngClass]="{'activeTabSignatureBook': headerTab == 3}" (click)="changeSignatureBookLeftContent(3)">
- <i class="fa fa-certificate fa-2x"></i>
- <i class="itemLabel">Circuit de visa</i>
- </div>
- <div class="item" [ngClass]="{'activeTabSignatureBook': headerTab == 4}" (click)="changeSignatureBookLeftContent(4)">
- <i class="fa fa-line-chart fa-2x"></i>
- <i class="itemLabel">Avancement</i>
+ <div id="closeSignatureBook"><i style="cursor: pointer" (click)="backToBasket()" class="fa fa-times-circle fa-2x"></i></div>
+ <div id="tabSignatureBook">
+ <div title="Courrier" class="item" [ngClass]="{'activeTabSignatureBook': headerTab == 1}" (click)="changeSignatureBookLeftContent(1)">
+ <i class="fa fa-dashboard fa-2x"></i>
+ </div>
+ <div title="Note(s)" class="item" [ngClass]="{'activeTabSignatureBook': headerTab == 2}" (click)="changeSignatureBookLeftContent(2)">
+ <i class="fa fa-pencil fa-2x">
+ <sup *ngIf="signatureBook.nbNotes > 0" class="nbRes" style="font-size: 12px;font-weight: bold;">{{signatureBook.nbNotes}}</sup>
+ </i>
+ </div>
+ <div title="Circuit de visa" class="item" [ngClass]="{'activeTabSignatureBook': headerTab == 3}" (click)="changeSignatureBookLeftContent(3)">
+ <i class="fa fa-certificate fa-2x"></i>
+ </div>
+ <div title="Avancement" class="item" [ngClass]="{'activeTabSignatureBook': headerTab == 4}" (click)="changeSignatureBookLeftContent(4)">
+ <i class="fa fa-line-chart fa-2x"></i>
+ </div>
</div>
+ <div id="labelSignatureBook" title="{{signatureBook.currentAction.actionLabel}}" ><div>{{signatureBook.currentAction.actionLabel}}</div></div>
<div class="others">
<span id="consigne">
<input type="text" value="{{signatureBook.consigne}}" title="Consigne" readonly="readonly">
@@ -37,6 +33,7 @@
</select>
<input name="send" id="send" value="Valider" class="button" type="button" (click)="validForm()">
</div>
+
</div>
<div class="contentSignatureBook">
<div class="resListContent" [ngStyle]="{'display': showResLeftPanel ? 'inline-block' : 'none'}" id="resListContent">
@@ -78,7 +75,7 @@
<i *ngIf="!showTopLeftPanel" class="fa fa-chevron-down" aria-hidden="true"></i>
<i *ngIf="showTopLeftPanel" class="fa fa-chevron-up" aria-hidden="true"></i>
</div>
- <iframe *ngIf="leftViewerLink != ''" id="leftPanelShowDocumentIframe" [src]="leftViewerLink | safeUrl" [ngStyle]="{'height': showTopLeftPanel ? '72%' : '80%'}"></iframe>
+ <iframe *ngIf="leftViewerLink != ''" id="leftPanelShowDocumentIframe" [src]="leftViewerLink | safeUrl" [ngStyle]="{'height': showTopLeftPanel ? '77%' : '85%'}"></iframe>
</div>
<div *ngIf="headerTab == 2" class="contentShow" style="width:100%;">
<iframe [src]="notesViewerLink | safeUrl"></iframe>
diff --git a/modules/visa/css/module.css b/modules/visa/css/module.css
index 89a8da54038..f8e0ae9049b 100644
--- a/modules/visa/css/module.css
+++ b/modules/visa/css/module.css
@@ -244,15 +244,14 @@
text-align: center !important;
}
-.headerSignatureBook .others{
+.titleSignatureBook .others{
border-right: solid 1px black;
- display: table-cell;
padding: 5px;
vertical-align: middle;
text-align: right;
}
-.headerSignatureBook .others input{
+.titleSignatureBook .others input{
background: #E6E6E6;
border-radius: 2px;
width: 350px;
@@ -363,7 +362,7 @@
.panelRight,.contentRight .contentShow{
display: inline-block;
- height: 85vh;
+ height: 91vh;
}
.contentLeft .contentShow{
height: 95vh;
@@ -462,8 +461,7 @@ img.panelSelectedThumbnail,img:hover.panelSelectedThumbnail{
}
.actions{
- width: 25%;
- display: table-cell;
+ width: 35%;
padding: 5px;
vertical-align: middle;
text-align: right;
@@ -497,8 +495,44 @@ img.panelSelectedThumbnail,img:hover.panelSelectedThumbnail{
overflow: hidden;
text-overflow: ellipsis;
}
+#closeSignatureBook{
+ padding:5px;
+ width:2%;
+ text-align: center;
+}
+#labelSignatureBook{
+ width: 33%;
+ padding-left: 10px;
+}
+
+#labelSignatureBook div{
+ width: 450px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: block;
+}
+
+#tabSignatureBook{
+ width:auto;
+}
+.titleSignatureBook div{
+ display:table-cell;
+ vertical-align: middle;
+}
-.titleSignatureBook span{
+#tabSignatureBook .item{
+ border-right: solid 1px black;
+ display: table-cell;
+ padding: 5px;
+ cursor: pointer;
+ width: 5%;
+ vertical-align: middle;
+ width: 40px;
+ text-align: center;
+ padding-left: 10px;
+padding-right: 10px;
+}
+/*.titleSignatureBook span{
display: inline-block;
vertical-align: middle;
padding:10px;
@@ -514,7 +548,7 @@ img.panelSelectedThumbnail,img:hover.panelSelectedThumbnail{
text-align: right;
padding-left: 5px;
top: -4px;
-}
+}*/
.headerSignatureBook{
border: solid 1px black;
@@ -529,7 +563,7 @@ img.panelSelectedThumbnail,img:hover.panelSelectedThumbnail{
border: solid 1px black;
display: block;
width: 100%;
- height:85vh;
+ height:91vh;
white-space: nowrap;
overflow: hidden;
background-color: #CEE9F1;
@@ -550,13 +584,7 @@ img.panelSelectedThumbnail,img:hover.panelSelectedThumbnail{
vertical-align: middle;
}
-.headerSignatureBook .itemLabel{
- /*display: none;*/
- padding-left: 5px;
- font-weight: bold;
-}
-
-.headerSignatureBook .item.activeTabSignatureBook{
+#tabSignatureBook .item.activeTabSignatureBook{
/*background: #009DC5;
color:white;*/
-moz-box-shadow: inset 0px 0px 5px 0px #656565;
--
GitLab