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
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
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
amrani
erp5
Commits
bd8aed5e
Commit
bd8aed5e
authored
Jul 31, 2018
by
amrani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added support for POPUP gadget in launcher
parent
df54ab65
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
123 additions
and
20 deletions
+123
-20
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_appcache.xml
...TemplateItem/web_page_module/rjs_gadget_erp5_appcache.xml
+4
-2
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_launcher_html.html
...teItem/web_page_module/rjs_gadget_erp5_launcher_html.html
+4
-0
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_launcher_html.xml
...ateItem/web_page_module/rjs_gadget_erp5_launcher_html.xml
+2
-2
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_launcher_js.js
...mplateItem/web_page_module/rjs_gadget_erp5_launcher_js.js
+6
-0
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_launcher_js.xml
...plateItem/web_page_module/rjs_gadget_erp5_launcher_js.xml
+2
-2
bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui/erp5css.less.txt
...teItem/portal_skins/erp5_web_renderjs_ui/erp5css.less.txt
+105
-14
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_appcache.xml
View file @
bd8aed5e
...
@@ -182,6 +182,8 @@ gadget_erp5_label_field.html\n
...
@@ -182,6 +182,8 @@ gadget_erp5_label_field.html\n
gadget_erp5_label_field.js\n
gadget_erp5_label_field.js\n
gadget_erp5_notification.html\n
gadget_erp5_notification.html\n
gadget_erp5_notification.js\n
gadget_erp5_notification.js\n
gadget_erp5_popup.html\n
gadget_erp5_popup.js\n
gadget_erp5_page_action.html\n
gadget_erp5_page_action.html\n
gadget_erp5_page_action.js\n
gadget_erp5_page_action.js\n
gadget_erp5_page_export.html\n
gadget_erp5_page_export.html\n
...
@@ -386,7 +388,7 @@ NETWORK:\n
...
@@ -386,7 +388,7 @@ NETWORK:\n
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
96
5.19284.27735.63931
</string>
</value>
<value>
<string>
96
9.16049.29484.11946
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -404,7 +406,7 @@ NETWORK:\n
...
@@ -404,7 +406,7 @@ NETWORK:\n
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
15
17844236.51
</float>
<float>
15
32944412.48
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_launcher_html.html
View file @
bd8aed5e
...
@@ -44,6 +44,10 @@
...
@@ -44,6 +44,10 @@
data-gadget-scope=
"notification"
data-gadget-scope=
"notification"
data-gadget-sandbox=
"public"
></div>
data-gadget-sandbox=
"public"
></div>
<div
data-gadget-url=
"gadget_erp5_popup.html"
data-gadget-scope=
"popup"
data-gadget-sandbox=
"public"
></div>
<div
data-gadget-url=
"${translation_gadget}"
<div
data-gadget-url=
"${translation_gadget}"
data-gadget-scope=
"translation_gadget"
data-gadget-scope=
"translation_gadget"
data-gadget-sandbox=
"public"
></div>
data-gadget-sandbox=
"public"
></div>
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_launcher_html.xml
View file @
bd8aed5e
...
@@ -236,7 +236,7 @@
...
@@ -236,7 +236,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
96
5.19244.9866.14694
</string>
</value>
<value>
<string>
96
8.54671.14652.65092
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -254,7 +254,7 @@
...
@@ -254,7 +254,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
15
17843980.1
</float>
<float>
15
31350333.5
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_launcher_js.js
View file @
bd8aed5e
...
@@ -374,6 +374,12 @@
...
@@ -374,6 +374,12 @@
]);
]);
})
})
.
allowPublicAcquisition
(
'
popupshow
'
,
function
(
argument_list
)
{
return
RSVP
.
all
([
route
(
this
,
"
popup
"
,
'
display_popup
'
,
argument_list
)
]);
})
.
allowPublicAcquisition
(
'
isDesktopMedia
'
,
function
(
argument_list
)
{
.
allowPublicAcquisition
(
'
isDesktopMedia
'
,
function
(
argument_list
)
{
return
window
.
matchMedia
(
"
(min-width: 85em)
"
).
matches
;
return
window
.
matchMedia
(
"
(min-width: 85em)
"
).
matches
;
})
})
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_launcher_js.xml
View file @
bd8aed5e
...
@@ -230,7 +230,7 @@
...
@@ -230,7 +230,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
96
6.11431.6711.50466
</string>
</value>
<value>
<string>
96
8.55010.57056.26112
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -248,7 +248,7 @@
...
@@ -248,7 +248,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
15
21043696.52
</float>
<float>
15
31350348.55
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui/erp5css.less.txt
View file @
bd8aed5e
...
@@ -997,9 +997,6 @@ div[data-gadget-scope='header'] .ui-header {
...
@@ -997,9 +997,6 @@ div[data-gadget-scope='header'] .ui-header {
@media @desktop {
@media @desktop {
.renderDesktopSubLink();
.renderDesktopSubLink();
}
}
&.ui-icon-warning {
background-color: @coloraccent;
}
}
}
}
}
...
@@ -1492,11 +1489,6 @@ div[data-gadget-scope='header'] .ui-header {
...
@@ -1492,11 +1489,6 @@ div[data-gadget-scope='header'] .ui-header {
}
}
}
}
.ui-icon-warning {
color: @coloraccent;
// Link is disabled in this case
opacity: 1;
}
}
}
/**********************************************
/**********************************************
...
@@ -1524,9 +1516,107 @@ div[data-gadget-scope='header'] .ui-header {
...
@@ -1524,9 +1516,107 @@ div[data-gadget-scope='header'] .ui-header {
}
}
}
}
/**********************************************
* POPUP
**********************************************/
@color_1: #FFFFFF;
@color_2: #ffffff;
@background_color_1: rgba(0,0,0,0.5);
@background_color_2: rgba(255, 255, 255, 1);
@background_color_3: #f4511e;
@background_color_4: #085078;
@keyframes overlayanimation {
0% {
margin-left: 100%;
transform: translateX(0%);
}
100% {
margin-left: 50%;
transform: translateX(-50%);
}
}
@media screen and (min-width: 320px) and (max-width: 400px) {
div[data-gadget-scope='popup'] {
div.overlay {
width: 320px;
}
}
}
@media screen and (min-width: 400px) {
div[data-gadget-scope='popup'] {
div.overlay {
width: 400px;
}
}
}
div[data-gadget-scope='popup'] {
background-color: @background_color_1;
visibility: hidden;
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
width: 100%;
height: 100%;
text-align: center;
z-index: 99998;
div.overlay {
margin: 100px auto;
padding: 0px;
padding-top: 0px;
text-align: center;
background-color: @background_color_2;
border: 1px solid #111111;
box-shadow: 2px 2px 40px #222;
animation: overlayanimation 0.2s ease-out;
}
form {
width: auto;
height: auto;
margin: 0 auto;
padding: 10px;
padding-top: 0px;
position: relative;
}
button {
display: inline-block;
background-color: @background_color_3;
border: none;
color: @color_1;
text-align: center;
font-size: 15px;
padding: 10px;
width: 100px;
cursor: pointer;
margin: 5px;
margin-top: 15px;
}
h3 {
font-size: 15px;
background-color: @background_color_4;
color: @color_2;
height: 30px;
line-height: 30px;
text-align: center;
border-bottom: 1px solid #000000;
}
span {
font-size: 45px;
overflow: hidden;
}
}
div[data-gadget-scope='popup'].visible {
visibility: visible;
}
/**********************************************
/**********************************************
* Listbox
* Listbox
**********************************************/
**********************************************/
div[data-gadget-scope='erp5_searchfield'] {
div[data-gadget-scope='erp5_searchfield'] {
padding-top: @margin-size;
padding-top: @margin-size;
...
@@ -1904,9 +1994,6 @@ div[data-gadget-scope='notification'] {
...
@@ -1904,9 +1994,6 @@ div[data-gadget-scope='notification'] {
.ui-controlgroup-controls {
.ui-controlgroup-controls {
button, a {
button, a {
.renderTabletHeaderButton();
.renderTabletHeaderButton();
&.ui-icon-warning {
background-color: @coloraccent;
}
}
}
}
}
...
@@ -1964,6 +2051,13 @@ div[data-gadget-scope='maximize'] button {
...
@@ -1964,6 +2051,13 @@ div[data-gadget-scope='maximize'] button {
}
}
}
}
.ui-icon-warning {
background-color: @coloraccent !important;
&::before {
content: "\f071";
}
}
.ui-icon-spinner {
.ui-icon-spinner {
// Don't fade spinner
// Don't fade spinner
opacity: 1;
opacity: 1;
...
@@ -2306,9 +2400,6 @@ div[data-gadget-scope='maximize'] button {
...
@@ -2306,9 +2400,6 @@ div[data-gadget-scope='maximize'] button {
.ui-icon-eye-slash::before {
.ui-icon-eye-slash::before {
content: "\f070";
content: "\f070";
}
}
.ui-icon-warning::before {
content: "\f071";
}
.ui-icon-low-vision::before {
.ui-icon-low-vision::before {
content: "\f2a8";
content: "\f2a8";
}
}
...
...
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