holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix vfs upload select-file dialog

Browse Source
This commit is contained in:
Hadi Nategh 2014-12-22 09:42:04 +00:00
parent c48065f4c3
commit b34adb3108
5 changed files with 50 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
etemplate/js/et2_widget_grid.js
View File

@ -985,11 +985,12 @@ var et2_grid = et2_DOMWidget.extend([et2_IDetachedDOM, et2_IAligned, et2_IResize
resize: function (_height) resize: function (_height)
{ {
if (typeof this.options != 'undefined' && _height) if (typeof this.options != 'undefined' && _height
&& typeof this.options.resize_ratio != 'undefined' && this.options.resize_ratio)
{ {
// apply the ratio // apply the ratio
_height = (this.options.resize_ratio != '')? _height * this.options.resize_ratio: _height; _height = (this.options.resize_ratio != '')? _height * this.options.resize_ratio: _height;
//if (_height != 0) this.table.height(this.table.height() + _height ); if (_height != 0) this.table.height(this.table.height() + _height );
} }
} }
}); });

18
filemanager/templates/default/app.css
View File

@ -72,9 +72,12 @@ div.filemanager_navigation > label > input {
.selectName input { width: 100%; } .selectName input { width: 100%; }
.selectMime select { width: 100%; } .selectMime select { width: 100%; }
.displayNone input, input.displayNone { display: none; } .displayNone input, input.displayNone { display: none; }
.selectFiles td div { border-style: groove; } .selectFiles div { overflow-y: auto;}
.selectFiles div { max-height: 400px; overflow:auto;} #filemanager-select_dir {
height:400px;
overflow-y: scroll;
display:inline-block;
}
/** /**
* VFS mounts and versioning * VFS mounts and versioning
*/ */
@ -89,3 +92,12 @@ div.filemanager_navigation > label > input {
.filemanager_config > * { .filemanager_config > * {
margin-top: 20px; margin-top: 20px;
} }
.error{color:red; font-style:italic;}
.createDir img {padding-right:30px;}
#filemanager-select_apps {
width: 61px;
height: 400px;
margin-top: 44px;
display: inline-block;
overflow-y: scroll;
}

28
filemanager/templates/default/select.xet
View File

@ -2,14 +2,14 @@
<!-- $Id$ --> <!-- $Id$ -->
<overlay> <overlay>
<template id="filemanager.select" template="" lang="" group="0" version="1.9.002"> <template id="filemanager.select" template="" lang="" group="0" version="1.9.002">
<grid width="100%"> <grid width="100%" resize_ratio="1">
<columns> <columns>
<column width="32"/> <column width="32"/>
<column/> <column />
</columns> </columns>
<rows> <rows>
<row valign="top"> <row valign="top">
<grid id="apps"> <grid id="apps" resize_ratio="1">
<columns> <columns>
<column/> <column/>
</columns> </columns>
@ -22,7 +22,7 @@
</row> </row>
</rows> </rows>
</grid> </grid>
<grid width="100%"> <grid width="100%" resize_ratio="1">
<columns> <columns>
<column/> <column/>
</columns> </columns>
@ -38,8 +38,8 @@
<button label="Create directory" id="button[createdir]" onclick="app.filemanager.createdir" image="button_createdir" ro_image="createdir_disabled" class="createDir"/> <button label="Create directory" id="button[createdir]" onclick="app.filemanager.createdir" image="button_createdir" ro_image="createdir_disabled" class="createDir"/>
</hbox> </hbox>
</row> </row>
<row class="selectFiles"> <row class="selectFiles file_dir_height" resize_ratio="1">
<grid width="100%" overflow="auto" id="dir"> <grid width="100%" id="dir" resize_ratio="1" >
<columns> <columns>
<column width="20"/> <column width="20"/>
<column/> <column/>
@ -69,20 +69,16 @@
<file id="file_upload"/> <file id="file_upload"/>
</groupbox> </groupbox>
</row> </row>
<row class="dialogFooterToolbar">
<hbox align="right">
<button label="@label" id="button[ok]" image="save" background_image="1"/>
<buttononly label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel" background_image="1"/>
</hbox>
</row>
</rows> </rows>
</grid> </grid>
</row> </row>
<row class="dialogFooterToolbar">
<hbox align="right">
<button label="@label" id="button[ok]" image="save" background_image="1"/>
<buttononly label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel" background_image="1"/>
</hbox>
</row>
</rows> </rows>
</grid> </grid>
<styles>
.error{color:red; font-style:italic;}
.createDir img {padding-right:30px;}
</styles>
</template> </template>
</overlay> </overlay>

28
filemanager/templates/pixelegg/app.css
View File

@ -115,12 +115,13 @@ div.filemanager_navigation > label > input {
input.displayNone { input.displayNone {
display: none; display: none;
} }
.selectFiles td div {
border-style: groove;
}
.selectFiles div { .selectFiles div {
max-height: 400px; overflow-y: auto;
overflow: auto; }
#filemanager-select_dir {
height: 400px;
overflow-y: scroll;
display: inline-block;
} }
/** /**
* VFS mounts and versioning * VFS mounts and versioning
@ -136,6 +137,20 @@ input.displayNone {
.filemanager_config > * { .filemanager_config > * {
margin-top: 20px; margin-top: 20px;
} }
.error {
color: red;
font-style: italic;
}
.createDir img {
padding-right: 30px;
}
#filemanager-select_apps {
width: 61px;
height: 400px;
margin-top: 44px;
display: inline-block;
overflow-y: scroll;
}
/*/***************************************************************** /*/*****************************************************************
// sidebar // sidebar
@ -314,9 +329,6 @@ table.egwGridView_grid img {
} }
/*// #####################################################*/ /*// #####################################################*/
/*Dialog filemanager*/ /*Dialog filemanager*/
#filemanager-select {
padding: 0px 8px 0 0;
}
#filemanager-select .dialogHeader .et2_button_icon { #filemanager-select .dialogHeader .et2_button_icon {
margin: 4px 4px 0 4px; margin: 4px 4px 0 4px;
border-top: solid 1px #ffffff; border-top: solid 1px #ffffff;

2
filemanager/templates/pixelegg/app.less
View File

@ -221,8 +221,6 @@ table.egwGridView_grid img {
#filemanager-select{ #filemanager-select{
padding: 0px 8px 0 0;
.dialogHeader{ .dialogHeader{
.et2_button_icon{ .et2_button_icon{
margin: 4px 4px 0 4px; margin: 4px 4px 0 4px;