diff --git a/core/config.class.inc.php b/core/config.class.inc.php index c64803270..6648ad60a 100644 --- a/core/config.class.inc.php +++ b/core/config.class.inc.php @@ -489,11 +489,11 @@ class Config 'show_in_conf_sample' => true, ], 'cron_max_execution_time' => [ - 'type' => 'integer', - 'description' => 'Duration (seconds) of the page cron.php, must be shorter than php setting max_execution_time and shorter than the web server response timeout', - 'default' => 600, - 'value' => 600, - 'source_of_value' => '', + 'type' => 'integer', + 'description' => 'Duration (seconds) of the cron.php script : if exceeded the script will exit even if there are remaining tasks to process. Must be shorter than php max_execution_time setting (note than when using CLI, this is set to 0 by default which means unlimited). If cron.php is ran via web, it must be shorter than the web server response timeout.', + 'default' => 600, + 'value' => 600, + 'source_of_value' => '', 'show_in_conf_sample' => true, ], 'cron_task_max_execution_time' => [ diff --git a/css/backoffice/layout/_navigation-menu.scss b/css/backoffice/layout/_navigation-menu.scss index 8183d2cce..5b7dc3647 100644 --- a/css/backoffice/layout/_navigation-menu.scss +++ b/css/backoffice/layout/_navigation-menu.scss @@ -14,7 +14,7 @@ $ibo-navigation-menu--body--background-color: $ibo-color-blue-grey-900 !default; $ibo-navigation-menu--body--text-color: $ibo-color-grey-300 !default; $ibo-navigation-menu--top-part--height: 120px !default; -$ibo-navigation-menu--top-part--padding-y: $ibo-navigation-menu--body--padding-y !default; +$ibo-navigation-menu--top-part--padding-y: $ibo-spacing-400 !default; $ibo-navigation-menu--top-part--padding-x: $ibo-navigation-menu--body--padding-x !default; $ibo-navigation-menu--top-part--elements-spacing: 20px !default; @@ -70,13 +70,13 @@ $ibo-navigation-menu--square-company-logo--width: 38px !default; $ibo-navigation-menu--square-company-logo--height: 38px !default; $ibo-navigation-menu--square-company-logo--margin-top: $ibo-spacing-0 !default; $ibo-navigation-menu--square-company-logo--margin-x: -5px !default; -$ibo-navigation-menu--square-company-logo--margin-bottom: $ibo-navigation-menu--body--padding-y * 2 !default; +$ibo-navigation-menu--square-company-logo--margin-bottom: ($ibo-navigation-menu--body--padding-y * 2) + 12px !default; /* +12px to keep burger & menu groups icons align in both expanded and collapsed mode */ $ibo-navigation-menu--full-company-logo--width: $ibo-navigation-menu--body--width-expanded !default; $ibo-navigation-menu--full-company-logo--height: 70px !default; $ibo-navigation-menu--full-company-logo--margin-top: $ibo-spacing-0 !default; $ibo-navigation-menu--full-company-logo--margin-right: $ibo-spacing-0 !default; -$ibo-navigation-menu--full-company-logo--margin-bottom: $ibo-spacing-0 !default; +$ibo-navigation-menu--full-company-logo--margin-bottom: $ibo-spacing-400 !default; $ibo-navigation-menu--full-company-logo--margin-left: -$ibo-navigation-menu--body--padding-y !default; $ibo-navigation-menu--full-company-logo--image--margin-x: auto !default; $ibo-navigation-menu--full-company-logo--image--margin-y: $ibo-spacing-0 !default; diff --git a/css/backoffice/pages/_about.scss b/css/backoffice/pages/_about.scss new file mode 100644 index 000000000..607613d13 --- /dev/null +++ b/css/backoffice/pages/_about.scss @@ -0,0 +1,20 @@ +/* + * @copyright Copyright (C) 2010-2021 Combodo SARL + * @license http://opensource.org/licenses/AGPL-3.0 + */ +$ibo-about-box--top-part--children--padding-y: $ibo-spacing-500 !default; +$ibo-about-box--top-part--children--padding-x: $ibo-spacing-400 !default; +$ibo-about-box--top-part--children--margin-y: auto !default; +$ibo-about-box--top-part--children--margin-x: auto !default; +$ibo-about-box--top-part--children--width: 50% !default; + +.ibo-about-box--top-part{ + display: flex; + flex-direction: row; + align-content: center; + > div{ + padding: $ibo-about-box--top-part--children--padding-y $ibo-about-box--top-part--children--padding-x; + margin: $ibo-about-box--top-part--children--margin-y $ibo-about-box--top-part--children--margin-x; + width: $ibo-about-box--top-part--children--width; + } +} \ No newline at end of file diff --git a/css/backoffice/pages/_all.scss b/css/backoffice/pages/_all.scss index 11f5a7599..d911ff390 100644 --- a/css/backoffice/pages/_all.scss +++ b/css/backoffice/pages/_all.scss @@ -3,6 +3,7 @@ * @license http://opensource.org/licenses/AGPL-3.0 */ +@import "about"; @import "base"; @import "preferences"; @import "attachments"; diff --git a/css/backoffice/vendors/_ckeditor.scss b/css/backoffice/vendors/_ckeditor.scss index bd9049baa..ca0203b61 100644 --- a/css/backoffice/vendors/_ckeditor.scss +++ b/css/backoffice/vendors/_ckeditor.scss @@ -49,7 +49,7 @@ $ibo-vendors-ckeditor--autocomplete-item-title--text-color: #3A3A3A !default; padding: $ibo-vendors-highlightjs--padding !important; box-shadow: 0 0px 3px 2px inset rgba(0, 0, 0, 0.4); border-radius: $ibo-vendors-highlightjs--border-radius; - white-space: pre-line; + white-space: pre-wrap; } .ibo-hljs-container{ diff --git a/css/login.css b/css/login.css index bd7a5e7d9..392f584fb 100644 --- a/css/login.css +++ b/css/login.css @@ -59,8 +59,8 @@ a:hover { padding-right: 20px; padding-top: 10px; padding-bottom: 10px; - height: 54px; - margin-top: 150px; + height: 94px; + margin-top: 110px; } #login-content { @@ -75,9 +75,10 @@ a:hover { { #login-logo { margin-top: 0; + padding-top: 0; } #login-content { - margin-top: 74px; + margin-top: 94px; } h1 { margin-top: 0; @@ -86,7 +87,7 @@ a:hover { #login-logo img { border: 0; - max-height: 54px; + max-height: 94px; } #login-form { diff --git a/css/unauthenticated.css b/css/unauthenticated.css index 35fa3b49d..e7a9a1991 100644 --- a/css/unauthenticated.css +++ b/css/unauthenticated.css @@ -14,34 +14,4 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - */ -body { - display: block; -} -/* Landing page */ -#uwp-main-container { - margin-top: 40px; -} -#uwp-main-container #uwp-logo, #uwp-main-container #uwp-title { - vertical-align: middle; -} -#uwp-main-container #uwp-title { - margin-left: 25px; - font-size: 20px; - font-weight: bold; -} -#uwp-main-container #uwp-description { - margin-bottom: 25px; -} -#uwp-main-container .uwp-text-hint--icon { - font-size: 12px; - margin-left: 5px; - color: #939191; -} -#uwp-main-container #uwp-bottom-buttons { - margin-top: 25px; - text-align: right; -} -#uwp-main-container #uwp-bottom-buttons .btn ~ .btn { - margin-left: 8px; -} + */body{display:block}#uwp-main-container{margin-top:40px}#uwp-main-container #uwp-logo,#uwp-main-container #uwp-title{vertical-align:middle;max-height:74px}#uwp-main-container #uwp-title{margin-left:25px;font-size:20px;font-weight:bold}#uwp-main-container #uwp-description{margin-bottom:25px}#uwp-main-container .uwp-text-hint--icon{font-size:12px;margin-left:5px;color:#939191}#uwp-main-container #uwp-bottom-buttons{margin-top:25px;text-align:right}#uwp-main-container #uwp-bottom-buttons .btn~.btn{margin-left:8px} \ No newline at end of file diff --git a/css/unauthenticated.scss b/css/unauthenticated.scss index fd5cdffd2..cffd36130 100644 --- a/css/unauthenticated.scss +++ b/css/unauthenticated.scss @@ -29,6 +29,7 @@ body{ #uwp-logo, #uwp-title{ vertical-align: middle; + max-height: 74px; } #uwp-title{ margin-left: 25px; diff --git a/datamodels/2.x/itop-portal-base/portal/src/Controller/ObjectController.php b/datamodels/2.x/itop-portal-base/portal/src/Controller/ObjectController.php index 43ace1e9d..0acdfd0be 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/Controller/ObjectController.php +++ b/datamodels/2.x/itop-portal-base/portal/src/Controller/ObjectController.php @@ -1244,7 +1244,7 @@ class ObjectController extends BrickController } $aData['att_id'] = $iAttId; - $aData['preview'] = $oDocument->IsPreviewAvailable() ; + $aData['preview'] = $oDocument->IsPreviewAvailable(); $aData['file_size'] = $oDocument->GetFormattedSize(); $aData['creation_date'] = $oAttachment->Get('creation_date'); $aData['user_id_friendlyname'] = $oAttachment->Get('user_id_friendlyname'); diff --git a/images/favicon.ico b/images/favicon.ico index 0d812b0f7..0b3cd4586 100644 Binary files a/images/favicon.ico and b/images/favicon.ico differ diff --git a/images/itop-logo-external.png b/images/itop-logo-external.png index 8bd1b0439..40f1a0535 100644 Binary files a/images/itop-logo-external.png and b/images/itop-logo-external.png differ diff --git a/images/itop-logo-square-64.png b/images/itop-logo-square-64.png index c88cf302f..63a369352 100644 Binary files a/images/itop-logo-square-64.png and b/images/itop-logo-square-64.png differ diff --git a/images/itop-logo-square.png b/images/itop-logo-square.png index 5f77d84d4..090de8adb 100644 Binary files a/images/itop-logo-square.png and b/images/itop-logo-square.png differ diff --git a/images/itop-logo.png b/images/itop-logo.png index 0519b9de7..6188690a3 100644 Binary files a/images/itop-logo.png and b/images/itop-logo.png differ diff --git a/images/logo-combodo.png b/images/logo-combodo.png old mode 100755 new mode 100644 index 66b1e07d2..ae3b82348 Binary files a/images/logo-combodo.png and b/images/logo-combodo.png differ diff --git a/images/logo-itop-dark-bg.svg b/images/logo-itop-dark-bg.svg index 98f047d9c..4ce457db7 100644 --- a/images/logo-itop-dark-bg.svg +++ b/images/logo-itop-dark-bg.svg @@ -1,59 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/images/logos/logo-combodo-dark.svg b/images/logos/logo-combodo-dark.svg new file mode 100644 index 000000000..aad057c3b --- /dev/null +++ b/images/logos/logo-combodo-dark.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + diff --git a/images/logos/logo-combodo-light.svg b/images/logos/logo-combodo-light.svg new file mode 100644 index 000000000..39687130a --- /dev/null +++ b/images/logos/logo-combodo-light.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + diff --git a/images/logos/logo-itop-baseline-dark.svg b/images/logos/logo-itop-baseline-dark.svg new file mode 100644 index 000000000..444ba89e7 --- /dev/null +++ b/images/logos/logo-itop-baseline-dark.svg @@ -0,0 +1,63 @@ + + + + + + + + + + + diff --git a/images/logos/logo-itop-baseline-light.svg b/images/logos/logo-itop-baseline-light.svg new file mode 100644 index 000000000..ffea897a0 --- /dev/null +++ b/images/logos/logo-itop-baseline-light.svg @@ -0,0 +1,62 @@ + + + + + + + + + + + diff --git a/images/logos/logo-itop-compact-dark.svg b/images/logos/logo-itop-compact-dark.svg new file mode 100644 index 000000000..1acc17bd3 --- /dev/null +++ b/images/logos/logo-itop-compact-dark.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/images/logos/logo-itop-compact-light.svg b/images/logos/logo-itop-compact-light.svg new file mode 100644 index 000000000..4a7532d6d --- /dev/null +++ b/images/logos/logo-itop-compact-light.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/images/logos/logo-itop-compact-orange.svg b/images/logos/logo-itop-compact-orange.svg new file mode 100644 index 000000000..cd71f0537 --- /dev/null +++ b/images/logos/logo-itop-compact-orange.svg @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/images/logos/logo-itop-simple-dark.svg b/images/logos/logo-itop-simple-dark.svg new file mode 100644 index 000000000..c1a545cdb --- /dev/null +++ b/images/logos/logo-itop-simple-dark.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/logos/logo-itop-simple-light.svg b/images/logos/logo-itop-simple-light.svg new file mode 100644 index 000000000..4ce457db7 --- /dev/null +++ b/images/logos/logo-itop-simple-light.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/setup/compiler.class.inc.php b/setup/compiler.class.inc.php index 89b1e5088..b7511bed1 100644 --- a/setup/compiler.class.inc.php +++ b/setup/compiler.class.inc.php @@ -3585,6 +3585,8 @@ EOF; * @param $sRelativeDir * * @throws \Exception + * + * @since 2.7.0 N°2498 */ protected function WriteStaticOnlyHtaccess($sTempTargetDir) { @@ -3626,6 +3628,8 @@ EOF; * @param $sModuleVersion * * @throws \Exception + * + * @since 2.7.0 N°2498 */ protected function WriteStaticOnlyWebConfig($sTempTargetDir) { diff --git a/setup/favicon.ico b/setup/favicon.ico index 104162ad9..0b3cd4586 100644 Binary files a/setup/favicon.ico and b/setup/favicon.ico differ diff --git a/setup/setuppage.class.inc.php b/setup/setuppage.class.inc.php index a1603323f..de92d4450 100644 --- a/setup/setuppage.class.inc.php +++ b/setup/setuppage.class.inc.php @@ -157,7 +157,7 @@ class SetupPage extends NiceWebPage public function output() { - $sLogo = utils::GetAbsoluteUrlAppRoot().'/images/itop-logo.png?t='.utils::GetCacheBusterTimestamp(); + $sLogo = utils::GetAbsoluteUrlAppRoot().'/images/logos/logo-itop-simple-dark.svg?t='.utils::GetCacheBusterTimestamp(); $oSetupPage = UIContentBlockUIBlockFactory::MakeStandard(); $oHeader = UIContentBlockUIBlockFactory::MakeStandard('header', ['ibo-setup--header']); $oSetupPage->AddSubBlock($oHeader); diff --git a/sources/Application/Branding.php b/sources/Application/Branding.php index d488dbba1..d594fcf83 100644 --- a/sources/Application/Branding.php +++ b/sources/Application/Branding.php @@ -53,7 +53,7 @@ class Branding 'default' => 'images/logo-itop-dark-bg.svg', ], self::ENUM_LOGO_TYPE_LOGIN_LOGO => [ - 'default' => 'images/itop-logo.png', + 'default' => 'images/itop-logo-external.png', ], ]; diff --git a/sources/Application/WebPage/ErrorPage.php b/sources/Application/WebPage/ErrorPage.php index 815ddc0c9..69d039f44 100644 --- a/sources/Application/WebPage/ErrorPage.php +++ b/sources/Application/WebPage/ErrorPage.php @@ -60,7 +60,7 @@ class ErrorPage extends NiceWebPage public function output() { - $sLogo = Branding::GetFullMainLogoAbsoluteUrl(); + $sLogo = Branding::GetLoginLogoAbsoluteUrl(); $oSetupPage = UIContentBlockUIBlockFactory::MakeStandard('ibo_setup_container', ['ibo-setup']); $oHeader = UIContentBlockUIBlockFactory::MakeStandard('header', ['ibo-setup--header']); $oSetupPage->AddSubBlock($oHeader); diff --git a/sources/Application/WebPage/UnauthenticatedWebPage.php b/sources/Application/WebPage/UnauthenticatedWebPage.php index 26c44f97d..9c9b17b9e 100644 --- a/sources/Application/WebPage/UnauthenticatedWebPage.php +++ b/sources/Application/WebPage/UnauthenticatedWebPage.php @@ -73,7 +73,7 @@ class UnauthenticatedWebPage extends NiceWebPage $this->sContent = ''; $this->sPanelTitle = ''; - $this->sPanelIcon = Branding::GetFullMainLogoAbsoluteUrl(); + $this->sPanelIcon = Branding::GetLoginLogoAbsoluteUrl(); $this->SetContentType('text/html'); diff --git a/sources/Controller/AjaxRenderController.php b/sources/Controller/AjaxRenderController.php index 68ba32c0f..86c8f4baf 100644 --- a/sources/Controller/AjaxRenderController.php +++ b/sources/Controller/AjaxRenderController.php @@ -826,9 +826,8 @@ $('#about_box').dialog({ EOF ); $sVersionString = Dict::Format('UI:iTopVersion:Short', ITOP_APPLICATION, ITOP_VERSION); - $oPage->add("
"); - $oPage->add('
'); - $oPage->add(''); + $oPage->add('
'); + $oPage->add('
'); $oPage->add('
'.$sVersionString.'
'); $oPage->add("
"); self::DisplayAboutLicenses($oPage); @@ -909,18 +908,9 @@ EOF // Display // - $oPage->add("
"); - $oPage->add('
'); - $oPage->add(''); - $oPage->add(''); - $oPage->add(''); - $oPage->add(''); - $oPage->add(''); - $oPage->add('
'); - $oPage->add($sVersionString.'
'); - $oPage->add('MySQL: '.$sMySQLVersion.'
'); - $oPage->add('PHP: '.$sPHPVersion.'
'); - $oPage->add('
'); + $oPage->add('
'); + $oPage->add('
'); + $oPage->add('
'.$sVersionString.'
'.'MySQL: '.$sMySQLVersion.'
'.'PHP: '.$sPHPVersion.'
'); $oPage->add("
"); self::DisplayAboutLicenses($oPage); diff --git a/sources/Controller/Base/Layout/ActivityPanelController.php b/sources/Controller/Base/Layout/ActivityPanelController.php index f0cda3f5d..479452fac 100644 --- a/sources/Controller/Base/Layout/ActivityPanelController.php +++ b/sources/Controller/Base/Layout/ActivityPanelController.php @@ -116,7 +116,9 @@ class ActivityPanelController 'html_rendering' => $sEntryAsHtml, ]; } - + // Finalize inline images + InlineImage::FinalizeInlineImages($oObject); + // Invoke extensions after the update of the object from the activity form /** @var \iApplicationUIExtension $oExtensionInstance */ foreach(MetaModel::EnumPlugins('iApplicationUIExtension') as $oExtensionInstance) @@ -126,9 +128,6 @@ class ActivityPanelController $oObject->DBWrite(); - // Finalize inline images - InlineImage::FinalizeInlineImages($oObject); - return $aResults; }