From d70b1d5a39e4c61f8a8788f0e6ee575515eb665f Mon Sep 17 00:00:00 2001
From: Sven Franck <sven.franck@nexedi.com>
Date: Tue, 14 Oct 2014 12:56:48 +0000
Subject: [PATCH] erp5_web_renderjs_ui: fixed header icon and spinner
---
.../web_page_module/rjs_gadget_erp5_css.xml | 41 +++++++++++--------
.../rjs_gadget_erp5_header_js.xml | 8 ++--
2 files changed, 29 insertions(+), 20 deletions(-)
diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_css.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_css.xml
index beb87eb059..383c51d4a0 100644
--- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_css.xml
+++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_css.xml
@@ -110,6 +110,7 @@
/* global reference font-size (.9em = 14.4px) */\n
html.ui-mobile body div p,\n
html.ui-mobile body div a,\n
+html.ui-mobile body div button,\n
html.ui-mobile body div h1,\n
html.ui-mobile body div h2,\n
html.ui-mobile body div h3,\n
@@ -181,6 +182,15 @@ html.ui-mobile body td a.ui-btn {\n
=========================================================================\n
*/\n
\n
+/*\n
+ -------------------------------------------------------------------------\n
+ ------------------------------- Loader ----------------------------------\n
+ -------------------------------------------------------------------------\n
+*/\n
+/* don\'t fade spinner */\n
+html body .ui-icon-spinner.ui-icon-spin {\n
+ opacity: 1;\n
+}\n
\n
/*\n
-------------------------------------------------------------------------\n
@@ -1542,6 +1552,15 @@ html body .ui-tag-list .ui-controlgroup-horizontal .ui-btn {\n
.ui-btn-icon-bottom:after {\n
left: 49%;\n
}\n
+/* set icon dimensions */\n
+.ui-btn-icon-left:after,\n
+.ui-btn-icon-right:after, \n
+.ui-btn-icon-top:after, \n
+.ui-btn-icon-bottom:after, \n
+.ui-btn-icon-notext:after {\n
+ width: auto;\n
+ height: auto;\n
+}\n
\n
/*\n
-------------------------------------------------------------------------\n
@@ -1929,7 +1948,6 @@ html .ui-header .ui-btn {\n
.responsive.ui-btn:after,\n
.ui-header .responsive.ui-btn-icon-left:after,\n
.ui-footer .responsive.ui-btn-icon-left:after {\n
- left: 0.37em;\n
text-indent: 0;\n
}\n
.responsive.ui-btn,\n
@@ -2707,10 +2725,10 @@ html .ui-icon.pull-right {\n
margin-left: .3em;\n
}\n
html .ui-icon-spin:after {\n
- -webkit-animation: spin 2s infinite linear;\n
- -moz-animation: spin 2s infinite linear;\n
- -o-animation: spin 2s infinite linear;\n
- animation: spin 2s infinite linear;\n
+ -webkit-animation: spin 1s infinite linear;\n
+ -moz-animation: spin 1s infinite linear;\n
+ -o-animation: spin 1s infinite linear;\n
+ animation: spin 1s infinite linear;\n
}\n
@-moz-keyframes spin {\n
0% {\n
@@ -4226,15 +4244,6 @@ html .ui-btn[class*="ui-icon-"]:after {\n
}\n
}\n
\n
-/* revert for no-svg BREAKS OPERA */\n
-/*\n
-.ui-nosvg .ui-page .ui-btn[class*="ui-icon-"]:after,\n
-.ui-nosvg .ui-page .ui-btn[class*="ui-icon-"]:after {\n
- margin-top: -11px;\n
- top: 50%;\n
- content: "";\n
-}\n
-*/\n
/* FALLBACK Icons - JQM compat: user, reorder, search, delete */\n
/* bars */\n
.ui-nosvg .ui-icon-reorder:after {\n
@@ -4391,7 +4400,7 @@ html .ui-btn[class*="ui-icon-"]:after {\n
</item>
<item>
<key> <string>serial</string> </key>
- <value> <string>938.15820.36055.62600</string> </value>
+ <value> <string>938.16005.6007.42325</string> </value>
</item>
<item>
<key> <string>state</string> </key>
@@ -4409,7 +4418,7 @@ html .ui-btn[class*="ui-icon-"]:after {\n
</tuple>
<state>
<tuple>
- <float>1413280129.44</float>
+ <float>1413291362.58</float>
<string>GMT</string>
</tuple>
</state>
diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_header_js.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_header_js.xml
index 9cae611696..61623fc625 100644
--- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_header_js.xml
+++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_header_js.xml
@@ -321,7 +321,7 @@
title: "Loading",\n
icon: default_right_icon,\n
url: "",\n
- class: "ui-disabled"\n
+ class: "ui-disabled ui-icon-spin"\n
};\n
} else if (!gadget.stats.submitted) {\n
default_right_icon = "spinner";\n
@@ -540,7 +540,7 @@
</item>
<item>
<key> <string>actor</string> </key>
- <value> <string>romain</string> </value>
+ <value> <string>sven</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
@@ -554,7 +554,7 @@
</item>
<item>
<key> <string>serial</string> </key>
- <value> <string>938.4424.15337.59562</string> </value>
+ <value> <string>938.15847.29908.51046</string> </value>
</item>
<item>
<key> <string>state</string> </key>
@@ -572,7 +572,7 @@
</tuple>
<state>
<tuple>
- <float>1412596556.28</float>
+ <float>1413281825.19</float>
<string>GMT</string>
</tuple>
</state>
--
2.30.9