Skip to content

erp5
erp5
Commit ed4ef1d9 authored by Sven Franck's avatar Sven Franck
Browse files
Options

erp5_web_renderjs_ui: fix css of multilistField

parent 4bcd41ff
Show whitespace changes
Inline Side-by-side
Showing with 43 additions and 23 deletions
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_css.xml
View file @ ed4ef1d9
...@@ -390,17 +390,18 @@ form label span {\n ...@@ -390,17 +390,18 @@ form label span {\n
color: red;\n color: red;\n
}\n }\n
\n \n
\n /* stretch controlgroup controls in case they don\'t */\n
/* layout form with left|right|center|bottom XXX: One big mess to re-factor!!!\n html.ui-mobile head + body .ui-field-contain fieldset .ui-controlgroup-controls {\n
.center {\n
width: 100%;\n width: 100%;\n
padding: 0 .5em;\n
-webkit-box-sizing: border-box;\n
-moz-box-sizing: border-box;\n
box-sizing: border-box;\n
text-align: left;\n
}\n }\n
*/\n /* remove double borders on vertical fieldsets TODO: no pseudo, not generic! */\n
html.ui-mobile head + body .ui-field-contain fieldset.ui-controlgroup-vertical .ui-controlgroup-controls > * .ui-btn {\n
border-bottom-width: 0;\n
}\n
html.ui-mobile head + body .ui-field-contain fieldset.ui-controlgroup-vertical .ui-controlgroup-controls > *:last-child .ui-btn {\n
border-bottom-width: 1px;\n
}\n
\n
.left,\n .left,\n
.right,\n .right,\n
.center,\n .center,\n
...@@ -1395,6 +1396,10 @@ html .ui-table-header:before {\n ...@@ -1395,6 +1396,10 @@ html .ui-table-header:before {\n
----------------------------- Textinput ---------------------------------\n ----------------------------- Textinput ---------------------------------\n
-------------------------------------------------------------------------\n -------------------------------------------------------------------------\n
*/\n */\n
/* remove JQM icons */\n
.ui-input-search:after {\n
background-image: none;\n
}\n
/* pre-enhanced clear button padding */\n /* pre-enhanced clear button padding */\n
.ui-input-has-clear .ui-btn input {\n .ui-input-has-clear .ui-btn input {\n
padding-left: 0;\n padding-left: 0;\n
...@@ -1829,6 +1834,7 @@ html body .ui-tag-list-inset .ui-controlgroup-horizontal .ui-checkbox .ui-btn-ac ...@@ -1829,6 +1834,7 @@ html body .ui-tag-list-inset .ui-controlgroup-horizontal .ui-checkbox .ui-btn-ac
text-shadow: none;\n text-shadow: none;\n
color: black;\n color: black;\n
}\n }\n
\n
/*\n /*\n
-------------------------------------------------------------------------\n -------------------------------------------------------------------------\n
-------------------------------- Button ---------------------------------\n -------------------------------- Button ---------------------------------\n
...@@ -4634,7 +4640,6 @@ html .ui-panel .ui-content .ui-btn[class*="ui-icon-"]:after {\n ...@@ -4634,7 +4640,6 @@ html .ui-panel .ui-content .ui-btn[class*="ui-icon-"]:after {\n
background-image: url(images/icons-png/user-white.png);\n background-image: url(images/icons-png/user-white.png);\n
}\n }\n
\n \n
\n
]]></string> </value> ]]></string> </value>
...@@ -4758,7 +4763,7 @@ html .ui-panel .ui-content .ui-btn[class*="ui-icon-"]:after {\n ...@@ -4758,7 +4763,7 @@ html .ui-panel .ui-content .ui-btn[class*="ui-icon-"]:after {\n
</item> </item>
<item> <item>
<key> <string>actor</string> </key> <key> <string>actor</string> </key>
<value> <string>super_sven</string> </value> <value> <string>zope</string> </value>
</item> </item>
<item> <item>
<key> <string>comment</string> </key> <key> <string>comment</string> </key>
...@@ -4772,7 +4777,7 @@ html .ui-panel .ui-content .ui-btn[class*="ui-icon-"]:after {\n ...@@ -4772,7 +4777,7 @@ html .ui-panel .ui-content .ui-btn[class*="ui-icon-"]:after {\n
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>940.38971.30865.62105</string> </value> <value> <string>941.1077.23453.57702</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -4790,7 +4795,7 @@ html .ui-panel .ui-content .ui-btn[class*="ui-icon-"]:after {\n ...@@ -4790,7 +4795,7 @@ html .ui-panel .ui-content .ui-btn[class*="ui-icon-"]:after {\n
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1422462300.89</float> <float>1424105668.83</float>
<string>GMT</string> <string>GMT</string>
</tuple> </tuple>
</state> </state>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_multilistfield_html.xml
View file @ ed4ef1d9
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
</script>\n </script>\n
</head>\n </head>\n
<body>\n <body>\n
<fieldset class="ui-controlgroup ui-corner-all">\n <fieldset class="ui-controlgroup ui-corner-all ui-controlgroup-vertical">\n
<div class="ui-controlgroup-controls">\n <div class="ui-controlgroup-controls">\n
</div>\n </div>\n
</fieldset>\n </fieldset>\n
...@@ -255,7 +255,7 @@ ...@@ -255,7 +255,7 @@
</item> </item>
<item> <item>
<key> <string>actor</string> </key> <key> <string>actor</string> </key>
<value> <string>xiaowu</string> </value> <value> <string>zope</string> </value>
</item> </item>
<item> <item>
<key> <string>comment</string> </key> <key> <string>comment</string> </key>
...@@ -269,7 +269,7 @@ ...@@ -269,7 +269,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>940.57847.24942.44731</string> </value> <value> <string>940.61935.4199.24456</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -287,8 +287,8 @@ ...@@ -287,8 +287,8 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1423579715.15</float> <float>1424105340.28</float>
<string>UTC</string> <string>GMT</string>
</tuple> </tuple>
</state> </state>
</object> </object>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_multilistfield_js.xml
View file @ ed4ef1d9
...@@ -169,6 +169,7 @@ ...@@ -169,6 +169,7 @@
})\n })\n
.push(function (translated_htmls) {\n .push(function (translated_htmls) {\n
var select_div,\n var select_div,\n
wrapper_class_string,\n
div = document.createElement("div");\n div = document.createElement("div");\n
for (i = 0; i < translated_htmls.length; i += 1) {\n for (i = 0; i < translated_htmls.length; i += 1) {\n
div.innerHTML = translated_htmls[i];\n div.innerHTML = translated_htmls[i];\n
...@@ -176,7 +177,21 @@ ...@@ -176,7 +177,21 @@
selects[i].innerHTML = select_div.innerHTML;\n selects[i].innerHTML = select_div.innerHTML;\n
if (field_json.editable !== 1) {\n if (field_json.editable !== 1) {\n
selects[i].setAttribute(\'readonly\', \'readonly\');\n selects[i].setAttribute(\'readonly\', \'readonly\');\n
selects[i].setAttribute(\'data-wrapper-class\', \'ui-state-readonly\');\n wrapper_class_string = wrapper_class_string || "";\n
wrapper_class_string += \'ui-state-readonly \';\n
}\n
// XXX add first + last class, needs to be improved\n
if (i === 0) {\n
wrapper_class_string = wrapper_class_string || ""; \n
wrapper_class_string += \'ui-first-child\';\n
}\n
if (i === translated_htmls.length - 1) {\n
wrapper_class_string = wrapper_class_string || ""; \n
wrapper_class_string += \'ui-last-child\';\n
}\n
if (wrapper_class_string) {\n
selects[i].setAttribute(\'data-wrapper-class\', wrapper_class_string);\n
wrapper_class_string = undefined;\n
}\n }\n
}\n }\n
});\n });\n
...@@ -315,7 +330,7 @@ ...@@ -315,7 +330,7 @@
</item> </item>
<item> <item>
<key> <string>actor</string> </key> <key> <string>actor</string> </key>
<value> <string>xiaowu</string> </value> <value> <string>zope</string> </value>
</item> </item>
<item> <item>
<key> <string>comment</string> </key> <key> <string>comment</string> </key>
...@@ -329,7 +344,7 @@ ...@@ -329,7 +344,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>940.58254.30018.38519</string> </value> <value> <string>941.1091.39269.24183</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -347,8 +362,8 @@ ...@@ -347,8 +362,8 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1423644326.02</float> <float>1424106460.96</float>
<string>UTC</string> <string>GMT</string>
</tuple> </tuple>
</state> </state>
</object> </object>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7