Commit 6c7ce4fe authored by Romain Courteaud's avatar Romain Courteaud

erp5_document_scanner: improve image review

parent 711b6462
......@@ -94,6 +94,9 @@ div[data-gadget-url$="gadget_document_scanner.html"] .new-btn {
width: calc(6em + 1px);
height: calc(6em + 1px);
}
div[data-gadget-url$="gadget_document_scanner.html"] .review-img-container {
height: 70vh;
}
div[data-gadget-url$="gadget_document_scanner.html"] .img-container,
div[data-gadget-url$="gadget_document_scanner.html"] .camera-input {
/* Never limit the container height here */
......
......@@ -244,7 +244,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>982.62805.13685.6178</string> </value>
<value> <string>982.62807.48775.28757</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -262,7 +262,7 @@
</tuple>
<state>
<tuple>
<float>1585917584.58</float>
<float>1585922346.12</float>
<string>UTC</string>
</tuple>
</state>
......
......@@ -191,9 +191,10 @@
guides: true,
center: true,
background: false,
minContainerWidth: 0,
minContainerHeight: 0,
minContainerWidth: 1,
minContainerHeight: 1,
responsive: true,
restore: true,
// Avoid any cropper calculation or guessing
scalable: false,
rotatable: false,
......@@ -730,7 +731,9 @@
div = domsugar('div', {'class': 'camera'}, [
buildPageTitle(gadget, result_list[0][2]),
domsugar('img', {src: gadget.state['blob_url_' + gadget.state.display_index]})
domsugar('div', {'class': 'review-img-container'}, [
domsugar('img', {src: gadget.state['blob_url_' + gadget.state.display_index]})
]),
// XXX TODO: why is the button rendering different from the other pages?
domsugar('div', {'class': 'edit-picture'}, button_list),
result_list[1]
......@@ -796,8 +799,7 @@
display_step: 'display_video',
display_index: null,
page_count: 0,
camera_list: [],
is_cropper_size_confirmed: false
camera_list: []
})
.declareMethod('render', function (options) {
// This method is called during the ERP5 form rendering
......@@ -1037,4 +1039,4 @@
}(rJS, RSVP, window, document, navigator, Cropper, Promise, JSON, jIO,
promiseEventListener, domsugar, createImageBitmap, FormData, Caman,
FileReader, DataView, URL, fx));
FileReader, DataView, URL, fx));
\ No newline at end of file
......@@ -244,7 +244,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>982.62865.31516.35805</string> </value>
<value> <string>982.62866.16795.56132</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -262,7 +262,7 @@
</tuple>
<state>
<tuple>
<float>1585921095.31</float>
<float>1585922429.02</float>
<string>UTC</string>
</tuple>
</state>
......
......@@ -94,6 +94,10 @@ div[data-gadget-url$="gadget_document_scanner.html"] {
height: calc(6em + 1px);
}
.review-img-container {
height: 70vh;
}
.img-container, .camera-input {
/* Never limit the container height here */
position: relative;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment