Skip to content
This repository was archived by the owner on Nov 25, 2020. It is now read-only.

Commit 53f1018

Browse files
committed
Quick fixes for inlineEdition - Probably to be rewritten properly.
1 parent 3e7b5a3 commit 53f1018

File tree

2 files changed

+19
-7
lines changed

2 files changed

+19
-7
lines changed

core/src/plugins/gui.ajax/res/js/ui/prototype/class.FilesList.js

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1580,6 +1580,7 @@ Class.create("FilesList", SelectableElements, {
15801580
var scrollTop = 0;
15811581
var addStyle = {fontSize: '12px'};
15821582
var span, posSpan;
1583+
var smallThumb = false;
15831584
if(this._displayMode == "list"){
15841585
span = item.select('span.text_label')[0];
15851586
posSpan = item.select('span.list_selectable_span')[0];
@@ -1588,10 +1589,20 @@ Class.create("FilesList", SelectableElements, {
15881589
scrollTop = this.htmlElement.down('div.table_rows_container').scrollTop;
15891590
}else if(this._displayMode == "thumb"){
15901591
span = item.select('div.thumbLabel')[0];
1591-
posSpan = span;
1592+
if(item.hasClassName('fl-displayMode-thumbsize-small')){
1593+
posSpan = item;
1594+
smallThumb = true;
1595+
}else{
1596+
posSpan = span;
1597+
}
15921598
offset.top=-2;
15931599
offset.left=3;
15941600
scrollTop = this.htmlElement.down('.selectable_div').scrollTop;
1601+
addStyle = {
1602+
marginTop: item.hasClassName('fl-displayMode-thumbsize-large') ? '10px' : '6px',
1603+
padding: item.hasClassName('fl-displayMode-thumbsize-large') ? '2px': 0,
1604+
border: 0
1605+
};
15951606
}else if(this._displayMode == "detail"){
15961607
span = item.select('div.thumbLabel')[0];
15971608
posSpan = span;
@@ -1682,7 +1693,7 @@ Class.create("FilesList", SelectableElements, {
16821693
width:'46px',
16831694
zIndex:2500,
16841695
left:(pos.left+offset.left+origWidth)+'px',
1685-
top:((pos.top+offset.top-scrollTop)+1)+'px'
1696+
top:smallThumb ? '182px' : ((pos.top+offset.top-scrollTop)+1)+'px'
16861697
});
16871698
var closeFunc = function(){
16881699
span.setStyle({color:''});

core/src/plugins/gui.ajax/res/js/ui/prototype/class.FoldersTree.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -316,10 +316,11 @@ Class.create("FoldersTree", AjxpPane, {
316316
var edit = new Element('input', {value:item.ajxpNode.getLabel('text'), id:'editbox'}).setStyle({
317317
zIndex:5000,
318318
position:'absolute',
319-
marginLeft:'0px',
320-
marginTop:'0px',
319+
marginLeft:'13px',
320+
marginTop:'5px',
321321
height:'24px',
322-
padding: 0
322+
padding: '2px',
323+
border: 0
323324
});
324325
$(document.getElementsByTagName('body')[0]).insert({bottom:edit});
325326
modal.showContent('editbox', (item.getWidth()-offset.left)+'', '20', true, false, {opacity:0.25, backgroundColor:'#fff'});
@@ -362,7 +363,7 @@ Class.create("FoldersTree", AjxpPane, {
362363
buttons.addClassName("inlineEdition");
363364
var ok = buttons.select('input[name="ok"]')[0];
364365
ok.observe("click", onOkAction);
365-
var origWidth = edit.getWidth()-44;
366+
var origWidth = edit.getWidth()-74;
366367
var newWidth = origWidth;
367368
if(origWidth < 70){
368369
// Offset edit box to be sure it's always big enough.
@@ -381,7 +382,7 @@ Class.create("FoldersTree", AjxpPane, {
381382
position:'absolute',
382383
width:'46px',
383384
zIndex:2500,
384-
left:(pos.left+offset.left+origWidth)+'px',
385+
left:(pos.left+offset.left+origWidth + 15)+'px',
385386
top:((pos.top+offset.top-scrollTop)-1)+'px'
386387
});
387388
var closeFunc = function(){

0 commit comments

Comments
 (0)