From 4d86731220ab26e5bf704953d4eee9c7647f5518 Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Mon, 3 Feb 2020 16:18:25 +0100 Subject: [PATCH 1/6] Replace sidebox open/close menu icons with their svg versions --- pixelegg/css/pixelegg.css | 24 +++++++++++++----------- pixelegg/less/layout_messages.less | 3 ++- pixelegg/less/layout_raster_header.less | 2 +- pixelegg/less/layout_raster_sidebar.less | 6 ++++-- 4 files changed, 20 insertions(+), 15 deletions(-) diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css index a41ccc89dd..bfd60318a7 100644 --- a/pixelegg/css/pixelegg.css +++ b/pixelegg/css/pixelegg.css @@ -1363,20 +1363,20 @@ span.ui-icon-search { box-shadow: -2px 1px 9px 3px #B4B4B4; } .ui-dialog .ui-dialog-buttonpane { - padding-left: .8em; - padding-right: .8em; + padding-left: 0.8em; + padding-right: 0.8em; padding-top: 0.7em; } .ui-dialog .ui-dialog-titlebar { - padding-left: .8em; - padding-right: .8em; + padding-left: 0.8em; + padding-right: 0.8em; font-size: 12pt; border: none; font-weight: normal; background: white; } .ui-dialog .ui-dialog-titlebar-close { - right: .8em; + right: 0.8em; } .ui-widget-content { border: 1px solid #B4B4B4; @@ -3747,7 +3747,7 @@ td.lettersearch { } /*popup Messsage*/ div#egwpopup_message { - background-color: .color_gray_0; + background-color: #FFFFFF; padding: 1em; overflow-y: auto; } @@ -4137,7 +4137,7 @@ td.message span.message { padding: 5px 0px 5px 0px; } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items .timezone select { - width: calc(80%); + width: calc(100% - 20px); margin-left: 10px; } /* ################################################### @@ -4499,9 +4499,10 @@ td.message span.message { padding: 0px 0px 0px 24px; line-height: 1em; font-size: 12px; - background-image: url(../images/arrow_right.png); + background-image: url(../images/arrow_right.svg); background-repeat: no-repeat; background-position: left center; + background-size: 12px; } #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category div.egw_fw_ui_category:nth-last-of-type(-n+3) img.egw_fw_ui_sidemenu_listitem_icon { display: block; @@ -4516,9 +4517,10 @@ td.message span.message { color: #f2f2f2; } #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category_active h1 { - background-image: url(../images/arrow_down_white.png); + background-image: url(../images/arrow_down.svg); line-height: 1em; font-size: 12px; + background-size: 12px; } #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category_active h1 a { color: #FFF; @@ -6077,7 +6079,7 @@ a.textSidebox { } } .egw-loading-prompt-container::before { - opacity: .3; + opacity: 0.3; content: ""; background-color: #aaaaaa; width: 100%; @@ -6156,7 +6158,7 @@ a.textSidebox { z-index: 999; width: 100px; border-radius: 5px; - border: solid 10px #679FD2; + border: solid 10px #679FD2; transform: translate(-50%, -50%); } /** diff --git a/pixelegg/less/layout_messages.less b/pixelegg/less/layout_messages.less index 24022edbd7..7a27570a9d 100755 --- a/pixelegg/less/layout_messages.less +++ b/pixelegg/less/layout_messages.less @@ -16,6 +16,7 @@ //############################################################################################################## + #egwpopup { top: 46px; right:0px !important; @@ -242,7 +243,7 @@ /*popup Messsage*/ div#egwpopup_message { - background-color: .color_gray_0; + background-color: @gray_0; padding: 1em; overflow-y: auto; } diff --git a/pixelegg/less/layout_raster_header.less b/pixelegg/less/layout_raster_header.less index 90059ec7d7..1127d6c087 100644 --- a/pixelegg/less/layout_raster_header.less +++ b/pixelegg/less/layout_raster_header.less @@ -252,7 +252,7 @@ padding: 5px 0px 5px 0px; } select { - width: calc(100% - 20px); + width: ~"calc(100% - 20px)"; margin-left: 10px; } } diff --git a/pixelegg/less/layout_raster_sidebar.less b/pixelegg/less/layout_raster_sidebar.less index 4220e46e21..8a4b5c46ea 100644 --- a/pixelegg/less/layout_raster_sidebar.less +++ b/pixelegg/less/layout_raster_sidebar.less @@ -201,9 +201,10 @@ padding: 0px 0px 0px 24px; line-height: 1em; .fontsize_l; - background-image:url(../images/arrow_right.png); + background-image:url(../images/arrow_right.svg); background-repeat:no-repeat; background-position:left center; + background-size: 12px; } div.egw_fw_ui_category:nth-last-of-type(-n+3) { @@ -233,9 +234,10 @@ background-color: @egw_color_2_a; .color_5_gray; h1 { - background-image:url(../images/arrow_down_white.png); + background-image:url(../images/arrow_down.svg); line-height: 1em; font-size: 12px; + background-size: 12px; a { color: #FFF; img {.dimension_width_height_s;} From 47c5a25841d17839c6261169272ddb0b3482cdf1 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Mon, 3 Feb 2020 18:05:59 +0100 Subject: [PATCH 2/6] trying to fix Travis builds (using default mysql service instead of failing MariaDB:10.0 addon) --- .travis.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 114c23bccc..0336bfca77 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,8 @@ language: php php: - - 7.0 - - 7.1 - 7.2 - 7.3 + - 7.4 # none of our dependencies allow 8.0 # - master @@ -14,11 +13,11 @@ matrix: services: - memcached -# - mysql we use mariadb instead installed via addons below - - postgres + - mysql #we use mariadb instead installed via addons below +# - postgres -addons: - mariadb: '10.0' +#addons: +# mariadb: '10.0' sudo: required @@ -38,7 +37,7 @@ before_script: echo "extension=memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; phpenv config-rm xdebug.ini; ;; - "7.3"|"master") + "7.3"|"7.4"|"master") echo "extension=memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; ;; esac @@ -53,7 +52,7 @@ before_script: composer require --ignore-platform-reqs 'phpunit/phpunit:~7'; ;; esac - #- php -m + - php -m - php -i - php install-cli.php --ignore-platform-reqs # create data directory From 291ac4db16c07702b7205e6f636aaf18834b60a8 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 4 Feb 2020 09:04:14 +0100 Subject: [PATCH 3/6] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 391b1a89a5..065c4b1b0b 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # EGroupware | Branch | Status | Tools | Usage | | ------ | ------ | ----- | ----- | -| master | [![Build Status](https://travis-ci.org/EGroupware/egroupware.svg?branch=master)](https://travis-ci.org/EGroupware/egroupware) | Travis CI | runs unit-tests after each commit | +| master | [![Build Status](https://travis-ci.org/EGroupware/egroupware.svg?branch=master)](https://travis-ci.org/EGroupware/egroupware) | Travis CI | runs unit-tests after each commit | | 17.1 | [![Build Status](https://travis-ci.org/EGroupware/egroupware.svg?branch=17.1)](https://travis-ci.org/EGroupware/egroupware) | [![Scrutinizer CI](https://scrutinizer-ci.com/images/logo.png)](https://scrutinizer-ci.com/g/EGroupware/egroupware/) scrutinizer | runs static analysis on our codebase | | 16.1 | [![Build Status](https://travis-ci.org/EGroupware/egroupware.svg?branch=16.1)](https://travis-ci.org/EGroupware/egroupware) | BrowserStack | manual testing with unusual browser versions or platforms | From 9adf0e300b2856900a0ee42ac0793fa0fe06c916 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 4 Feb 2020 09:07:29 +0100 Subject: [PATCH 4/6] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 065c4b1b0b..ea974dfd35 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # EGroupware | Branch | Status | Tools | Usage | | ------ | ------ | ----- | ----- | -| master | [![Build Status](https://travis-ci.org/EGroupware/egroupware.svg?branch=master)](https://travis-ci.org/EGroupware/egroupware) | Travis CI | runs unit-tests after each commit | +| master | [![Build Status](https://travis-ci.org/EGroupware/egroupware.svg?branch=master)](https://travis-ci.org/EGroupware/egroupware) | Travis CI | runs unit-tests after each commit | | 17.1 | [![Build Status](https://travis-ci.org/EGroupware/egroupware.svg?branch=17.1)](https://travis-ci.org/EGroupware/egroupware) | [![Scrutinizer CI](https://scrutinizer-ci.com/images/logo.png)](https://scrutinizer-ci.com/g/EGroupware/egroupware/) scrutinizer | runs static analysis on our codebase | | 16.1 | [![Build Status](https://travis-ci.org/EGroupware/egroupware.svg?branch=16.1)](https://travis-ci.org/EGroupware/egroupware) | BrowserStack | manual testing with unusual browser versions or platforms | From f46db0484ac58b41003382d9803dfe6b7c1afd86 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 4 Feb 2020 09:35:23 +0100 Subject: [PATCH 5/6] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ea974dfd35..3a9426a508 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,8 @@ | Branch | Status | Tools | Usage | | ------ | ------ | ----- | ----- | | master | [![Build Status](https://travis-ci.org/EGroupware/egroupware.svg?branch=master)](https://travis-ci.org/EGroupware/egroupware) | Travis CI | runs unit-tests after each commit | -| 17.1 | [![Build Status](https://travis-ci.org/EGroupware/egroupware.svg?branch=17.1)](https://travis-ci.org/EGroupware/egroupware) | [![Scrutinizer CI](https://scrutinizer-ci.com/images/logo.png)](https://scrutinizer-ci.com/g/EGroupware/egroupware/) scrutinizer | runs static analysis on our codebase | -| 16.1 | [![Build Status](https://travis-ci.org/EGroupware/egroupware.svg?branch=16.1)](https://travis-ci.org/EGroupware/egroupware) | BrowserStack | manual testing with unusual browser versions or platforms | +| 19.1 | [![Build Status](https://travis-ci.org/EGroupware/egroupware.svg?branch=19.1)](https://travis-ci.org/EGroupware/egroupware) | [![Scrutinizer CI](https://scrutinizer-ci.com/images/logo.png)](https://scrutinizer-ci.com/g/EGroupware/egroupware/) scrutinizer | runs static analysis on our codebase | +| 17.1 | [![Build Status](https://travis-ci.org/EGroupware/egroupware.svg?branch=17.1)](https://travis-ci.org/EGroupware/egroupware) | BrowserStack | manual testing with unusual browser versions or platforms | ### Default and prefered installation method for EGroupware is via your package manager: From 491d17bc08b97cf4676775690d9087f6010589d2 Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Tue, 4 Feb 2020 13:27:55 +0100 Subject: [PATCH 6/6] * Collabora: Fix issue of inserting an image into document pops a rename dialog --- api/js/etemplate/et2_widget_vfs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/js/etemplate/et2_widget_vfs.js b/api/js/etemplate/et2_widget_vfs.js index c02d4f7db9..47cdcc6024 100644 --- a/api/js/etemplate/et2_widget_vfs.js +++ b/api/js/etemplate/et2_widget_vfs.js @@ -1262,7 +1262,7 @@ var et2_vfsSelect = (function(){ "use strict"; return et2_inputWidget.extend( default: if (self.options.method === 'download') submit_value.path = _data.content.download_baseUrl; files = submit_value.path+'/'+submit_value.name; - if (self.options.method !== 'download' && !savemode) + if (self.options.mode === 'saveas' && !savemode) { for(var p in _data.content.dir) {