Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
138
Merge Requests
138
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
erp5
Commits
ff5255d5
Commit
ff5255d5
authored
Jan 29, 2020
by
Gabriel Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_document_scanner: Improve texts of all buttons
parent
2a5410de
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
bt5/erp5_document_scanner/PathTemplateItem/web_page_module/rjs_gadget_document_scanner_js.js
...ateItem/web_page_module/rjs_gadget_document_scanner_js.js
+7
-7
bt5/erp5_document_scanner/PathTemplateItem/web_page_module/rjs_gadget_document_scanner_js.xml
...teItem/web_page_module/rjs_gadget_document_scanner_js.xml
+2
-2
No files found.
bt5/erp5_document_scanner/PathTemplateItem/web_page_module/rjs_gadget_document_scanner_js.js
View file @
ff5255d5
...
@@ -95,7 +95,7 @@
...
@@ -95,7 +95,7 @@
})
})
.
push
(
function
()
{
.
push
(
function
()
{
var
state_dict
=
{};
var
state_dict
=
{};
state_dict
[
'
blob_state_
'
+
blob_page
]
=
'
stored
'
;
state_dict
[
'
blob_state_
'
+
blob_page
]
=
'
OK
'
;
// XXX TODO: ajax must return a active process image content UUID
// XXX TODO: ajax must return a active process image content UUID
// which should be sent in the final form submittion
// which should be sent in the final form submittion
state_dict
[
'
blob_uuid_
'
+
blob_page
]
=
'
XXX
'
;
state_dict
[
'
blob_uuid_
'
+
blob_page
]
=
'
XXX
'
;
...
@@ -103,7 +103,7 @@
...
@@ -103,7 +103,7 @@
},
function
()
{
},
function
()
{
// XXX TODO: Handle error case
// XXX TODO: Handle error case
var
state_dict
=
{};
var
state_dict
=
{};
state_dict
[
'
blob_state_
'
+
blob_page
]
=
'
failed
'
;
state_dict
[
'
blob_state_
'
+
blob_page
]
=
'
Error
'
;
return
gadget
.
changeState
(
state_dict
);
return
gadget
.
changeState
(
state_dict
);
});
});
}
}
...
@@ -239,7 +239,7 @@
...
@@ -239,7 +239,7 @@
// XXX TODO display a loader when sending
// XXX TODO display a loader when sending
if
(
gadget
.
state
[
'
blob_state_
'
+
i
]
!==
'
deleted
'
)
{
if
(
gadget
.
state
[
'
blob_state_
'
+
i
]
!==
'
deleted
'
)
{
thumbnail_dom_list
.
push
(
domsugar
(
'
button
'
,
{
type
:
'
button
'
,
thumbnail_dom_list
.
push
(
domsugar
(
'
button
'
,
{
type
:
'
button
'
,
text
:
'
Im
age
'
+
(
i
+
1
)
+
'
(
'
+
gadget
.
state
[
'
blob_state_
'
+
i
]
+
'
)
'
,
text
:
'
P
age
'
+
(
i
+
1
)
+
'
(
'
+
gadget
.
state
[
'
blob_state_
'
+
i
]
+
'
)
'
,
// Do not allow to show again the current image
// Do not allow to show again the current image
// or do not allow to show sending image (to simplify button management)
// or do not allow to show sending image (to simplify button management)
disabled
:
(
i
===
gadget
.
state
.
page
)
||
(
gadget
.
state
[
'
blob_state_
'
+
i
]
===
'
sending
'
),
disabled
:
(
i
===
gadget
.
state
.
page
)
||
(
gadget
.
state
[
'
blob_state_
'
+
i
]
===
'
sending
'
),
...
@@ -252,7 +252,7 @@
...
@@ -252,7 +252,7 @@
// Always add a button to generate a new image
// Always add a button to generate a new image
// XXX TODO translation + right term
// XXX TODO translation + right term
thumbnail_dom_list
.
push
(
domsugar
(
'
button
'
,
{
type
:
'
button
'
,
thumbnail_dom_list
.
push
(
domsugar
(
'
button
'
,
{
type
:
'
button
'
,
text
:
'
New
'
,
text
:
'
New
Page
'
,
// Do not allow to show again the current image
// Do not allow to show again the current image
disabled
:
(
len
===
gadget
.
state
.
page
-
1
),
disabled
:
(
len
===
gadget
.
state
.
page
-
1
),
'
class
'
:
'
new-btn
'
'
class
'
:
'
new-btn
'
...
@@ -292,7 +292,7 @@
...
@@ -292,7 +292,7 @@
video
.
play
();
video
.
play
();
return
RSVP
.
all
([
return
RSVP
.
all
([
getVideoDeviceList
(),
getVideoDeviceList
(),
gadget
.
getTranslationList
([
"
Take Pic
ture
"
,
"
Change Camera
"
])
gadget
.
getTranslationList
([
"
Cap
ture
"
,
"
Change Camera
"
])
]);
]);
})
})
.
push
(
function
(
result_list
)
{
.
push
(
function
(
result_list
)
{
...
@@ -346,7 +346,7 @@
...
@@ -346,7 +346,7 @@
.
push
(
function
(
blob
)
{
.
push
(
function
(
blob
)
{
gadget
.
detached_promise_dict
.
media_stream
.
cancel
(
'
Not needed anymore, as captured
'
);
gadget
.
detached_promise_dict
.
media_stream
.
cancel
(
'
Not needed anymore, as captured
'
);
return
RSVP
.
all
([
return
RSVP
.
all
([
gadget
.
getTranslationList
([
"
Reset
"
,
"
Confirm
"
]),
gadget
.
getTranslationList
([
"
Delete
"
,
"
Save
"
]),
createImageBitmap
(
blob
)
createImageBitmap
(
blob
)
]);
]);
})
})
...
@@ -399,7 +399,7 @@
...
@@ -399,7 +399,7 @@
}
}
function
renderSubmittedPicture
(
gadget
)
{
function
renderSubmittedPicture
(
gadget
)
{
return
gadget
.
getTranslationList
([
"
Delete
"
,
"
Retry
"
])
return
gadget
.
getTranslationList
([
"
Delete
"
,
"
Save
"
])
.
push
(
function
(
translation_list
)
{
.
push
(
function
(
translation_list
)
{
var
button_list
=
[
var
button_list
=
[
// XXX TODO: improve icon
// XXX TODO: improve icon
...
...
bt5/erp5_document_scanner/PathTemplateItem/web_page_module/rjs_gadget_document_scanner_js.xml
View file @
ff5255d5
...
@@ -244,7 +244,7 @@
...
@@ -244,7 +244,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
981.30
481.36256.38348
</string>
</value>
<value>
<string>
981.30
507.33878.33041
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -262,7 +262,7 @@
...
@@ -262,7 +262,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
1580
220211.01
</float>
<float>
1580
308941.19
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment