issue 749 fixed filebox ux error

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9988 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2011-12-23 07:55:29 +00:00
parent da8821fcae
commit d523bc8f7a
4 changed files with 38 additions and 83 deletions

View file

@ -81,65 +81,27 @@
}) (jQuery); }) (jQuery);
function addRow(tableID){ function addRow(ulId){
var $ = jQuery;
var table = document.getElementById(tableID); var count = $('#'+ulId).children().length;
var rowCount = table.rows.length; var clone = $('#'+ulId).find('li:last-child').prev().clone();
var initial = table.rows(0); $('#'+ulId).find('li:last-child').prev().find('.__addBtn').remove();
var text1 = initial.cells(0).children(0).innerHTML;
var text2 = initial.cells(1).children(0).innerHTML; clone.find('input[name^="attribute_name"]').attr("name", "attribute_name"+count).attr('value', '')
var addrow = table.rows(rowCount-2).cells(2).children(0); .attr("id", "attribute_name"+count)
var deleteLink = table.rows(rowCount-2).cells(3).children(0).cloneNode(true); .prev('label').attr('for', 'attribute_name'+count);
var row = table.insertRow(rowCount-1); clone.find('input[name^="attribute_value"]').attr("name", "attribute_value"+count).attr('value', '')
.attr("id", "attribute_value"+count)
//cell for attribute name .prev('label').attr('for', 'attribute_value'+count);
var cell0= row.insertCell(0) clone.find('.__deleteBtn').attr("href", "javascript:clearRow('fileUp', "+count+")");
var element0 = document.createElement("label");
element0.innerHTML = text1; $('#'+ulId).find('li:last-child').before(clone);
element0.htmlFor = "attribute_name"+rowCount;
cell0.appendChild(element0);
var element1 = document.createElement("input");
element1.type = "text";
element1.name="attribute_name"+rowCount;
element1.id="attribute_name"+rowCount;
cell0.appendChild(element1);
//cell for attribute value
var cell1 = row.insertCell(1);
var element2 = document.createElement("label");
element2.innerHTML = text2;
element2.htmlFor = "attribute_value"+rowCount;
cell1.appendChild(element2);
var element3 = document.createElement("input");
element3.type = "text";
element3.id="attribute_value"+rowCount;
element3.name="attribute_value"+rowCount;
cell1.appendChild(element3);
//cell for addrow link
var cell2 = row.insertCell(2);
cell2.appendChild(addrow);
//cell for delete link
var cell3 = row.insertCell(3);
deleteLink.href = "javascript:clearRow('attributes',"+rowCount+")";
cell3.appendChild(deleteLink);
} }
function clearRow(tableID,rowNumber){ function clearRow(ulId,rowNumber){
var table = document.getElementById(tableID); var $ = jQuery;
var text = "attribute_name"+rowNumber; var count = $('#'+ulId).children().length - 1;
var rowCount = table.rows.length; if (count <= 1) return;
var sw = 0;
for(i=0;i<rowCount-2;i++){ $('#'+ulId).find('input[name="attribute_name'+rowNumber+'"]').parent().remove();
if(table.rows(i).cells[0].children(1).id == text) {
table.deleteRow(i);
sw = 1;
}
}
if(!sw){
var addrow = table.rows(rowCount-2).cells(2).children(0);
table.rows(rowCount-3).cells(2).appendChild(addrow);
table.deleteRow(rowCount-2);
}
} }

View file

@ -4,7 +4,7 @@ jQuery(function($){
var ESC_KEY = 27; var ESC_KEY = 27;
// Overlapping label // Overlapping label
$('.form li').find('>input:text,>input:password,>textarea') $('.form li').find('>input:text:not(".notmulti"),>input:password,>textarea')
.filter('input[value!=""],textarea:not(:empty)').prev('label').css('visibility','hidden').end().end() .filter('input[value!=""],textarea:not(:empty)').prev('label').css('visibility','hidden').end().end()
.prev('label') .prev('label')
.addClass('overlap') .addClass('overlap')

View file

@ -994,15 +994,15 @@ Le module [Administration des Modules] montera tous les modules installés et vo
<value xml:lang="en"><![CDATA[Cannot delete a start module.]]></value> <value xml:lang="en"><![CDATA[Cannot delete a start module.]]></value>
</item> </item>
<item name="attribute_name"> <item name="attribute_name">
<value xml:lang="ko"><![CDATA[변수명]]></value>
<value xml:lang="en"><![CDATA[Attribute name]]></value> <value xml:lang="en"><![CDATA[Attribute name]]></value>
</item> </item>
<item name="attribute_value"> <item name="attribute_value">
<value xml:lang="ko"><![CDATA[값]]></value>
<value xml:lang="en"><![CDATA[Attribute value]]></value> <value xml:lang="en"><![CDATA[Attribute value]]></value>
</item> </item>
<item name="add"> <item name="cmd_add">
<value xml:lang="ko"><![CDATA[추가]]></value>
<value xml:lang="en"><![CDATA[Add]]></value> <value xml:lang="en"><![CDATA[Add]]></value>
</item> </item>
<item name="delete">
<value xml:lang="en"><![CDATA[Delete]]></value>
</item>
</lang> </lang>

View file

@ -8,25 +8,18 @@
<input type="hidden" name="filter" value="{$filter}" /> <input type="hidden" name="filter" value="{$filter}" />
<input type="hidden" name="input" value="{$input}" /> <input type="hidden" name="input" value="{$input}" />
<h2>{$lang->upload_file}</h2> <h2>{$lang->upload_file}</h2>
<span class="more"><a href="#fileUp" class="tgAnchor" data-effect="slide" data-duration="200">{$lang->cmd_show_hide}</a></span> <div class="tgContent">
<div class="tgContent" id="fileUp"> <ul id="fileUp">
<table cellspacing="0" id="attributes"> <li>
<tr> <label for="attribute_name1" style="display: inline;">{$lang->attribute_name} </label> <input type="text" class="notmulti" name="attribute_name1" id="attribute_name1" />
<td> <label for="attribute_value1" style="display: inline; font-weight:bold">{$lang->attribute_value} </label> <input type="text" class="notmulti" name="attribute_value1" id="attribute_value1" />
<label for="attribute_name1">{$lang->attribute_name} </label><input type="text" name="attribute_name1" id="attribute_name1" /> <a class="__addBtn" href="javascript:addRow('fileUp')">{$lang->cmd_add}</a>
</td> <a class="__deleteBtn" href="javascript:clearRow('fileUp',1)">{$lang->cmd_delete}</a>
<td> </li>
<label for="attribute_value1">{$lang->attribute_value} </label><input type="text" name="attribute_value1" id="attribute_value1" /> <li>
</td> <label for="file" style="display: inline">{$lang->file}</label> <input type="file" name="addfile" id="file"/>
<td><a href="javascript:addRow('attributes')">{$lang->add}</a></td> </li>
<td><a href="javascript:clearRow('attributes',1)">{$lang->delete}</a></td> </ul>
</tr>
<tr>
<td>
<label for="file">{$lang->file}</label><input type="file" name="addfile" id="file"/>
</td>
</tr>
</table>
<div class="btnArea"> <div class="btnArea">
<span class="btn"><input type="submit" value="{$lang->cmd_save}" /></span> <span class="btn"><input type="submit" value="{$lang->cmd_save}" /></span>
</div> </div>