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
Eteri
erp5
Commits
d65e4255
Commit
d65e4255
authored
Aug 04, 2017
by
Vincent Bechu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_officejs_ooffice] Fix view and presentation site layout
parent
56ac7b76
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
47 additions
and
44 deletions
+47
-44
bt5/erp5_officejs_ooffice/PathTemplateItem/web_page_module/gadget_ooffice_jio_presentation_view_js.js
...eb_page_module/gadget_ooffice_jio_presentation_view_js.js
+13
-12
bt5/erp5_officejs_ooffice/PathTemplateItem/web_page_module/gadget_ooffice_jio_presentation_view_js.xml
...b_page_module/gadget_ooffice_jio_presentation_view_js.xml
+2
-2
bt5/erp5_officejs_ooffice/PathTemplateItem/web_page_module/gadget_ooffice_jio_spreadsheet_view_js.js
...web_page_module/gadget_ooffice_jio_spreadsheet_view_js.js
+12
-11
bt5/erp5_officejs_ooffice/PathTemplateItem/web_page_module/gadget_ooffice_jio_spreadsheet_view_js.xml
...eb_page_module/gadget_ooffice_jio_spreadsheet_view_js.xml
+2
-2
bt5/erp5_officejs_ooffice/PathTemplateItem/web_page_module/gadget_ooffice_jio_text_view_js.js
...teItem/web_page_module/gadget_ooffice_jio_text_view_js.js
+12
-11
bt5/erp5_officejs_ooffice/PathTemplateItem/web_page_module/gadget_ooffice_jio_text_view_js.xml
...eItem/web_page_module/gadget_ooffice_jio_text_view_js.xml
+2
-2
bt5/erp5_officejs_ooffice/PathTemplateItem/web_site_module/ooffice_presentation/development.xml
...Item/web_site_module/ooffice_presentation/development.xml
+4
-4
No files found.
bt5/erp5_officejs_ooffice/PathTemplateItem/web_page_module/gadget_ooffice_jio_presentation_view_js.js
View file @
d65e4255
...
...
@@ -23,9 +23,8 @@
return
this
.
changeState
({
jio_key
:
options
.
jio_key
,
doc
:
options
.
doc
,
editable
:
(
options
.
doc
.
content_type
===
undefined
||
options
.
doc
.
content_type
.
indexOf
(
"
application/x-asc
"
)
===
0
)
?
(
options
.
editable
?
1
:
0
)
:
0
editable
:
options
.
editable
?
1
:
0
,
content_editable
:
options
.
doc
.
content_type
.
indexOf
(
"
application/x-asc
"
)
===
0
});
})
...
...
@@ -81,7 +80,7 @@
});
})
.
push
(
function
(
blob
)
{
if
(
gadget
.
state
.
editable
)
{
if
(
gadget
.
state
.
content_
editable
)
{
return
jIO
.
util
.
readBlobAsDataURL
(
blob
);
}
return
jIO
.
util
.
readBlobAsText
(
blob
);
...
...
@@ -91,7 +90,7 @@
return
gadget
.
getDeclaredGadget
(
'
form_view
'
);
})
.
push
(
function
(
form_gadget
)
{
var
editable
=
gadget
.
state
.
editable
;
var
editable
=
gadget
.
state
.
editable
&&
gadget
.
state
.
content_editable
;
return
form_gadget
.
render
({
erp5_document
:
{
"
_embedded
"
:
{
"
_view
"
:
{
...
...
@@ -151,13 +150,13 @@
"
type
"
:
"
StringField
"
},
"
my_content
"
:
{
"
default
"
:
editable
?
data
:
""
,
"
css_class
"
:
editable
===
1
?
"
content-iframe-maximize
"
:
""
,
"
default
"
:
((
gadget
.
state
.
editable
||
!
gadget
.
state
.
content_editable
)
?
data
:
""
)
,
"
css_class
"
:
editable
?
"
content-iframe-maximize
"
:
""
,
"
required
"
:
0
,
"
editable
"
:
editable
,
"
key
"
:
"
text_content
"
,
"
hidden
"
:
0
,
"
type
"
:
editable
===
1
?
"
GadgetField
"
:
"
EditorField
"
,
"
type
"
:
editable
?
"
GadgetField
"
:
"
EditorField
"
,
"
url
"
:
"
../ooffice_presentation_gadget/development/
"
,
"
sandbox
"
:
"
iframe
"
}
...
...
@@ -196,10 +195,12 @@
next_url
:
url_list
[
2
],
save_action
:
true
};
if
(
gadget
.
state
.
editable
)
{
header_dict
.
edit_content
=
url_list
[
3
].
replace
(
"
n.editable=true
"
,
""
).
replace
(
"
p.editable=true
"
,
""
);
}
else
{
header_dict
.
edit_properties
=
url_list
[
3
];
if
(
gadget
.
state
.
content_editable
)
{
if
(
gadget
.
state
.
editable
)
{
header_dict
.
edit_properties
=
url_list
[
3
].
replace
(
"
n.editable=true
"
,
""
).
replace
(
"
p.editable=true
"
,
""
);
}
else
{
header_dict
.
edit_content
=
url_list
[
3
];
}
}
return
gadget
.
updateHeader
(
header_dict
);
});
...
...
bt5/erp5_officejs_ooffice/PathTemplateItem/web_page_module/gadget_ooffice_jio_presentation_view_js.xml
View file @
d65e4255
...
...
@@ -233,7 +233,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
961.
8941.47778.20736
</string>
</value>
<value>
<string>
961.
12049.45812.375
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -251,7 +251,7 @@
</tuple>
<state>
<tuple>
<float>
1501
674778
.2
</float>
<float>
1501
852055
.2
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
bt5/erp5_officejs_ooffice/PathTemplateItem/web_page_module/gadget_ooffice_jio_spreadsheet_view_js.js
View file @
d65e4255
...
...
@@ -23,9 +23,8 @@
return
this
.
changeState
({
jio_key
:
options
.
jio_key
,
doc
:
options
.
doc
,
editable
:
(
options
.
doc
.
content_type
===
undefined
||
options
.
doc
.
content_type
.
indexOf
(
"
application/x-asc
"
)
===
0
)
?
(
options
.
editable
?
1
:
0
)
:
0
editable
:
options
.
editable
?
1
:
0
,
content_editable
:
options
.
doc
.
content_type
.
indexOf
(
"
application/x-asc
"
)
===
0
});
})
...
...
@@ -91,7 +90,7 @@
return
gadget
.
getDeclaredGadget
(
'
form_view
'
);
})
.
push
(
function
(
form_gadget
)
{
var
editable
=
gadget
.
state
.
editable
;
var
editable
=
gadget
.
state
.
editable
&&
gadget
.
state
.
content_editable
;
return
form_gadget
.
render
({
erp5_document
:
{
"
_embedded
"
:
{
"
_view
"
:
{
...
...
@@ -151,13 +150,13 @@
"
type
"
:
"
StringField
"
},
"
my_content
"
:
{
"
default
"
:
editable
?
data
:
""
,
"
css_class
"
:
editable
===
1
?
"
content-iframe-maximize
"
:
""
,
"
default
"
:
gadget
.
state
.
editable
||
!
gadget
.
state
.
content_editable
?
data
:
""
,
"
css_class
"
:
editable
?
"
content-iframe-maximize
"
:
""
,
"
required
"
:
0
,
"
editable
"
:
editable
,
"
key
"
:
"
text_content
"
,
"
hidden
"
:
0
,
"
type
"
:
editable
===
1
?
"
GadgetField
"
:
"
EditorField
"
,
"
type
"
:
editable
?
"
GadgetField
"
:
"
EditorField
"
,
"
url
"
:
"
../ooffice_spreadsheet_gadget/development/
"
,
"
sandbox
"
:
"
iframe
"
}
...
...
@@ -196,10 +195,12 @@
next_url
:
url_list
[
2
],
save_action
:
true
};
if
(
gadget
.
state
.
editable
)
{
header_dict
.
edit_properties
=
url_list
[
3
].
replace
(
"
n.editable=true
"
,
""
).
replace
(
"
p.editable=true
"
,
""
);
}
else
{
header_dict
.
edit_content
=
url_list
[
3
];
if
(
gadget
.
state
.
content_editable
)
{
if
(
gadget
.
state
.
editable
)
{
header_dict
.
edit_properties
=
url_list
[
3
].
replace
(
"
n.editable=true
"
,
""
).
replace
(
"
p.editable=true
"
,
""
);
}
else
{
header_dict
.
edit_content
=
url_list
[
3
];
}
}
return
gadget
.
updateHeader
(
header_dict
);
});
...
...
bt5/erp5_officejs_ooffice/PathTemplateItem/web_page_module/gadget_ooffice_jio_spreadsheet_view_js.xml
View file @
d65e4255
...
...
@@ -233,7 +233,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
961.
8942.12786.29798
</string>
</value>
<value>
<string>
961.
12049.61422.61457
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -251,7 +251,7 @@
</tuple>
<state>
<tuple>
<float>
1501
674744.05
</float>
<float>
1501
852106.78
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
bt5/erp5_officejs_ooffice/PathTemplateItem/web_page_module/gadget_ooffice_jio_text_view_js.js
View file @
d65e4255
...
...
@@ -23,9 +23,8 @@
return
this
.
changeState
({
jio_key
:
options
.
jio_key
,
doc
:
options
.
doc
,
editable
:
(
options
.
doc
.
content_type
===
undefined
||
options
.
doc
.
content_type
.
indexOf
(
"
application/x-asc
"
)
===
0
)
?
(
options
.
editable
?
1
:
0
)
:
0
editable
:
options
.
editable
?
1
:
0
,
content_editable
:
options
.
doc
.
content_type
.
indexOf
(
"
application/x-asc
"
)
===
0
});
})
...
...
@@ -91,7 +90,7 @@
return
gadget
.
getDeclaredGadget
(
'
form_view
'
);
})
.
push
(
function
(
form_gadget
)
{
var
editable
=
gadget
.
state
.
editable
;
var
editable
=
gadget
.
state
.
editable
&&
gadget
.
state
.
content_editable
;
return
form_gadget
.
render
({
erp5_document
:
{
"
_embedded
"
:
{
"
_view
"
:
{
...
...
@@ -151,13 +150,13 @@
"
type
"
:
"
StringField
"
},
"
my_content
"
:
{
"
default
"
:
editable
?
data
:
""
,
"
css_class
"
:
editable
===
1
?
"
content-iframe-maximize
"
:
""
,
"
default
"
:
gadget
.
state
.
editable
||
!
gadget
.
state
.
content_editable
?
data
:
""
,
"
css_class
"
:
editable
?
"
content-iframe-maximize
"
:
""
,
"
required
"
:
0
,
"
editable
"
:
editable
,
"
key
"
:
"
text_content
"
,
"
hidden
"
:
0
,
"
type
"
:
editable
===
1
?
"
GadgetField
"
:
"
EditorField
"
,
"
type
"
:
editable
?
"
GadgetField
"
:
"
EditorField
"
,
"
url
"
:
"
../ooffice_text_gadget/development/
"
,
"
sandbox
"
:
"
iframe
"
}
...
...
@@ -196,10 +195,12 @@
next_url
:
url_list
[
2
],
save_action
:
true
};
if
(
gadget
.
state
.
editable
)
{
header_dict
.
edit_properties
=
url_list
[
3
].
replace
(
"
n.editable=true
"
,
""
).
replace
(
"
p.editable=true
"
,
""
);
}
else
{
header_dict
.
edit_content
=
url_list
[
3
];
if
(
gadget
.
state
.
content_editable
)
{
if
(
gadget
.
state
.
editable
)
{
header_dict
.
edit_properties
=
url_list
[
3
].
replace
(
"
n.editable=true
"
,
""
).
replace
(
"
p.editable=true
"
,
""
);
}
else
{
header_dict
.
edit_content
=
url_list
[
3
];
}
}
return
gadget
.
updateHeader
(
header_dict
);
});
...
...
bt5/erp5_officejs_ooffice/PathTemplateItem/web_page_module/gadget_ooffice_jio_text_view_js.xml
View file @
d65e4255
...
...
@@ -233,7 +233,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
961.
8942.56202.26999
</string>
</value>
<value>
<string>
961.
12050.13423.63675
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -251,7 +251,7 @@
</tuple>
<state>
<tuple>
<float>
1501
674679.08
</float>
<float>
1501
852115.45
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
bt5/erp5_officejs_ooffice/PathTemplateItem/web_site_module/ooffice_presentation/development.xml
View file @
d65e4255
...
...
@@ -317,7 +317,7 @@
</item>
<item>
<key>
<string>
configuration_default_jio_document_page_gadget_url
</string>
</key>
<value>
<string>
ojs_
document_list
</string>
</value>
<value>
<string>
ojs_
controller
</string>
</value>
</item>
<item>
<key>
<string>
configuration_default_view_action_reference
</string>
</key>
...
...
@@ -325,7 +325,7 @@
</item>
<item>
<key>
<string>
configuration_frontpage_gadget_url
</string>
</key>
<value>
<string>
ojs_
controller
</string>
</value>
<value>
<string>
ojs_
document_list
</string>
</value>
</item>
<item>
<key>
<string>
configuration_hateoas_url
</string>
</key>
...
...
@@ -570,7 +570,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
961.1
764.47271.40089
</string>
</value>
<value>
<string>
961.1
0686.10882.5973
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -588,7 +588,7 @@
</tuple>
<state>
<tuple>
<float>
1501
234963.
4
</float>
<float>
1501
848515.7
4
</float>
<string>
UTC
</string>
</tuple>
</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