diff --git a/filemanager/templates/default/app.css b/filemanager/templates/default/app.css index 94f07c63ce..d13a84ed3d 100644 --- a/filemanager/templates/default/app.css +++ b/filemanager/templates/default/app.css @@ -28,22 +28,26 @@ div.filemanager_navigation { position: relative; width: 100%; white-space: normal; + margin: 5px 0 0 5px; } div.filemanager_navigation > * { vertical-align: middle; } +div.filemanager_navigation > img { + margin-top: 3px; +} #filemanager-index_buttons { float: right; } #filemanager-index_buttons > * { vertical-align: middle; - //padding-left: 2px; + padding-left: 5px; margin:0; } div.filemanager_navigation > label { position: absolute; left: 50px; - right: 385px; + right: 422px; padding-top: 3px; font-size: 140%; white-space: nowrap; diff --git a/filemanager/templates/default/sharing.css b/filemanager/templates/default/sharing.css index 364950211a..e457cc2cbc 100644 --- a/filemanager/templates/default/sharing.css +++ b/filemanager/templates/default/sharing.css @@ -25,8 +25,12 @@ div.header_row_right, span.header_count, select#filemanager-index_filter, span.s div#filemanager-index_buttons img#filemanager-index_button\[change_view\] { display: inline-block !important; position: absolute; - right: 418px; - top: 10px; + right: 360px; + top: 4px; +} + +div.filemanager_navigation { + margin: -5px 0 8px 10px !important; } div.filemanager_navigation label { @@ -35,12 +39,14 @@ div.filemanager_navigation label { div.search { position: absolute; - top: 8px; - right: 215px; + top: 4px; + right: 190px; } div#filemanager-index_buttons div.et2_file { - margin-top: 6px; + width: 160px; + margin-top: 3px; + padding-right: 20px; } div.et2_nextmatch div.nextmatch_header_row { diff --git a/filemanager/templates/pixelegg/app.css b/filemanager/templates/pixelegg/app.css index 487a589974..95975e4311 100755 --- a/filemanager/templates/pixelegg/app.css +++ b/filemanager/templates/pixelegg/app.css @@ -57,21 +57,26 @@ div.filemanager_navigation { position: relative; width: 100%; white-space: normal; + margin: 5px 0 0 5px; } div.filemanager_navigation > * { vertical-align: middle; } +div.filemanager_navigation > img { + margin-top: 3px; +} #filemanager-index_buttons { float: right; } #filemanager-index_buttons > * { vertical-align: middle; + padding-left: 5px; margin: 0; } div.filemanager_navigation > label { position: absolute; left: 50px; - right: 385px; + right: 422px; padding-top: 3px; font-size: 140%; white-space: nowrap; diff --git a/filemanager/templates/pixelegg/app.less b/filemanager/templates/pixelegg/app.less index a1140e3ed1..a831f441e6 100644 --- a/filemanager/templates/pixelegg/app.less +++ b/filemanager/templates/pixelegg/app.less @@ -66,7 +66,7 @@ div.filemanager_navigation{ float: left; left: 74px; - right: 485px; + right: 421px; font-size: 140%; top: 5px; diff --git a/filemanager/templates/pixelegg/sharing.css b/filemanager/templates/pixelegg/sharing.css new file mode 100644 index 0000000000..42ff0293b8 --- /dev/null +++ b/filemanager/templates/pixelegg/sharing.css @@ -0,0 +1,79 @@ +/** + * EGroupware - CSS Styles used by sharing GUI + * + * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License + * @package etemplate + * @link http://www.egroupware.org + * @author Ralf Becker + * @copyright (c) 2014/15 by Ralf Becker + * @version $Id$ + */ +/** + * EGroupware - CSS Styles used by sharing GUI + * + * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License + * @package etemplate + * @link http://www.egroupware.org + * @author Ralf Becker + * @copyright (c) 2014/15 by Ralf Becker + * @version $Id$ + */ +div#popupMainDiv { + height: 100% !important; + padding: 0 !important; + background-image: none; +} +/** + * simplify NM UI for sharing + */ +div#filemanager-index_buttons img, +div#filemanager-index_favorite_wrapper, +div.header_row_right, +span.header_count, +select#filemanager-index_filter, +span.selectcols { + display: none !important; +} +div#filemanager-index_buttons img#filemanager-index_button\[change_view\] { + display: inline-block !important; + position: absolute; + right: 360px; + top: 4px; +} +div.filemanager_navigation { + margin: -5px 0 8px 10px !important; +} +div.filemanager_navigation label { + /*right: 265px !important;*/ +} +div.search { + position: absolute; + top: 4px; + right: 190px; +} +div#filemanager-index_buttons div.et2_file { + width: 160px; + margin-top: 3px; + padding-right: 20px; +} +div.et2_nextmatch div.nextmatch_header_row { + padding-bottom: 0px; +} +div.nextmatch_header { + padding-bottom: 0 !important; + padding-top: 10px !important; +} +div#filemanager-index_buttons img#filemanager-index_button\[change_view\] { + right: 418px; + top: 10px; +} +div.filemanager_navigation { + margin: 0px !important; +} +div.search { + top: 8px; + right: 215px; +} +div#filemanager-index_buttons div.et2_file { + margin-top: 6px; +} diff --git a/filemanager/templates/pixelegg/sharing.less b/filemanager/templates/pixelegg/sharing.less new file mode 100644 index 0000000000..d6ffe1e97c --- /dev/null +++ b/filemanager/templates/pixelegg/sharing.less @@ -0,0 +1,30 @@ +/** + * EGroupware - CSS Styles used by sharing GUI + * + * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License + * @package etemplate + * @link http://www.egroupware.org + * @author Ralf Becker + * @copyright (c) 2014/15 by Ralf Becker + * @version $Id$ + */ + +@import (less) "../default/sharing.css"; + +div#filemanager-index_buttons img#filemanager-index_button\[change_view\] { + right: 418px; + top: 10px; +} + +div.filemanager_navigation { + margin: 0px !important; +} + +div.search { + top: 8px; + right: 215px; +} + +div#filemanager-index_buttons div.et2_file { + margin-top: 6px; +} diff --git a/phpgwapi/inc/class.egw_sharing.inc.php b/phpgwapi/inc/class.egw_sharing.inc.php index 01ad4186d4..248aebd1c9 100644 --- a/phpgwapi/inc/class.egw_sharing.inc.php +++ b/phpgwapi/inc/class.egw_sharing.inc.php @@ -345,7 +345,7 @@ class egw_sharing $GLOBALS['egw_info']['user']['preferences']['filemanager']['nm_view'] = 'tile'; $_GET['cd'] = 'no'; $GLOBALS['egw_info']['flags']['js_link_registry'] = true; - egw_framework::includeCSS('/filemanager/templates/default/sharing.css'); + egw_framework::includeCSS('filemanager', 'sharing'); $ui = new egw_sharing_filemanager(); $ui->index(); }