branch develop updated (5915299 -> 299b632)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository faxtomail. See http://git.codelutin.com/faxtomail.git from 5915299 Ajout d’une colonne « Nom du client » pour les listes et la recherche (fixes #7423) new 299b632 Lorsqu'on ouvre une réponse d'un élément dans le consultation des archives sur la partie web, et qu'on imprime, la réponse et le contenu de la demande se superposent à l'impression. fixes #7485 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 299b6325af87428089d17b7e26531b8e8b014fd9 Author: Kevin Morin <morin@codelutin.com> Date: Thu Aug 27 17:01:59 2015 +0200 Lorsqu'on ouvre une réponse d'un élément dans le consultation des archives sur la partie web, et qu'on imprime, la réponse et le contenu de la demande se superposent à l'impression. fixes #7485 Summary of changes: .../main/webapp/WEB-INF/content/demand-detail.jsp | 34 ++++++++++++++++++++++ .../src/main/webapp/css/demand-detail.css | 21 ++++++++++++- .../src/main/webapp/js/demand-detail.js | 2 ++ 3 files changed, 56 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See http://git.codelutin.com/faxtomail.git commit 299b6325af87428089d17b7e26531b8e8b014fd9 Author: Kevin Morin <morin@codelutin.com> Date: Thu Aug 27 17:01:59 2015 +0200 Lorsqu'on ouvre une réponse d'un élément dans le consultation des archives sur la partie web, et qu'on imprime, la réponse et le contenu de la demande se superposent à l'impression. fixes #7485 --- .../main/webapp/WEB-INF/content/demand-detail.jsp | 34 ++++++++++++++++++++++ .../src/main/webapp/css/demand-detail.css | 21 ++++++++++++- .../src/main/webapp/js/demand-detail.js | 2 ++ 3 files changed, 56 insertions(+), 1 deletion(-) diff --git a/faxtomail-ui-web/src/main/webapp/WEB-INF/content/demand-detail.jsp b/faxtomail-ui-web/src/main/webapp/WEB-INF/content/demand-detail.jsp index 8c8a8ce..c95909f 100644 --- a/faxtomail-ui-web/src/main/webapp/WEB-INF/content/demand-detail.jsp +++ b/faxtomail-ui-web/src/main/webapp/WEB-INF/content/demand-detail.jsp @@ -41,6 +41,7 @@ <div id="main-container" class="container-fluid" ng-app="DemandDetailModule" ng-controller="DemandDetailController"> <s:if test="demand != null"> + <!-- groupe | réponses | historique | pj --> <nav class="navbar navbar-default" role="navigation"> <div class="container-fluid"> @@ -301,8 +302,41 @@ </div> </div> </div> + + <script> + $('#replyModal').on('hide.bs.modal', function (e) { + $('#main-container').removeClass('not-printable'); + $('#printable-reply').addClass('not-printable'); + }); + </script> + + </div> + + <div id="printable-reply" class="not-printable"> + <dl class="dl-horizontal"> + <dt>De</dt> + <dd>{{currentReply.sender}}</dd> + <dt>À</dt> + <dd>{{currentReply.toRecipients}}</dd> + <dt>Copie à</dt> + <dd>{{currentReply.ccRecipients}}</dd> + <dt>Copie cachée à</dt> + <dd>{{currentReply.bccRecipients}}</dd> + <dt>Sujet</dt> + <dd>{{currentReply.subject}}</dd> + </dl> + <p class="well" ng-bind-html="currentReply.content"></p> + <div> + Pièces jointes + <ul> + <li ng-repeat="attachment in currentReply.attachments"> + <a href="reply-attachment-download.action?id={{currentReply.id}}&index={{$index}}" title="Ouvrir la pive jointe">{{attachment.filename}}</a> + </li> + </ul> + </div> </div> </s:if> </div> + </body> </html> \ No newline at end of file diff --git a/faxtomail-ui-web/src/main/webapp/css/demand-detail.css b/faxtomail-ui-web/src/main/webapp/css/demand-detail.css index 57c8847..885daed 100644 --- a/faxtomail-ui-web/src/main/webapp/css/demand-detail.css +++ b/faxtomail-ui-web/src/main/webapp/css/demand-detail.css @@ -69,4 +69,23 @@ .dropdown-menu > li a { text-decoration: none; -} \ No newline at end of file +} + +/** #7485 Mauvaise impression des réponses **/ + +@media screen { + #printable-reply { + display: none; + } +} + +@media print { + .not-printable > * { + display: none!important; + } + + .not-printable #printable-reply { + display: block!important; + } +} + diff --git a/faxtomail-ui-web/src/main/webapp/js/demand-detail.js b/faxtomail-ui-web/src/main/webapp/js/demand-detail.js index 7da2347..73bb3e3 100644 --- a/faxtomail-ui-web/src/main/webapp/js/demand-detail.js +++ b/faxtomail-ui-web/src/main/webapp/js/demand-detail.js @@ -32,6 +32,8 @@ DemandDetailModule.controller('DemandDetailController', ['$scope', 'DemandDetail $scope.showReplyModal = function(index) { $scope.currentReply = $scope.replies[index]; + $('#main-container').addClass('not-printable'); + $('#printable-reply').removeClass('not-printable'); $('#replyModal').modal('show'); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm