Skip to content

erp5
erp5
Commit 9841bfcc authored by Vincent Pelletier's avatar Vincent Pelletier
Browse files
Options

Fix a glitch which happened when left or right groups were too wide for... 

Fix a glitch which happened when left or right groups were too wide for browser window: right group used to wrap under left group. The chosen way is to wrap both groups in a table using a javascript. This used to be done by page template in html_style, but as form_render must remain generic it can't be done there.
Fix the display of login_form: make the html source code closer to what would be rendered by form_view if login_form was a formulator form.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@21211 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 7560a65d
Hide whitespace changes
Inline Side-by-side
Showing with 103 additions and 36 deletions
product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.css.xml
View file @ 9841bfcc
......@@ -595,6 +595,14 @@ div.index_html table {\n
min-height: 2.5em;\n
}\n
\n
table.fake {\n
width: 100%;\n
}\n
\n
table.fake > tr > fieldset {\n
display: table-cell;\n
}\n
\n
.content .field {\n
position: relative;\n
clear: left;\n
......@@ -613,14 +621,14 @@ div.index_html table {\n
display: none;\n
}\n
\n
div.top_group,\n
table.fake,\n
fieldset.left,\n
fieldset.center,\n
fieldset.bottom {\n
clear: both;\n
}\n
\n
div.top_group,\n
table.fake,\n
fieldset.left,\n
fieldset.right,\n
fieldset.center,\n
......@@ -628,7 +636,7 @@ fieldset.bottom {\n
margin-bottom: 5px;\n
}\n
\n
div.top_group,\n
table.fake,\n
fieldset.left,\n
fieldset.right,\n
fieldset.center {\n
......@@ -644,6 +652,11 @@ fieldset.center {\n
padding-bottom: 5px;\n
}\n
\n
.login fieldset {\n
width: 50%;\n
float: left;\n
}\n
\n
fieldset.left {\n
width: 50%;\n
float: left;\n
......@@ -656,10 +669,10 @@ fieldset.right {\n
margin-left: -12px; /* 5px margin *2 + 2px for left & right border width */\n
}\n
\n
div.top_group fieldset.left,\n
div.top_group fieldset.right {\n
table.fake fieldset {\n
border-width: 0;\n
padding: 0;\n
margin: 0;\n
width: 50%;\n
}\n
\n
......@@ -677,6 +690,7 @@ fieldset.bottom .field label {\n
}\n
\n
.login fieldset,\n
.dialog_box table.fake,\n
.dialog_box .left,\n
.dialog_box .right,\n
.dialog_box .center {\n
......
product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.js.xml
View file @ 9841bfcc
......@@ -94,45 +94,94 @@ function autoFocus() {\n
}\n
}\n
\n
function fixLeftRightHeight(){\n
var lh = 0;\n
var lfieldset;\n
var rh = 0;\n
var rfieldset;\n
var list=document.getElementsByTagName(\'fieldset\');\n
for(i=0; i<list.length; i=i+1){\n
list_parts = list[i].id.split(\'_\');\n
for(j=1; j<list_parts.length; j=j+1){\n
if(list_parts[j] == "left"){\n
lfieldset = list[i];\n
lh = lfieldset.offsetHeight;\n
break;\n
}else{\n
if(list_parts[j] == "right"){\n
rfieldset = list[i];\n
rh = rfieldset.offsetHeight;\n
break;\n
function buildTables(element_list, rowPredicate, columnPredicate,\n
tableClassName) {\n
/* Generic code to build a table from elements in element_list.\n
* rowPredicate(element) -> bool\n
* When it returns a true value, a new line is started with element.\n
* When is returns a false value, element is skipped.\n
* columnPredicate(element, initial_element) -> bitfield\n
* bit 3: end_table (if true, imlies end_row)\n
* End current table.\n
* bit 2: end_row\n
* End current row.\n
* bit 1: use_element\n
* Element passed to columnPredicate will be put in current row.\n
* Hardcoded:\n
* - items in a table line must be siblings in existing DOM\n
* - table is put in place of first element of the first row\n
*/\n
var element_index = 0;\n
while (element_index < element_list.length) {\n
var row_list = [];\n
var end_table = false;\n
while ((!end_table) && element_index < element_list.length) {\n
var row_begin = element_list[element_index];\n
if (rowPredicate(row_begin)) {\n
var item_list = [row_begin];\n
var row_item = row_begin;\n
var end_line = false;\n
while ((!end_line) && (row_item = row_item.nextSibling) != null) {\n
var predicate_result = columnPredicate(row_item, row_begin)\n
if ((predicate_result & 1) != 0)\n
item_list.push(row_item);\n
end_table = ((predicate_result & 4) != 0);\n
end_line = ((predicate_result & 6) != 0);\n
}\n
row_list.push(item_list);\n
}\n
element_index++;\n
}\n
if(lh && rh){\n
break;\n
/* Do not create a table with just one cell. */\n
if ((row_list.length > 1) ||\n
(row_list.length == 1 && row_list[0].length > 1)) {\n
var first_element = row_list[0][0];\n
var container = first_element.parentNode;\n
var fake_table = document.createElement("table");\n
var i;\n
var j;\n
fake_table.className = tableClassName;\n
container.insertBefore(fake_table, first_element);\n
for (i = 0; i < row_list.length; i++) {\n
var fake_row = document.createElement("tr");\n
var row_element_list = row_list[i];\n
for (j = 0; j < row_element_list.length; j++)\n
fake_row.appendChild(row_element_list[j]);\n
fake_table.appendChild(fake_row);\n
}\n
}\n
}\n
if(lh && rh){\n
lfieldset.style.height = (lh>rh)? lh+"px" : rh+"px";\n
rfieldset.style.height = (lh>rh)? lh+"px" : rh+"px";\n
lfieldset.style.borderRightWidth = 0;\n
rfieldset.style.borderLeftWidth = 0;\n
/* XXX: hardcoded values required unless there is a way to compute "12px"-"1px" in js */\n
lfieldset.style.marginRight = "-11px";\n
rfieldset.style.marginLeft = "-11px";\n
}\n
\n
function matchChunk(string, separator, chunk_value) {\n
if (string != null) {\n
var id_chunks = string.split(separator);\n
var i;\n
for (i = 0; i < id_chunks.length; i++) {\n
if (id_chunks[i] == chunk_value)\n
return true;\n
}\n
}\n
return false;\n
}\n
\n
function matchLeftFieldset(element) {\n
return (element.tagName == "FIELDSET") &&\n
matchChunk(element.id, \'_\', "left");\n
}\n
\n
function matchRightFieldset(element, ignored) {\n
if ((element.tagName == "FIELDSET") &&\n
matchChunk(element.id, \'_\', "right"))\n
return 7; /* End row, table and use element */\n
return 0;\n
}\n
\n
function fixLeftRightHeightAndFocus(fix_height) {\n
if (fix_height == 1) {\n
fixLeftRightHeight();\n
buildTables(document.getElementsByTagName(\'fieldset\'),\n
matchLeftFieldset, matchRightFieldset,\n
"fake");\n
}\n
autoFocus();\n
}\n
......
product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/login_form.xml
View file @ 9841bfcc
......@@ -78,18 +78,21 @@
<input tal:condition="exists: request/came_from"\n
type="hidden" name="came_from"\n
tal:attributes="value request/came_from" />\n
<fieldset id="fieldset_left" class="left">\n
<fieldset>\n
<div class="field">\n
<label for="name" class="required" i18n:translate="" i18n:domain="ui">Name</label>\n
<div class="input"><input type="text" name="__ac_name" id="name" tal:attributes="value python: request.get(\'__ac_name\') or \'\'" /></div>\n
<p class="clear"></p>\n
</div>\n
<div class="field">\n
<label for="password" i18n:translate="" i18n:domain="ui">Password</label>\n
<div class="input"><input type="password" name="__ac_password" id="password" /></div>\n
<p class="clear"></p>\n
</div>\n
<div class="field">\n
<label for="cb_remember" i18n:translate="" i18n:domain="ui">Remember my name</label>\n
<div class="input"><input type="checkbox" name="__ac_persistent" value="1" checked="checked" id="cb_remember" /></div>\n
<p class="clear"></p>\n
</div>\n
<div class="field">\n
<label>&nbsp;</label>\n
......@@ -98,6 +101,7 @@
tal:attributes="name python: \'%s:method\' % (form_action, )"\n
i18n:attributes="value" i18n:domain="ui" />\n
</div>\n
<p class="clear"></p>\n
</div>\n
<div class="field">\n
<label>&nbsp;</label>\n
......
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