[IMP] mail: document_viewer, improve design and fixes
- Improve design - LESS: use mixing and variables when possible, code formatting - Solve a minor issue causing images to be not perfectly centered - Improve visual feedbacks (tooltips, cursors, hover states...)
This commit is contained in:
stefanorigano
committed by
Géry Debongnie
Géry Debongnie
parent
e5b109b422
commit
00aabb8895
@@ -59,6 +59,7 @@ var DocumentViewer = Widget.extend({
|
||||
this.$el.modal('show');
|
||||
this.$el.on('hidden.bs.modal', _.bind(this._onDestroy, this));
|
||||
this.$('.o_viewer_img').load(_.bind(this._onImageLoaded, this));
|
||||
this.$('[data-toggle="tooltip"]').tooltip({delay: 0});
|
||||
return this._super.apply(this, arguments);
|
||||
},
|
||||
|
||||
@@ -102,6 +103,7 @@ var DocumentViewer = Widget.extend({
|
||||
widget: this
|
||||
}));
|
||||
this.$('.o_viewer_img').load(_.bind(this._onImageLoaded, this));
|
||||
this.$('[data-toggle="tooltip"]').tooltip({delay: 0});
|
||||
this._reset();
|
||||
},
|
||||
/**
|
||||
@@ -184,6 +186,7 @@ var DocumentViewer = Widget.extend({
|
||||
var top = $image.prop('offsetHeight') * this.scale > $zoomer.height() ? e.clientY - this.dragStartY : 0;
|
||||
var left = $image.prop('offsetWidth') * this.scale > $zoomer.width() ? e.clientX - this.dragStartX : 0;
|
||||
$zoomer.css("transform", "translate3d("+ left +"px, " + top + "px, 0)");
|
||||
$image.css('cursor', 'move');
|
||||
}
|
||||
},
|
||||
/**
|
||||
@@ -196,6 +199,7 @@ var DocumentViewer = Widget.extend({
|
||||
this.enableDrag = false;
|
||||
this.dragstopX = e.clientX - this.dragStartX;
|
||||
this.dragstopY = e.clientY - this.dragStartY;
|
||||
this.$('.o_viewer_img').css('cursor', '');
|
||||
}
|
||||
},
|
||||
/**
|
||||
|
||||
@@ -334,78 +334,105 @@
|
||||
}
|
||||
|
||||
.o_modal_fullscreen {
|
||||
.o-viewer-black-btn () {
|
||||
background-color: fade(black, 40%);
|
||||
color: fade(@gray-lighter, 70%);
|
||||
|
||||
&:hover {
|
||||
background-color: fade(black,60%);
|
||||
color: white;
|
||||
}
|
||||
}
|
||||
|
||||
.o_viewer_content {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
.square(100%);
|
||||
position: relative;
|
||||
cursor: pointer;
|
||||
|
||||
.o_viewer-header {
|
||||
width: 100%;
|
||||
.o-position-absolute(0, 0, @left: 0);
|
||||
height: 45px;
|
||||
padding: 10px 10px 0;
|
||||
background-color: rgba(0, 0, 0, 0.45);
|
||||
cursor: auto;
|
||||
.o_image_caption {
|
||||
color: #FFFFFF;
|
||||
display: inline;
|
||||
padding: @grid-gutter-width*0.5;
|
||||
background-color: fade(black, 80%);
|
||||
z-index: 1;
|
||||
color: #FFFFFF;
|
||||
|
||||
a {
|
||||
.o-hover-text-color(fade(@gray-lighter,60%), white);
|
||||
}
|
||||
|
||||
.o_close_btn {
|
||||
.o-position-absolute(-1px, @grid-gutter-width*0.5);
|
||||
font-size: @font-size-h1;
|
||||
font-weight: 300;
|
||||
}
|
||||
}
|
||||
|
||||
.o_loading_img {
|
||||
.o-position-absolute(@top: 50%);
|
||||
width: 25px;
|
||||
right: 50%;
|
||||
z-index: 1;
|
||||
.o-position-absolute(@top: 45%, @right: 0, @left: 0);
|
||||
}
|
||||
|
||||
.o_viewer_img_wrapper {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
cursor: pointer;
|
||||
.square(100%);
|
||||
position: fixed;
|
||||
background-color: fade(black, 70%);
|
||||
|
||||
.o_viewer_zoomer {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
.square(100%);
|
||||
.o-flex-display();
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
.o-justify-content(center);
|
||||
.o-align-items(center);
|
||||
padding: 45px 0;
|
||||
|
||||
img {
|
||||
image-orientation: from-image; // Only supported in Firefox
|
||||
}
|
||||
|
||||
img, video {
|
||||
cursor :auto;
|
||||
max-width: 100%;
|
||||
max-height: 100%;
|
||||
transition: 0.3s cubic-bezier(0, 0, 0.49, 1.6) 0s, opacity 0.15s;
|
||||
transition: 0.2s cubic-bezier(0, 0, 0.49, 1.6) 0s, opacity 0.15s;
|
||||
box-shadow: 0 0 40px black;
|
||||
}
|
||||
|
||||
.o_viewer_pdf {
|
||||
width: 80%;
|
||||
height: 90%;
|
||||
.size(80%, 100%);
|
||||
border: 0px;
|
||||
box-shadow: 1px 1px 20px 1px #000;
|
||||
}
|
||||
|
||||
.o_viewer_video {
|
||||
height: 80%;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.o_viewer_toolbar {
|
||||
.o-position-absolute(@left: 50%);
|
||||
bottom: 15px;
|
||||
transform: translate(-50%, -50%);
|
||||
padding: 8px 10px 0px 10px;
|
||||
background-color: rgba(0, 0, 0, 0.6);
|
||||
.o-position-absolute(@left: 50%, @bottom: @grid-gutter-width*0.5);
|
||||
.o-transform(translate(-50%, -50%));
|
||||
overflow: hidden;
|
||||
border-radius: 4px;
|
||||
background-color: fade(black, 40%);
|
||||
|
||||
.o_viewer_toolbar_btn {
|
||||
.o-viewer-black-btn();
|
||||
padding-left: 8px;
|
||||
padding-right: 8px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.arrow {
|
||||
.o-position-absolute(@top: 50%);
|
||||
color: #FFFFFF;
|
||||
}
|
||||
.arrow-left {
|
||||
left: 0;
|
||||
.o-position-absolute(50%, @grid-gutter-width*0.5);
|
||||
border-radius: 100%;
|
||||
padding: 12px 16px 11px 18px;
|
||||
.o-viewer-black-btn();
|
||||
}
|
||||
|
||||
.arrow-right {
|
||||
right: 0;
|
||||
}
|
||||
i.fa {
|
||||
color: #FFFFFF;
|
||||
.arrow-left {
|
||||
left: @grid-gutter-width*0.5;
|
||||
right: auto;
|
||||
padding: 12px 18px 11px 16px;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,55 +22,39 @@
|
||||
<t t-name="DocumentViewer.Content">
|
||||
<div class="o_viewer_content">
|
||||
<div class="o_viewer-header">
|
||||
<h2 class="o_image_caption"><t t-esc="widget.activeAttachment.name"/></h2>
|
||||
<ul class="list-inline pull-right">
|
||||
<li t-if="widget.activeAttachment.type == 'image'">
|
||||
<a class="o_print_btn" href="#">
|
||||
<i class="fa fa-2x fa-print"/>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a class="o_close_btn" href="#">
|
||||
<i class="fa fa-2x fa-times"/>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
<span class="o_image_caption">
|
||||
<i class="fa fa-picture-o mr8" t-if="widget.activeAttachment.type == 'image'"/>
|
||||
<i class="fa fa-file-text mr8" t-if="widget.activeAttachment.type == 'application/pdf'"/>
|
||||
<i class="fa fa-video-camera mr8" t-if="widget.activeAttachment.type == 'video'"/>
|
||||
<t t-esc="widget.activeAttachment.name"/>
|
||||
<a href="#" class="o_download_btn ml8 small" data-toggle="tooltip" data-placement="right" title="Download"><i class="fa fa-fw fa-download"/></a>
|
||||
</span>
|
||||
<a class="o_close_btn pull-right" href="#">×</a>
|
||||
</div>
|
||||
<div class="o_viewer_img_wrapper">
|
||||
<div class="o_viewer_zoomer">
|
||||
<div t-if="widget.activeAttachment.type == 'image'" class="o_loading_img">
|
||||
<i class="fa fa-spinner fa-spin fa-3x fa-fw" aria-hidden="true"/>
|
||||
<div t-if="widget.activeAttachment.type == 'image'" class="o_loading_img text-center">
|
||||
<i class="fa fa-circle-o-notch fa-spin text-gray-light fa-3x fa-fw" aria-hidden="true"/>
|
||||
</div>
|
||||
<img t-if="widget.activeAttachment.type == 'image'" class="o_viewer_img" t-attf-src="/web/image/#{widget.activeAttachment.id}?unique=1"/>
|
||||
<iframe class="mb48 o_viewer_pdf" t-if="widget.activeAttachment.type == 'application/pdf'" t-attf-src="/web/static/lib/pdfjs/web/viewer.html?file=/web/content/#{widget.activeAttachment.id}" />
|
||||
<iframe class="mt32 o_viewer_pdf" t-if="widget.activeAttachment.type == 'application/pdf'" t-attf-src="/web/static/lib/pdfjs/web/viewer.html?file=/web/content/#{widget.activeAttachment.id}" />
|
||||
<video t-if="widget.activeAttachment.type == 'video'" class="o_viewer_video" controls="controls">
|
||||
<source t-attf-src="/web/image/#{widget.activeAttachment.id}" t-att-data-type="widget.activeAttachment.mimetype"/>
|
||||
</video>
|
||||
</div>
|
||||
</div>
|
||||
<div t-if="widget.activeAttachment.type == 'image'" class="o_viewer_toolbar">
|
||||
<ul class="list-inline">
|
||||
<li>
|
||||
<a class="o_rotate" href="#">
|
||||
<i class="fa fa-2x fa-repeat"></i>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a class="o_zoom_out" href="#">
|
||||
<i class="fa fa-2x fa-search-minus"></i>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a class="o_zoom_in" href="#">
|
||||
<i class="fa fa-2x fa-search-plus"></i>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a class="o_download_btn" href="#">
|
||||
<i class="fa fa-2x fa-download"/>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
<div t-if="widget.activeAttachment.type == 'image'" class="o_viewer_toolbar btn-toolbar" role="toolbar">
|
||||
<div class="btn-group ml0" role="group">
|
||||
<a href="#" class="o_viewer_toolbar_btn btn o_zoom_in" data-toggle="tooltip" title="Zoom In"><i class="fa fa-fw fa-plus"/></a>
|
||||
<a href="#" class="o_viewer_toolbar_btn btn o_zoom_out" data-toggle="tooltip" title="Zoom Out"><i class="fa fa-fw fa-minus"/></a>
|
||||
</div>
|
||||
<div class="btn-group" role="group">
|
||||
<a href="#" class="o_viewer_toolbar_btn btn o_rotate" data-toggle="tooltip" title="Rotate"><i class="fa fa-fw fa-repeat"/></a>
|
||||
</div>
|
||||
<div class="btn-group" role="group">
|
||||
<a href="#" class="o_viewer_toolbar_btn btn o_print_btn" data-toggle="tooltip" title="Print"><i class="fa fa-fw fa-print"/></a>
|
||||
<a href="#" class="o_viewer_toolbar_btn btn o_download_btn" data-toggle="tooltip" title="Download"><i class="fa fa-fw fa-download"/></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</t>
|
||||
@@ -81,10 +65,10 @@
|
||||
|
||||
<t t-if="widget.attachment.length != 1">
|
||||
<a class="arrow arrow-left move_previous" href="#">
|
||||
<span class="fa fa-3x fa-chevron-left"/>
|
||||
<span class="fa fa-chevron-left"/>
|
||||
</a>
|
||||
<a class="arrow arrow-right move_next" href="#">
|
||||
<span class="fa fa-3x fa-chevron-right"/>
|
||||
<span class="fa fa-chevron-right"/>
|
||||
</a>
|
||||
</t>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user