extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-26 04:41:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

improve filemanager alignment and look, remove tarp in favor of just some empty space and take possible hidden file-upload into account width of path

Browse Source
This commit is contained in:
Ralf Becker 2016-02-24 10:41:18 +00:00
parent 0f93bdfcff
commit 0656d7e004
4 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
filemanager/js/app.js
View File

@ -720,7 +720,7 @@ app.classes.filemanager = AppJS.extend(
// Toggle button icon to the other view // Toggle button icon to the other view
button_widget.set_image("list_"+(view == nm.controller.VIEW_ROW ? nm.controller.VIEW_TILE : nm.controller.VIEW_ROW)); button_widget.set_image("list_"+(view == nm.controller.VIEW_ROW ? nm.controller.VIEW_TILE : nm.controller.VIEW_ROW));
button_widget.set_label(view == nm.controller.VIEW_ROW ? this.egw.lang("Tile view") : this.egw.lang('List view')); button_widget.set_statustext(view == nm.controller.VIEW_ROW ? this.egw.lang("Tile view") : this.egw.lang('List view'));
} }
nm.set_view(view); nm.set_view(view);
@ -737,7 +737,7 @@ app.classes.filemanager = AppJS.extend(
{ {
template.loading.done(function() { template.loading.done(function() {
nm.applyFilters({view: view}); nm.applyFilters({view: view});
}) });
} }
}, },
@ -853,7 +853,7 @@ app.classes.filemanager = AppJS.extend(
widget.options.onFinish = function() { widget.options.onFinish = function() {
widget.options.onFinish = old_onfinish; widget.options.onFinish = old_onfinish;
widget.options.onFinishOne = old_onfinishone; widget.options.onFinishOne = old_onfinishone;
} };
// This triggers the upload // This triggers the upload
widget.set_value(files); widget.set_value(files);
@ -893,8 +893,14 @@ app.classes.filemanager = AppJS.extend(
{ {
widget.set_readonly(_ro); widget.set_readonly(_ro);
} }
else // upload
else if (widget.disabled != _ro)
{ {
// fix width of path-widget to kope with hidden/shown upload
var path_parent = jQuery(this.path_widget[id].getDOMNode().parentNode);
var width = jQuery(widget.getDOMNode()).outerWidth(true);
path_parent.css('right', (parseInt(path_parent.css('right'))+(_ro?-1:1)*width)+'px');
widget.set_disabled(_ro); widget.set_disabled(_ro);
} }
} }

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

@ -24,7 +24,7 @@
#filemanager-index_filemanager-index-header_left { #filemanager-index_filemanager-index-header_left {
float: left; float: left;
width: 100%; width: 100%;
margin-bottom: 1px; margin-bottom: 2px;
} }
div.filemanager_navigation { div.filemanager_navigation {
position: relative; position: relative;
@ -40,13 +40,13 @@ div.filemanager_navigation > img {
#filemanager-index_buttons { #filemanager-index_buttons {
float: right; float: right;
} }
img#filemanager-index_tarp { button#filemanager-index_button\[change_view\] {
height: 22px; margin-right: 20px;
} }
div.filemanager_navigation > label { div.filemanager_navigation > label {
position: absolute; position: absolute;
left: 56px; left: 56px;
right: 475px; right: 456px;
font-size: 140%; font-size: 140%;
white-space: nowrap; white-space: nowrap;
} }

1
filemanager/templates/default/index.xet
View File

@ -52,7 +52,6 @@
<hbox id="buttons"> <hbox id="buttons">
<button statustext="Go to" id="button[go]" image="key_enter" background_image="true"/> <button statustext="Go to" id="button[go]" image="key_enter" background_image="true"/>
<buttononly statustext="Tile view" id="button[change_view]" onclick="app.filemanager.change_view" image="list_tile" background_image="true"/> <buttononly statustext="Tile view" id="button[change_view]" onclick="app.filemanager.change_view" image="list_tile" background_image="true"/>
<image id="tarp" src="buttonseparator"/>
<buttononly statustext="Rename, change permissions or ownership" id="button[edit]" onclick="app.filemanager.editprefs();" image="edit" background_image="true"/> <buttononly statustext="Rename, change permissions or ownership" id="button[edit]" onclick="app.filemanager.editprefs();" image="edit" background_image="true"/>
<buttononly statustext="Create directory" id="button[createdir]" onclick="app.filemanager.createdir();" image="button_createdir" ro_image="createdir_disabled" background_image="true"/> <buttononly statustext="Create directory" id="button[createdir]" onclick="app.filemanager.createdir();" image="button_createdir" ro_image="createdir_disabled" background_image="true"/>
<buttononly statustext="Create a link" id="button[symlink]" onclick="app.filemanager.symlink();" image="link" ro_image="link_disabled" background_image="true"/> <buttononly statustext="Create a link" id="button[symlink]" onclick="app.filemanager.symlink();" image="link" ro_image="link_disabled" background_image="true"/>

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

@ -53,7 +53,7 @@
#filemanager-index_filemanager-index-header_left { #filemanager-index_filemanager-index-header_left {
float: left; float: left;
width: 100%; width: 100%;
margin-bottom: 1px; margin-bottom: 2px;
} }
div.filemanager_navigation { div.filemanager_navigation {
position: relative; position: relative;
@ -69,13 +69,13 @@ div.filemanager_navigation > img {
#filemanager-index_buttons { #filemanager-index_buttons {
float: right; float: right;
} }
img#filemanager-index_tarp { button#filemanager-index_button\[change_view\] {
height: 22px; margin-right: 20px;
} }
div.filemanager_navigation > label { div.filemanager_navigation > label {
position: absolute; position: absolute;
left: 56px; left: 56px;
right: 475px; right: 456px;
font-size: 140%; font-size: 140%;
white-space: nowrap; white-space: nowrap;
} }