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
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
preetwinder
erp5
Commits
4712b3ac
Commit
4712b3ac
authored
8 years ago
by
Hardik Juneja
Committed by
Cédric Le Ninivin
8 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_officejs: Add auto sync functionality and move document list dialog upwards [UX changes]
parent
e5dbbbca
Changes
14
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
83 additions
and
60 deletions
+83
-60
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_web_page_view_html.html
...b_page_module/gadget_officejs_jio_web_page_view_html.html
+4
-6
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_web_page_view_html.xml
...eb_page_module/gadget_officejs_jio_web_page_view_html.xml
+3
-3
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_configurator_html.html
...ge_module/gadget_officejs_page_jio_configurator_html.html
+22
-22
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_configurator_html.xml
...age_module/gadget_officejs_page_jio_configurator_html.xml
+3
-3
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_configurator_js.js
...b_page_module/gadget_officejs_page_jio_configurator_js.js
+3
-0
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_configurator_js.xml
..._page_module/gadget_officejs_page_jio_configurator_js.xml
+3
-3
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_dav_configurator_js.js
...ge_module/gadget_officejs_page_jio_dav_configurator_js.js
+3
-0
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_dav_configurator_js.xml
...e_module/gadget_officejs_page_jio_dav_configurator_js.xml
+2
-2
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_erp5_configurator_html.html
...dule/gadget_officejs_page_jio_erp5_configurator_html.html
+2
-2
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_erp5_configurator_html.xml
...odule/gadget_officejs_page_jio_erp5_configurator_html.xml
+3
-3
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_erp5_configurator_js.js
...e_module/gadget_officejs_page_jio_erp5_configurator_js.js
+4
-0
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_erp5_configurator_js.xml
..._module/gadget_officejs_page_jio_erp5_configurator_js.xml
+3
-3
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_sync_js.js
...plateItem/web_page_module/gadget_officejs_page_sync_js.js
+25
-10
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_sync_js.xml
...lateItem/web_page_module/gadget_officejs_page_sync_js.xml
+3
-3
No files found.
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_web_page_view_html.html
View file @
4712b3ac
...
...
@@ -14,17 +14,15 @@
<
form
class
=
"
view-web-page-form
"
>
<
div
class
=
"
center
"
>
<
div
class
=
"
ui-field-contain
"
>
<
div
class
=
"
center
"
>
<
div
class
=
"
ui-field-contain
"
>
<
label
data
-
i18n
=
"
Title:
"
>
Title
:
<
/label
>
<
input
type
=
"
text
"
name
=
"
title
"
value
=
"
{{title}}
"
>
<
/div
>
<
button
type
=
"
submit
"
data
-
i18n
=
"
Save
"
style
=
"
display:none;
"
>
Save
<
/button
>
<
/div
>
<
div
class
=
"
ui-field-contain
"
>
<
fieldset
data
-
role
=
"
collapsible
"
>
<
legend
>
Extra
Properties
<
/legend
>
<
div
class
=
"
ui-field-contain
"
>
<
label
data
-
i18n
=
"
Reference:
"
>
Reference
:
<
/label
>
...
...
@@ -46,8 +44,8 @@
<
textarea
name
=
"
description
"
>
{{
description
}}
<
/textarea
>
<
/div
>
<
/div
>
<
/div
>
<
/fieldset
>
<
div
class
=
'
document-content
'
><
/div
>
<
/div
>
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_web_page_view_html.xml
View file @
4712b3ac
...
...
@@ -218,7 +218,7 @@
</item>
<item>
<key>
<string>
actor
</string>
</key>
<value>
<string>
cedric.le.ninivin
</string>
</value>
<value>
<string>
zope
</string>
</value>
</item>
<item>
<key>
<string>
comment
</string>
</key>
...
...
@@ -232,7 +232,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
9
45.58608.59350.33075
</string>
</value>
<value>
<string>
9
54.38520.8745.1109
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -250,7 +250,7 @@
</tuple>
<state>
<tuple>
<float>
14
42858061.15
</float>
<float>
14
76433509.51
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_configurator_html.html
View file @
4712b3ac
...
...
@@ -21,6 +21,28 @@
</3>
</section>
</article>
<article
class=
"ui-content ui-body-c document-access"
>
<section
class=
"ui-content-header-plain"
>
<h3
class=
"ui-content-title ui-body-c"
>
<span
class=
"ui-icon ui-icon-custom ui-icon-file-text-o"
>
</span>
Your Documents
</h3>
</section>
<section
class=
"ui-body-c ui-content-section"
>
<p
style=
"color: red"
>
Continue by
<b>
synchronizing
</b>
with your remote storage or
<b>
accessing
</b>
your documents
</p>
<div
class=
"ui-controlgroup ui-controlgroup-horizontal"
>
<div
class=
"ui-grid-a ui-responsive"
>
<div
class=
"ui-block-a"
>
<a
class=
"ui-btn"
href=
"#page=sync&auto_repair=true"
data-i18n=
"Synchronize"
>
Synchronize
</a>
</div>
<div
class=
"ui-block-b"
>
<a
class=
"ui-btn"
href=
"#page=document_list"
data-i18n=
"Go to document List"
>
Access document List
</a>
</div>
</div>
</div>
</section>
</article>
<article
class=
"ui-content ui-body-c"
>
<section
class=
"ui-content-header-plain"
>
...
...
@@ -52,27 +74,5 @@
<!--/div-->
</section>
</article>
<article
class=
"ui-content ui-body-c document-access"
>
<section
class=
"ui-content-header-plain"
>
<h3
class=
"ui-content-title ui-body-c"
>
<span
class=
"ui-icon ui-icon-custom ui-icon-file-text-o"
>
</span>
Your Documents
</h3>
</section>
<section
class=
"ui-body-c ui-content-section"
>
<p
style=
"color: red"
>
Continue by
<b>
synchronizing
</b>
with your remote storage or
<b>
accessing
</b>
your documents
</p>
<div
class=
"ui-controlgroup ui-controlgroup-horizontal"
>
<div
class=
"ui-grid-a ui-responsive"
>
<div
class=
"ui-block-a"
>
<a
class=
"ui-btn"
href=
"#page=sync"
data-i18n=
"Synchronize"
>
Synchronize
</a>
</div>
<div
class=
"ui-block-b"
>
<a
class=
"ui-btn"
href=
"#page=document_list"
data-i18n=
"Go to document List"
>
Access document List
</a>
</div>
</div>
</div>
</section>
</article>
</body>
</html>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_configurator_html.xml
View file @
4712b3ac
...
...
@@ -220,7 +220,7 @@
</item>
<item>
<key>
<string>
actor
</string>
</key>
<value>
<string>
cedric.le.ninivin
</string>
</value>
<value>
<string>
zope
</string>
</value>
</item>
<item>
<key>
<string>
comment
</string>
</key>
...
...
@@ -234,7 +234,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
9
47.12629.17894.55808
</string>
</value>
<value>
<string>
9
54.38531.13446.10769
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -252,7 +252,7 @@
</tuple>
<state>
<tuple>
<float>
14
48032104.14
</float>
<float>
14
76434371.85
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_configurator_js.js
View file @
4712b3ac
...
...
@@ -25,6 +25,9 @@
})
.
push
(
function
()
{
return
gadget
.
reload
();
})
.
push
(
function
()
{
return
gadget
.
redirect
({
page
:
'
sync
'
,
auto_repair
:
'
true
'
});
});
}
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_configurator_js.xml
View file @
4712b3ac
...
...
@@ -216,7 +216,7 @@
</item>
<item>
<key>
<string>
actor
</string>
</key>
<value>
<string>
cedric.le.ninivin
</string>
</value>
<value>
<string>
zope
</string>
</value>
</item>
<item>
<key>
<string>
comment
</string>
</key>
...
...
@@ -230,7 +230,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
9
47.12629.17894.55808
</string>
</value>
<value>
<string>
9
54.38525.9614.27067
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -248,7 +248,7 @@
</tuple>
<state>
<tuple>
<float>
14
47936126.33
</float>
<float>
14
76437867.08
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_dav_configurator_js.js
View file @
4712b3ac
...
...
@@ -60,6 +60,9 @@
})
.
push
(
function
()
{
return
gadget
.
reload
();
})
.
push
(
function
()
{
return
gadget
.
redirect
({
page
:
'
sync
'
,
auto_repair
:
'
true
'
});
});
}
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_dav_configurator_js.xml
View file @
4712b3ac
...
...
@@ -234,7 +234,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
9
47.53845.25131.55500
</string>
</value>
<value>
<string>
9
54.38524.51199.12134
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -252,7 +252,7 @@
</tuple>
<state>
<tuple>
<float>
14
50259852.52
</float>
<float>
14
76437846.74
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_erp5_configurator_html.html
View file @
4712b3ac
...
...
@@ -30,7 +30,7 @@
<div
class=
"ui-form"
>
<div
class=
"ui-field-contain"
>
<label
data-i18n=
"Connection URL:"
>
Connection URL:
</label>
<input
type=
"url"
name=
"erp5_url"
required
disabled
/>
<input
type=
"url"
name=
"erp5_url"
class=
"ui-focus"
required
disabled
/>
</div>
<div
class=
"select-storage ui-controlgroup ui-controlgroup-horizontal"
>
<div
class=
"ui-grid-b ui-responsive"
>
...
...
@@ -56,7 +56,7 @@
<div
class=
"ui-controlgroup ui-controlgroup-horizontal"
>
<div
class=
"ui-grid-a ui-responsive"
>
<div
class=
"ui-block-a"
>
<a
class=
"ui-btn"
href=
"#page=sync"
data-i18n=
"Synchronize"
>
Synchronize
</a>
<a
class=
"ui-btn"
href=
"#page=sync
&auto_repair=true
"
data-i18n=
"Synchronize"
>
Synchronize
</a>
</div>
<div
class=
"ui-block-b"
>
<a
class=
"ui-btn"
href=
"#page=document_list"
data-i18n=
"Go to document List"
>
Access document List
</a>
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_erp5_configurator_html.xml
View file @
4712b3ac
...
...
@@ -259,7 +259,7 @@
</item>
<item>
<key>
<string>
actor
</string>
</key>
<value>
<string>
supercedriclen
</string>
</value>
<value>
<string>
zope
</string>
</value>
</item>
<item>
<key>
<string>
comment
</string>
</key>
...
...
@@ -273,7 +273,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
95
1.60950.25016.15394
</string>
</value>
<value>
<string>
95
4.38565.29657.34116
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -291,7 +291,7 @@
</tuple>
<state>
<tuple>
<float>
14
66162879.59
</float>
<float>
14
76436854.76
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_erp5_configurator_js.js
View file @
4712b3ac
...
...
@@ -59,6 +59,9 @@
})
.
push
(
function
()
{
return
gadget
.
reload
();
})
.
push
(
function
()
{
return
gadget
.
redirect
({
page
:
'
sync
'
,
auto_repair
:
'
true
'
});
});
}
...
...
@@ -163,6 +166,7 @@
erp5_url_input
.
value
=
erp5_url
||
"
https://www.example.org
"
;
erp5_url_input
.
removeAttribute
(
"
disabled
"
);
erp5_url_input
.
parentNode
.
classList
.
remove
(
'
ui-state-disabled
'
);
erp5_url_input
.
focus
();
});
});
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_erp5_configurator_js.xml
View file @
4712b3ac
...
...
@@ -255,7 +255,7 @@
</item>
<item>
<key>
<string>
actor
</string>
</key>
<value>
<string>
supercedriclen
</string>
</value>
<value>
<string>
zope
</string>
</value>
</item>
<item>
<key>
<string>
comment
</string>
</key>
...
...
@@ -269,7 +269,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
95
1.61016.16868.60825
</string>
</value>
<value>
<string>
95
4.38591.30253.42973
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -287,7 +287,7 @@
</tuple>
<state>
<tuple>
<float>
14
66159556.89
</float>
<float>
14
76438691.35
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_sync_js.js
View file @
4712b3ac
...
...
@@ -9,9 +9,24 @@
templater
.
getElementById
(
"
page-template
"
).
innerHTML
);
function
repair_and_redirect
(
gadget
)
{
gadget
.
props
.
element
.
querySelector
(
"
button
"
).
disabled
=
true
;
return
new
RSVP
.
Queue
()
.
push
(
function
()
{
return
gadget
.
repair
()
})
.
push
(
function
(
result
)
{
if
(
result
!==
undefined
&&
result
.
hasOwnProperty
(
'
redirect
'
)){
return
gadget
.
redirect
(
result
.
redirect
);
}
return
gadget
.
redirect
({});
});
}
gadget_klass
.
ready
(
function
(
g
)
{
g
.
props
=
{};
g
.
props
.
auto_repair
=
false
;
return
g
.
getElement
()
.
push
(
function
(
element
)
{
g
.
props
.
element
=
element
;
...
...
@@ -22,6 +37,11 @@
.
declareAcquiredMethod
(
"
translateHtml
"
,
"
translateHtml
"
)
.
declareMethod
(
"
render
"
,
function
()
{
var
gadget
=
this
;
if
(
arguments
[
0
].
auto_repair
===
"
true
"
)
{
gadget
.
props
.
auto_repair
=
true
;
}
return
gadget
.
updateHeader
({
title
:
"
Synchronize
"
})
...
...
@@ -39,6 +59,10 @@
.
declareService
(
function
()
{
var
gadget
=
this
;
if
(
gadget
.
props
.
auto_repair
===
true
)
{
return
repair_and_redirect
(
gadget
);
}
return
new
RSVP
.
Queue
()
.
push
(
function
()
{
return
promiseEventListener
(
...
...
@@ -48,16 +72,7 @@
);
})
.
push
(
function
()
{
gadget
.
props
.
element
.
querySelector
(
"
button
"
)
.
disabled
=
true
;
return
gadget
.
repair
();
})
.
push
(
function
(
result
)
{
if
(
result
!==
undefined
&&
result
.
hasOwnProperty
(
'
redirect
'
)){
return
gadget
.
redirect
(
result
.
redirect
);
}
return
gadget
.
redirect
({});
return
repair_and_redirect
(
gadget
);
});
});
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_sync_js.xml
View file @
4712b3ac
...
...
@@ -214,7 +214,7 @@
</item>
<item>
<key>
<string>
actor
</string>
</key>
<value>
<string>
cedric.le.ninivin
</string>
</value>
<value>
<string>
zope
</string>
</value>
</item>
<item>
<key>
<string>
comment
</string>
</key>
...
...
@@ -228,7 +228,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
9
45.58607.65382.65228
</string>
</value>
<value>
<string>
9
54.38795.35440.52684
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -246,7 +246,7 @@
</tuple>
<state>
<tuple>
<float>
14
42858160.45
</float>
<float>
14
76450033.82
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
This diff is collapsed.
Click to expand it.
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