Merge branch 'support/3.0' into feature/faf_sqlite

* Rename SCSS variables
  * Optimize SCSS rules

.make/composer/rmDeniedTestDir.php

@@ -36,18 +36,24 @@ clearstatcache();
 $oiTopComposer = new iTopComposer();
 $aDeniedButStillPresent = $oiTopComposer->ListDeniedButStillPresent();
 
+echo "\n";
 foreach ($aDeniedButStillPresent as $sDir)
 {
-	if (! preg_match('#[tT]ests?/?$#', $sDir))
+	if (false === iTopComposer::IsTestDir($sDir))
 	{
-		echo "\nfound INVALID denied test dir: '$sDir'\n";
+		echo "ERROR found INVALID denied test dir: '$sDir'\n";
 		throw new \Exception("$sDir must end with /Test/ or /test/");
 	}
 
+	if (false === file_exists($sDir)) {
+		echo "INFO $sDir is in denied list, but not existing on disk => skipping !\n";
+		continue;
+	}
+
 	try
 	{
 		SetupUtils::rrmdir($sDir);
-		echo "Remove denied test dir: '$sDir'\n";
+		echo "OK Remove denied test dir: '$sDir'\n";
 	}
 	catch (\Exception $e)
 	{

.make/release/update-versions.php

@@ -26,6 +26,7 @@ require_once (__DIR__.DIRECTORY_SEPARATOR.'update.classes.inc.php');
 $aFilesUpdaters = array(
 	new iTopVersionFileUpdater(),
 	new DatamodelsModulesFiles(),
+	new ConstantFileUpdater('ITOP_CORE_VERSION', 'approot.inc.php'),
 );
 
 if (count($argv) === 1)

.make/release/update.classes.inc.php

@@ -69,6 +69,40 @@ abstract class AbstractSingleFileVersionUpdater extends FileVersionUpdater
 	}
 }
 
+/**
+ * @since 2.7.7 3.0.1 3.1.0 N°4714
+ */
+class ConstantFileUpdater extends AbstractSingleFileVersionUpdater {
+	/** @var string */
+	private $sConstantName;
+
+	/**
+	 * @param $sConstantName constant to search, for example `ITOP_CORE_VERSION`
+	 * @param $sFileToUpdate file containing constant definition
+	 */
+	public function __construct($sConstantName, $sFileToUpdate)
+	{
+		$this->sConstantName = $sConstantName;
+		parent::__construct($sFileToUpdate);
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function UpdateFileContent($sVersionLabel, $sFileContent, $sFileFullPath)
+	{
+		$sConstantSearchPattern = <<<REGEXP
+/define\('{$this->sConstantName}', ?'[^']+'\);/
+REGEXP;
+
+		return preg_replace(
+			$sConstantSearchPattern,
+			"define('{$this->sConstantName}', '{$sVersionLabel}');",
+			$sFileContent
+		);
+	}
+}
+
 class iTopVersionFileUpdater extends AbstractSingleFileVersionUpdater
 {
 	public function __construct()

application/cmdbabstract.class.inc.php

@@ -391,7 +391,8 @@ JS
 			$oSingletonFilter = new DBObjectSearch(get_class($this));
 			$oSingletonFilter->AddCondition('id', $this->GetKey(), '=');
 			$oBlock = new MenuBlock($oSingletonFilter, 'details', false);
-			$oActionMenuBlock = $oBlock->GetRenderContent($oPage);
+			$sActionMenuId = utils::Sanitize(uniqid('', true), '', utils::ENUM_SANITIZATION_FILTER_ELEMENT_IDENTIFIER);
+			$oActionMenuBlock = $oBlock->GetRenderContent($oPage, [], $sActionMenuId);
 			$aHeaderBlocks['toolbar'][$oActionMenuBlock->GetId()] = $oActionMenuBlock;
 		}
 
@@ -649,11 +650,17 @@ HTML
 			if ($oAttDef instanceof AttributeDashboard) {
 				if (!$this->IsNew()) {
 					$sHostContainerInEditionUrlParam = ($bEditMode) ? '&host_container_in_edition=true' : '';
-					$oPage->AddAjaxTab($oAttDef->GetLabel(),
-						utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php?operation=dashboard&class='.get_class($this).'&id='.$this->GetKey().'&attcode='.$oAttDef->GetCode().$sHostContainerInEditionUrlParam,
-						true,
+					$oPage->AddAjaxTab(
 						'Class:'.$sClass.'/Attribute:'.$sAttCode,
-						AjaxTab::ENUM_TAB_PLACEHOLDER_DASHBOARD);
+						utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php?operation=dashboard&class='
+							.get_class($this)
+							.'&id='.$this->GetKey()
+							.'&attcode='.$oAttDef->GetCode()
+							.$sHostContainerInEditionUrlParam,
+						true,
+						$oAttDef->GetLabel(),
+						AjaxTab::ENUM_TAB_PLACEHOLDER_DASHBOARD
+					);
 					// Add graphs dependencies
 					WebResourcesHelper::EnableC3JSToWebPage($oPage);
 				}
@@ -1739,6 +1746,9 @@ HTML
 	 * @param array $aParams
 	 *
 	 * @throws \Exception
+	 *  only used in old and deprecated export.php
+	 *
+	 * @internal Only to be used by `/webservices/export.php` : this is a legacy method that produces wrong HTML (no TR on table body rows)
 	 */
 	public static function DisplaySetAsHTMLSpreadsheet(WebPage $oPage, CMDBObjectSet $oSet, $aParams = array())
 	{
@@ -1759,6 +1769,8 @@ HTML
 	 * @throws \MySQLException
 	 * @throws \MySQLHasGoneAwayException
 	 * @throws \Exception
+	 * 
+	 * @internal Only to be used by `/webservices/export.php` : this is a legacy method that produces wrong HTML (no TR on table body rows)
 	 */
 	public static function GetSetAsHTMLSpreadsheet(DBObjectSet $oSet, $aParams = array())
 	{
@@ -4231,13 +4243,20 @@ HTML;
 				if (!is_null($oImage->GetData()))
 				{
 					$aSize = utils::GetImageSize($oImage->GetData());
-					$oImage = utils::ResizeImageToFit(
-						$oImage,
-						$aSize[0],
-						$aSize[1],
-						$oAttDef->Get('storage_max_width'),
-						$oAttDef->Get('storage_max_height')
-					);
+					if (is_array($aSize) && $aSize[0] > 0 && $aSize[1] > 0)
+					{
+						$oImage = utils::ResizeImageToFit(
+							$oImage,
+							$aSize[0],
+							$aSize[1],
+							$oAttDef->Get('storage_max_width'),
+							$oAttDef->Get('storage_max_height')
+						);
+					}
+					else
+					{
+						IssueLog::Warning($sClass . ':' . $this->GetKey() . '/' . $sAttCode . ': Image could not be resized. Mimetype: ' . $oImage->GetMimeType() . ', filename: ' . $oImage->GetFileName());
+					}
 				}
 				$aOtherData = utils::ReadPostedParam("attr_{$sFormPrefix}{$sAttCode}", null, 'raw_data');
 				if (is_array($aOtherData))

application/dashboard.class.inc.php

@@ -583,7 +583,7 @@ JS
 		$oPage->add('<div id="select_dashlet" class="ibo-dashboard--available-dashlets--list" data-role="ibo-dashboard--available-dashlets--list">');
 		$aAvailableDashlets = $this->GetAvailableDashlets();
 		foreach ($aAvailableDashlets as $sDashletClass => $aInfo) {
-			$oPage->add('<span dashlet_class="'.$sDashletClass.'" class="ibo-dashboard-editor--available-dashlet-icon dashlet_icon ui-widget-content ui-corner-all" data-role="ibo-dashboard-editor--available-dashlet-icon" id="dashlet_'.$sDashletClass.'" title="'.$aInfo['label'].'"><img src="'.$sUrl.$aInfo['icon'].'" /></span>');
+			$oPage->add('<span dashlet_class="'.$sDashletClass.'" class="ibo-dashboard-editor--available-dashlet-icon dashlet_icon ui-widget-content ui-corner-all" data-role="ibo-dashboard-editor--available-dashlet-icon" id="dashlet_'.$sDashletClass.'" data-tooltip-content="'.$aInfo['label'].'"  title="'.$aInfo['label'].'"><img src="'.$sUrl.$aInfo['icon'].'" /></span>');
 		}
 		$oPage->add('</div>');
 
@@ -1066,11 +1066,11 @@ EOF
 					 dashboard.html(data);
 					 dashboard.unblock();
 					 if ($('#ibo-dashboard-selector$sDivId input').prop("checked")) {
-					 	$('#ibo-dashboard-selector$sDivId').data('tooltip-content', '$sSwitchToStandard');
+					 	$('#ibo-dashboard-selector$sDivId').attr('data-tooltip-content', '$sSwitchToStandard');
 					 } else {
-					    $('#ibo-dashboard-selector$sDivId').data('tooltip-content', '$sSwitchToCustom');
+					    $('#ibo-dashboard-selector$sDivId').attr('data-tooltip-content', '$sSwitchToCustom');
 					 }
-					 CombodoTooltip.InitAllNonInstantiatedTooltips($('#ibo-dashboard-selector$sDivId').parent());
+					 CombodoTooltip.InitAllNonInstantiatedTooltips($('#ibo-dashboard-selector$sDivId').parent(), true);
 					}
 				 );
 			}

application/displayblock.class.inc.php

@@ -539,8 +539,10 @@ class DisplayBlock
 	 * @throws DictExceptionMissingString
 	 * @throws MySQLException
 	 * @throws Exception
+	 *
+	 * @since 2.7.7 3.0.1 3.1.0 N°3129 add type hinting to $aExtraParams
 	 */
-	public function GetRenderContent(WebPage $oPage, array $aExtraParams = [], string $sId = null)
+	public function GetRenderContent(WebPage $oPage, array $aExtraParams, string $sId)
 	{
 		$sHtml = '';
 		$oBlock = null;
@@ -853,7 +855,7 @@ JS
 	{
 		$oField = new FieldExpression($sFilterCode,  $oFilter->GetClassAlias());
 		$sListExpr = '('.implode(', ', CMDBSource::Quote($condition)).')';
-		$sOQLCondition = $oField->Render()." IN $sListExpr";
+		$sOQLCondition = $oField->RenderExpression()." IN $sListExpr";
 		$oNewCondition = Expression::FromOQL($sOQLCondition);
 		return $oNewCondition;		
 	}
@@ -1730,7 +1732,24 @@ class HistoryBlock extends DisplayBlock
 		$this->iLimitCount = $iCount;
 	}
 
-	public function GetRenderContent(WebPage $oPage, array $aExtraParams = [], string $sId = null)
+	/**
+	 * @param \WebPage $oPage
+	 * @param array $aExtraParams
+	 * @param string $sId
+	 *
+	 * @return string
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \DictExceptionMissingString
+	 * @throws \MissingQueryArgument
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 *
+	 * @since 2.7.7 3.0.1 3.1.0 N°3129 Remove default value for $aExtraParams and add type hinting for PHP 8.0 compatibility
+	 *      (var is unused, and all calls were already made using a default value)
+	 */
+	public function GetRenderContent(WebPage $oPage, array $aExtraParams, string $sId)
 	{
 		$sHtml = '';
 		$bTruncated = false;
@@ -1871,11 +1890,10 @@ class MenuBlock extends DisplayBlock
 	 * @throws \DictExceptionMissingString
 	 * @throws \MissingQueryArgument
 	 * @throws \MySQLException
-	 * @throws \MySQLHasGoneAwayException
-	 * @throws \OQLException
-	 * @throws \ReflectionException
+	 *
+	 * @since 2.7.7 3.0.1 3.1.0 N°3129 Remove default value and add type hinting on $aExtraParams for PHP 8.0 compatibility
 	 */
-	public function GetRenderContent(WebPage $oPage, array $aExtraParams = [], string $sId = null)
+	public function GetRenderContent(WebPage $oPage, array $aExtraParams, string $sId)
 	{
 		$oRenderBlock = new UIContentBlock();
 

application/loginwebpage.class.inc.php

@@ -483,6 +483,7 @@ class LoginWebPage extends NiceWebPage
 					$iResponse = $oLoginFSMExtensionInstance->LoginAction($sLoginState, $iErrorCode);
 					if ($iResponse == self::LOGIN_FSM_RETURN)
 					{
+						Session::WriteClose();
 						return $iErrorCode; // Asked to exit FSM, generally login OK
 					}
 					if ($iResponse == self::LOGIN_FSM_ERROR)

application/maintenancemsg.php

@@ -77,17 +77,28 @@ function _MaintenanceHtmlMessage($sMessage)
  */
 function _MaintenanceJsonMessage($sTitle, $sMessage)
 {
-	@include_once(APPROOT."/application/ajaxwebpage.class.inc.php");
-	if (class_exists('ajax_page'))
+	if (class_exists('JsonPage'))
 	{
-		$oP = new ajax_page($sTitle);
+		$oP = new JsonPage($sTitle);
 		$oP->add_header('Access-Control-Allow-Origin: *');
-		$oP->SetContentType('application/json');
-		$oP->add('{"code":100, "message":"'.$sMessage.'"}');
+
+		$aMessage = [
+			'code' => 100,
+			'message' =>$sMessage
+		];
+
+		$oP->AddData($aMessage);
 		$oP->Output();
-	}
-	else
-	{
-		_MaintenanceTextMessage($sMessage);
+	} else {
+		@include_once(APPROOT."/application/ajaxwebpage.class.inc.php");
+		if (class_exists('ajax_page')) {
+			$oP = new ajax_page($sTitle);
+			$oP->add_header('Access-Control-Allow-Origin: *');
+			$oP->SetContentType('application/json');
+			$oP->add('{"code":100, "message":"'.$sMessage.'"}');
+			$oP->Output();
+		} else {
+			_MaintenanceTextMessage($sMessage);
+		}
 	}
 }

application/menunode.class.inc.php

@@ -5,6 +5,7 @@
  */
 
 use Combodo\iTop\Application\Helper\WebResourcesHelper;
+use Combodo\iTop\Application\UI\Base\Component\Title\Title;
 use Combodo\iTop\Application\UI\Base\Component\Title\TitleUIBlockFactory;
 
 require_once(APPROOT.'/application/utils.inc.php');
@@ -1126,16 +1127,20 @@ class OQLMenuNode extends MenuNode
 	{
 		$sUsageId = utils::GetSafeId($sUsageId);
 		$oSearch = DBObjectSearch::FromOQL($sOql);
-
+		$sClass= 	$oSearch->GetClass();
+		$sIcon = MetaModel::GetClassIcon($sClass, false);
 		if ($bSearchPane) {
 			$aParams = array_merge(['open' => $bSearchOpen, 'table_id' => $sUsageId, 'submit_on_load' => false], $aExtraParams);
 			$oBlock = new DisplayBlock($oSearch, 'search', false /* Asynchronous */, $aParams);
 			$oBlock->Display($oPage, 0);
+			$oPage->add("<div class='sf_results_area ibo-add-margin-top-250' data-target='search_results'>");
 		}
-
-		$oPage->add("<div class='sf_results_area' data-target='search_results'>");
-		$oTitle = TitleUIBlockFactory::MakeForPage($sTitle);
-		$oPage->AddUiBlock($oTitle);
+		else {
+			$oPage->add("<div class='sf_results_area' data-target='search_results'>");
+		}
+		$aExtraParams['panel_class'] =$sClass;
+		$aExtraParams['panel_title'] = $sTitle;
+		$aExtraParams['panel_icon'] = $sIcon;
 
 		$aParams = array_merge(array('table_id' => $sUsageId), $aExtraParams);
 		$oBlock = new DisplayBlock($oSearch, 'list', false /* Asynchronous */, $aParams);

application/shortcut.class.inc.php

@@ -288,7 +288,8 @@ class ShortcutOQL extends Shortcut
 		$oPage->add_ready_script(
 <<<JS
 // Note: the title gets deleted by the validation mechanism
-$("#attr_auto_reload_sec").tooltip({items: 'input', content: '$sRateTitle'});
+$("#attr_auto_reload_sec").attr('data-tooltip-content', '$sRateTitle');
+CombodoTooltip.InitTooltipFromMarkup($("#attr_auto_reload_sec"));
 $("#attr_auto_reload_sec").prop('disabled', !$('#attr_auto_reload').is(':checked'));
 
 $('#attr_auto_reload').change( function(ev) {

application/startup.inc.php

@@ -66,7 +66,6 @@ register_shutdown_function(function()
 });
 $oKPI = new ExecutionKPI();
 Session::Start();
-Session::WriteClose();
 $oKPI->ComputeAndReport("Session Start");
 
 $sSwitchEnv = utils::ReadParam('switch_env', null);

application/themehandlerservice.class.inc.php

@@ -29,7 +29,7 @@ class ThemeHandlerService
 	{
 	}
 
-	public function CompileTheme($sThemeId, $bSetup = false, $sSetupCompilationTimestamp="", $aThemeParameters = null, $aImportsPaths = null, $sWorkingPath = null){
-		return ThemeHandler::CompileTheme($sThemeId, $bSetup, $sSetupCompilationTimestamp="", $aThemeParameters, $aImportsPaths, $sWorkingPath);
+	public function CompileTheme($sThemeId, $bSetup = false, $sSetupCompilationTimestamp = "", $aThemeParameters = null, $aImportsPaths = null, $sWorkingPath = null){
+		return ThemeHandler::CompileTheme($sThemeId, $bSetup, $sSetupCompilationTimestamp, $aThemeParameters, $aImportsPaths, $sWorkingPath);
 	}
 }

application/twigextension.class.inc.php

@@ -2,6 +2,7 @@
 
 namespace Combodo\iTop;
 
+use AttributeDate;
 use AttributeDateTime;
 use Dict;
 use Exception;
@@ -55,6 +56,10 @@ class TwigExtension
 						{
 							return AttributeDateTime::GetFormat()->Format($sDate);
 						}
+						if (preg_match('@^\d\d\d\d-\d\d-\d\d$@', trim($sDate)))
+						{
+							return AttributeDate::GetFormat()->Format($sDate);
+						}
 					}
 					catch (Exception $e)
 					{

application/ui.extkeywidget.class.inc.php

@@ -61,6 +61,8 @@ class UIExtKeyWidget
 	protected $sAttCode;
 	protected $bSearchMode;
 
+	//public function __construct($sAttCode, $sClass, $sTitle, $oAllowedValues, $value, $iInputId, $bMandatory, $sNameSuffix = '', $sFieldPrefix = '', $sFormPrefix = '')
+
 	/**
 	 * @param \WebPage $oPage
 	 * @param string $sAttCode
@@ -80,18 +82,13 @@ class UIExtKeyWidget
 	 * @throws \Exception
 	 *
 	 * @since 3.0.0 N°3750 new $sInputType parameter
+	 * @since 2.7.7 3.0.1 3.1.0 N°3129 Add default value for $aArgs for PHP 8.0 compat
 	 */
 	public static function DisplayFromAttCode(
 		$oPage, $sAttCode, $sClass, $sTitle, $oAllowedValues, $value, $iInputId, $bMandatory, $sFieldName = '', $sFormPrefix = '',
 		$aArgs = [], $bSearchMode = false, &$sInputType = ''
 	)
 	{
-		// we will only use key & name, so let's reduce fields loaded !
-		$aAttToLoad = [
-			$sClass => [], // nothing, id and friendlyname are automatically added by the API
-		];
-		$oAllowedValues->OptimizeColumnLoad($aAttToLoad);
-
 		$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
 		$sTargetClass = $oAttDef->GetTargetClass();
 		$iMaxComboLength = $oAttDef->GetMaximumComboLength();
@@ -254,7 +251,7 @@ class UIExtKeyWidget
 						$aOption['picture_url'] = $oImage->GetDisplayURL($sClassAllowed, $oObj->GetKey(), $sObjectImageAttCode);
 						$aOption['initials'] = '';
 					} else {
-						$aOption['initials'] = utils::ToAcronym($oObj->Get('friendlyname'));
+						$aOption['initials'] = utils::FormatInitialsForMedallion(utils::ToAcronym($oObj->Get('friendlyname')));
 					}
 				}
 				array_push($aOptions, $aOption);
@@ -776,9 +773,11 @@ JS
      *
      * @throws CoreException
      * @throws OQLException
+     *
+     * @since 2.7.7 3.0.1 3.1.0 N°3129 Remove default value for $oObj for PHP 8.0 compatibility
      */
 	public function AutoComplete(
-		WebPage $oP, $sFilter, $oObj = null, $sContains = '', $sOutputFormat = self::ENUM_OUTPUT_FORMAT_CSV, $sOperation = null
+		WebPage $oP, $sFilter, $oObj, $sContains, $sOutputFormat = self::ENUM_OUTPUT_FORMAT_CSV, $sOperation = null
 	)
 	{
 		if (is_null($sFilter)) {
@@ -830,7 +829,7 @@ JS
 					}
 
 					if (array_key_exists('initials', $aValue)) {
-						$aElt['initials'] = $aValue['initials'];
+						$aElt['initials'] = utils::FormatInitialsForMedallion($aValue['initials']);
 						if (array_key_exists('picture_url', $aValue)) {
 							$aElt['picture_url'] = $aValue['picture_url'];
 						}

application/ui.linksdirectwidget.class.inc.php

@@ -75,9 +75,15 @@ class UILinksWidgetDirect
 	 * @param array $aArgs
 	 * @param string $sFormPrefix
 	 * @param DBObject $oCurrentObj
+	 *
+	 * @since 2.7.7 3.0.1 3.1.0 N°3129 Remove default value for $aArgs for PHP 8.0 compatibility (handling wrong values at method start)
 	 */
-	public function Display(WebPage $oPage, $oValue, $aArgs = array(), $sFormPrefix, $oCurrentObj)
+	public function Display(WebPage $oPage, $oValue, $aArgs, $sFormPrefix, $oCurrentObj)
 	{
+		if (empty($aArgs)) {
+			$aArgs = [];
+		}
+
 		$oLinksetDef = MetaModel::GetAttributeDef($this->sClass, $this->sAttCode);
 		switch($oLinksetDef->GetEditMode())
 		{
@@ -127,8 +133,10 @@ class UILinksWidgetDirect
 	 * @param string $sFormPrefix
 	 * @param DBObject $oCurrentObj
 	 * @param bool $bDisplayMenu
+	 *
+	 * @since 2.7.7 3.0.1 3.1.0 N°3129 Remove default value for $aArgs for PHP 8.0 compatibility (protected method, always called with default value)
 	 */
-	protected function DisplayAsBlock(WebPage $oPage, $oValue, $aArgs = array(), $sFormPrefix, $oCurrentObj, $bDisplayMenu)
+	protected function DisplayAsBlock(WebPage $oPage, $oValue, $aArgs, $sFormPrefix, $oCurrentObj, $bDisplayMenu)
 	{
 		$oLinksetDef = MetaModel::GetAttributeDef($this->sClass, $this->sAttCode);
 		$sTargetClass = $oLinksetDef->GetLinkedClass();
@@ -228,8 +236,10 @@ class UILinksWidgetDirect
 	 * @param string $sFormPrefix
 	 * @param DBObject $oCurrentObj
 	 * @param array $aButtons
+	 *
+	 * @since 2.7.7 3.0.1 3.1.0 N°3129 Remove default value for $aArgs for PHP 8.0 compatibility (protected method, caller already handles it)
 	 */
-	protected function DisplayEditInPlace(WebPage $oPage, $oValue, $aArgs = array(), $sFormPrefix, $oCurrentObj, $aButtons = array('create', 'delete'))
+	protected function DisplayEditInPlace(WebPage $oPage, $oValue, $aArgs, $sFormPrefix, $oCurrentObj, $aButtons = array('create', 'delete'))
 	{
 		$aAttribs = $this->GetTableConfig();
 		$oValue->Rewind();
@@ -296,7 +306,7 @@ class UILinksWidgetDirect
 		}
 		$oHiddenCriteria = $oHiddenFilter->GetCriteria();
 		$aArgs = $oHiddenFilter->GetInternalParams();
-		$sHiddenCriteria = $oHiddenCriteria->Render($aArgs);
+		$sHiddenCriteria = $oHiddenCriteria->RenderExpression(false, $aArgs);
 
 		$oLinkSetDef = MetaModel::GetAttributeDef($this->sClass, $this->sAttCode);
 		$valuesDef = $oLinkSetDef->GetValuesDef();

application/utils.inc.php

@@ -2118,11 +2118,21 @@ class utils
 	}
 	
 	/**
-	 * Returns the relative (to MODULESROOT) path of the root directory of the module containing the file where the call to
-	 * this function is made
-	 * or an empty string if no such module is found (or not called within a module file)
-	 * @param number $iCallDepth The depth of the module in the callstack. Zero when called directly from within the module
-	 * @return string
+	 * **Warning** : returned result can be invalid as we're using backtrace to find the module dir name
+	 *
+	 * @param int $iCallDepth The depth of the module in the callstack. Zero when called directly from within the module
+	 *
+	 * @return string the relative (to MODULESROOT) path of the root directory of the module containing the file where the call to
+	 *     this function is made
+	 *     or an empty string if no such module is found (or not called within a module file)
+	 *
+	 * @uses \debug_backtrace()
+	 *
+	 * @since 3.0.0 Before writing model.*.php file, compiler will now always delete it.
+	 *      If you have symlinks enabled, base dir will be original module dir, but since this behavior change this won't be true anymore for model.*.php
+	 *      In consequence the backtrace analysis won't be possible for this file
+	 *      See N°4854
+	 * @link https://www.itophub.io/wiki/page?id=3_0_0%3Arelease%3A3_0_whats_new#compiler_always_generate_new_model_php compiler behavior change documentation
 	 */
 	public static function GetCurrentModuleDir($iCallDepth)
 	{
@@ -2147,9 +2157,14 @@ class utils
 	}
 
 	/**
+	 * **Warning** : as this method uses {@see GetCurrentModuleDir} it produces hazardous results.
+	 * You should better uses directly {@see GetAbsoluteUrlModulesRoot} and add the module dir name yourself ! See N°4573
+	 *
 	 * @return string the base URL for all files in the current module from which this method is called
 	 * or an empty string if no such module is found (or not called within a module file)
 	 * @throws \Exception
+	 *
+	 * @uses GetCurrentModuleDir
 	 */
 	public static function GetCurrentModuleUrl()
 	{
@@ -2404,43 +2419,19 @@ class utils
 	}
 
 	/**
-	 * @return string eg : '2_7_0' ITOP_VERSION is '2.7.1-dev'
+	 * @return string eg : '2_7_0' if iTop core version is '2.7.5-2'
+	 * @throws \ApplicationException if constant value is invalid
+	 * @uses ITOP_CORE_VERSION
 	 */
-	public static function GetItopVersionWikiSyntax() {
-		$sMinorVersion = self::GetItopMinorVersion();
+	public static function GetItopVersionWikiSyntax($sItopVersion = ITOP_CORE_VERSION)
+	{
+		$aExplodedVersion = explode('.', $sItopVersion);
 
-		return str_replace('.', '_', $sMinorVersion).'_0';
-	}
-
-	/**
-	 * @param string $sPatchVersion if non provided, will call GetItopPatchVersion
-	 *
-	 * @return string eg 2.7 if ITOP_VERSION is '2.7.0-dev'
-	 * @throws \Exception
-	 */
-	public static function GetItopMinorVersion($sPatchVersion = null) {
-		if (is_null($sPatchVersion)) {
-			$sPatchVersion = self::GetItopPatchVersion();
-		}
-		$aExplodedVersion = explode('.', $sPatchVersion);
-
-		if (count($aExplodedVersion) < 2) {
-			throw new Exception('iTop version is wrongfully configured!');
-		}
-		if (($aExplodedVersion[0] == '') || ($aExplodedVersion[1] == '')) {
-			throw new Exception('iTop version is wrongfully configured!');
+		if ((false === isset($aExplodedVersion[0])) || (false === isset($aExplodedVersion[1]))) {
+			throw new ApplicationException('iTop version is wrongfully configured!');
 		}
 
-		return sprintf('%d.%d', $aExplodedVersion[0], $aExplodedVersion[1]);
-	}
-
-	/**
-	 * @return string eg '2.7.0' if ITOP_VERSION is '2.7.0-dev'
-	 */
-	public static function GetItopPatchVersion() {
-		$aExplodedVersion = explode('-', ITOP_VERSION);
-
-		return $aExplodedVersion[0];
+		return "{$aExplodedVersion[0]}_{$aExplodedVersion[1]}_0";
 	}
 
 	/**
@@ -3059,6 +3050,20 @@ HTML;
 		return $aMentionedObjects;
 	}
 
+	/**
+	 * Note: This method is not ideal, but other solutions seemed even less ideal:
+	 *   * Add a "$sMaxLength" param. to utils::ToAcronym(): Does not work for every use cases (see corresponding ticket) as in some parts utils::ToAcronym isn't necessarly meant to be used in a medallion.
+	 *
+	 * @param string $sInitials
+	 *
+	 * @return string Truncates $sInitials so it can fit in medallions
+	 * @since 3.0.1 N°4913
+	 */
+	public static function FormatInitialsForMedallion(string $sInitials): string
+	{
+		return mb_substr($sInitials, 0, 3);
+	}
+
 	/**
 	 * @param $sUrl
 	 * @param string $sParamName

approot.inc.php

@@ -4,8 +4,25 @@ define('APPROOT', dirname(__FILE__).'/');
 define('APPCONF', APPROOT.'conf/');
 
 /**
- * iTop framework Version
+ * iTop Datamodel XML format version
+ *
+ * It was also used in iTop 3.0.0 to get iTop core version (instead of {@see ITOP_VERSION} which gives the application version).
+ * To address this need you should now use {@see ITOP_CORE_VERSION}
+ *
+ * @see ITOP_CORE_VERSION to get full iTop core version
  */
 define('ITOP_DESIGN_LATEST_VERSION', '3.0');
 
+/**
+ * Constant containing the iTop core version, whatever application was built
+ *
+ * Note that in iTop 3.0.0 we used {@see ITOP_DESIGN_LATEST_VERSION} to get core version.
+ * When releasing, both constants should be updated : see `.make/release/update-versions.php` for that !
+ *
+ * @since 2.7.7 3.0.1 3.1.0 N°4714 constant creation
+ * @used-by utils::GetItopVersionWikiSyntax()
+ * @used-by iTopModulesPhpVersionIntegrationTest
+ */
+define('ITOP_CORE_VERSION', '3.0.1');
+
 require_once APPROOT.'bootstrap.inc.php';

composer.json

@@ -16,16 +16,16 @@
     "pelago/emogrifier": "3.1.0",
     "scssphp/scssphp": "1.0.6",
     "swiftmailer/swiftmailer": "5.4.12",
-    "symfony/console": "3.4.*",
-    "symfony/dotenv": "3.4.*",
-    "symfony/framework-bundle": "3.4.*",
+    "symfony/console": "~3.4.47",
+    "symfony/dotenv": "~3.4.47",
+    "symfony/framework-bundle": "~3.4.47",
     "symfony/polyfill-php70": "1.*",
-    "symfony/twig-bundle": "3.4.*",
-    "symfony/yaml": "3.4.*"
+    "symfony/twig-bundle": "~3.4.47",
+    "symfony/yaml": "~3.4.47"
   },
   "require-dev": {
-    "symfony/stopwatch": "3.4.*",
-    "symfony/web-profiler-bundle": "3.4.*"
+    "symfony/stopwatch": "~3.4.47",
+    "symfony/web-profiler-bundle": "~3.4.47"
   },
   "suggest": {
     "ext-libsodium": "Required to use the AttributeEncryptedString.",

core/attributedef.class.inc.php

@@ -5717,7 +5717,7 @@ class AttributeMetaEnum extends AttributeEnum
 		$aLocalizedValues = array();
 		foreach($aRawValues as $sKey => $sValue)
 		{
-			$aLocalizedValues[$sKey] = Str::pure2html($this->GetValueLabel($sKey));
+			$aLocalizedValues[$sKey] = $this->GetValueLabel($sKey);
 		}
 
 		return $aLocalizedValues;

core/cmdbchangeop.class.inc.php

@@ -1077,7 +1077,7 @@ class CMDBChangeOpSetAttributeLinksTune extends CMDBChangeOpSetAttributeLinks
 			{
 				$oField = new FieldExpression('objclass',  $oSearch->GetClassAlias());
 				$sListExpr = '('.implode(', ', CMDBSource::Quote($aLinkClasses)).')';
-				$sOQLCondition = $oField->Render()." IN $sListExpr";
+				$sOQLCondition = $oField->RenderExpression()." IN $sListExpr";
 				$oNewCondition = Expression::FromOQL($sOQLCondition);
 				$oSearch->AddConditionExpression($oNewCondition);
 			}

core/cmdbobject.class.inc.php

@@ -161,7 +161,7 @@ abstract class CMDBObject extends DBObject
 	 *
 	 * @param string $sId ID of the user doing the change, null if not done by a user (eg. background task)
 	 *
-	 * @since 3.0.0
+	 * @since 3.0.0 N°2847 following the addition of CMDBChange.user_id
 	 */
 	public static function SetTrackUserId($sId)
 	{

core/cmdbsource.class.inc.php

@@ -350,6 +350,12 @@ class CMDBSource
 
 	}
 
+	/**
+	 * @return string
+	 * @throws \MySQLException
+	 *
+	 * @uses \CMDBSource::QueryToCol() so needs a connection opened !
+	 */
 	public static function GetDBVersion()
 	{
 		$aVersions = self::QueryToCol('SELECT Version() as version', 'version');
@@ -367,8 +373,10 @@ class CMDBSource
 	/**
 	 * Get the DB vendor between MySQL and its main forks
 	 * @return string
+	 *
+	 * @uses \CMDBSource::GetServerVariable() so needs a connection opened !
 	 */
-	static public function GetDBVendor()
+	public static function GetDBVendor()
 	{
 		$sDBVendor = static::ENUM_DB_VENDOR_MYSQL;
 		
@@ -672,13 +680,13 @@ class CMDBSource
 	private static function StartTransaction()
 	{
 		$aStackTrace = debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT , 3);
-		$sCaller = 'From '.$aStackTrace[1]['file'].'('.$aStackTrace[1]['line'].'): '.$aStackTrace[2]['class'].'->'.$aStackTrace[2]['function'].'()';
+
 		$bHasExistingTransactions = self::IsInsideTransaction();
 		if (!$bHasExistingTransactions) {
-			IssueLog::Trace("START TRANSACTION $sCaller", LogChannels::CMDB_SOURCE);
+			IssueLog::Trace("START TRANSACTION was sent to the DB", LogChannels::CMDB_SOURCE, ['stacktrace' => $aStackTrace]);
 			self::DBQuery('START TRANSACTION');
 		} else {
-			IssueLog::Trace("Ignore nested (".self::$m_iTransactionLevel.") START TRANSACTION $sCaller", LogChannels::CMDB_SOURCE);
+			IssueLog::Trace("START TRANSACTION ignored as a transaction is already opened", LogChannels::CMDB_SOURCE, ['stacktrace' => $aStackTrace]);
 		}
 
 		self::AddTransactionLevel();

core/config.class.inc.php

@@ -22,7 +22,15 @@
 
 define('ITOP_APPLICATION', 'iTop');
 define('ITOP_APPLICATION_SHORT', 'iTop');
-define('ITOP_VERSION', '3.0.0-dev');
+
+/**
+ * Constant containing the application version
+ * Warning: this might be different from iTop core version!
+ *
+ * @see ITOP_CORE_VERSION to get iTop core version
+ */
+define('ITOP_VERSION', '3.0.1-dev');
+
 define('ITOP_VERSION_NAME', 'Fullmoon');
 define('ITOP_REVISION', 'svn');
 define('ITOP_BUILD_DATE', '$WCNOW$');
@@ -608,6 +616,13 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		],
+		/**
+		 * The timezone is automatically set using this parameter in \utils::InitTimeZone
+		 * This method is called almost everywhere, cause it's called in \MetaModel::LoadConfig and exec.php... but you might
+		 * need to get it yourself !
+		 *
+		 * @used-by utils::InitTimeZone()
+		 */
 		'timezone' => [
 			'type' => 'string',
 			'description' => 'Timezone (reference: http://php.net/manual/en/timezones.php). If empty, it will be left unchanged and MUST be explicitly configured in PHP',
@@ -851,13 +866,23 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		],
+		'impact_analysis_lazy_loading' => [
+			'type'                => 'bool',
+			'description'         => 'In the impact analysis view: display the analysis or filter before display',
+			'default'             => false,
+			'value'               => '',
+			'source_of_value'     => '',
+			'show_in_conf_sample' => false,
+		],
 		'url_validation_pattern' => [
 			'type' => 'string',
 			'description' => 'Regular expression to validate/detect the format of an URL (URL attributes and Wiki formatting for Text attributes)',
-			'default' => '(https?|ftp)\://([a-zA-Z0-9+!*(),;?&=\$_.-]+(\:[a-zA-Z0-9+!*(),;?&=\$_.-]+)?@)?([a-zA-Z0-9-.]{3,})(\:[0-9]{2,5})?(/([a-zA-Z0-9%+\$_-]\.?)+)*/?(\?[a-zA-Z+&\$_.-][a-zA-Z0-9;:[\]@&%=+/\$_.-]*)?(#[a-zA-Z_.-][a-zA-Z0-9+\$_.-]*)?',
-			//            SHEME.......... USER....................... PASSWORD.......................... HOST/IP........... PORT.......... PATH........................ GET............................................ ANCHOR............................
+			'default' => /** @lang RegExp */
+			'(https?|ftp)\://([a-zA-Z0-9+!*(),;?&=\$_.-]+(\:[a-zA-Z0-9+!*(),;?&=\$_.-]+)?@)?([a-zA-Z0-9-.]{3,})(\:[0-9]{2,5})?(/([a-zA-Z0-9:%+\$_-]\.?)+)*/?(\?[a-zA-Z+&\$_.-][a-zA-Z0-9;:[\]@&%=+/\$_.-]*)?(#[a-zA-Z_.-][a-zA-Z0-9+\$_.-]*)?',
+			// SCHEME....... USER....................... PASSWORD.......................... HOST/IP........... PORT.......... PATH......................... GET............................................ ANCHOR..........................
 			// Example: http://User:passWord@127.0.0.1:8888/patH/Page.php?arrayArgument[2]=something:blah20#myAnchor
-			// Origin of this regexp: http://www.php.net/manual/fr/function.preg-match.php#93824
+			// RegExp source: http://www.php.net/manual/fr/function.preg-match.php#93824
+			// Update with N°4515
 			'value' => '',
 			'source_of_value' => '',
 			'show_in_conf_sample' => true,
@@ -1175,7 +1200,7 @@ class Config
 		],
 		'compatibility.include_deprecated_js_files' => [
 			'type' => 'bool',
-			'description' => 'Include the deprecated JS files to ease usage of not migrated extensions',
+			'description' => 'Include the deprecated JS files (in iTop previous version) to ease usage of not migrated extensions',
 			'default' => false,
 			'value' => false,
 			'source_of_value' => '',
@@ -1191,7 +1216,7 @@ class Config
 		],
 		'compatibility.include_deprecated_css_files' => [
 			'type' => 'bool',
-			'description' => 'Include the deprecated CSS files to ease usage of not migrated extensions',
+			'description' => 'Include the deprecated CSS files (in iTop previous version) to ease usage of not migrated extensions',
 			'default' => false,
 			'value' => false,
 			'source_of_value' => '',
@@ -1600,6 +1625,16 @@ class Config
 		return $this->m_aSettings[$sPropCode]['value'];
 	}
 
+	/**
+	 * @return mixed
+	 *
+	 * @since 3.0.1 N°4515
+	 */
+	public function GetDefault(string $sPropCode)
+	{
+		return $this->m_aSettings[$sPropCode]['default'];
+	}
+
 	/**
 	 * Whether the $sPropCode parameter has a custom value or the default one.
 	 *

core/csvbulkexport.class.inc.php

@@ -220,16 +220,15 @@ class CSVBulkExport extends TabularBulkExport
 
 				$sFormatInput = '<input type="text" size="15" name="date_format" id="csv_custom_date_time_format" title="" value="'.htmlentities($sDateTimeFormat, ENT_QUOTES, 'UTF-8').'"/>';
 				$oRadioCustom = InputUIBlockFactory::MakeForInputWithLabel(Dict::Format('Core:BulkExport:DateTimeFormatCustom_Format', $sFormatInput), "csv_date_format_radio", "custom", "csv_date_time_format_custom", "radio");
+				$oRadioCustom->SetDescription(Dict::S('UI:CSVImport:CustomDateTimeFormatTooltip'));
 				$oRadioCustom->GetInput()->SetIsChecked($sDateTimeFormat !== (string)AttributeDateTime::GetFormat());
 				$oRadioCustom->SetBeforeInput(false);
 				$oRadioCustom->GetInput()->AddCSSClass('ibo-input-checkbox');
 				$oFieldSetDate->AddSubBlock($oRadioCustom);
 
-				$sJSTooltip = json_encode('<div class="date_format_tooltip">'.Dict::S('UI:CSVImport:CustomDateTimeFormatTooltip').'</div>');
 
 				$oP->add_ready_script(
 					<<<EOF
-$('#csv_custom_date_time_format').tooltip({content: function() { return $sJSTooltip; } });
 $('#form_part_csv_options').on('preview_updated', function() { FormatDatesInPreview('csv', 'csv'); });
 $('#csv_date_time_format_default').on('click', function() { FormatDatesInPreview('csv', 'csv'); });
 $('#csv_date_time_format_custom').on('click', function() { FormatDatesInPreview('csv', 'csv'); });

core/dbobject.class.php

@@ -2934,6 +2934,9 @@ abstract class DBObject implements iDisplay
 				utils::EnrichRaisedException($oTrigger, $e);
 			}
 		}
+		
+		// - TriggerOnObjectMention
+		$this->ActivateOnMentionTriggers(true);
 
 		return $this->m_iKey;
 	}
@@ -3197,50 +3200,7 @@ abstract class DBObject implements iDisplay
 			// Activate any existing trigger
 			$sClass = get_class($this);
 			// - TriggerOnObjectMention
-			//   1 - Check if any caselog updated
-			$aUpdatedLogAttCodes = array();
-			foreach($aChanges as $sAttCode => $value)
-			{
-				$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
-				if($oAttDef instanceof AttributeCaseLog)
-				{
-					$aUpdatedLogAttCodes[] = $sAttCode;
-				}
-			}
-			//   2 - Find mentioned objects
-			$aMentionedObjects = array();
-			foreach ($aUpdatedLogAttCodes as $sAttCode) {
-				/** @var \ormCaseLog $oUpdatedCaseLog */
-				$oUpdatedCaseLog = $this->Get($sAttCode);
-				$aMentionedObjects = array_merge_recursive($aMentionedObjects, utils::GetMentionedObjectsFromText($oUpdatedCaseLog->GetModifiedEntry()));
-			}
-			//   3 - Trigger for those objects
-			// TODO: This should be refactored and moved into the caselogs loop, otherwise, we won't be able to know which case log triggered the action.
-			foreach ($aMentionedObjects as $sMentionedClass => $aMentionedIds) {
-				foreach ($aMentionedIds as $sMentionedId) {
-					/** @var \DBObject $oMentionedObject */
-					$oMentionedObject = MetaModel::GetObject($sMentionedClass, $sMentionedId);
-					$aTriggerArgs = $this->ToArgs('this') + array('mentioned->object()' => $oMentionedObject);
-
-					$aParams = array('class_list' => MetaModel::EnumParentClasses($sClass, ENUM_PARENT_CLASSES_ALL));
-					$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT TriggerOnObjectMention AS t WHERE t.target_class IN (:class_list)"), array(), $aParams);
-					while ($oTrigger = $oSet->Fetch())
-					{
-						/** @var \TriggerOnObjectMention $oTrigger */
-						try {
-							// Ensure to handle only mentioned object in the trigger's scope
-							if ($oTrigger->IsMentionedObjectInScope($oMentionedObject) === false) {
-								continue;
-							}
-
-							$oTrigger->DoActivate($aTriggerArgs);
-						}
-						catch (Exception $e) {
-							utils::EnrichRaisedException($oTrigger, $e);
-						}
-					}
-				}
-			}
+			$this->ActivateOnMentionTriggers(false);
 
 			$bHasANewExternalKeyValue = false;
 			$aHierarchicalKeys = array();
@@ -3453,6 +3413,74 @@ abstract class DBObject implements iDisplay
 		return $this->m_iKey;
 	}
 
+	/**
+	 * Activate TriggerOnObjectMention triggers for the current object
+	 *
+	 * @param bool $bNewlyCreatedObject
+	 *
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \MySQLException
+	 * @throws \OQLException
+	 * @since 3.0.1 N°4741
+	 */
+	private function ActivateOnMentionTriggers(bool $bNewlyCreatedObject): void
+	{
+		$sClass = get_class($this);
+		$aChanges = $bNewlyCreatedObject ? $this->m_aOrigValues : $this->ListChanges();
+
+		// 1 - Check if any caselog updated
+		$aUpdatedLogAttCodes = [];
+		foreach ($aChanges as $sAttCode => $value) {
+			$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
+			if ($oAttDef instanceof AttributeCaseLog) {
+				// Skip empty log on creation
+				if ($bNewlyCreatedObject && $value->GetModifiedEntry() === '') {
+					continue;
+				}
+
+				$aUpdatedLogAttCodes[] = $sAttCode;
+			}
+		}
+
+		// 2 - Find mentioned objects
+		$aMentionedObjects = [];
+		foreach ($aUpdatedLogAttCodes as $sAttCode) {
+			/** @var \ormCaseLog $oUpdatedCaseLog */
+			$oUpdatedCaseLog = $this->Get($sAttCode);
+			$aMentionedObjects = array_merge_recursive($aMentionedObjects, utils::GetMentionedObjectsFromText($oUpdatedCaseLog->GetModifiedEntry()));
+		}
+
+		// 3 - Trigger for those objects
+		// TODO: This should be refactored and moved into the caselogs loop, otherwise, we won't be able to know which case log triggered the action.
+		foreach ($aMentionedObjects as $sMentionedClass => $aMentionedIds) {
+			foreach ($aMentionedIds as $sMentionedId) {
+				/** @var \DBObject $oMentionedObject */
+				$oMentionedObject = MetaModel::GetObject($sMentionedClass, $sMentionedId);
+				$aTriggerArgs = $this->ToArgs('this') + ['mentioned->object()' => $oMentionedObject];
+
+				$aParams = ['class_list' => MetaModel::EnumParentClasses($sClass, ENUM_PARENT_CLASSES_ALL)];
+				$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT TriggerOnObjectMention AS t WHERE t.target_class IN (:class_list)"), [], $aParams);
+				while ($oTrigger = $oSet->Fetch())
+				{
+					/** @var \TriggerOnObjectMention $oTrigger */
+					try {
+						// Ensure to handle only mentioned object in the trigger's scope
+						if ($oTrigger->IsMentionedObjectInScope($oMentionedObject) === false) {
+							continue;
+						}
+
+						$oTrigger->DoActivate($aTriggerArgs);
+					}
+					catch (Exception $e) {
+						utils::EnrichRaisedException($oTrigger, $e);
+					}
+				}
+			}
+		}
+	}
+
 	/**
 	 * @internal
 	 * Save updated fields previous values for {@see DBObject::DBUpdate()} callbacks
@@ -5378,7 +5406,7 @@ abstract class DBObject implements iDisplay
 						}
 						$oLnk->Set($sRoleAttCode, $sRoleValue);
 					}
-					$oLinkSet->AddObject($oLnk);
+					$oLinkSet->AddItem($oLnk);
 					$this->Set($sTargetListAttCode, $oLinkSet);
 				}
 				break;

core/dbobjectsearch.class.php

@@ -416,6 +416,10 @@ class DBObjectSearch extends DBSearch
 	 * @param string $sFilterCode
 	 * @param mixed $value
 	 * @param string $sOpCode operator to use : 'IN', 'NOT IN', 'Contains',' Begins with', 'Finishes with', ...
+	 *   If no operator is specified then :
+	 *     * for id field we will use "="
+	 *     * for other fields we will call the corresponding {@link AttributeDefinition::GetSmartConditionExpression} method impl
+	 *       to generate the expression
 	 * @param bool $bParseSearchString
 	 *
 	 * @throws \CoreException
@@ -465,14 +469,14 @@ class DBObjectSearch extends DBSearch
 			if (!is_array($value)) $value = array($value);
 			if (count($value) === 0) throw new Exception('AddCondition '.$sOpCode.': Value cannot be an empty array.');
 			$sListExpr = '('.implode(', ', CMDBSource::Quote($value)).')';
-			$sOQLCondition = $oField->Render()." IN $sListExpr";
+			$sOQLCondition = $oField->RenderExpression()." IN $sListExpr";
 			break;
 
 		case 'NOTIN':
 			if (!is_array($value)) $value = array($value);
             if (count($value) === 0) throw new Exception('AddCondition '.$sOpCode.': Value cannot be an empty array.');
 			$sListExpr = '('.implode(', ', CMDBSource::Quote($value)).')';
-			$sOQLCondition = $oField->Render()." NOT IN $sListExpr";
+			$sOQLCondition = $oField->RenderExpression()." NOT IN $sListExpr";
 			break;
 
 		case 'Contains':
@@ -1232,7 +1236,7 @@ class DBObjectSearch extends DBSearch
 				elseif (MetaModel::IsParentClass($oRightFilter->GetFirstJoinedClass(), $oLeftFilter->GetClass()))
 				{
 					// Specialize $oRightFilter
-					$oRightFilter->ChangeClass($oLeftFilter->GetClass());
+					$oRightFilter->ChangeClass($oLeftFilter->GetFirstJoinedClass());
 				}
 				else
 				{
@@ -1368,7 +1372,7 @@ class DBObjectSearch extends DBSearch
 	public function GetQueryParams($bExcludeMagicParams = true)
 	{
 		$aParams = array();
-		$this->m_oSearchCondition->Render($aParams, true);
+		$this->m_oSearchCondition->RenderExpression(false, $aParams, true);
 
 		if ($bExcludeMagicParams)
 		{
@@ -1457,7 +1461,7 @@ class DBObjectSearch extends DBSearch
 
 		$sRes .= ' ' . $this->GetFirstJoinedClass() . ' AS `' . $this->GetFirstJoinedClassAlias() . '`';
 		$sRes .= $this->ToOQL_Joins();
-		$sRes .= " WHERE ".$this->m_oSearchCondition->Render($aParams, $bRetrofitParams);
+		$sRes .= " WHERE ".$this->m_oSearchCondition->RenderExpression(false, $aParams, $bRetrofitParams);
 
 		if ($bWithAllowAllFlag && $this->m_bAllowAllData)
 		{

core/dbunionsearch.class.php

@@ -416,7 +416,11 @@ class DBUnionSearch extends DBSearch
 		$aSearches = array();
 		foreach ($this->aSearches as $oSearch)
 		{
-			$aSearches[] = $oSearch->Filter($sClassAlias, $oFilter);
+			if (!$oSearch->IsAllDataAllowed()) {
+				$aSearches[] = $oSearch->Filter($sClassAlias, $oFilter);
+			} else {
+				$aSearches[] = $oSearch;
+			}
 		}
 		return new DBUnionSearch($aSearches);
 	}

core/dict.class.inc.php

@@ -302,13 +302,12 @@ class Dict
 	 *
 	 * @param $sSourceCode
 	 * @param $sDestCode
+	 * @since 3.0.1 Not clone sSourceCode entry if sDestCode entry already exist
 	 */
 	public static function CloneString($sSourceCode, $sDestCode)
 	{
-		foreach(self::$m_aLanguages as $sLanguageCode => $foo)
-		{
-			if (isset(self::$m_aData[$sLanguageCode][$sSourceCode]))
-			{
+		foreach(self::$m_aLanguages as $sLanguageCode => $foo) {
+			if (isset(self::$m_aData[$sLanguageCode][$sSourceCode]) && !isset(self::$m_aData[$sLanguageCode][$sDestCode] ))	{
 				self::$m_aData[$sLanguageCode][$sDestCode] = self::$m_aData[$sLanguageCode][$sSourceCode];
 			}
 		}

core/displayablegraph.class.inc.php

@@ -31,7 +31,7 @@ class DisplayableNode extends GraphNode
 {
 	public $x;
 	public $y;
-	
+
 	/**
 	 * Create a new node inside a graph
 	 * @param SimpleGraph $oGraph
@@ -51,27 +51,27 @@ class DisplayableNode extends GraphNode
 	{
 		return $this->GetProperty('icon_url', '');
 	}
-	
+
 	public function GetLabel()
 	{
 		return $this->GetProperty('label', $this->sId);
 	}
-	
+
 	public function GetWidth()
 	{
 		return max(32, 5*strlen($this->GetProperty('label'))); // approximation of the text's bounding box
 	}
-	
+
 	public function GetHeight()
 	{
 		return 32;
 	}
-	
+
 	public function Distance2(DisplayableNode $oNode)
 	{
 		$dx = $this->x - $oNode->x;
 		$dy = $this->y - $oNode->y;
-		
+
 		$d2 = $dx*$dx + $dy*$dy - $this->GetHeight()*$this->GetHeight();
 		if ($d2 < 40)
 		{
@@ -79,12 +79,12 @@ class DisplayableNode extends GraphNode
 		}
 		return $d2;
 	}
-	
+
 	public function Distance(DisplayableNode $oNode)
 	{
 		return sqrt($this->Distance2($oNode));
 	}
-	
+
 	public function GetForRaphael($aContextDefs)
 	{
 		$aNode = array();
@@ -100,7 +100,7 @@ class DisplayableNode extends GraphNode
 		$aNode['label'] = $this->GetLabel();
 		$aNode['id'] = $this->GetId();
 		$fOpacity = ($this->GetProperty('is_reached') ? 1 : 0.4);
-		$aNode['icon_attr'] = array('opacity' => $fOpacity);		
+		$aNode['icon_attr'] = array('opacity' => $fOpacity);
 		$aNode['text_attr'] = array('opacity' => $fOpacity);
 		$aNode['tooltip'] = $this->GetTooltip($aContextDefs);
 		$aNode['context_icons'] = array();
@@ -114,7 +114,7 @@ class DisplayableNode extends GraphNode
 		}
 		return $aNode;
 	}
-	
+
 	public function RenderAsPDF(iTopPDF $oPdf, DisplayableGraph $oGraph, $fScale, $aContextDefs)
 	{
 		$Alpha = 1.0;
@@ -170,7 +170,7 @@ class DisplayableNode extends GraphNode
 		$oPdf->SetTextColor(0, 0, 0);
 		$oPdf->Text($this->x*$fScale - $width/2, ($this->y + 18)*$fScale, $this->GetProperty('label'));
 	}
-	
+
 	/**
 	 * Create a "whitened" version of the icon (retaining the transparency) to be used a background for masking the underlying lines
 	 * @param string $sIconFile The path to the file containing the icon
@@ -179,35 +179,35 @@ class DisplayableNode extends GraphNode
 	protected function CreateWhiteIcon(DisplayableGraph $oGraph, $sIconFile)
 	{
 		$aInfo = getimagesize($sIconFile);
-		
+
 		$im = null;
 		switch($aInfo['mime'])
 		{
 			case 'image/png':
-			if (function_exists('imagecreatefrompng'))
-			{
-				$im = imagecreatefrompng($sIconFile);
-			}
-			break;
-			
+				if (function_exists('imagecreatefrompng'))
+				{
+					$im = imagecreatefrompng($sIconFile);
+				}
+				break;
+
 			case 'image/gif':
-			if (function_exists('imagecreatefromgif'))
-			{
-				$im = imagecreatefromgif($sIconFile);
-			}
-			break;
-			
+				if (function_exists('imagecreatefromgif'))
+				{
+					$im = imagecreatefromgif($sIconFile);
+				}
+				break;
+
 			case 'image/jpeg':
 			case 'image/jpg':
-			if (function_exists('imagecreatefromjpeg'))
-			{
-				$im = imagecreatefromjpeg($sIconFile);
-			}
-			break;
-			
+				if (function_exists('imagecreatefromjpeg'))
+				{
+					$im = imagecreatefromjpeg($sIconFile);
+				}
+				break;
+
 			default:
-			return null;
-			
+				return null;
+
 		}
 		if($im && imagefilter($im, IMG_FILTER_COLORIZE, 255, 255, 255))
 		{
@@ -222,17 +222,17 @@ class DisplayableNode extends GraphNode
 			return null;
 		}
 	}
-	
+
 	public function GetObjectCount()
 	{
 		return 1;
 	}
-	
+
 	public function GetObjectClass()
 	{
 		return is_object($this->GetProperty('object', null)) ? get_class($this->GetProperty('object', null)) : null;
 	}
-	
+
 	protected function AddToStats($oNode, &$aNodesPerClass)
 	{
 		$sClass = $oNode->GetObjectClass();
@@ -256,9 +256,9 @@ class DisplayableNode extends GraphNode
 		{
 			$aNodesPerClass[$sClass][$sKey]['nodes'][$oNode->GetId()] = $oNode;
 			$aNodesPerClass[$sClass][$sKey]['count'] += $oNode->GetObjectCount();
-		}		
+		}
 	}
-	
+
 	/**
 	 * Retrieves the list of neighbour nodes, in the given direction: 'up' or 'down'
 	 * @param bool $bDirectionDown
@@ -279,11 +279,11 @@ class DisplayableNode extends GraphNode
 			foreach($this->GetIncomingEdges() as $oEdge)
 			{
 				$aNextNodes[] = $oEdge->GetSourceNode();
-			}	
+			}
 		}
 		return $aNextNodes;
 	}
-	
+
 	/**
 	 * Replaces the next neighbour node (in the given direction: 'up' or 'down') by the supplied group node
 	 * preserving the connectivity of the graph
@@ -351,7 +351,7 @@ class DisplayableNode extends GraphNode
 				}
 			}
 		}
-		
+
 		if ($oGraph->GetNode($oNextNode->GetId()))
 		{
 			$oGraph->_RemoveNode($oNextNode);
@@ -367,9 +367,9 @@ class DisplayableNode extends GraphNode
 			{
 				$oNewNode->AddObject($oNextNode->GetProperty('object'));
 			}
-		}			
+		}
 	}
-	
+
 	/**
 	 * Group together (as a special kind of nodes) all the similar neighbours of the current node
 	 * @param DisplayableGraph $oGraph
@@ -381,7 +381,7 @@ class DisplayableNode extends GraphNode
 	{
 		if ($this->GetProperty('grouped') === true) return;
 		$this->SetProperty('grouped', true);
-		
+
 		$aNodesPerClass = array();
 		foreach($this->GetNextNodes($bDirectionDown) as $oNode)
 		{
@@ -412,7 +412,7 @@ class DisplayableNode extends GraphNode
 						$oNewNode->SetProperty('is_reached', ($sStatus == 'reached'));
 						$oNewNode->SetProperty('count', $aGroupProps['count']);
 					}
-					
+
 					try
 					{
 						if ($bDirectionDown)
@@ -427,8 +427,8 @@ class DisplayableNode extends GraphNode
 					catch(Exception $e)
 					{
 						// Ignore this redundant egde
-					}				
-					
+					}
+
 					foreach($aGroupProps['nodes'] as $oNextNode)
 					{
 						$this->ReplaceNextNodeBy($oGraph, $oNextNode, $oNewNode, $bDirectionDown);
@@ -445,7 +445,7 @@ class DisplayableNode extends GraphNode
 			}
 		}
 	}
-	
+
 	public function GetTooltip($aContextDefs)
 	{
 		$sHtml = '';
@@ -474,9 +474,9 @@ class DisplayableNode extends GraphNode
 			$sHtml .= '<tr><td>'.$oAttDef->GetLabel().':&nbsp;</td><td>'.$oCurrObj->GetAsHtml($sAttCode).'</td></tr>';
 		}
 		$sHtml .= '</tbody></table>';
-		return $sHtml;		
+		return $sHtml;
 	}
-	
+
 	/**
 	 * Get the description of the node in "dot" language
 	 * Used to generate the positions in the graph, but we'd better use fake label
@@ -508,7 +508,7 @@ class DisplayableRedundancyNode extends DisplayableNode
 	{
 		return 24;
 	}
-	
+
 	public function GetForRaphael($aContextDefs)
 	{
 		$aNode = array();
@@ -519,7 +519,7 @@ class DisplayableRedundancyNode extends DisplayableNode
 		$aNode['x'] = $this->x;
 		$aNode['y']= $this->y;
 		$aNode['label'] = $this->GetLabel();
-		$aNode['id'] = $this->GetId();	
+		$aNode['id'] = $this->GetId();
 		$fDiscOpacity = ($this->GetProperty('is_reached') ? 1 : 0.2);
 		$sColor = ($this->GetProperty('is_reached_count') > $this->GetProperty('threshold')) ? '#c33' : '#999';
 		$aNode['disc_attr'] = array('stroke-width' => 2, 'stroke' => '#000', 'fill' => $sColor, 'opacity' => $fDiscOpacity);
@@ -550,35 +550,35 @@ class DisplayableRedundancyNode extends DisplayableNode
 		$height = $oPdf->GetStringHeight(1000, $sLabel);
 		$xPos = (float)$this->x*$fScale - $width/2;
 		$yPos = (float)$this->y*$fScale - $height/2;
-		
+
 		$oPdf->SetXY(($this->x - 16)*$fScale, ($this->y - 16)*$fScale);
-		
+
 		$oPdf->Cell(32*$fScale, 32*$fScale, $sLabel, 0, 0, 'C', 0, '', 0, false, 'T', 'C');
 	}
-	
+
 	/**
 	 * @see DisplayableNode::GroupSimilarNeighbours()
 	 */
 	public function GroupSimilarNeighbours(DisplayableGraph $oGraph, $iThresholdCount, $bDirectionUp = false, $bDirectionDown = true)
 	{
 		parent::GroupSimilarNeighbours($oGraph, $iThresholdCount, $bDirectionUp, $bDirectionDown);
-				
+
 		if ($bDirectionUp)
 		{
 			$aNodesPerClass = array();
 			foreach($this->GetIncomingEdges() as $oEdge)
 			{
 				$oNode = $oEdge->GetSourceNode();
-				
+
 				if (($oNode->GetObjectClass() !== null) && (!$oNode->GetProperty('is_reached')))
-				{			
+				{
 					$this->AddToStats($oNode, $aNodesPerClass);
 				}
 				else
 				{
 					//$oNode->GroupSimilarNeighbours($oGraph, $iThresholdCount, $bDirectionUp, $bDirectionDown);
 				}
-			}		
+			}
 			foreach($aNodesPerClass as $sClass => $aDefs)
 			{
 				foreach($aDefs as $sStatus => $aGroupProps)
@@ -591,8 +591,8 @@ class DisplayableRedundancyNode extends DisplayableNode
 						$oNewNode->SetProperty('is_reached', ($sStatus == 'is_reached'));
 						$oNewNode->SetProperty('class', $sClass);
 						$oNewNode->SetProperty('count', count($aGroupProps['nodes']));
-													
-						
+
+
 						$sNewId = $this->GetId().'::'.$sClass.'/'.(($sStatus == 'reached') ? '_reached': '');
 						$oNewNode = $oGraph->GetNode($sNewId);
 						if ($oNewNode == null)
@@ -604,7 +604,7 @@ class DisplayableRedundancyNode extends DisplayableNode
 							$oNewNode->SetProperty('is_reached', ($sStatus == 'reached'));
 							$oNewNode->SetProperty('count', $aGroupProps['count']);
 						}
-							
+
 						try
 						{
 							$oOutgoingEdge = new DisplayableEdge($oGraph, '-'.$this->GetId().'-'.$oNewNode->GetId().'/'.$sStatus, $oNewNode, $this);
@@ -613,7 +613,7 @@ class DisplayableRedundancyNode extends DisplayableNode
 						{
 							// Ignore this redundant egde
 						}
-							
+
 						foreach($aGroupProps['nodes'] as $oNextNode)
 						{
 							$this->ReplaceNextNodeBy($oGraph, $oNextNode, $oNewNode, !$bDirectionUp);
@@ -631,7 +631,7 @@ class DisplayableRedundancyNode extends DisplayableNode
 			}
 		}
 	}
-	
+
 	public function GetTooltip($aContextDefs)
 	{
 		$sHtml = '';
@@ -640,9 +640,9 @@ class DisplayableRedundancyNode extends DisplayableNode
 		$sHtml .= "<tr><td>".Dict::Format('UI:RelationTooltip:ImpactedItems_N_of_M' , $this->GetProperty('is_reached_count'), $this->GetProperty('min_up') + $this->GetProperty('threshold'))."</td></tr>";
 		$sHtml .= "<tr><td>".Dict::Format('UI:RelationTooltip:CriticalThreshold_N_of_M' , $this->GetProperty('threshold'), $this->GetProperty('min_up') + $this->GetProperty('threshold'))."</td></tr>";
 		$sHtml .= '</tbody></table>';
-		return $sHtml;		
+		return $sHtml;
 	}
-	
+
 
 	public function GetObjectCount()
 	{
@@ -666,7 +666,7 @@ class DisplayableEdge extends GraphEdge
 		}
 		$xStart = $oSourceNode->x * $fScale;
 		$yStart = $oSourceNode->y * $fScale;
-		
+
 		$oSinkNode = $this->GetSinkNode();
 		if (($oSinkNode->x == null) || ($oSinkNode->y == null))
 		{
@@ -674,9 +674,9 @@ class DisplayableEdge extends GraphEdge
 		}
 		$xEnd = $oSinkNode->x * $fScale;
 		$yEnd = $oSinkNode->y * $fScale;
-		
+
 		$bReached = ($this->GetSourceNode()->GetProperty('is_reached') && $this->GetSinkNode()->GetProperty('is_reached'));
-		
+
 		$oPdf->setAlpha(1);
 		if ($bReached)
 		{
@@ -688,8 +688,8 @@ class DisplayableEdge extends GraphEdge
 		}
 		$oPdf->SetLineStyle(array('width' => 2*$fScale, 'cap' => 'round', 'join' => 'miter', 'dash' => 0, 'color' => $aColor));
 		$oPdf->Line($xStart, $yStart, $xEnd, $yEnd);
-		
-		
+
+
 		$vx = $xEnd - $xStart;
 		$vy = $yEnd - $yStart;
 		$l = sqrt($vx*$vx + $vy*$vy);
@@ -699,24 +699,24 @@ class DisplayableEdge extends GraphEdge
 		$uy = $vx;
 		$lPos = max($l/2, $l - 40*$fScale);
 		$iArrowSize = 5*$fScale;
-		
+
 		$x = $xStart  + $lPos * $vx;
 		$y = $yStart + $lPos * $vy;
 		$oPdf->Line($x, $y, $x + $iArrowSize * ($ux-$vx), $y + $iArrowSize * ($uy-$vy));
-		$oPdf->Line($x, $y, $x - $iArrowSize * ($ux+$vx), $y - $iArrowSize * ($uy+$vy));		
+		$oPdf->Line($x, $y, $x - $iArrowSize * ($ux+$vx), $y - $iArrowSize * ($uy+$vy));
 	}
 }
 
 class DisplayableGroupNode extends DisplayableNode
 {
 	protected $aObjects;
-	
+
 	public function __construct(SimpleGraph $oGraph, $sId, $x = 0, $y = 0)
 	{
 		parent::__construct($oGraph, $sId, $x, $y);
 		$this->aObjects = array();
 	}
-	
+
 	public function AddObject(DBObject $oObj = null)
 	{
 		if (is_object($oObj))
@@ -729,12 +729,12 @@ class DisplayableGroupNode extends DisplayableNode
 			$this->aObjects[$oObj->GetKey()] = $oObj;
 		}
 	}
-	
+
 	public function GetObjects()
 	{
 		return $this->aObjects;
 	}
-	
+
 	public function GetWidth()
 	{
 		return 50;
@@ -760,7 +760,7 @@ class DisplayableGroupNode extends DisplayableNode
 		$aNode['tooltip'] = $this->GetTooltip($aContextDefs);
 		return $aNode;
 	}
-	
+
 	public function RenderAsPDF(iTopPDF $oPdf, DisplayableGraph $oGraph, $fScale, $aContextDefs)
 	{
 		$bReached = $this->GetProperty('is_reached');
@@ -790,7 +790,7 @@ class DisplayableGroupNode extends DisplayableNode
 		$oPdf->SetTextColor(0, 0, 0);
 		$oPdf->Text($this->x * $fScale - $width / 2, ($this->y + 25) * $fScale, $this->GetProperty('label'));
 	}
-	
+
 	public function GetTooltip($aContextDefs)
 	{
 		$iGroupIdx = $this->GetProperty('group_index');
@@ -823,7 +823,7 @@ class DisplayableGraph extends SimpleGraph
 	protected $aTempImages;
 	protected $aSourceObjects;
 	protected $aSinkObjects;
-	
+
 	public function __construct()
 	{
 		parent::__construct();
@@ -831,14 +831,14 @@ class DisplayableGraph extends SimpleGraph
 		$this->aSourceObjects = array();
 		$this->aSinkObjects = array();
 	}
-	
+
 	public function GetTempImageName()
 	{
 		$sNewTempName = tempnam(APPROOT.'data', 'img-');
 		$this->aTempImages[] = $sNewTempName;
 		return $sNewTempName;
 	}
-	
+
 	public function __destruct()
 	{
 		foreach($this->aTempImages as $sTempFile)
@@ -918,7 +918,7 @@ class DisplayableGraph extends SimpleGraph
 			$oSinkNode = $oNewGraph->GetNode($oEdge->GetSinkNode()->GetId());
 			$oNewEdge = new DisplayableEdge($oNewGraph, $oEdge->GetId(), $oSourceNode, $oSinkNode);
 		}
-		
+
 		// Remove duplicate edges between two nodes
 		$oEdgesIter = new RelationTypeIterator($oNewGraph, 'Edge');
 		$aEdgeKeys = array();
@@ -946,7 +946,7 @@ class DisplayableGraph extends SimpleGraph
 				}
 			}
 		}
-		
+
 		$oNodesIter = new RelationTypeIterator($oNewGraph, 'Node');
 		foreach($oNodesIter as $oNode)
 		{
@@ -981,7 +981,7 @@ class DisplayableGraph extends SimpleGraph
 				}
 			}
 		}
-		
+
 		// Remove duplicate edges between two nodes
 		$oEdgesIter = new RelationTypeIterator($oNewGraph, 'Edge');
 		$aEdgeKeys = array();
@@ -1010,10 +1010,10 @@ class DisplayableGraph extends SimpleGraph
 			}
 		}
 		set_time_limit(intval($iPreviousTimeLimit));
-		
+
 		return $oNewGraph;
 	}
-	
+
 	/**
 	 * Initializes the positions by rendering using Graphviz in xdot format
 	 * and parsing the output.
@@ -1026,7 +1026,7 @@ class DisplayableGraph extends SimpleGraph
 		{
 			throw new Exception($sDot);
 		}
-		
+
 		$aChunks = explode(";", $sDot);
 		foreach($aChunks as $sChunk)
 		{
@@ -1035,7 +1035,7 @@ class DisplayableGraph extends SimpleGraph
 				$sId = $aMatches[1];
 				$xPos = $aMatches[2];
 				$yPos = $aMatches[3];
-				
+
 				$oNode = $this->GetNode($sId);
 				if ($oNode !== null)
 				{
@@ -1049,7 +1049,7 @@ class DisplayableGraph extends SimpleGraph
 			}
 		}
 	}
-	
+
 	public function GetBoundingBox()
 	{
 		$xMin = null;
@@ -1074,10 +1074,10 @@ class DisplayableGraph extends SimpleGraph
 				$yMax = max($yMax, $oNode->y + $oNode->GetHeight() / 2);
 			}
 		}
-		
+
 		return array('xmin' => $xMin, 'xmax' => $xMax, 'ymin' => $yMin, 'ymax' => $yMax);
 	}
-	
+
 	function Translate($dx, $dy)
 	{
 		$oIterator = new RelationTypeIterator($this, 'Node');
@@ -1085,9 +1085,9 @@ class DisplayableGraph extends SimpleGraph
 		{
 			$oNode->x += $dx;
 			$oNode->y += $dy;
-		}		
+		}
 	}
-	
+
 	public function UpdatePositions($aPositions)
 	{
 		foreach($aPositions as $sNodeId => $aPos)
@@ -1107,7 +1107,7 @@ class DisplayableGraph extends SimpleGraph
 	function GetAsJSON($sContextKey)
 	{
 		$aContextDefs = static::GetContextDefinitions($sContextKey, false);
-		
+
 		$aData = array('nodes' => array(), 'edges' => array(), 'groups' => array(), 'lists' => array());
 		$iGroupIdx = 0;
 		$oIterator = new RelationTypeIterator($this, 'Node');
@@ -1131,7 +1131,7 @@ class DisplayableGraph extends SimpleGraph
 				$aData['groups'][$iGroupIdx] = array('class' => $sClass, 'keys' => $aKeys);
 				$oNode->SetProperty('group_index', $iGroupIdx);
 				$iGroupIdx++;
-				
+
 				if ($oNode->GetProperty('is_reached'))
 				{
 					// Also add the objects from this group into the 'list' tab
@@ -1139,11 +1139,11 @@ class DisplayableGraph extends SimpleGraph
 					{
 						$aData['lists'][$sClass] = $aKeys;
 					}
-					else 
+					else
 					{
 						$aData['lists'][$sClass] = array_merge($aData['lists'][$sClass], $aKeys);
 					}
-						
+
 				}
 			}
 			if (($oNode instanceof DisplayableNode) && $oNode->GetProperty('is_reached') && is_object($oNode->GetProperty('object')))
@@ -1157,9 +1157,9 @@ class DisplayableGraph extends SimpleGraph
 			}
 			$aData['nodes'][] = $oNode->GetForRaphael($aContextDefs);
 		}
-		
+
 		uksort($aData['lists'], array(get_class($this), 'SortOnClassLabel')); // sort on the localized names of the classes to provide a consistent and stable order
-		
+
 		$oIterator = new RelationTypeIterator($this, 'Edge');
 		foreach($oIterator as $sId => $oEdge)
 		{
@@ -1171,7 +1171,7 @@ class DisplayableGraph extends SimpleGraph
 			$aEdge['attr'] = array('opacity' => $fOpacity, 'stroke' => '#000');
 			$aData['edges'][] = $aEdge;
 		}
-	
+
 		return json_encode($aData);
 	}
 
@@ -1200,12 +1200,12 @@ class DisplayableGraph extends SimpleGraph
 	{
 		$aContextDefs = static::GetContextDefinitions($sContextKey, false); // No need to develop the parameters
 		$oPdf = $oPage->get_tcpdf();
-				
+
 		$aBB = $this->GetBoundingBox();
 		$this->Translate(-$aBB['xmin'], -$aBB['ymin']);
-		
+
 		$aMargins = $oPdf->getMargins();
-		
+
 		if ($xMin == -1)
 		{
 			$xMin = $aMargins['left'];
@@ -1222,7 +1222,7 @@ class DisplayableGraph extends SimpleGraph
 		{
 			$yMax = $oPdf->getPageHeight() - $aMargins['bottom'];
 		}
-		
+
 		$fBreakMargin = $oPdf->getBreakMargin();
 		$oPdf->SetAutoPageBreak(false);
 		$aRemainingArea = $this->RenderKey($oPdf, $sComments, $xMin, $yMin, $xMax, $yMax, $aContextDefs);
@@ -1230,19 +1230,19 @@ class DisplayableGraph extends SimpleGraph
 		$xMax = $aRemainingArea['xmax'];
 		$yMin = $aRemainingArea['ymin'];
 		$yMax = $aRemainingArea['ymax'];
-		
+
 		//$oPdf->Rect($xMin, $yMin, $xMax - $xMin, $yMax - $yMin, 'D', array(), array(225, 50, 50));
-		
+
 		$fPageW = $xMax - $xMin;
 		$fPageH = $yMax - $yMin;
-		
-		$w = $aBB['xmax'] - $aBB['xmin']; 
+
+		$w = $aBB['xmax'] - $aBB['xmin'];
 		$h = $aBB['ymax'] - $aBB['ymin'] + 10; // Extra space for the labels which may appear "below" the icons
-		
+
 		$fScale = min($fPageW / $w, $fPageH / $h);
 		$dx = ($fPageW - $fScale * $w) / 2;
 		$dy = ($fPageH - $fScale * $h) / 2;
-		
+
 		$this->Translate(($xMin + $dx)/$fScale, ($yMin + $dy)/$fScale);
 
 		$oIterator = new RelationTypeIterator($this, 'Edge');
@@ -1264,7 +1264,7 @@ class DisplayableGraph extends SimpleGraph
 		$oPdf->SetAlpha(1);
 		$oPdf->SetTextColor(0, 0, 0);
 	}
-	
+
 	/**
 	 * Renders (in PDF) the key (legend) of the graphics vertically to the left of the specified zone (xmin,ymin, xmax,ymax),
 	 * and the comment (if any) at the bottom of the page. Returns the position of remaining area.
@@ -1332,7 +1332,7 @@ class DisplayableGraph extends SimpleGraph
 			$yPos += $fIconSize + 2 * $fPadding;
 		}
 		$oPdf->Rect($xMin, $yMin, $fMaxWidth + $fIconSize + 3*$fPadding, $yMax - $yMin, 'D');
-		
+
 		if ($sComments != '')
 		{
 			// Draw the comment text (surrounded by a rectangle)
@@ -1347,10 +1347,10 @@ class DisplayableGraph extends SimpleGraph
 			$oPdf->Rect($xPos, $yPos, $w + 2*$fPadding, $h + 2*$fPadding, 'D');
 			$yMax = $yPos - $fPadding;
 		}
-		
+
 		return array('xmin' => $xMin + $fMaxWidth + $fIconSize + 4*$fPadding, 'xmax' => $xMax, 'ymin' => $yMin, 'ymax' => $yMax);
 	}
-	
+
 	/**
 	 * Get the context definitions from the parameters / configuration. The format of the "key" string is:
 	 * <module>/relation_context/<class>/<relation>/<direction>
@@ -1372,7 +1372,7 @@ class DisplayableGraph extends SimpleGraph
 		else
 		{
 			$sLeafClass = $aLevels[2];
-			
+
 			if (!MetaModel::IsValidClass($sLeafClass))
 			{
 				IssueLog::Warning("GetContextDefinitions: invalid 'sLeafClass' = '$sLeafClass'. A valid class name is expected in 3rd position inside '$sContextKey' !");
@@ -1387,7 +1387,7 @@ class DisplayableGraph extends SimpleGraph
 						$aContextDefs = array_merge($aContextDefs, $aRelationContext[$sClass][$aLevels[3]][$aLevels[4]]['items']);
 					}
 				}
-				
+
 				// Check if the queries are valid
 				foreach($aContextDefs as $sKey => $sDefs)
 				{
@@ -1425,168 +1425,101 @@ class DisplayableGraph extends SimpleGraph
 	 * @throws \CoreException
 	 * @throws \DictExceptionMissingString
 	 */
-	function Display(WebPage $oP, $aResults, $sRelation, ApplicationContext $oAppContext, $aExcludedObjects, $sObjClass, $iObjKey, $sContextKey, $aContextParams = array())
-	{	
-		$aContextDefs = static::GetContextDefinitions($sContextKey, true, $aContextParams);
-		$aExcludedByClass = array();
-		foreach($aExcludedObjects as $oObj)
-		{
-			if (!array_key_exists(get_class($oObj), $aExcludedByClass))
-			{
-				$aExcludedByClass[get_class($oObj)] = array();
-			}
-			$aExcludedByClass[get_class($oObj)][] = $oObj->GetKey();
-		}
-		$sSftShort = Dict::S('UI:ElementsDisplayed');
-		$sSearchToggle = Dict::S('UI:Search:Toggle');
-		$oP->add("<div class=\"not-printable\">\n");
-		$oUiSearchBlock = new Panel($sSftShort, [],Panel::ENUM_COLOR_SCHEME_CYAN, 'ds_flash');
-		$oUiSearchBlock->SetCSSClasses(["ibo-search-form-panel", "display_block"]);
-		$oUiSearchBlock->SetIsCollapsible(true);
-		$oUiHtmlBlock = new Combodo\iTop\Application\UI\Base\Component\Html\Html(
-<<<EOF
- <div id="ds_flash" class="search_box ibo-display-graph--search-box">
-	<div id="dh_flash_criterion_outer" class="sf_criterion_area"><div class="sf_criterion_row">
-EOF
-		);
-		$oP->add_ready_script(
-<<<EOF
-	$("#dh_flash > .sf_title").on('click', function() {
-		$("#dh_flash").toggleClass('closed');
-	});
-    $('#ReloadMovieBtn').button().button('disable');
-EOF
-		);
-		$aSortedElements = array();
-		foreach($aResults as $sClassIdx => $aObjects)
-		{
-			foreach($aObjects as $oCurrObj)
-			{
-				$sSubClass = get_class($oCurrObj);
-				$aSortedElements[$sSubClass] = MetaModel::GetName($sSubClass);
-			}
-		}
-				
-		asort($aSortedElements);
-		$idx = 0;
-		foreach($aSortedElements as $sSubClass => $sClassName)
-		{
-			$oUiHtmlBlock->AddHtml("<div><input type=\"checkbox\" id=\"exclude_$idx\" name=\"excluded[]\" value=\"$sSubClass\" checked onChange=\"$('#ReloadMovieBtn').button('enable')\"><label for=\"exclude_$idx\">");
-			$oUiMedallionBlock= new MedallionIcon(MetaModel::GetClassIcon($sSubClass, false));
-			$oUiMedallionBlock->SetDescription($sClassName);
-			$oUiHtmlBlock->AddHtml(BlockRenderer::RenderBlockTemplates($oUiMedallionBlock));
-			$oUiHtmlBlock->AddHtml("</label></div>");
-			$idx++;
-		}
-		$oUiHtmlBlock->AddHtml("</div>");
-		$oUiHtmlBlock->AddHtml("<button type=\"button\" id=\"ReloadMovieBtn\" class=\"ibo-button ibo-is-neutral ibo-is-regular\" onClick=\"DoReload()\">".Dict::S('UI:Button:Refresh')."</button></div></form>");
-		$oUiHtmlBlock->AddHtml("</div>\n");
-		$oUiHtmlBlock->AddHtml("</div>\n"); // class="not-printable"
+	function Display(WebPage $oP, $aResults, $sRelation, ApplicationContext $oAppContext, $aExcludedObjects, $sObjClass, $iObjKey, $sContextKey, $aContextParams = array(), bool $sLazyLoading = false)
+	{
+		list($aExcludedByClass, $aAdditionalContexts) = $this->DisplayFiltering($sContextKey, $aContextParams, $aExcludedObjects, $oP, $aResults, $sLazyLoading);
 
-		$oUiSearchBlock->AddSubBlock($oUiHtmlBlock);
-		$oP->AddUiBlock($oUiSearchBlock);
-		$aAdditionalContexts = array();
-		foreach($aContextDefs as $sKey => $aDefinition)
-		{
-			$aAdditionalContexts[] = array('key' => $sKey, 'label' => Dict::S($aDefinition['dict']), 'oql' => $aDefinition['oql'], 'default' => (array_key_exists('default', $aDefinition)  && ($aDefinition['default'] == 'yes')));
-		}
-		
-		$sDirection = utils::ReadParam('d', 'horizontal');
 		$iGroupingThreshold = utils::ReadParam('g', 5);
 
 		WebResourcesHelper::EnableSimpleGraphInWebPage($oP);
-		try
-		{
+		try {
 			$this->InitFromGraphviz();
-			$sExportAsPdfURL = '';
 			$sExportAsPdfURL = utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php?operation=relation_pdf&relation='.$sRelation.'&direction='.($this->bDirectionDown ? 'down' : 'up');
-			$oAppcontext = new ApplicationContext();
 			$sContext = $oAppContext->GetForLink();
 			$sDrillDownURL = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=details&class=%1$s&id=%2$s&'.$sContext;
 			$sExportAsDocumentURL = utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php?operation=relation_attachment&relation='.$sRelation.'&direction='.($this->bDirectionDown ? 'down' : 'up');
 			$sLoadFromURL = utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php?operation=relation_json&relation='.$sRelation.'&direction='.($this->bDirectionDown ? 'down' : 'up');
 			$sAttachmentExportTitle = '';
-			if (($sObjClass != null) && ($iObjKey != null))
-			{
+			if (($sObjClass != null) && ($iObjKey != null)) {
 				$oTargetObj = MetaModel::GetObject($sObjClass, $iObjKey, false);
-				if ($oTargetObj)
-				{
+				if ($oTargetObj) {
 					$sAttachmentExportTitle = Dict::Format('UI:Relation:AttachmentExportOptions_Name', $oTargetObj->GetName());
 				}
 			}
-	
+
 			$sId = 'graph';
 			$sStyle = '';
-			if ($oP->IsPrintableVersion())
-			{
+			if ($oP->IsPrintableVersion()) {
 				// Optimize for printing on A4/Letter vertically
 				$sStyle = 'margin-left:auto; margin-right:auto;';
 				$oP->add_ready_script("$('.simple-graph').width(18/2.54*96).resizable({ stop: function() { $(window).trigger('resized'); }});"); // Default width about 18 cm, since most browsers assume 96 dpi
 			}
 			$oP->add('<div id="'.$sId.'" class="simple-graph" style="'.$sStyle.'"></div>');
 			$aParams = array(
-				'source_url' => $sLoadFromURL,
-				'sources' => ($this->bDirectionDown ? $this->aSourceObjects : $this->aSinkObjects),
-				'excluded' => $aExcludedByClass,
-				'grouping_threshold' => $iGroupingThreshold,
-				'export_as_pdf' => array('url' => $sExportAsPdfURL, 'label' => Dict::S('UI:Relation:ExportAsPDF')),
+				'source_url'           => $sLoadFromURL,
+				'sources'              => ($this->bDirectionDown ? $this->aSourceObjects : $this->aSinkObjects),
+				'excluded'             => $aExcludedByClass,
+				'grouping_threshold'   => $iGroupingThreshold,
+				'export_as_pdf'        => array('url' => $sExportAsPdfURL, 'label' => Dict::S('UI:Relation:ExportAsPDF')),
 				'export_as_attachment' => array('url' => $sExportAsDocumentURL, 'label' => Dict::S('UI:Relation:ExportAsAttachment'), 'obj_class' => $sObjClass, 'obj_key' => $iObjKey),
-				'drill_down' => array('url' => $sDrillDownURL, 'label' => Dict::S('UI:Relation:DrillDown')),
-				'labels' => array(
-					'export_pdf_title' => Dict::S('UI:Relation:PDFExportOptions'),
+				'drill_down'           => array('url' => $sDrillDownURL, 'label' => Dict::S('UI:Relation:DrillDown')),
+				'labels'               => array(
+					'export_pdf_title'           => Dict::S('UI:Relation:PDFExportOptions'),
 					'export_as_attachment_title' => $sAttachmentExportTitle,
-					'export' => Dict::S('UI:Button:Export'),
-					'cancel' => Dict::S('UI:Button:Cancel'),
-					'title' => Dict::S('UI:RelationOption:Title'),
-					'untitled' => Dict::S('UI:RelationOption:Untitled'),
-					'include_list' => Dict::S('UI:RelationOption:IncludeList'),
-					'comments' => Dict::S('UI:RelationOption:Comments'),
-					'grouping_threshold' => Dict::S('UI:RelationOption:GroupingThreshold'),
-					'refresh' => Dict::S('UI:Button:Refresh'),
-					'check_all' => Dict::S('UI:SearchValue:CheckAll'),
-					'uncheck_all' => Dict::S('UI:SearchValue:UncheckAll'),
-					'none_selected' => Dict::S('UI:Relation:NoneSelected'),
-					'nb_selected' => Dict::S('UI:SearchValue:NbSelected'),
-					'additional_context_info' => Dict::S('UI:Relation:AdditionalContextInfo'),
-					'zoom' => Dict::S('UI:Relation:Zoom'),
-					'loading' => Dict::S('UI:Loading'),
+					'export'                     => Dict::S('UI:Button:Export'),
+					'cancel'                     => Dict::S('UI:Button:Cancel'),
+					'title'                      => Dict::S('UI:RelationOption:Title'),
+					'untitled'                   => Dict::S('UI:RelationOption:Untitled'),
+					'include_list'               => Dict::S('UI:RelationOption:IncludeList'),
+					'comments'                   => Dict::S('UI:RelationOption:Comments'),
+					'grouping_threshold'         => Dict::S('UI:RelationOption:GroupingThreshold'),
+					'refresh'                    => Dict::S('UI:Button:Refresh'),
+					'check_all'                  => Dict::S('UI:SearchValue:CheckAll'),
+					'uncheck_all'                => Dict::S('UI:SearchValue:UncheckAll'),
+					'none_selected'              => Dict::S('UI:Relation:NoneSelected'),
+					'nb_selected'                => Dict::S('UI:SearchValue:NbSelected'),
+					'additional_context_info'    => Dict::S('UI:Relation:AdditionalContextInfo'),
+					'zoom'                       => Dict::S('UI:Relation:Zoom'),
+					'loading'                    => Dict::S('UI:Loading'),
 				),
-				'page_format' => array(
-					'label' => Dict::S('UI:Relation:PDFExportPageFormat'),
+				'page_format'          => array(
+					'label'  => Dict::S('UI:Relation:PDFExportPageFormat'),
 					'values' => array(
-						'A3' => Dict::S('UI:PageFormat_A3'),
-						'A4' => Dict::S('UI:PageFormat_A4'),
+						'A3'     => Dict::S('UI:PageFormat_A3'),
+						'A4'     => Dict::S('UI:PageFormat_A4'),
 						'Letter' => Dict::S('UI:PageFormat_Letter'),
 					),
 				),
-				'page_orientation' => array(
-					'label' => Dict::S('UI:Relation:PDFExportPageOrientation'),
+				'page_orientation'     => array(
+					'label'  => Dict::S('UI:Relation:PDFExportPageOrientation'),
 					'values' => array(
 						'P' => Dict::S('UI:PageOrientation_Portrait'),
 						'L' => Dict::S('UI:PageOrientation_Landscape'),
 					),
 				),
-				'additional_contexts' => $aAdditionalContexts,
-				'context_key' => $sContextKey,
+				'additional_contexts'  => $aAdditionalContexts,
+				'context_key'          => $sContextKey,
 			);
-			if (!extension_loaded('gd'))
-			{
+			if (!extension_loaded('gd')) {
 				// PDF export requires GD
 				unset($aParams['export_as_pdf']);
 			}
-			if (!extension_loaded('gd') || is_null($sObjClass) || is_null($iObjKey))
-			{
+			if (!extension_loaded('gd') || is_null($sObjClass) || is_null($iObjKey)) {
 				// Export as Attachment requires GD (for building the PDF) AND a valid objclass/objkey couple
 				unset($aParams['export_as_attachment']);
 			}
-			$oP->add_ready_script("$('#$sId').simple_graph(".json_encode($aParams).");");
+			if ($oP->IsPrintableVersion() || !$sLazyLoading) {
+				$oP->add_ready_script(" $('#$sId').simple_graph(".json_encode($aParams).");");
+			} else {
+				$oP->add_script("function Load(){var aExcluded = [];	$('input[name^=excluded]').each( function() {if (!$(this).prop('checked'))	{	aExcluded.push($(this).val());		}} ); var params= $.extend(".json_encode($aParams).",  {excluded_classes: aExcluded}); $('#$sId').simple_graph(params);}");
+			}
 		}
 		catch(Exception $e)
 		{
 			$oP->add('<div>'.$e->getMessage().'</div>');
 		}
 		$oP->add_script(
-<<<EOF
+			<<<EOF
 		
 	function DoReload()
 	{
@@ -1611,5 +1544,95 @@ EOF
 EOF
 		);
 	}
-	
+
+	/**
+	 * @param string $sContextKey
+	 * @param array $aContextParams
+	 * @param array $aExcludedObjects
+	 * @param \WebPage $oP
+	 * @param array $aResults
+	 *
+	 * @return array
+	 * @throws \CoreException
+	 * @throws \DictExceptionMissingString
+	 * @throws \ReflectionException
+	 * @throws \Twig\Error\LoaderError
+	 * @throws \Twig\Error\RuntimeError
+	 * @throws \Twig\Error\SyntaxError
+	 */
+	public function DisplayFiltering(string $sContextKey, array $aContextParams, array $aExcludedObjects, WebPage $oP, array $aResults, bool $sLazyLoading = false): array
+	{
+		$aContextDefs = static::GetContextDefinitions($sContextKey, true, $aContextParams);
+		$aExcludedByClass = array();
+		foreach ($aExcludedObjects as $oObj) {
+			if (!array_key_exists(get_class($oObj), $aExcludedByClass)) {
+				$aExcludedByClass[get_class($oObj)] = array();
+			}
+			$aExcludedByClass[get_class($oObj)][] = $oObj->GetKey();
+		}
+		$sSftShort = Dict::S('UI:ElementsDisplayed');
+		$oP->add("<div class=\"not-printable\">\n");
+		$oUiSearchBlock = new Panel($sSftShort, [], Panel::ENUM_COLOR_SCHEME_CYAN, 'dh_flash');
+		$oUiSearchBlock->SetCSSClasses(["ibo-search-form-panel", "display_block"]);
+		$oUiSearchBlock->SetIsCollapsible(true);
+		$oUiHtmlBlock = new Combodo\iTop\Application\UI\Base\Component\Html\Html(
+			<<<EOF
+		
+    <div id="ds_flash" class="search_box ibo-display-graph--search-box">
+	<div id="dh_flash_criterion_outer" class="sf_criterion_area"><div class="sf_criterion_row">
+EOF
+		);
+		$oP->add_ready_script(
+			<<<EOF
+	$("#dh_flash > .sf_title").on("click", function() {
+		$("#dh_flash").toggleClass("closed");
+	});
+	$("#ReloadMovieBtn").button().button("disable");
+EOF
+		);
+		if ($sLazyLoading) {
+			$oP->add_ready_script("$('#ReloadMovieBtn').button('enable');");
+		} else {
+			$oP->add_ready_script("$('#dh_flash').addClass('closed');");
+		}
+		$aSortedElements = array();
+		foreach ($aResults as $sClassIdx => $aObjects) {
+			foreach ($aObjects as $oCurrObj) {
+				$sSubClass = get_class($oCurrObj);
+				$aSortedElements[$sSubClass] = MetaModel::GetName($sSubClass);
+			}
+		}
+
+		asort($aSortedElements);
+		$idx = 0;
+		foreach ($aSortedElements as $sSubClass => $sClassName) {
+			$oUiHtmlBlock->AddHtml("<div><input type=\"checkbox\" id=\"exclude_$idx\" name=\"excluded[]\" value=\"$sSubClass\" checked onChange=\"$('#ReloadMovieBtn').button('enable')\"><label for=\"exclude_$idx\">");
+			$oUiMedallionBlock = new MedallionIcon(MetaModel::GetClassIcon($sSubClass, false));
+			$oUiMedallionBlock->SetDescription($sClassName);
+			$oUiHtmlBlock->AddHtml(BlockRenderer::RenderBlockTemplates($oUiMedallionBlock));
+			$oUiHtmlBlock->AddHtml("</label></div>");
+			$idx++;
+		}
+		$oUiHtmlBlock->AddHtml("</div>");
+		if ($sLazyLoading) {
+			$sOnCLick = "Load(); $('#ReloadMovieBtn').attr('onclick','DoReload()');$('#ReloadMovieBtn').html('".Dict::S('UI:Button:Refresh')."');";
+			$oUiHtmlBlock->AddHtml("<button type=\"button\" id=\"ReloadMovieBtn\" class=\"ibo-button ibo-is-neutral ibo-is-regular\" onClick=\"$sOnCLick\">".Dict::S('Relation:impacts/LoadData')."</button></div></form>");
+		} else {
+			$sOnCLick = "DoReload()";
+			$oUiHtmlBlock->AddHtml("<button type=\"button\" id=\"ReloadMovieBtn\" class=\"ibo-button ibo-is-neutral ibo-is-regular\" onClick=\"$sOnCLick\">".Dict::S('UI:Button:Refresh')."</button></div></form>");
+		}
+		$oUiHtmlBlock->AddHtml("</div>\n");
+		$oUiHtmlBlock->AddHtml("</div>\n"); // class="not-printable"
+
+		$oUiSearchBlock->AddSubBlock($oUiHtmlBlock);
+		$oP->AddUiBlock($oUiSearchBlock);
+
+		$aAdditionalContexts = array();
+		foreach ($aContextDefs as $sKey => $aDefinition) {
+			$aAdditionalContexts[] = array('key' => $sKey, 'label' => Dict::S($aDefinition['dict']), 'oql' => $aDefinition['oql'], 'default' => (array_key_exists('default', $aDefinition) && ($aDefinition['default'] == 'yes')));
+		}
+
+		return array($aExcludedByClass, $aAdditionalContexts);
+	}
+
 }

core/excelbulkexport.class.inc.php

@@ -111,16 +111,15 @@ class ExcelBulkExport extends TabularBulkExport
 
 				$sFormatInput = '<input type="text" size="15" name="date_format" id="excel_custom_date_time_format" title="" value="'.htmlentities($sDateTimeFormat, ENT_QUOTES, 'UTF-8').'"/>';
 				$oRadioCustom = InputUIBlockFactory::MakeForInputWithLabel(Dict::Format('Core:BulkExport:DateTimeFormatCustom_Format', $sFormatInput), "excel_date_format_radio", "custom", "excel_date_time_format_custom", "radio");
+				$oRadioCustom->SetDescription(Dict::S('UI:CSVImport:CustomDateTimeFormatTooltip'));
 				$oRadioCustom->GetInput()->SetIsChecked($sDateTimeFormat !== (string)AttributeDateTime::GetFormat());
 				$oRadioCustom->SetBeforeInput(false);
 				$oRadioCustom->GetInput()->AddCSSClass('ibo-input-checkbox');
 				$oFieldSetDate->AddSubBlock($oRadioCustom);
 
 
-				$sJSTooltip = json_encode('<div class="date_format_tooltip">'.Dict::S('UI:CSVImport:CustomDateTimeFormatTooltip').'</div>');
 				$oP->add_ready_script(
 					<<<EOF
-$('#excel_custom_date_time_format').tooltip({content: function() { return $sJSTooltip; } });
 $('#form_part_xlsx_options').on('preview_updated', function() { FormatDatesInPreview('excel', 'xlsx'); });
 $('#excel_date_time_format_default').on('click', function() { FormatDatesInPreview('excel', 'xlsx'); });
 $('#excel_date_time_format_custom').on('click', function() { FormatDatesInPreview('excel', 'xlsx'); });

core/log.class.inc.php

@@ -455,6 +455,7 @@ class LogFileNameBuilderFactory
 class FileLog
 {
 	protected $oFileNameBuilder;
+	protected $bHasSQLite;
 
 	/**
 	 * FileLog constructor.
@@ -467,6 +468,22 @@ class FileLog
 	public function __construct($sFileName = '')
 	{
 		$this->oFileNameBuilder = LogFileNameBuilderFactory::GetInstance($sFileName);
+		$sLogFilePath = $this->oFileNameBuilder->GetLogFilePath();
+		$this->bHasSQLite = class_exists('SQLite3');
+		if ($this->bHasSQLite) {
+			if (empty($sLogFilePath)) {
+				return;
+			}
+			$bCreate = false;
+			$sDBFilePath = "$sLogFilePath.db";
+			if (!is_file($sDBFilePath)) {
+				$bCreate = true;
+			}
+			$this->DB = new SQLite3($sDBFilePath);
+			if ($bCreate) {
+				$this->DB->exec('CREATE TABLE log (id INTEGER PRIMARY KEY AUTOINCREMENT, date TEXT, level TEXT, user TEXT, content LONGTEXT, context LONGTEXT, channel TEXT)');
+			}
+		}
 	}
 
 	public function Error($sText, $sChannel = '', $aContext = array())
@@ -502,6 +519,17 @@ class FileLog
 
 	protected function Write($sText, $sLevel = '', $sChannel = '', $aContext = array())
 	{
+		if ($this->bHasSQLite) {
+			$stmt = $this->DB->prepare('INSERT INTO log (date, level, user, content, context, channel) VALUES (:date, :level, :user, :content, :context, :channel)');
+			$stmt->bindValue(':date', date('Y-m-d H:i:s'));
+			$stmt->bindValue(':level', $sLevel);
+			$stmt->bindValue(':user', LogAPI::GetUserInfo());
+			$stmt->bindValue(':content', $sText);
+			$stmt->bindValue(':context', empty($aContext) ? '' : var_export($aContext, true));
+			$stmt->bindValue(':channel', $sChannel);
+			$stmt->execute();
+		}
+
 		$sTextPrefix = empty($sLevel) ? '' : (str_pad($sLevel, 7));
 		$sTextPrefix .= ' | ';
 		$sTextPrefix .= str_pad(LogAPI::GetUserInfo(), 5)." | ";
@@ -542,14 +570,26 @@ class FileLog
  */
 class LogChannels
 {
-	public const CLI          = 'CLI';
-	public const CONSOLE      = 'console';
-	public const DEADLOCK     = 'DeadLock';
-	public const INLINE_IMAGE = 'InlineImage';
-	public const PORTAL       = 'portal';
-	public const CMDB_SOURCE  = 'cmdbsource';
-	public const CORE         = 'core';
 	public const APC = 'apc';
+
+	public const CLI          = 'CLI';
+
+	/**
+	 * @var string
+	 * @since 2.7.7 N°4558 use this new channel when logging DB transactions
+	 * @since 3.0.0 logs info in CMDBSource (see commit a117906f)
+	 */
+	public const CMDB_SOURCE = 'cmdbsource';
+
+	public const CONSOLE      = 'console';
+
+	public const CORE         = 'core';
+
+	public const DEADLOCK     = 'DeadLock';
+
+	public const INLINE_IMAGE = 'InlineImage';
+
+	public const PORTAL       = 'portal';
 }
 
 
@@ -1137,7 +1177,12 @@ class DeprecatedCallsLog extends LogAPI
 	 */
 	public static function NotifyDeprecatedFile(?string $sAdditionalMessage = null): void
 	{
-		if (!static::IsLogLevelEnabled(self::LEVEL_WARNING, self::ENUM_CHANNEL_FILE)) {
+		try {
+			if (!static::IsLogLevelEnabled(self::LEVEL_WARNING, self::ENUM_CHANNEL_FILE)) {
+				return;
+			}
+		}
+		catch (ConfigException $e) {
 			return;
 		}
 

core/metamodel.class.php

@@ -655,7 +655,7 @@ abstract class MetaModel
 	 * @param string $sRuleId
 	 *
 	 * @throws \CoreException
-	 * @since 2.6.1 N°1918 (sous les pavés, la plage) initialize in 'root_class' property the class that has the first
+	 * @since 2.6.1 N°1968 (sous les pavés, la plage) initialize in 'root_class' property the class that has the first
 	 *         definition of the rule in the hierarchy
 	 */
 	private static function SetUniquenessRuleRootClass($sRootClass, $sRuleId)

core/ownershiplock.class.inc.php

@@ -31,13 +31,13 @@ class iTopOwnershipToken extends DBObject
 	{
 		$aParams = array
 		(
-			'category' => 'application',
-			'key_type' => 'autoincrement',
-			'name_attcode' => array('obj_class', 'obj_key'),
-			'state_attcode' => '',
-			'reconc_keys' => array(''),
-			'db_table' => 'priv_ownership_token',
-			'db_key_field' => 'id',
+			'category'            => '',
+			'key_type'            => 'autoincrement',
+			'name_attcode'        => array('obj_class', 'obj_key'),
+			'state_attcode'       => '',
+			'reconc_keys'         => array(''),
+			'db_table'            => 'priv_ownership_token',
+			'db_key_field'        => 'id',
 			'db_finalclass_field' => '',
 		);
 		MetaModel::Init_Params($aParams);

core/pdfbulkexport.class.inc.php

@@ -95,15 +95,14 @@ class PDFBulkExport extends HTMLBulkExport
 
 				$sFormatInput = '<input type="text" size="15" name="date_format" id="pdf_custom_date_time_format" title="" value="'.htmlentities($sDateTimeFormat, ENT_QUOTES, 'UTF-8').'"/>';
 				$oRadioCustom = InputUIBlockFactory::MakeForInputWithLabel(Dict::Format('Core:BulkExport:DateTimeFormatCustom_Format', $sFormatInput), "pdf_date_format_radio", "custom", "pdf_date_time_format_custom", "radio");
+				$oRadioCustom->SetDescription(Dict::S('UI:CSVImport:CustomDateTimeFormatTooltip'));
 				$oRadioCustom->GetInput()->SetIsChecked($sDateTimeFormat !== (string)AttributeDateTime::GetFormat());
 				$oRadioCustom->SetBeforeInput(false);
 				$oRadioCustom->GetInput()->AddCSSClass('ibo-input-checkbox');
 				$oFieldSetDate->AddSubBlock($oRadioCustom);
 
-				$sJSTooltip = json_encode('<div id="date_format_tooltip">'.Dict::S('UI:CSVImport:CustomDateTimeFormatTooltip').'</div>');
 				$oP->add_ready_script(
 					<<<EOF
-$('#pdf_custom_date_time_format').tooltip({content: function() { return $sJSTooltip; } });
 $('#form_part_pdf_options').on('preview_updated', function() { FormatDatesInPreview('pdf', 'html'); });
 $('#pdf_date_time_format_default').on('click', function() { FormatDatesInPreview('pdf', 'html'); });
 $('#pdf_date_time_format_custom').on('click', function() { FormatDatesInPreview('pdf', 'html'); });

core/spreadsheetbulkexport.class.inc.php

@@ -84,15 +84,14 @@ class SpreadsheetBulkExport extends TabularBulkExport
 
 				$sFormatInput = '<input type="text" size="15" name="date_format" id="spreadsheet_custom_date_time_format" title="" value="'.htmlentities($sDateTimeFormat, ENT_QUOTES, 'UTF-8').'"/>';
 				$oRadioCustom = InputUIBlockFactory::MakeForInputWithLabel(Dict::Format('Core:BulkExport:DateTimeFormatCustom_Format', $sFormatInput), "spreadsheet_date_format_radio", "custom", "spreadsheet_date_time_format_custom", "radio");
+				$oRadioCustom->SetDescription(Dict::S('UI:CSVImport:CustomDateTimeFormatTooltip'));
 				$oRadioCustom->GetInput()->SetIsChecked($sDateTimeFormat !== (string)AttributeDateTime::GetFormat());
 				$oRadioCustom->GetInput()->AddCSSClass('ibo-input-checkbox');
 				$oRadioCustom->SetBeforeInput(false);
 				$oFieldSetDate->AddSubBlock($oRadioCustom);
 
-				$sJSTooltip = json_encode('<div class="date_format_tooltip">'.Dict::S('UI:CSVImport:CustomDateTimeFormatTooltip').'</div>');
 				$oP->add_ready_script(
 					<<<EOF
-$('#spreadsheet_custom_date_time_format').tooltip({content: function() { return $sJSTooltip; } });
 $('#form_part_spreadsheet_options').on('preview_updated', function() { FormatDatesInPreview('spreadsheet', 'spreadsheet'); });
 $('#spreadsheet_date_time_format_default').on('click', function() { FormatDatesInPreview('spreadsheet', 'spreadsheet'); });
 $('#spreadsheet_date_time_format_custom').on('click', function() { FormatDatesInPreview('spreadsheet', 'spreadsheet'); });

core/sqlobjectquery.class.inc.php

@@ -494,7 +494,17 @@ class SQLObjectQuery extends SQLQuery
 		}
 	}
 
-	private function PrepareSingleTable(SQLObjectQuery $oRootQuery, &$aFrom, $sCallerAlias = '', $aJoinData)
+	/**
+	 * @param \SQLObjectQuery $oRootQuery
+	 * @param $aFrom
+	 * @param $sCallerAlias
+	 * @param $aJoinData
+	 *
+	 * @return string
+	 *
+	 * @since 2.7.7 3.0.1 3.1.0 N°3129 Remove default value for $sCallerAlias for PHP 8.0 compat (Private method with only 2 calls in the class, both providing the optional parameter)
+	 */
+	private function PrepareSingleTable(SQLObjectQuery $oRootQuery, &$aFrom, $sCallerAlias, $aJoinData)
 	{
 		$aTranslationTable[$this->m_sTable]['*'] = $this->m_sTableAlias;
 		$sJoinCond = '';
@@ -613,6 +623,7 @@ class SQLObjectQuery extends SQLQuery
 		$aTempFrom = array(); // temporary subset of 'from' specs, to be grouped in the final query
 		foreach ($this->m_aJoinSelects as $aJoinData)
 		{
+			/** @var \SQLObjectQuery $oRightSelect */
 			$oRightSelect = $aJoinData["select"];
 
 			$oRightSelect->PrepareSingleTable($oRootQuery, $aTempFrom, $this->m_sTableAlias, $aJoinData);

css/backoffice/blocks-integrations/collapsible-section/_all.scss

@@ -4,4 +4,5 @@
  */
 
 @import "collapsible-section-with-blocks";
-@import "collapsible-section-within-caselog-list";
+@import "collapsible-section-within-caselog-list";
+@import "collapsible-section-within-alert";

css/backoffice/blocks-integrations/collapsible-section/_collapsible-section-within-alert.scss

@@ -0,0 +1,26 @@
+/*
+ * @copyright   Copyright (C) 2010-2022 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+/* SCSS variables */
+$ibo-collapsible-section-within-alert--body--padding: $ibo-spacing-300 !default;
+$ibo-collapsible-section-within-alert--body--text-color: $ibo-color-grey-900 !default;
+
+.ibo-alert--body {
+  .ibo-collapsible-section {
+    .ibo-collapsible-section--header .ibo-collapsible-section--title,
+    .ibo-collapsible-section--body {
+      @extend %ibo-font-size-150;
+    }
+
+    .ibo-collapsible-section--body {
+      color: $ibo-collapsible-section-within-alert--body--text-color;
+      padding: $ibo-collapsible-section-within-alert--body--padding;
+    }
+  }
+  > * + .ibo-collapsible-section {
+    margin-top: 8px;
+  }
+}
+  

css/backoffice/blocks-integrations/field/_all.scss

@@ -3,4 +3,5 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
-@import "field-with-field";
+@import "field-with-field";
+@import "field-with-fieldset";

css/backoffice/blocks-integrations/field/_field-with-fieldset.scss

@@ -0,0 +1,10 @@
+/*
+ * @copyright   Copyright (C) 2010-2021 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+$ibo-field--spacing-top--with-fieldset: $ibo-spacing-700 !default;
+
+.ibo-fieldset + .ibo-field {
+  margin-top: $ibo-field--spacing-top--with-fieldset;
+}

css/backoffice/blocks-integrations/fieldset/_all.scss

@@ -3,5 +3,6 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
+@import "fieldset-with-field";
 @import "fieldset-with-fieldset";
 @import "fieldset-with-multicolumn";

css/backoffice/blocks-integrations/fieldset/_fieldset-with-field.scss

@@ -0,0 +1,10 @@
+/*
+ * @copyright   Copyright (C) 2010-2021 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+$ibo-fieldset--spacing-top--with-field: $ibo-spacing-700 !default;
+
+.ibo-field + .ibo-fieldset:not(.ibo-column) {
+  margin-top: $ibo-fieldset--spacing-top--with-field;
+}

css/backoffice/blocks-integrations/fieldset/_fieldset-with-fieldset.scss

@@ -3,8 +3,8 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
-$ibo-fieldset--spacing-left--with-fieldset: $ibo-spacing-800 !default;
+$ibo-fieldset--spacing-top--with-fieldset: $ibo-spacing-800 !default;
 
 .ibo-fieldset + .ibo-fieldset:not(.ibo-column) {
-    margin-top: $ibo-fieldset--spacing-left--with-fieldset;
+    margin-top: $ibo-fieldset--spacing-top--with-fieldset;
 }

css/backoffice/blocks-integrations/fieldset/_fieldset-with-multicolumn.scss

@@ -3,9 +3,9 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
-$ibo-fieldset--spacing-left--with-multicolumn: $ibo-spacing-800 !default;
+$ibo-fieldset--spacing-top--with-multicolumn: $ibo-spacing-800 !default;
 
 
 .ibo-multi-column + .ibo-fieldset {
-  margin-top: $ibo-fieldset--spacing-left--with-multicolumn;
+  margin-top: $ibo-fieldset--spacing-top--with-multicolumn;
 }

css/backoffice/blocks-integrations/input/_input-with-label.scss

@@ -11,4 +11,18 @@ $ibo-input--spacing-left--with-label: $ibo-spacing-300 !default;
 select + label, label + select, label > select,
 input + label, label + input, label > input {
   margin-left: $ibo-input--spacing-left--with-label;
+}
+
+.ibo-input-with-label--label {
+  &.ibo-has-description {
+    &::after {
+      content: $ibo-field--label--description--content;
+      padding-left: $ibo-field--label--description--padding-left;
+      vertical-align: top;
+
+      cursor: pointer;
+      color: $ibo-field--label--description--color;
+      @extend %ibo-font-ral-bol-50;
+    }
+  }
 }

css/backoffice/components/_button.scss

@@ -479,6 +479,22 @@ $ibo-button-colors: (
   &.ibo-action-button {
     float: right;
   }
+
+  .ibo-button--loading-icon {
+    display: none;
+  }
+  
+  &.ibo-is-loading {
+    .ibo-button--icon{
+      display: none;
+    }
+    .ibo-button--loading-icon {
+      display: inline-block;
+       &+ .ibo-button--label{
+        margin-left: $ibo-button--label--margin-left;
+      }
+    }
+  }
 }
 
 .ibo-button--label {

css/backoffice/components/_datatable.scss

@@ -122,6 +122,7 @@ $ibo-fieldsorter--selected--background-color: $ibo-color-blue-200 !default;
   }
 }
 
-.ibo-datatable--selected-count{
+.ibo-datatable--selected-count, .ibo-datatable--result-count{
   padding-right: 0.2em;
+  padding-left: 0.1em;
 }

css/backoffice/components/_search-form.scss

@@ -345,6 +345,7 @@ $ibo-search-results-area--datatable-scrollhead--border--is-sticking: $ibo-search
         /* Form group (operators) is displayed only when the criteria is toggled to opened state */
         display: none;
         max-width: 450px;
+        width: max-content;
         max-height: 520px;
         overflow-x: auto;
         overflow-y: hidden;
@@ -374,7 +375,7 @@ $ibo-search-results-area--datatable-scrollhead--border--is-sticking: $ibo-search
 						}
 
 						.sfc_op_name {
-							width: 90px;
+							width: 96px;
 						}
 
 						.sfc_op_content {

css/backoffice/components/_title.scss

@@ -8,6 +8,8 @@ $ibo-title--padding-y: $ibo-spacing-400 !default;
 $ibo-title--padding-x: $ibo-spacing-0 !default;
 
 $ibo-title--icon--size: 90px !default;
+$ibo-title--icon--size-2: 80px !default;
+$ibo-title--icon--size-3: 70px !default;
 
 $ibo-title--icon-background--size--must-contain: contain !default;
 $ibo-title--icon-background--size--must-cover: cover !default;
@@ -29,6 +31,18 @@ $ibo-title--icon-background--size--must-zoomout: 66.67% !default;
   min-height: $ibo-title--icon--size;
   overflow: hidden;
 }
+.ibo-title--icon > .ibo-title--icon-level-2{
+  width: $ibo-title--icon--size-2;
+  height: $ibo-title--icon--size-2;
+  min-width: $ibo-title--icon--size-2;
+  min-height: $ibo-title--icon--size-2;
+}
+.ibo-title--icon > .ibo-title--icon-level-3{
+  width: $ibo-title--icon--size-3;
+  height: $ibo-title--icon--size-3;
+  min-width: $ibo-title--icon--size-3;
+  min-height: $ibo-title--icon--size-3;
+}
 
 .ibo-title--icon-background {
   width: 100%;

css/backoffice/components/input/_input-image.scss

@@ -3,6 +3,7 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
+$ibo-input-image--image-view--min-height: 96px !default;
 $ibo-input-image--image-view--background-color: $ibo-color-grey-200 !default;
 $ibo-input-image--image-view--border-radius: $ibo-border-radius-500 !default;
 
@@ -18,6 +19,7 @@ $ibo-input-image--edit-buttons--elements-spacing: $ibo-input-image--edit-buttons
 .ibo-input-image--image-view {
   position: relative;
   overflow: hidden;
+  min-height: $ibo-input-image--image-view--min-height;
   background-color: $ibo-input-image--image-view--background-color;
   border-radius: $ibo-input-image--image-view--border-radius;
   @extend %ibo-fully-centered-content;

css/backoffice/components/input/_input-select.scss

@@ -64,6 +64,8 @@ $ibo-input-select--autocomplete-item-image--border: 1px solid $ibo-color-grey-60
       color: inherit;
       border-color: $ibo-color-white-100;
       padding-left: $ibo-input-select--padding-x;
+
+      @extend %ibo-font-ral-nor-150;
     }
 
     > [data-value] {
@@ -102,6 +104,13 @@ $ibo-input-select--autocomplete-item-image--border: 1px solid $ibo-color-grey-60
   > input {
     background-color: unset;
     border: unset;
+    &:focus{
+      outline: none !important; /* Overwrite browsers default focus outline */
+    }
+  }
+  
+  &.input-active{
+    border: 1px solid $ibo-input--focus--border-color;
   }
 }
 .ibo-input-select-wrapper{

css/backoffice/components/input/_input.scss

@@ -22,7 +22,6 @@ $ibo-input--placeholder--color: $ibo-color-grey-600 !default;
 $ibo-input--disabled--background-color: $ibo-color-grey-300 !default;
 $ibo-input--placeholder--color: $ibo-color-grey-700 !default;
 
-$ibo-input-wrapper--is-error--background-color: $ibo-color-red-200 !default;
 $ibo-input-wrapper--is-error--border-color: $ibo-color-red-600 !default;
 $ibo-field-validation: $ibo-color-red-700 !default;
 
@@ -38,6 +37,8 @@ $ibo-input--margin-x: $ibo-spacing-200 !default;
   border: 1px solid $ibo-input--border-color;
   border-radius: $ibo-input--border-radius;
 
+  @extend %ibo-font-ral-nor-150;
+  
 	&:focus{
 		border: 1px solid $ibo-input--focus--border-color;
 	}
@@ -55,7 +56,6 @@ textarea.ibo-input{
 .ibo-input-wrapper.is-error, .ibo-input-field-wrapper.is-error {
 	.ibo-input, .ibo-input-vanilla,  .cke, textarea {
     border: 1px solid $ibo-input-wrapper--is-error--border-color;
-    background-color: $ibo-input-wrapper--is-error--background-color;
   }
   .ibo-input-vanilla input{
     border: 0;

css/backoffice/layout/activity-panel/_activity-panel.scss

@@ -41,6 +41,12 @@ $ibo-activity-panel--tab-title-decoration--border-radius: $ibo-border-radius-300
 
 $ibo-activity-panel--tab-title-draft-indicator--margin-x: $ibo-activity-panel--tab-title-decoration--margin-right !default;
 
+$ibo-activity-panel--tab-title-messages-count--margin-left: $ibo-activity-panel--tab-title-draft-indicator--margin-x !default;
+$ibo-activity-panel--tab-title-messages-count--background-color: $ibo-color-grey-200 !default;
+$ibo-activity-panel--tab-title-messages-count--padding-x: $ibo-spacing-200 !default;
+$ibo-activity-panel--tab-title-messages-count--padding-y: $ibo-spacing-0 !default;
+$ibo-activity-panel--tab-title-messages-count--border-radius: $ibo-border-radius-300 !default;
+
 $ibo-activity-panel--tab-title-text--max-width: 100px !default;
 
 /* - Tab toolbar */
@@ -180,6 +186,9 @@ $ibo-activity-panel--open-icon--margin-left: 0.75rem !default;
 		.ibo-activity-panel--tab-title{
 			background-color: $ibo-activity-panel--tab-title--is-active--background-color;
 		}
+    .ibo-activity-panel--tab-title-messages-count{
+      display: none;
+    }
 	}
   &.ibo-is-draft{
     .ibo-activity-panel--tab-title-draft-indicator{
@@ -213,6 +222,17 @@ $ibo-activity-panel--open-icon--margin-left: 0.75rem !default;
 	border-radius: $ibo-activity-panel--tab-title-decoration--border-radius;
 	@extend %ibo-depression-100;
 }
+.ibo-activity-panel--tab-title-messages-count{
+  display: inline-block;
+  margin-left: $ibo-activity-panel--tab-title-messages-count--margin-left;
+  background-color: $ibo-activity-panel--tab-title-messages-count--background-color;
+  padding: $ibo-activity-panel--tab-title-messages-count--padding-y $ibo-activity-panel--tab-title-messages-count--padding-x;
+  border-radius: $ibo-activity-panel--tab-title-messages-count--border-radius;
+
+  &[data-messages-count="0"]{
+    display: none;
+  }
+}
 .ibo-activity-panel--tab-title-draft-indicator{
   display: none;
   margin-left: $ibo-activity-panel--tab-title-draft-indicator--margin-x;

css/backoffice/pages/_all.scss

@@ -12,4 +12,5 @@
 @import "datamodel-viewer";
 @import "csv-import";
 @import "global-search";
+@import "run-query";
 @import "welcome-popup";

css/backoffice/pages/_run-query.scss

@@ -0,0 +1,10 @@
+/*
+ * @copyright   Copyright (C) 2010-2021 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+$ibo-run-query--highlight--background-color: $ibo-color-primary-300 !default;
+
+.ibo-run-query--highlight{
+  background-color: $ibo-run-query--highlight--background-color;
+}

css/backoffice/utils/helpers/_misc.scss

@@ -134,6 +134,9 @@ body.ibo-has-fullscreen-descendant {
   @extend %ibo-font-code-150;
 }
 
+.ibo-add-margin-top-250{
+  margin-top:  $ibo-spacing-400;
+}
 /*
  * A single class to handle WYSIWYG generated content, where only HTML tags are available
  * See https://bulma.io/documentation/elements/content/
@@ -158,7 +161,7 @@ body.ibo-has-fullscreen-descendant {
 
   /* Preserve original text color in code blocks, except for the Highlight.js blocks which have their own colors */
   & > code,
-  :not(pre.hljs) code {
+  code:not(.hljs)  {
     color: inherit;
   }
 }

css/backoffice/vendors/_ckeditor.scss

@@ -52,6 +52,10 @@ $ibo-vendors-ckeditor--autocomplete-item-title--text-color: #3A3A3A !default;
 	white-space: pre-line;
 }
 
+.ibo-hljs-container{
+  padding: 0 !important;
+}
+
 /* Mentions in caselogs */
 /* Note: Mind the "ul", it allows us to have a more precise rule than the original plugin's CSS so we can override it */
 ul.cke_autocomplete_panel{

css/css-variables.scss

@@ -15,6 +15,9 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  */
+
+// Beware the version number MUST be enclosed with quotes otherwise v2.3.0 becomes v2 0.3 .0
+$version: "v2.7.7";
 $approot-relative: "../../../../" !default; // relative to env-***/branding/themes/***/main.css
 
 // Base colors

datamodels/2.x/authent-cas/module.authent-cas.php

@@ -5,7 +5,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'authent-cas/3.0.0',
+	'authent-cas/3.0.1',
 	array(
 		// Identification
 		//

datamodels/2.x/authent-cas/src/CASLoginExtension.php

@@ -29,6 +29,8 @@ use utils;
  */
 class CASLoginExtension extends AbstractLoginFSMExtension implements iLogoutExtension, iLoginUIExtension
 {
+	const LOGIN_MODE = 'cas';
+
 	/**
 	 * Return the list of supported login modes for this plugin
 	 *
@@ -36,7 +38,7 @@ class CASLoginExtension extends AbstractLoginFSMExtension implements iLogoutExte
 	 */
 	public function ListSupportedLoginModes()
 	{
-		return array('cas');
+		return array(static::LOGIN_MODE);
 	}
 
 	protected function OnStart(&$iErrorCode)
@@ -47,12 +49,12 @@ class CASLoginExtension extends AbstractLoginFSMExtension implements iLogoutExte
 
 	protected function OnReadCredentials(&$iErrorCode)
 	{
-		if (Session::Get('login_mode') == 'cas')
+		if (empty(Session::Get('login_mode')) || Session::Get('login_mode') == static::LOGIN_MODE)
 		{
 			static::InitCASClient();
 			if (phpCAS::isAuthenticated())
 			{
-				Session::Set('login_mode', 'cas');
+				Session::Set('login_mode', static::LOGIN_MODE);
 				Session::Set('auth_user', phpCAS::getUser());
 				Session::Unset('login_will_redirect');
 			}
@@ -68,7 +70,7 @@ class CASLoginExtension extends AbstractLoginFSMExtension implements iLogoutExte
 					$iErrorCode = LoginWebPage::EXIT_CODE_MISSINGLOGIN;
 					return LoginWebPage::LOGIN_FSM_ERROR;
 				}
-				Session::Set('login_mode', 'cas');
+				Session::Set('login_mode', static::LOGIN_MODE);
 				phpCAS::forceAuthentication(); // Redirect to CAS and exit
 			}
 		}
@@ -77,7 +79,7 @@ class CASLoginExtension extends AbstractLoginFSMExtension implements iLogoutExte
 
 	protected function OnCheckCredentials(&$iErrorCode)
 	{
-		if (Session::Get('login_mode') == 'cas')
+		if (Session::Get('login_mode') == static::LOGIN_MODE)
 		{
 			if (!Session::IsSet('auth_user'))
 			{
@@ -94,7 +96,7 @@ class CASLoginExtension extends AbstractLoginFSMExtension implements iLogoutExte
 
 	protected function OnCredentialsOK(&$iErrorCode)
 	{
-		if (Session::Get('login_mode') == 'cas')
+		if (Session::Get('login_mode') == static::LOGIN_MODE)
 		{
 			$sAuthUser = Session::Get('auth_user');
 			if (!LoginWebPage::CheckUser($sAuthUser))
@@ -109,7 +111,7 @@ class CASLoginExtension extends AbstractLoginFSMExtension implements iLogoutExte
 
 	protected function OnError(&$iErrorCode)
 	{
-		if (Session::Get('login_mode') == 'cas')
+		if (Session::Get('login_mode') == static::LOGIN_MODE)
 		{
 			Session::Unset('phpCAS');
 			if ($iErrorCode != LoginWebPage::EXIT_CODE_MISSINGLOGIN)
@@ -124,7 +126,7 @@ class CASLoginExtension extends AbstractLoginFSMExtension implements iLogoutExte
 
 	protected function OnConnected(&$iErrorCode)
 	{
-		if (Session::Get('login_mode') == 'cas')
+		if (Session::Get('login_mode') == static::LOGIN_MODE)
 		{
 			Session::Set('can_logoff', true);
 			return LoginWebPage::CheckLoggedUser($iErrorCode);
@@ -205,7 +207,7 @@ class CASLoginExtension extends AbstractLoginFSMExtension implements iLogoutExte
 		$oLoginContext->SetLoaderPath(APPROOT.'env-'.utils::GetCurrentEnvironment().'/authent-cas/view');
 
 		$aData = array(
-			'sLoginMode' => 'cas',
+			'sLoginMode' => static::LOGIN_MODE,
 			'sLabel' => Dict::S('CAS:Login:SignIn'),
 			'sTooltip' => Dict::S('CAS:Login:SignInTooltip'),
 		);

datamodels/2.x/authent-external/module.authent-external.php

@@ -27,7 +27,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'authent-external/3.0.0',
+	'authent-external/3.0.1',
 	array(
 		// Identification
 		//

datamodels/2.x/authent-ldap/module.authent-ldap.php

@@ -9,7 +9,7 @@ if (function_exists('ldap_connect'))
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'authent-ldap/3.0.0',
+	'authent-ldap/3.0.1',
 	array(
 		// Identification
 		//

datamodels/2.x/authent-local/dictionaries/pl.dict.authent-local.php

@@ -20,7 +20,6 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
-
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -30,11 +29,9 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
-
 //
 // Class: UserLocal
 //
-
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:UserLocal' => 'Użytkownik '.ITOP_APPLICATION_SHORT,
 	'Class:UserLocal+' => 'Użytkownik uwierzytelniony przez '.ITOP_APPLICATION_SHORT,
@@ -49,10 +46,13 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Class:UserLocal/Attribute:expiration/Value:never_expire+' => '',
 	'Class:UserLocal/Attribute:expiration/Value:force_expire' => 'Wygasło',
 	'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '',
+	'Class:UserLocal/Attribute:expiration/Value:otp_expire' => 'One-time Password~~',
+	'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'Password cannot be changed by the user.~~',
 	'Class:UserLocal/Attribute:password_renewed_date' => 'Odnowienie hasła',
 	'Class:UserLocal/Attribute:password_renewed_date+' => 'Kiedy ostatnio zmieniano hasło',
 
 	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Hasło musi mieć co najmniej 8 znaków i zawierać duże, małe litery, cyfry i znaki specjalne.',
 
-	'UserLocal:password:expiration' => 'Poniższe pola wymagają rozszerzenia'
+	'UserLocal:password:expiration' => 'Poniższe pola wymagają rozszerzenia',
+	'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => 'Setting password expiration to "One-time password" is not allowed for your own User~~',
 ));

datamodels/2.x/authent-local/module.authent-local.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'authent-local/3.0.0',
+	'authent-local/3.0.1',
 	array(
 		// Identification
 		//

datamodels/2.x/combodo-backoffice-darkmoon-theme/datamodel.combodo-backoffice-darkmoon-theme.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.0">
+  <branding>
+    <themes>
+      <theme id="darkmoon" _delta="define">
+        <variables>
+        </variables>
+        <imports>
+          <import id="nord-scss-variables" xsi:type="variables">combodo-backoffice-darkmoon-theme/vendors/nord/src/sass/nord.scss</import>
+          <import id="darkmoon-scss-variables" xsi:type="variables">combodo-backoffice-darkmoon-theme/scss/scss-variables.scss</import>
+        </imports>
+        <stylesheets>
+          <stylesheet id="fullmoon">../css/backoffice/main.scss</stylesheet>
+          <stylesheet id="editor">combodo-backoffice-darkmoon-theme/scss/editor.scss</stylesheet>
+        </stylesheets>
+        <precompiled_stylesheet>combodo-backoffice-darkmoon-theme/precompiled-themes/main.css</precompiled_stylesheet>
+      </theme>
+    </themes>
+  </branding>
+</itop_design>

datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/cs.dict.combodo-backoffice-darkmoon-theme.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2021 Combodo SARL
+ * @license    http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with iTop. If not, see <http://www.gnu.org/licenses/>
+ */
+
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+	'theme:darkmoon' => 'Dark moon~~',
+));

datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/da.dict.combodo-backoffice-darkmoon-theme.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2021 Combodo SARL
+ * @license    http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with iTop. If not, see <http://www.gnu.org/licenses/>
+ */
+
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+	'theme:darkmoon' => 'Dark moon~~',
+));

datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/de.dict.combodo-backoffice-darkmoon-theme.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2021 Combodo SARL
+ * @license    http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with iTop. If not, see <http://www.gnu.org/licenses/>
+ */
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'theme:darkmoon' => 'Dark moon~~',
+));

datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/en.dict.combodo-backoffice-darkmoon-theme.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2021 Combodo SARL
+ * @license    http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with iTop. If not, see <http://www.gnu.org/licenses/>
+ */
+
+Dict::Add('EN US', 'English', 'English', array(
+	'theme:darkmoon' => 'Dark moon',
+));

datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/es_cr.dict.combodo-backoffice-darkmoon-theme.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2021 Combodo SARL
+ * @license    http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with iTop. If not, see <http://www.gnu.org/licenses/>
+ */
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
+	'theme:darkmoon' => 'Dark moon~~',
+));

datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/fr.dict.combodo-backoffice-darkmoon-theme.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2021 Combodo SARL
+ * @license    http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with iTop. If not, see <http://www.gnu.org/licenses/>
+ */
+
+Dict::Add('FR FR', 'French', 'Français', array(
+	'theme:darkmoon' => 'Dark moon~~',
+));

datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/hu.dict.combodo-backoffice-darkmoon-theme.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2021 Combodo SARL
+ * @license    http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with iTop. If not, see <http://www.gnu.org/licenses/>
+ */
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'theme:darkmoon' => 'Dark moon~~',
+));

datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/it.dict.combodo-backoffice-darkmoon-theme.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2021 Combodo SARL
+ * @license    http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with iTop. If not, see <http://www.gnu.org/licenses/>
+ */
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'theme:darkmoon' => 'Dark moon~~',
+));

datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/ja.dict.combodo-backoffice-darkmoon-theme.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2021 Combodo SARL
+ * @license    http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with iTop. If not, see <http://www.gnu.org/licenses/>
+ */
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'theme:darkmoon' => 'Dark moon~~',
+));

datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/nl.dict.combodo-backoffice-darkmoon-theme.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2021 Combodo SARL
+ * @license    http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with iTop. If not, see <http://www.gnu.org/licenses/>
+ */
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'theme:darkmoon' => 'Dark moon~~',
+));

datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/pt_br.dict.combodo-backoffice-darkmoon-theme.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2021 Combodo SARL
+ * @license    http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with iTop. If not, see <http://www.gnu.org/licenses/>
+ */
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'theme:darkmoon' => 'Dark moon~~',
+));

datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/ru.dict.combodo-backoffice-darkmoon-theme.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2021 Combodo SARL
+ * @license    http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with iTop. If not, see <http://www.gnu.org/licenses/>
+ */
+
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'theme:darkmoon' => 'Dark moon~~',
+));

datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/sk.dict.combodo-backoffice-darkmoon-theme.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2021 Combodo SARL
+ * @license    http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with iTop. If not, see <http://www.gnu.org/licenses/>
+ */
+
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
+	'theme:darkmoon' => 'Dark moon~~',
+));

datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/tr.dict.combodo-backoffice-darkmoon-theme.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2021 Combodo SARL
+ * @license    http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with iTop. If not, see <http://www.gnu.org/licenses/>
+ */
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'theme:darkmoon' => 'Dark moon~~',
+));

datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/zh_cn.dict.combodo-backoffice-darkmoon-theme.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2021 Combodo SARL
+ * @license    http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with iTop. If not, see <http://www.gnu.org/licenses/>
+ */
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'theme:darkmoon' => 'Dark moon~~',
+));

datamodels/2.x/combodo-backoffice-darkmoon-theme/model.combodo-backoffice-darkmoon-theme.php

@@ -0,0 +1,17 @@
+<?php
+
+// PHP Data Model definition file
+
+// WARNING - WARNING - WARNING
+// DO NOT EDIT THIS FILE (unless you know what you are doing)
+//
+// If you use supply a datamodel.xxxx.xml file with your module
+// the this file WILL BE overwritten by the compilation of the
+// module (during the setup) if the datamodel.xxxx.xml file
+// contains the definition of new classes or menus.
+//
+// The recommended way to define new classes (for iTop 2.0) is via the XML definition.
+// This file remains in the module's template only for the cases where there is:
+// - either no new class or menu defined in the XML file
+// - or no XML file at all supplied by the module
+

datamodels/2.x/combodo-backoffice-darkmoon-theme/module.combodo-backoffice-darkmoon-theme.php

@@ -0,0 +1,52 @@
+<?php
+//
+// iTop module definition file
+//
+
+SetupWebPage::AddModule(
+	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
+	'combodo-backoffice-darkmoon-theme/3.0.1',
+	array(
+		// Identification
+		//
+		'label' => 'Backoffice: Darkmoon theme',
+		'category' => 'business',
+
+		// Setup
+		//
+		'dependencies' => array(
+			
+		),
+		'mandatory' => true,
+		'visible' => false,
+
+		// Components
+		//
+		'datamodel' => array(
+			'model.combodo-backoffice-darkmoon-theme.php'
+		),
+		'webservice' => array(
+			
+		),
+		'data.struct' => array(
+			// add your 'structure' definition XML files here,
+		),
+		'data.sample' => array(
+			// add your sample data XML files here,
+		),
+		
+		// Documentation
+		//
+		'doc.manual_setup' => '', // hyperlink to manual setup documentation, if any
+		'doc.more_information' => '', // hyperlink to more information, if any 
+
+		// Default settings
+		//
+		'settings' => array(
+			// Module specific settings go here, if any
+		),
+	)
+);
+
+
+?>

datamodels/2.x/combodo-backoffice-darkmoon-theme/scss/editor.scss

@@ -0,0 +1,829 @@
+
+.cke_reset_all,
+.cke_reset_all *,
+.cke_reset_all a,
+.cke_reset_all textarea {
+	color: $ibo-color-grey-950  !important;
+}
+.cke_reset_all fieldset {
+	border: 2px groove #e0dfe3  !important;
+}
+.cke_chrome {
+	border: 1px solid $ibo-color-grey-300 !important;
+}
+.cke_editable{
+  background: $ibo-color-grey-100;
+}
+.cke_inner {
+	background: $ibo-color-grey-300 !important;
+}
+.cke_top {
+	border-bottom: 1px solid $ibo-color-grey-500 !important;
+	background: $ibo-color-grey-200 !important;
+	white-space: normal !important;
+}
+.cke_float .cke_top {
+	border: 1px solid $ibo-color-grey-500 !important;
+}
+.cke_bottom {
+
+	border-top: 1px solid $ibo-color-grey-500 !important;
+	background: $ibo-color-grey-200 !important;
+}
+.cke_browser_ios .cke_contents {
+	overflow-y: auto;
+	-webkit-overflow-scrolling: touch;
+}
+.cke_resizer {
+	border-color: transparent #bcbcbc transparent transparent;
+}
+.cke_resizer_rtl {
+	border-color: transparent transparent transparent #bcbcbc;
+}
+.cke_panel {
+	background-color: $ibo-color-grey-200;
+	border: 1px solid #d1d1d1;
+}
+.cke_panel_listItem.cke_selected a,
+.cke_panel_listItem a:hover,
+.cke_panel_listItem a:focus,
+.cke_panel_listItem a:active {
+	background-color: #e9e9e9;
+}
+.cke_panel_listItem a:focus {
+	outline: 1px dotted #000;
+}
+
+.cke_panel_grouptitle {
+	color: #484848;
+	border-bottom: 1px solid #d1d1d1;
+	background: #f8f8f8;
+}
+.cke_colorblock,
+.cke_colorblock a {
+	text-decoration: none;
+	color: #000;
+}
+a:hover.cke_colorbox,
+a:focus.cke_colorbox,
+a:active.cke_colorbox {
+	outline: 0;
+	padding: 0;
+	border: 2px solid #139ff7;
+}
+a:hover.cke_colorbox {
+	border-color: #bcbcbc;
+}
+a.cke_colorauto,
+a.cke_colormore {
+	border: #fff 1px solid;
+	padding: 3px;
+	display: block;
+	cursor: pointer;
+}
+a:hover.cke_colorauto,
+a:hover.cke_colormore,
+a:focus.cke_colorauto,
+a:focus.cke_colormore,
+a:active.cke_colorauto,
+a:active.cke_colormore {
+	outline: 0;
+	border: #139ff7 1px solid;
+	background-color: #f8f8f8;
+}
+a:hover.cke_colorauto,
+a:hover.cke_colormore {
+	border-color: #bcbcbc;
+}
+.cke_colorauto span.cke_colorbox {
+	width: 18px;
+	height: 18px;
+	border: 1px solid #808080;
+	margin-left: 1px;
+	margin-top: 3px;
+}
+.cke_rtl .cke_colorauto span.cke_colorbox {
+	margin-left: 0;
+	margin-right: 1px;
+}
+span.cke_colorbox[style*="#ffffff"],
+span.cke_colorbox[style*="#FFFFFF"],
+span.cke_colorbox[style="background-color:#fff"],
+span.cke_colorbox[style="background-color:#FFF"],
+span.cke_colorbox[style*="rgb(255,255,255)"],
+span.cke_colorbox[style*="rgb(255, 255, 255)"] {
+	border: 1px solid #808080;
+	width: 18px;
+	height: 18px;
+}
+.cke_toolbar {
+	float: left;
+}
+.cke_rtl .cke_toolbar {
+	float: right;
+}
+.cke_toolgroup {
+	border: 0;
+	float: left;
+	margin: 1px 2px 6px 0;
+	padding-right: 3px;
+}
+.cke_rtl .cke_toolgroup {
+	float: right;
+	margin: 1px 0 6px 2px;
+	padding-left: 3px;
+	padding-right: 0;
+}
+.cke_hc .cke_toolgroup {
+	margin-right: 5px;
+	margin-bottom: 5px;
+}
+.cke_hc.cke_rtl .cke_toolgroup {
+	margin-right: 0;
+	margin-left: 5px;
+}
+a.cke_button {
+	display: inline-block;
+	height: 18px;
+	padding: 4px 6px;
+	outline: 0;
+	cursor: default;
+	float: left;
+	border: 0;
+	position: relative;
+}
+a.cke_button_expandable {
+	padding: 4px 5px;
+}
+.cke_rtl a.cke_button {
+	float: right;
+}
+.cke_hc a.cke_button {
+	border: 1px solid black;
+	padding: 3px 5px;
+	margin: 0 3px 5px 0;
+}
+.cke_hc.cke_rtl a.cke_button {
+	margin: 0 0 5px 3px;
+}
+a.cke_button_on {
+	background: #fff;
+	border: 1px #bcbcbc solid;
+	padding: 3px 5px;
+}
+a.cke_button_expandable.cke_button_on {
+	padding: 3px 4px;
+}
+a.cke_button_off:hover,
+a.cke_button_off:focus,
+a.cke_button_off:active {
+	background: #e5e5e5;
+	border: 1px #bcbcbc solid;
+	padding: 3px 5px;
+}
+a.cke_button_expandable.cke_button_off:hover,
+a.cke_button_expandable.cke_button_off:focus,
+a.cke_button_expandable.cke_button_off:active {
+	padding: 3px 4px;
+}
+.cke_hc a.cke_button_on,
+.cke_hc a.cke_button_off:hover,
+.cke_hc a.cke_button_off:focus,
+.cke_hc a.cke_button_off:active {
+	background: #e5e5e5;
+	border: 3px solid #000;
+	padding: 1px 3px;
+}
+a.cke_button_disabled:hover,
+a.cke_button_disabled:focus,
+a.cke_button_disabled:active {
+	border: 0;
+	padding: 4px 6px;
+	background-color: transparent;
+}
+a.cke_button_expandable.cke_button_disabled:hover,
+a.cke_button_expandable.cke_button_disabled:active {
+	padding: 4px 5px;
+}
+a.cke_button_disabled:focus {
+	border: 1px #bcbcbc solid;
+	padding: 3px 5px;
+}
+a.cke_button_expandable.cke_button_disabled:focus {
+	padding: 3px 4px;
+}
+.cke_hc a.cke_button_disabled:hover,
+.cke_hc a.cke_button_disabled:focus,
+.cke_hc a.cke_button_disabled:active {
+	border: 1px solid #acacac;
+	padding: 3px 5px;
+	margin: 0 3px 5px 0;
+}
+.cke_hc a.cke_button_disabled:focus {
+	border: 3px solid #000;
+	padding: 1px 3px;
+}
+.cke_hc.cke_rtl a.cke_button_disabled:hover,
+.cke_hc.cke_rtl a.cke_button_disabled:focus,
+.cke_hc.cke_rtl a.cke_button_disabled:active {
+	margin: 0 0 5px 3px;
+}
+a.cke_button_disabled .cke_button_icon,
+a.cke_button_disabled .cke_button_arrow {
+	opacity: 0.3;
+}
+.cke_hc a.cke_button_disabled {
+	border-color: #acacac;
+}
+.cke_hc a.cke_button_disabled .cke_button_icon,
+.cke_hc a.cke_button_disabled .cke_button_label {
+	opacity: 0.5;
+}
+.cke_toolgroup a.cke_button:last-child:after,
+.cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after {
+	content: "";
+	position: absolute;
+	height: 18px;
+	width: 0;
+	border-right: 1px solid #bcbcbc;
+	margin-top: 4px;
+	top: 0;
+	right: -3px;
+}
+.cke_rtl .cke_toolgroup a.cke_button:last-child:after,
+.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after {
+	border-right: 0;
+	right: auto;
+	border-left: 1px solid #bcbcbc;
+	top: 0;
+	left: -3px;
+}
+.cke_hc .cke_toolgroup a.cke_button:last-child:after,
+.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,
+.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after {
+	border-color: #000;
+	top: 0;
+	right: -7px;
+}
+.cke_hc.cke_rtl .cke_toolgroup a.cke_button:last-child:after,
+.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,
+.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after {
+	top: 0;
+	right: auto;
+	left: -7px;
+}
+.cke_toolgroup a.cke_button:hover:last-child:after,
+.cke_toolgroup a.cke_button:focus:last-child:after,
+.cke_toolgroup a.cke_button.cke_button_on:last-child:after {
+	top: -1px;
+	right: -4px;
+}
+.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,
+.cke_rtl .cke_toolgroup a.cke_button:focus:last-child:after,
+.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after {
+	top: -1px;
+	right: auto;
+	left: -4px;
+}
+.cke_hc .cke_toolgroup a.cke_button:hover:last-child:after,
+.cke_hc .cke_toolgroup a.cke_button.cke_button_on:last-child:after {
+	top: -2px;
+	right: -9px;
+}
+.cke_hc.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,
+.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after {
+	top: -2px;
+	right: auto;
+	left: -9px;
+}
+.cke_toolbar.cke_toolbar_last .cke_toolgroup a.cke_button:last-child:after {
+	content: none;
+	border: 0;
+	width: 0;
+	height: 0;
+}
+.cke_button_icon {
+	cursor: inherit;
+	background-repeat: no-repeat;
+	margin-top: 1px;
+	width: 16px;
+	height: 16px;
+	float: left;
+	display: inline-block;
+}
+.cke_rtl .cke_button_icon {
+	float: right;
+}
+.cke_hc .cke_button_icon {
+	display: none;
+}
+.cke_button_label {
+	display: none;
+	padding-left: 3px;
+	margin-top: 1px;
+	line-height: 17px;
+	vertical-align: middle;
+	float: left;
+	cursor: default;
+	color: #484848;
+}
+.cke_rtl .cke_button_label {
+	padding-right: 3px;
+	padding-left: 0;
+	float: right;
+}
+.cke_hc .cke_button_label {
+	padding: 0;
+	display: inline-block;
+	font-size: 12px;
+}
+.cke_button_arrow {
+	display: inline-block;
+	margin: 8px 0 0 3px;
+	width: 0;
+	height: 0;
+	cursor: default;
+	vertical-align: top;
+	border-left: 3px solid transparent;
+	border-right: 3px solid transparent;
+	border-top: 3px solid #484848;
+}
+.cke_rtl .cke_button_arrow {
+	margin-right: 5px;
+	margin-left: 0;
+}
+.cke_hc .cke_button_arrow {
+	font-size: 10px;
+	margin: 3px 0 0 3px;
+	width: auto;
+	border: 0;
+}
+.cke_toolbar_separator {
+	float: left;
+	background-color: #bcbcbc;
+	margin: 4px 2px 0 2px;
+	height: 18px;
+	width: 1px;
+}
+.cke_rtl .cke_toolbar_separator {
+	float: right;
+}
+.cke_hc .cke_toolbar_separator {
+	background-color: #000;
+	margin-left: 2px;
+	margin-right: 5px;
+	margin-bottom: 9px;
+}
+.cke_hc.cke_rtl .cke_toolbar_separator {
+	margin-left: 5px;
+	margin-right: 2px;
+}
+.cke_toolbar_break {
+	display: block;
+	clear: left;
+}
+.cke_rtl .cke_toolbar_break {
+	clear: right;
+}
+a.cke_toolbox_collapser {
+	width: 12px;
+	height: 11px;
+	float: right;
+	margin: 11px 0 0;
+	font-size: 0;
+	cursor: default;
+	text-align: center;
+	border: 1px solid #bcbcbc;
+}
+.cke_rtl .cke_toolbox_collapser {
+	float: left;
+}
+.cke_toolbox_collapser:hover {
+	background: #e5e5e5;
+}
+.cke_toolbox_collapser.cke_toolbox_collapser_min {
+	margin: 0 2px 4px;
+}
+.cke_toolbox_collapser .cke_arrow {
+	display: inline-block;
+	height: 0;
+	width: 0;
+	font-size: 0;
+	margin-top: 1px;
+	border: 3px solid transparent;
+	border-bottom-color: #484848;
+}
+.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow {
+	margin-top: 4px;
+	border-bottom-color: transparent;
+	border-top-color: #484848;
+}
+.cke_hc .cke_toolbox_collapser .cke_arrow {
+	font-size: 8px;
+	width: auto;
+	border: 0;
+	margin-top: 0;
+}
+.cke_menuitem span {
+	cursor: default;
+}
+.cke_menubutton {
+	display: block;
+}
+.cke_hc .cke_menubutton {
+	padding: 2px;
+}
+.cke_menubutton:hover,
+.cke_menubutton:focus,
+.cke_menubutton:active {
+	background-color: #e9e9e9;
+	display: block;
+	outline: 1px dotted;
+}
+.cke_menubutton:hover {
+	outline: 0;
+}
+.cke_hc .cke_menubutton:hover,
+.cke_hc .cke_menubutton:focus,
+.cke_hc .cke_menubutton:active {
+	border: 2px solid;
+	padding: 0;
+}
+.cke_menubutton_disabled:hover,
+.cke_menubutton_disabled:focus,
+.cke_menubutton_disabled:active {
+	background-color: transparent;
+	outline: 0;
+}
+.cke_menubutton_inner {
+	display: table-row;
+}
+.cke_menubutton_icon,
+.cke_menubutton_label,
+.cke_menuarrow {
+	display: table-cell;
+}
+.cke_menubutton_icon {
+	background-color: #f8f8f8;
+	padding: 6px 4px;
+}
+.cke_hc .cke_menubutton_icon {
+	height: 16px;
+	width: 0;
+	padding: 4px 0;
+}
+.cke_menubutton:hover .cke_menubutton_icon,
+.cke_menubutton:focus .cke_menubutton_icon,
+.cke_menubutton:active .cke_menubutton_icon {
+	background-color: #e9e9e9;
+}
+.cke_menubutton_disabled:hover .cke_menubutton_icon,
+.cke_menubutton_disabled:focus .cke_menubutton_icon,
+.cke_menubutton_disabled:active .cke_menubutton_icon {
+	background-color: #f8f8f8;
+	outline: 0;
+}
+.cke_menuitem .cke_menubutton_on {
+	background-color: #e9e9e9;
+	border: 1px solid #dedede;
+	outline: 0;
+}
+.cke_menubutton_on .cke_menubutton_icon {
+	padding-right: 3px;
+	background-color: #e9e9e9;
+}
+.cke_menubutton_label {
+	padding: 0 5px;
+	background-color: transparent;
+	width: 100%;
+	vertical-align: middle;
+}
+.cke_menubutton_shortcut {
+	color: #979797;
+}
+.cke_menubutton_disabled .cke_menubutton_label {
+	opacity: 0.3;
+	filter: alpha(opacity=30);
+}
+.cke_panel_frame .cke_menubutton_label {
+	display: none;
+}
+.cke_menuseparator {
+	background-color: #d1d1d1;
+	height: 1px;
+}
+.cke_menuarrow {
+	background: transparent url(images/arrow.png) no-repeat 0 10px;
+	padding: 0 5px;
+}
+.cke_rtl .cke_menuarrow {
+	background-position: 5px -13px;
+	background-repeat: no-repeat;
+}
+.cke_hc .cke_menuarrow {
+	background-image: none;
+}
+.cke_menuarrow span {
+	display: none;
+}
+.cke_hc .cke_menuarrow span {
+	vertical-align: middle;
+	display: inline;
+}
+.cke_combo {
+	display: inline-block;
+	float: left;
+	position: relative;
+	margin-bottom: 5px;
+}
+.cke_rtl .cke_combo {
+	float: right;
+}
+.cke_hc .cke_combo {
+	margin-top: 1px;
+	margin-bottom: 10px;
+}
+.cke_combo:after {
+	content: "";
+	position: absolute;
+	height: 18px;
+	width: 0;
+	border-right: 1px solid #bcbcbc;
+	margin-top: 5px;
+	top: 0;
+	right: 0;
+}
+.cke_rtl .cke_combo:after {
+	border-right: 0;
+	border-left: 1px solid #bcbcbc;
+	right: auto;
+	left: 0;
+}
+.cke_hc .cke_combo:after {
+	border-color: #000;
+}
+a.cke_combo_button {
+	cursor: default;
+	display: inline-block;
+	float: left;
+	margin: 0;
+	padding: 1px;
+}
+.cke_rtl a.cke_combo_button {
+	float: right;
+}
+.cke_hc a.cke_combo_button {
+	padding: 4px;
+}
+.cke_combo_on a.cke_combo_button,
+.cke_combo_off a.cke_combo_button:hover,
+.cke_combo_off a.cke_combo_button:focus,
+.cke_combo_off a.cke_combo_button:active {
+	background: #e5e5e5;
+	border: 1px solid #bcbcbc;
+	padding: 0 0 0 1px;
+	margin-left: -1px;
+}
+.cke_combo_off a.cke_combo_button:focus {
+	outline: 0;
+}
+.cke_combo_on a.cke_combo_button,
+.cke_combo_off a.cke_combo_button:active {
+	background: #fff;
+}
+.cke_rtl .cke_combo_on a.cke_combo_button,
+.cke_rtl .cke_combo_off a.cke_combo_button:hover,
+.cke_rtl .cke_combo_off a.cke_combo_button:focus,
+.cke_rtl .cke_combo_off a.cke_combo_button:active {
+	padding: 0 1px 0 0;
+	margin-left: 0;
+	margin-right: -1px;
+}
+.cke_hc .cke_combo_on a.cke_combo_button,
+.cke_hc .cke_combo_off a.cke_combo_button:hover,
+.cke_hc .cke_combo_off a.cke_combo_button:focus,
+.cke_hc .cke_combo_off a.cke_combo_button:active {
+	border: 3px solid #000;
+	padding: 1px 1px 1px 2px;
+}
+.cke_hc.cke_rtl .cke_combo_on a.cke_combo_button,
+.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:hover,
+.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:focus,
+.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:active {
+	padding: 1px 2px 1px 1px;
+}
+.cke_toolbar_start + .cke_combo_on a.cke_combo_button,
+.cke_toolbar_start + .cke_combo_off a.cke_combo_button:hover,
+.cke_toolbar_start + .cke_combo_off a.cke_combo_button:focus,
+.cke_toolbar_start + .cke_combo_off a.cke_combo_button:active {
+	padding: 0 0 0 3px;
+	margin-left: -3px;
+}
+.cke_rtl .cke_toolbar_start + .cke_combo_on a.cke_combo_button,
+.cke_rtl .cke_toolbar_start + .cke_combo_off a.cke_combo_button:hover,
+.cke_rtl .cke_toolbar_start + .cke_combo_off a.cke_combo_button:focus,
+.cke_rtl .cke_toolbar_start + .cke_combo_off a.cke_combo_button:active {
+	padding: 0 3px 0 0;
+	margin-left: 0;
+	margin-right: -3px;
+}
+.cke_hc .cke_toolbar > .cke_toolbar_start + .cke_combo_on a.cke_combo_button,
+.cke_hc .cke_toolbar > .cke_toolbar_start + .cke_combo_off a.cke_combo_button:hover,
+.cke_hc .cke_toolbar > .cke_toolbar_start + .cke_combo_off a.cke_combo_button:focus,
+.cke_hc .cke_toolbar > .cke_toolbar_start + .cke_combo_off a.cke_combo_button:active {
+	padding: 1px 1px 1px 7px;
+	margin-left: -6px;
+}
+.cke_hc.cke_rtl .cke_toolbar > .cke_toolbar_start + .cke_combo_on a.cke_combo_button,
+.cke_hc.cke_rtl .cke_toolbar > .cke_toolbar_start + .cke_combo_off a.cke_combo_button:hover,
+.cke_hc.cke_rtl .cke_toolbar > .cke_toolbar_start + .cke_combo_off a.cke_combo_button:focus,
+.cke_hc.cke_rtl .cke_toolbar > .cke_toolbar_start + .cke_combo_off a.cke_combo_button:active {
+	padding: 1px 7px 1px 1px;
+	margin-left: 0;
+	margin-right: -6px;
+}
+.cke_toolbox .cke_toolbar:first-child > .cke_toolbar_start + .cke_combo_on a.cke_combo_button,
+.cke_toolbox .cke_toolbar:first-child > .cke_toolbar_start + .cke_combo_off a.cke_combo_button:hover,
+.cke_toolbox .cke_toolbar:first-child > .cke_toolbar_start + .cke_combo_off a.cke_combo_button:focus,
+.cke_toolbox .cke_toolbar:first-child > .cke_toolbar_start + .cke_combo_off a.cke_combo_button:active,
+.cke_toolbar_break + .cke_toolbar > .cke_toolbar_start + .cke_combo_on a.cke_combo_button,
+.cke_toolbar_break + .cke_toolbar > .cke_toolbar_start + .cke_combo_off a.cke_combo_button:hover,
+.cke_toolbar_break + .cke_toolbar > .cke_toolbar_start + .cke_combo_off a.cke_combo_button:focus,
+.cke_toolbar_break + .cke_toolbar > .cke_toolbar_start + .cke_combo_off a.cke_combo_button:active {
+	padding: 0;
+	margin: 0;
+}
+.cke_hc .cke_toolbox .cke_toolbar:first-child > .cke_toolbar_start + .cke_combo_on a.cke_combo_button,
+.cke_hc .cke_toolbox .cke_toolbar:first-child > .cke_toolbar_start + .cke_combo_off a.cke_combo_button:hover,
+.cke_hc .cke_toolbox .cke_toolbar:first-child > .cke_toolbar_start + .cke_combo_off a.cke_combo_button:focus,
+.cke_hc .cke_toolbox .cke_toolbar:first-child > .cke_toolbar_start + .cke_combo_off a.cke_combo_button:active,
+.cke_hc .cke_toolbar_break + .cke_toolbar > .cke_toolbar_start + .cke_combo_on a.cke_combo_button,
+.cke_hc .cke_toolbar_break + .cke_toolbar > .cke_toolbar_start + .cke_combo_off a.cke_combo_button:hover,
+.cke_hc .cke_toolbar_break + .cke_toolbar > .cke_toolbar_start + .cke_combo_off a.cke_combo_button:focus,
+.cke_hc .cke_toolbar_break + .cke_toolbar > .cke_toolbar_start + .cke_combo_off a.cke_combo_button:active {
+	padding: 1px;
+	margin: 0;
+}
+.cke_toolbar .cke_combo + .cke_toolbar_end,
+.cke_toolbar .cke_combo + .cke_toolgroup {
+	margin-right: 0;
+	margin-left: 2px;
+}
+.cke_rtl .cke_toolbar .cke_combo + .cke_toolbar_end,
+.cke_rtl .cke_toolbar .cke_combo + .cke_toolgroup {
+	margin-left: 0;
+	margin-right: 2px;
+}
+.cke_hc .cke_toolbar .cke_combo + .cke_toolbar_end,
+.cke_hc .cke_toolbar .cke_combo + .cke_toolgroup {
+	margin-left: 5px;
+}
+.cke_hc.cke_rtl .cke_toolbar .cke_combo + .cke_toolbar_end,
+.cke_hc.cke_rtl .cke_toolbar .cke_combo + .cke_toolgroup {
+	margin-left: 0;
+	margin-right: 5px;
+}
+.cke_toolbar.cke_toolbar_last .cke_combo:nth-last-child(-n + 2):after {
+	content: none;
+	border: 0;
+	width: 0;
+	height: 0;
+}
+.cke_combo_text {
+	line-height: 26px;
+	padding-left: 10px;
+	text-overflow: ellipsis;
+	overflow: hidden;
+	float: left;
+	cursor: default;
+	color: #484848;
+	width: 60px;
+}
+.cke_rtl .cke_combo_text {
+	float: right;
+	text-align: right;
+	padding-left: 0;
+	padding-right: 10px;
+}
+.cke_hc .cke_combo_text {
+	line-height: 18px;
+	font-size: 12px;
+}
+.cke_combo_open {
+	cursor: default;
+	display: inline-block;
+	font-size: 0;
+	height: 19px;
+	line-height: 17px;
+	margin: 1px 10px 1px;
+	width: 5px;
+}
+.cke_hc .cke_combo_open {
+	height: 12px;
+}
+.cke_combo_arrow {
+	cursor: default;
+	margin: 11px 0 0;
+	float: left;
+	height: 0;
+	width: 0;
+	font-size: 0;
+	border-left: 3px solid transparent;
+	border-right: 3px solid transparent;
+	border-top: 3px solid #484848;
+}
+.cke_hc .cke_combo_arrow {
+	font-size: 10px;
+	width: auto;
+	border: 0;
+	margin-top: 3px;
+}
+.cke_combo_label {
+	display: none;
+	float: left;
+	line-height: 26px;
+	vertical-align: top;
+	margin-right: 5px;
+}
+.cke_rtl .cke_combo_label {
+	float: right;
+	margin-left: 5px;
+	margin-right: 0;
+}
+.cke_combo_disabled .cke_combo_inlinelabel,
+.cke_combo_disabled .cke_combo_open {
+	opacity: 0.3;
+}
+.cke_path {
+	float: left;
+	margin: -2px 0 2px;
+}
+a.cke_path_item,
+span.cke_path_empty {
+	display: inline-block;
+	float: left;
+	padding: 3px 4px;
+	margin-right: 2px;
+	cursor: default;
+	text-decoration: none;
+	outline: 0;
+	border: 0;
+	color: #484848;
+	font-weight: bold;
+	font-size: 11px;
+}
+.cke_rtl .cke_path,
+.cke_rtl .cke_path_item,
+.cke_rtl .cke_path_empty {
+	float: right;
+}
+a.cke_path_item:hover,
+a.cke_path_item:focus,
+a.cke_path_item:active {
+	background-color: #e5e5e5;
+}
+.cke_hc a.cke_path_item:hover,
+.cke_hc a.cke_path_item:focus,
+.cke_hc a.cke_path_item:active {
+	border: 2px solid;
+	padding: 1px 2px;
+}
+.cke_button__source_label,
+.cke_button__sourcedialog_label {
+	display: inline;
+}
+.cke_combopanel__fontsize {
+	width: 135px;
+}
+textarea.cke_source {
+	font-family: "Courier New", Monospace;
+	font-size: small;
+	background-color: #fff;
+	white-space: pre-wrap;
+	border: 0;
+	padding: 0;
+	margin: 0;
+	display: block;
+}
+.cke_wysiwyg_frame,
+.cke_wysiwyg_div {
+	background-color: #fff;
+}
+.cke_notifications_area {
+	pointer-events: none;
+}
+.cke_notification {
+	pointer-events: auto;
+	position: relative;
+	margin: 10px;
+	width: 300px;
+	color: white;
+	text-align: center;
+	opacity: 0.95;
+	filter: alpha(opacity = 95);
+	-webkit-animation: fadeIn 0.7s;
+	animation: fadeIn 0.7s;
+}
+.cke_notification_message a {
+	color: #12306f;
+}

datamodels/2.x/combodo-backoffice-darkmoon-theme/vendors/nord/.gitattributes

@@ -0,0 +1,35 @@
+# Automatically perform line feed (LF) normalization for files detected as text and leave all files detected as binary
+# untouched.
+* text=auto
+
+# +----------------------+
+# + Adobe Creative Suite +
+# +----------------------+
+# Color Swatch Exchange
+*.ase binary
+
+# +-------------------+
+# + Adobe Illustrator +
+# +-------------------+
+# Project Map
+*.ai binary
+
+# +-----------------+
+# + Adobe Photoshop +
+# +-----------------+
+# Color Palette
+*.aco binary
+
+# +---------------+
+# + GIMP/Inkscape +
+# +---------------+
+# Color Palette
+*.gpl text eol=lf
+# Project Map
+*.xcf binary
+
+# +-------+
+# + Gpick +
+# +-------+
+# Color Palette
+*.gpa binary

datamodels/2.x/combodo-backoffice-darkmoon-theme/vendors/nord/.gitignore

@@ -0,0 +1,23 @@
+# +---------+
+# + Node.js +
+# +---------+
+node_modules
+npm-debug.log*
+.npm/
+*.log
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# +-------------------+
+# + Project Structure +
+# +-------------------+
+build
+
+# +------+
+# + Sass +
+# +------+
+.sass-cache
+*.css.map

datamodels/2.x/combodo-backoffice-darkmoon-theme/vendors/nord/.sassdocrc

@@ -0,0 +1,12 @@
+{
+  "dest": "./build/documentation/sassdoc",
+  "package": "package.json",
+  "groups": {
+    "polarnight": "Polar Night",
+    "snowstorm": "Snow Storm",
+    "frost": "Frost",
+    "aurora": "Aurora"
+  },
+  "theme": "flippant",
+  "verbose": true
+}

datamodels/2.x/combodo-backoffice-darkmoon-theme/vendors/nord/.travis.yml

@@ -0,0 +1,20 @@
+# ++++++++++++++++++++++++++++++++++++++++++++++++++++
+# title      Travis CI Build Configuration           +
+# project    nord                                    +
+# repository https://github.com/arcticicestudio/nord +
+# author     Arctic Ice Studio                       +
+# email      development@arcticicestudio.com         +
+# copyright  Copyright (C) 2016                      +
+# ++++++++++++++++++++++++++++++++++++++++++++++++++++
+#
+# [References]
+# Travis CI Documentation
+#   (https://docs.travis-ci.com)
+language: node_js
+cache:
+ directories:
+    - $HOME/node_modules
+before_script:
+  - npm install -g gulp
+  - npm install
+script: gulp compile-css-template sassdoc

datamodels/2.x/combodo-backoffice-darkmoon-theme/vendors/nord/CHANGELOG.md

@@ -0,0 +1,86 @@
+<p align="center"><img src="https://cdn.rawgit.com/arcticicestudio/nord/develop/src/assets/nord-logo-banner.svg"/></p>
+
+<p align="center"><img src="https://assets-cdn.github.com/favicon.ico" width=24 height=24/> <a href="https://github.com/arcticicestudio/nord/releases/latest"><img src="https://img.shields.io/github/release/arcticicestudio/nord.svg"/></a> <img src="https://www.npmjs.com/static/images/touch-icons/favicon-32x32.png" width=24 height=24/> <a href="https://www.npmjs.com/package/nord"><img src="https://img.shields.io/npm/v/nord.svg"/></a> <a href="https://www.npmjs.com/package/nord"><img src="https://img.shields.io/npm/dt/nord.svg"/></a> <a href="https://www.npmjs.com/package/nord"><img src="https://img.shields.io/npm/dm/nord.svg"/></a></p>
+
+---
+
+# 0.2.0 (2016-11-22)
+## Features
+### Project Assets
+Added new SVG variations of the color palette components.  
+Can be used for showcases or any kind of branding concepts. (@arcticicestudio, 78ef70b8)
+
+![Polar Night](https://cdn.rawgit.com/arcticicestudio/nord/develop/src/assets/nord-component-polar-night.svg) ![Snow Storm](https://cdn.rawgit.com/arcticicestudio/nord/develop/src/assets/nord-component-snow-storm.svg)
+![Frost](https://cdn.rawgit.com/arcticicestudio/nord/develop/src/assets/nord-component-frost.svg) ![Aurora](https://cdn.rawgit.com/arcticicestudio/nord/develop/src/assets/nord-component-aurora.svg)
+
+### Toolbox
+Created [Travis CI](https://travis-ci.org) (`.travis.yml`) and [Circle CI](https://circleci.com)  (`circle.yml`) configuration files for continuous builds against the Gulp tasks `compile-css-template` and `sassdoc`. (@arcticicestudio, #4, 00beff7d)
+
+## Improvements
+### Native Formats
+The "Adobe Photoshop Color Palette" [`nord.ase`](https://github.com/arcticicestudio/nord/blob/develop/src/native/nord.ase) is now fully compatible to Adobe Photoshop CS6.  
+The original file has been created via [Gpick](http://gpick.org) and has been recreated using [Adobe Photoshop CS6](http://www.adobe.com/products/photoshop.html) to be fully compatible to the vendor format. (@arcticicestudio, #5, 30ae2f4b)
+
+### Design Documentation
+Switched the color definitions for `nord8` and `nord14`.  
+The accent color `nord8` is now used for methods and functions while strings and attribute values are now colored by `nord14` instead.
+This is design has already been implemented in all port projects before, but is now officially stated with this release version. (@arcticicestudio, #1, 2a95e4c0)
+
+Switched the color of punctuations and variables/constants.  
+The `nord4` color is now used for variables and constants while punctuations are now colored by `nord6` instead.  
+This design has also already been implemented in all port projects before, but is now officially stated with this release version. (@arcticicestudio, #2, f8231acd)
+
+`nord13` is now used to colorize all kind of regular expressions. (@arcticicestudio, #3, adfcac5c)
+
+### Project Documentation
+Added new official [port projects](https://github.com/arcticicestudio/nord#port-projects). (@arcticicestudio, eacf9078, 51f46d1b, d51a995b)  
+[![Nord Eclipse Syntax](https://cdn.rawgit.com/arcticicestudio/nord/develop/src/assets/nord-eclipse-syntax-banner.svg)](https://github.com/arcticicestudio/nord-eclipse-syntax)  
+[![Nord gedit](https://cdn.rawgit.com/arcticicestudio/nord/develop/src/assets/banner-nord-gedit.svg)](https://github.com/arcticicestudio/nord-gedit)  
+[![Nord Java](https://cdn.rawgit.com/arcticicestudio/nord/develop/src/assets/nord-java-banner.svg)](https://github.com/arcticicestudio/nord-java)  
+[![Nord Terminix](https://cdn.rawgit.com/arcticicestudio/nord/develop/src/assets/nord-terminix-banner.svg)](https://github.com/arcticicestudio/nord-terminix)  
+
+Added [NPM](https://www.npmjs.com) registry badges to show the latest published version and amount of downloads. (@arcticicestudio, 2c061e15)
+<img src="https://www.npmjs.com/static/images/touch-icons/favicon-32x32.png" width=24 height=24/> <a href="https://www.npmjs.com/package/nord"><img src="https://img.shields.io/npm/v/nord.svg"/></a> <a href="https://www.npmjs.com/package/nord"><img src="https://img.shields.io/npm/dt/nord.svg"/></a> <a href="https://www.npmjs.com/package/nord"><img src="https://img.shields.io/npm/dm/nord.svg"/></a>
+
+# 0.1.0 (2016-09-04)
+![Nord Palette Overview](https://cdn.rawgit.com/arcticicestudio/nord/develop/src/assets/nord-overview.svg)
+
+## Features
+### <img src="http://sass-lang.com/favicon.ico" width=16 height=16 /> Sass
+  - Implemented the `nord.scss` stylesheet
+  - Implemented the `template-css.scss` stylesheet.  
+    This template can be compiled to a `nord.css` stylesheet via [Gulp][gulp]:
+    ```sh
+    npm install
+    gulp compile-css-template
+    ```
+
+#### <img src="http://sassdoc.com/favicon.png" width=16 height=16 /> Sassdoc
+Nord Sass sources are documented using the [Sassdoc][sassdoc] documentation syntax which can be compiled to a HTML documentation via [Gulp][gulp]:  
+```sh
+npm install
+gulp sassdoc
+```
+The Sassdoc theme can be changed by editing the `.sassdocrc` configuration file.
+
+### <img src="http://lesscss.org/public/ico/favicon.ico" width=16 height=16 /> LESSCSS
+  - Implemented the `nord.less` stylesheet
+
+#### KSS
+Nord LESSCSS sources are documented using the [KSS](http://warpspire.com/kss) documentation syntax.  
+Information about the generation of a styleguide can be found in the [official KSS documentation](http://warpspire.com/kss/styleguides).
+
+### ![][icon-color-swatch] Color Swatches
+Added various native color palette files: 
+  - **Adobe Photoshop**: `nord.aco` (binary)
+  - **Adobe Swatch Exchange**: `nord.ase`  (binary)
+  - **Gpick Palette**: `nord.gpa`  (binary)
+  - **GIMP/Inkscape/CinePaint/Krita Palette**:`nord.gpl`
+  - **Alias/WaveFront Material**: `nord.mtl`
+
+# 0.0.0 (2016-09-04)
+**Project Initialization**
+
+[icon-color-swatch]: https://cdn.rawgit.com/arcticicestudio/nord/develop/src/assets/icon-color-swatch.svg
+[sassdoc]: http://sassdoc.com
+[gulp]: http://gulpjs.com

datamodels/2.x/combodo-backoffice-darkmoon-theme/vendors/nord/LICENSE.md

@@ -0,0 +1,356 @@
+Apache License
+==============
+
+*Version 2.0, January 2004*  
+*&lt;<http://www.apache.org/licenses/>&gt;*
+
+### Terms and Conditions for use, reproduction, and distribution
+
+#### 1. Definitions
+
+"License" shall mean the terms and conditions for use, reproduction, and
+distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright
+owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities
+that control, are controlled by, or are under common control with that entity.
+For the purposes of this definition, "control" means **(i)** the power, direct or
+indirect, to cause the direction or management of such entity, whether by
+contract or otherwise, or **(ii)** ownership of fifty percent (50%) or more of the
+outstanding shares, or **(iii)** beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising
+permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including
+but not limited to software source code, documentation source, and configuration
+files.
+
+"Object" form shall mean any form resulting from mechanical transformation or
+translation of a Source form, including but not limited to compiled object code,
+generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made
+available under the License, as indicated by a copyright notice that is included
+in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that
+is based on (or derived from) the Work and for which the editorial revisions,
+annotations, elaborations, or other modifications represent, as a whole, an
+original work of authorship. For the purposes of this License, Derivative Works
+shall not include works that remain separable from, or merely link (or bind by
+name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version
+of the Work and any modifications or additions to that Work or Derivative Works
+thereof, that is intentionally submitted to Licensor for inclusion in the Work
+by the copyright owner or by an individual or Legal Entity authorized to submit
+on behalf of the copyright owner. For the purposes of this definition,
+"submitted" means any form of electronic, verbal, or written communication sent
+to the Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control systems, and
+issue tracking systems that are managed by, or on behalf of, the Licensor for
+the purpose of discussing and improving the Work, but excluding communication
+that is conspicuously marked or otherwise designated in writing by the copyright
+owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
+of whom a Contribution has been received by Licensor and subsequently
+incorporated within the Work.
+
+#### 2. Grant of Copyright License
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable copyright license to reproduce, prepare Derivative Works of,
+publicly display, publicly perform, sublicense, and distribute the Work and such
+Derivative Works in Source or Object form.
+
+#### 3. Grant of Patent License
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable (except as stated in this section) patent license to make, have
+made, use, offer to sell, sell, import, and otherwise transfer the Work, where
+such license applies only to those patent claims licensable by such Contributor
+that are necessarily infringed by their Contribution(s) alone or by combination
+of their Contribution(s) with the Work to which such Contribution(s) was
+submitted. If You institute patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Work or a
+Contribution incorporated within the Work constitutes direct or contributory
+patent infringement, then any patent licenses granted to You under this License
+for that Work shall terminate as of the date such litigation is filed.
+
+#### 4. Redistribution
+
+You may reproduce and distribute copies of the Work or Derivative Works thereof
+in any medium, with or without modifications, and in Source or Object form,
+provided that You meet the following conditions:
+
+* **(a)** You must give any other recipients of the Work or Derivative Works a copy of
+this License; and
+* **(b)** You must cause any modified files to carry prominent notices stating that You
+changed the files; and
+* **(c)** You must retain, in the Source form of any Derivative Works that You distribute,
+all copyright, patent, trademark, and attribution notices from the Source form
+of the Work, excluding those notices that do not pertain to any part of the
+Derivative Works; and
+* **(d)** If the Work includes a "NOTICE" text file as part of its distribution, then any
+Derivative Works that You distribute must include a readable copy of the
+attribution notices contained within such NOTICE file, excluding those notices
+that do not pertain to any part of the Derivative Works, in at least one of the
+following places: within a NOTICE text file distributed as part of the
+Derivative Works; within the Source form or documentation, if provided along
+with the Derivative Works; or, within a display generated by the Derivative
+Works, if and wherever such third-party notices normally appear. The contents of
+the NOTICE file are for informational purposes only and do not modify the
+License. You may add Your own attribution notices within Derivative Works that
+You distribute, alongside or as an addendum to the NOTICE text from the Work,
+provided that such additional attribution notices cannot be construed as
+modifying the License.
+
+You may add Your own copyright statement to Your modifications and may provide
+additional or different license terms and conditions for use, reproduction, or
+distribution of Your modifications, or for any such Derivative Works as a whole,
+provided Your use, reproduction, and distribution of the Work otherwise complies
+with the conditions stated in this License.
+
+#### 5. Submission of Contributions
+
+Unless You explicitly state otherwise, any Contribution intentionally submitted
+for inclusion in the Work by You to the Licensor shall be under the terms and
+conditions of this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify the terms of
+any separate license agreement you may have executed with Licensor regarding
+such Contributions.
+
+#### 6. Trademarks
+
+This License does not grant permission to use the trade names, trademarks,
+service marks, or product names of the Licensor, except as required for
+reasonable and customary use in describing the origin of the Work and
+reproducing the content of the NOTICE file.
+
+#### 7. Disclaimer of Warranty
+
+Unless required by applicable law or agreed to in writing, Licensor provides the
+Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
+including, without limitation, any warranties or conditions of TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
+solely responsible for determining the appropriateness of using or
+redistributing the Work and assume any risks associated with Your exercise of
+permissions under this License.
+
+#### 8. Limitation of Liability
+
+In no event and under no legal theory, whether in tort (including negligence),
+contract, or otherwise, unless required by applicable law (such as deliberate
+and grossly negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special, incidental,
+or consequential damages of any character arising as a result of this License or
+out of the use or inability to use the Work (including but not limited to
+damages for loss of goodwill, work stoppage, computer failure or malfunction, or
+any and all other commercial damages or losses), even if such Contributor has
+been advised of the possibility of such damages.
+
+#### 9. Accepting Warranty or Additional Liability
+
+While redistributing the Work or Derivative Works thereof, You may choose to
+offer, and charge a fee for, acceptance of support, warranty, indemnity, or
+other liability obligations and/or rights consistent with this License. However,
+in accepting such obligations, You may act only on Your own behalf and on Your
+sole responsibility, not on behalf of any other Contributor, and only if You
+agree to indemnify, defend, and hold each Contributor harmless for any liability
+incurred by, or claims asserted against, such Contributor by reason of your
+accepting any such warranty or additional liability.
+
+*END OF TERMS AND CONDITIONS*
+
+### APPENDIX: How to apply the Apache License to your work
+
+To apply the Apache License to your work, attach the following boilerplate
+notice, with the fields enclosed by brackets `[]` replaced with your own
+identifying information. (Don't include the brackets!) The text should be
+enclosed in the appropriate comment syntax for the file format. We also
+recommend that a file or class name and description of purpose be included on
+the same "printed page" as the copyright notice for easier identification within
+third-party archives.
+
+    Copyright [yyyy] [name of copyright owner]
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+      http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+## Creative Commons Attribution-ShareAlike 4.0 International Public License
+
+By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-ShareAlike 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.
+
+### Section 1 – Definitions.
+
+a. **Adapted Material** means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.
+
+b. **Adapter's License** means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License.
+
+c. **BY-SA Compatible License** means a license listed at [creativecommons.org/compatiblelicenses](http://creativecommons.org/compatiblelicenses), approved by Creative Commons as essentially the equivalent of this Public License.
+
+d. **Copyright and Similar Rights** means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights.
+
+e. **Effective Technological Measures** means those measures that, in the absence of proper authority, may not be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar international agreements.
+
+f. **Exceptions and Limitations** means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.
+
+g. **License Elements** means the license attributes listed in the name of a Creative Commons Public License. The License Elements of this Public License are Attribution and ShareAlike.
+
+h. **Licensed Material** means the artistic or literary work, database, or other material to which the Licensor applied this Public License.
+
+i. **Licensed Rights** means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.
+
+j. **Licensor** means the individual(s) or entity(ies) granting rights under this Public License.
+
+k. **Share** means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.
+
+l. **Sui Generis Database Rights** means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.
+
+m. **You** means the individual or entity exercising the Licensed Rights under this Public License. Your has a corresponding meaning.
+
+### Section 2 – Scope.
+
+a. **_License grant.**_
+
+    1. Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:
+
+        A. reproduce and Share the Licensed Material, in whole or in part; and
+
+        B. produce, reproduce, and Share Adapted Material.
+
+    2. **Exceptions and Limitations.** For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.
+
+    3. **Term.** The term of this Public License is specified in Section 6(a).
+
+    4. **Media and formats; technical modifications allowed.** The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section 2(a)(4) never produces Adapted Material.
+
+    5. **Downstream recipients.**
+
+        A. **Offer from the Licensor – Licensed Material.** Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.
+
+        B. **Additional offer from the Licensor – Adapted Material. Every recipient of Adapted Material from You automatically receives an offer from the Licensor to exercise the Licensed Rights in the Adapted Material under the conditions of the Adapter’s License You apply.
+
+        C. **No downstream restrictions.** You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.
+
+    6. **No endorsement.** Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section 3(a)(1)(A)(i).
+
+b. **_Other rights.**_
+
+    1. Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.
+
+    2. Patent and trademark rights are not licensed under this Public License.
+
+    3. To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties.
+
+### Section 3 – License Conditions.
+
+Your exercise of the Licensed Rights is expressly made subject to the following conditions.
+
+a. **_Attribution.**_
+
+    1. If You Share the Licensed Material (including in modified form), You must:
+
+        A. retain the following if it is supplied by the Licensor with the Licensed Material:
+
+            i. identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);
+
+            ii. a copyright notice;
+
+            iii. a notice that refers to this Public License;
+
+            iv. a notice that refers to the disclaimer of warranties;
+
+            v. a URI or hyperlink to the Licensed Material to the extent reasonably practicable;
+
+        B. indicate if You modified the Licensed Material and retain an indication of any previous modifications; and
+
+        C. indicate the Licensed Material is licensed under this Public License, and include the text of, or the URI or hyperlink to, this Public License.
+
+    2. You may satisfy the conditions in Section 3(a)(1) in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.
+
+    3. If requested by the Licensor, You must remove any of the information required by Section 3(a)(1)(A) to the extent reasonably practicable.
+
+b. **_ShareAlike.**_
+
+In addition to the conditions in Section 3(a), if You Share Adapted Material You produce, the following conditions also apply.
+
+1. The Adapter’s License You apply must be a Creative Commons license with the same License Elements, this version or later, or a BY-SA Compatible License.
+
+2. You must include the text of, or the URI or hyperlink to, the Adapter's License You apply. You may satisfy this condition in any reasonable manner based on the medium, means, and context in which You Share Adapted Material.
+
+3. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, Adapted Material that restrict exercise of the rights granted under the Adapter's License You apply.
+
+### Section 4 – Sui Generis Database Rights.
+
+Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:
+
+a. for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database;
+
+b. if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material, including for purposes of Section 3(b); and
+
+c. You must comply with the conditions in Section 3(a) if You Share all or a substantial portion of the contents of the database.
+
+For the avoidance of doubt, this Section 4 supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.
+
+### Section 5 – Disclaimer of Warranties and Limitation of Liability.
+
+a. **Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.**
+
+b. **To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.**
+
+c. The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.
+
+### Section 6 – Term and Termination.
+
+a. This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.
+
+b. Where Your right to use the Licensed Material has terminated under Section 6(a), it reinstates:
+
+    1. automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or
+
+    2. upon express reinstatement by the Licensor.
+
+    For the avoidance of doubt, this Section 6(b) does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.
+
+c. For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.
+
+d. Sections 1, 5, 6, 7, and 8 survive termination of this Public License.
+
+### Section 7 – Other Terms and Conditions.
+
+a. The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.
+
+b. Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.t stated herein are separate from and independent of the terms and conditions of this Public License.
+
+### Section 8 – Interpretation.
+
+a. For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.
+
+b. To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.
+
+c. No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.
+
+d. Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.
+
+```
+Creative Commons is not a party to its public licenses. Notwithstanding, Creative Commons may elect to apply one of its public licenses to material it publishes and in those instances will be considered the “Licensor.” Except for the limited purpose of indicating that material is shared under a Creative Commons public license or as otherwise permitted by the Creative Commons policies published at [creativecommons.org/policies](http://creativecommons.org/policies), Creative Commons does not authorize the use of the trademark “Creative Commons” or any other trademark or logo of Creative Commons without its prior written consent including, without limitation, in connection with any unauthorized modifications to any of its public licenses or any other arrangements, understandings, or agreements concerning use of licensed material. For the avoidance of doubt, this paragraph does not form part of the public licenses.
+
+Creative Commons may be contacted at creativecommons.org
+```

datamodels/2.x/combodo-backoffice-darkmoon-theme/vendors/nord/README.md

@@ -0,0 +1,103 @@
+<p align="center"><img src="https://cdn.rawgit.com/arcticicestudio/nord/develop/src/assets/nord-logo-banner.svg"/></p>
+
+<p align="center"><img src="https://cdn.travis-ci.org/images/favicon-c566132d45ab1a9bcae64d8d90e4378a.svg" width=24 height=24/> <a href="https://travis-ci.org/arcticicestudio/nord"><img src="https://img.shields.io/travis/arcticicestudio/nord/develop.svg"/></a> <img src="https://circleci.com/favicon.ico" width=24 height=24/> <a href="https://circleci.com/gh/arcticicestudio/nord"><img src="https://circleci.com/gh/arcticicestudio/nord.svg?style=shield&circle-token=8945e0a295af1d51d224daf2a800eb4be8b9589d"/></a> <img src="https://assets-cdn.github.com/favicon.ico" width=24 height=24/> <a href="https://github.com/arcticicestudio/nord/releases/latest"><img src="https://img.shields.io/github/release/arcticicestudio/nord.svg"/></a> <a href="https://github.com/arcticicestudio/nord/releases/latest"><img src="https://img.shields.io/badge/pre--release---_-blue.svg"/></a> <img src="https://www.npmjs.com/static/images/touch-icons/favicon-32x32.png" width=24 height=24/> <a href="https://www.npmjs.com/package/nord"><img src="https://img.shields.io/npm/v/nord.svg"/></a> <a href="https://www.npmjs.com/package/nord"><img src="https://img.shields.io/npm/dt/nord.svg"/></a> <a href="https://www.npmjs.com/package/nord"><img src="https://img.shields.io/npm/dm/nord.svg"/></a></p>
+
+<p align="center">A arctic, north-bluish color palette.</p>
+
+<p align="center">Created for the clean- and minimal flat design pattern to achieve a optimal focus and readability for code syntax highlighting and UI.
+It consists of a total of sixteen, carefully selected, dimmed pastel colors for a eye-comfortable, but yet colorful ambiance.</p>
+
+---
+
+The color palette it divided into four named components to represent the different color effects.
+
+![Nord Palette Overview](https://cdn.rawgit.com/arcticicestudio/nord/develop/src/assets/nord-overview.svg)
+
+Nord colors are numbered from `nord0` to `nord15` where each component contains a different amount of colors:  
+  1. **Polar Night** `nord0` - `nord3`  
+  2. **Snow Storm** `nord4` - `nord6`  
+  3. **Frost** `nord7` - `nord10`  
+  4. **Aurora** `nord11` - `nord15`  
+
+This naming convention allows an uncomplicated use for terminals and preserves the compatibility to similar projects like [base16](http://chriskempson.com/projects/base16).
+
+## Usage
+To show a list of all available [Gulp][gulp] tasks run `gulp` or `gulp help`.
+
+### CSS
+The [CSS specification](https://www.w3.org/TR/css-variables) supports the usage of primitive value types to define custom properties which can be used to create e.g. color variables.  
+Nord provides the `template-css.scss` template file to compile a `nord.css` stylesheet.
+
+The generated file contains all Nord color variables prefixed with `--` inside the `:root` pseudo-class.  
+The `:root` pseudo-class represents an element that is the root of the document.  
+This is always the HTML (`<html>`) element which allows to use the Nord color variables for the whole document.
+
+The `nord.css` stylesheet can be compiled via [Gulp][gulp]:  
+```sh
+npm install
+gulp compile-css-template
+```
+
+### <img src="http://sass-lang.com/favicon.ico" width=16 height=16 /> Sass
+Copy the `nord.scss` file into your project and import it in your [Sass](http://sass-lang.com) files:
+```css
+@import "nord";
+```
+The `.scss` file extension is optional.
+
+#### <img src="http://sassdoc.com/favicon.png" width=16 height=16 /> SassDoc
+Nord Sass sources are documented using the [SassDoc](http://sassdoc.com) documentation syntax which can be compiled to a HTML documentation via [Gulp][gulp]:  
+```sh
+npm install
+gulp sassdoc
+```
+The Sassdoc theme can be changed by editing the `.sassdocrc` configuration file.
+
+### <img src="http://lesscss.org/public/ico/favicon.ico" width=16 height=16/> LESSCSS
+Copy the `nord.less` file into your project and import it in your [LESSCSS](http://lesscss.org) files:  
+```css
+@import "nord";
+```
+Information about how the `@import` statement handles imports with different file extensions can be found in the [official LESSCSS documentation](http://lesscss.org/features/#import-directives-feature).
+
+#### KSS
+Nord LESSCSS sources are documented using the [KSS](http://warpspire.com/kss) documentation syntax.  
+Information about the generation of a styleguide can be found in the [official KSS documentation](http://warpspire.com/kss/styleguides).
+
+### <img src="https://cdn.rawgit.com/arcticicestudio/nord/develop/src/assets/icon-color-swatch.svg"/> Color Swatches
+Nord is available in various native formats:
+  - `.aco` Adobe Photoshop Palette
+  - `.ase` Adobe Swatch Exchange
+  - `.gpa` Gpick Palette
+  - `.gpl` GIMP/Inkscape/CinePaint/Krita Palette
+  - `.mtl` Alias/WaveFront Material
+
+A list of detailed information about each file format can be found [here](http://www.selapa.net/swatches/colors/fileformats.php).
+
+## Port Projects
+[![Nord Atom Syntax](https://cdn.rawgit.com/arcticicestudio/nord/develop/src/assets/banner-nord-atom-syntax.svg)](https://atom.io/themes/nord-atom-syntax)  
+[![Nord Atom UI](https://cdn.rawgit.com/arcticicestudio/nord/develop/src/assets/banner-nord-atom-ui.svg)](https://atom.io/themes/nord-atom-ui)  
+[![Nord Eclipse Syntax](https://cdn.rawgit.com/arcticicestudio/nord/develop/src/assets/nord-eclipse-syntax-banner.svg)](https://github.com/arcticicestudio/nord-eclipse-syntax)  
+[![Nord gedit](https://cdn.rawgit.com/arcticicestudio/nord/develop/src/assets/banner-nord-gedit.svg)](https://github.com/arcticicestudio/nord-gedit)  
+[![Nord IntelliJ IDEA Syntax](https://cdn.rawgit.com/arcticicestudio/nord/develop/src/assets/banner-nord-intellij-idea-syntax.svg)](https://github.com/arcticicestudio/nord-intellij-idea-syntax)  
+[![Nord Java](https://cdn.rawgit.com/arcticicestudio/nord/develop/src/assets/nord-java-banner.svg)](https://github.com/arcticicestudio/nord-java)  
+[![Nord Notepad++](https://cdn.rawgit.com/arcticicestudio/nord/develop/src/assets/banner-nord-notepadplusplus.svg)](https://github.com/arcticicestudio/nord-notepadplusplus)  
+[![Nord Terminix](https://cdn.rawgit.com/arcticicestudio/nord/develop/src/assets/nord-terminix-banner.svg)](https://github.com/arcticicestudio/nord-terminix)  
+[![Nord Vim](https://cdn.rawgit.com/arcticicestudio/nord/develop/src/assets/banner-nord-vim.svg)](https://github.com/arcticicestudio/nord-vim)
+
+## Forks
+  - [Nordisk](https://github.com/kamwitsta/nordisk) by @kamwitsta
+
+## Development
+[![](https://img.shields.io/badge/Changelog-0.2.0-blue.svg)](https://github.com/arcticicestudio/nord/blob/v0.2.0/CHANGELOG.md) [![](https://img.shields.io/badge/Workflow-gitflow_Branching_Model-blue.svg)](http://nvie.com/posts/a-successful-git-branching-model) [![](https://img.shields.io/badge/Versioning-ArcVer_0.8.0-blue.svg)](https://github.com/arcticicestudio/arcver)
+
+### Contribution
+Please report issues/bugs, feature requests and suggestions for improvements to the [issue tracker](https://github.com/arcticicestudio/nord/issues).
+
+<p align="center"><img src="https://cdn.rawgit.com/arcticicestudio/nord/develop/src/assets/banner-footer-mountains.svg" /></p>
+
+<p align="center"> <img src="http://arcticicestudio.com/favicon.ico" width=16 height=16/> Copyright &copy; 2016 Arctic Ice Studio</p>
+
+<p align="center"><a href="http://www.apache.org/licenses/LICENSE-2.0"><img src="https://img.shields.io/badge/License-Apache_2.0-blue.svg"/></a> <a href="https://creativecommons.org/licenses/by-sa/4.0"><img src="https://img.shields.io/badge/License-CC_BY--SA_4.0-blue.svg"/></a></p>
+
+[gulp]: http://gulpjs.com

datamodels/2.x/combodo-backoffice-darkmoon-theme/vendors/nord/circle.yml

@@ -0,0 +1,23 @@
+# ++++++++++++++++++++++++++++++++++++++++++++++++++++
+# title      Circle CI Build Configuration           +
+# project    nord                                    +
+# repository https://github.com/arcticicestudio/nord +
+# author     Arctic Ice Studio                       +
+# email      development@arcticicestudio.com         +
+# copyright  Copyright (C) 2016                      +
+# ++++++++++++++++++++++++++++++++++++++++++++++++++++
+#
+# [References]
+# Circle CI
+#   (https://circleci.com/docs)
+machine:
+  node:
+    version: 6.1.0
+dependencies:
+  override:
+    - npm install -g gulp
+    - npm install
+test:
+  override:
+    - gulp compile-css-template sassdoc
+    - find . -maxdepth 2 -type d -regextype posix-egrep -regex ".*/build/(.*)" -exec cp -r {} $CIRCLE_ARTIFACTS \;

datamodels/2.x/combodo-backoffice-darkmoon-theme/vendors/nord/gulpfile.js

@@ -0,0 +1,130 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++
+title     Project Gulp File               +
+project   nord                            +
+author    Arctic Ice Studio               +
+email     development@arcticicestudio.com +
+copyright Copyright (C) 2016              +
++++++++++++++++++++++++++++++++++++++++++++
+
+[References]
+Gulp
+  (http://gulpjs.com)
+npmjs
+  (https://www.npmjs.com)
+*/
+
+"use strict";
+/*+---------------+
+  + Configuration +
+  +---------------+*/
+var config = {
+  project: {
+    id: "nord",
+    name: "Nord",
+    version: "0.2.0",
+    repository: "https://github.com/arcticicestudio/nord",
+    author: "Arctic Ice Studio",
+    email: "development@arcticicestudio.com"
+  },
+  build: {
+    base: "./build",
+    css: "./build/css",
+    sassdoc: "./build/documentation/sassdoc"
+  },
+  src: {
+    sass: "./src/sass"
+  },
+  tasks: {
+    compilation: {
+      sass: {
+        extensions: {
+          input: ["scss"],
+          output: "css"
+        },
+        options: {
+          indentedSyntax: false,
+          indentType: "space",
+          indentWidth: 2,
+          linefeed: "lf",
+          outputStyle: "expanded",
+          precision: 5,
+          sourceComments: false
+        }
+      }
+    }
+  }
+}
+
+/*+---------+
+  + Imports +
+  +---------+*/
+var del          = require("del");
+var fs           = require("fs");
+var gulp         = require("gulp-help")(require("gulp"));
+var gulputil     = require("gulp-util");
+var path         = require("path");
+var plumber      = require("gulp-plumber");
+var rename       = require("gulp-rename");
+var sass         = require("gulp-sass");
+var sassdoc      = require("sassdoc");
+
+/*+-------+
+  + Tasks +
+  +-------+*/
+/**
+ * Cleans the whole build folder.
+ *
+ * @since 0.1.0
+ */
+gulp.task("clean", function() {
+  del(config.build.base);
+});
+
+/**
+ * Cleans the CSS build folder.
+ *
+ * @since 0.1.0
+ */
+gulp.task("clean-css", function(){
+  del(config.build.css);
+});
+
+/**
+ * Cleans the documentation build folder.
+ *
+ * @since 0.1.0
+ */
+gulp.task("clean-documentation", function(){
+  del(config.build.sassdoc);
+});
+
+/**
+ * Compiles the Sass CSS template.
+ *
+ * @since 0.1.0
+ */
+gulp.task("compile-css-template", function() {
+  return gulp.src(path.join(config.src.sass, "/template-css." + config.tasks.compilation.sass.extensions.input))
+    .pipe(plumber())
+    .pipe(sass(config.tasks.compilation.sass.options).on("error", sass.logError))
+    .pipe(rename("/nord." + config.tasks.compilation.sass.extensions.output))
+    .pipe(gulp.dest(config.build.css))
+});
+
+/**
+ * Shows the help.
+ *
+ * @since 0.1.0
+ */
+gulp.task("default", ["help"]);
+
+/**
+ * Creates the Sassdoc documentation.
+ *
+ * @since 0.1.0
+ */
+gulp.task("sassdoc", function () {
+  return gulp.src(path.join(config.src.sass, "/**/*." + config.tasks.compilation.sass.extensions.input))
+    .pipe(sassdoc())
+});

datamodels/2.x/combodo-backoffice-darkmoon-theme/vendors/nord/package.json

@@ -0,0 +1,42 @@
+{
+  "name": "nord",
+  "title": "Nord",
+  "version": "0.2.0",
+  "description": "A arctic, north-bluish color palette",
+  "author": {
+    "name": "Arctic Ice Studio",
+    "email": "development@arcticicestudio.com",
+    "url": "http://arcticicestudio.com"
+  },
+  "homepage": "https://github.com/arcticicestudio/nord",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/arcticicestudio/nord.git"
+  },
+  "bugs": {
+    "url": "https://github.com/arcticicestudio/nord/issues"
+  },
+  "license" : "(Apache-2.0 AND CC-BY-SA-4.0)",
+  "keywords": [
+    "nord",
+    "arctic",
+    "north",
+    "bluish",
+    "clean",
+    "minimal",
+    "flat",
+    "ui",
+    "syntax"
+  ],
+  "devDependencies": {
+    "del": "2.2.2",
+    "gulp": "3.9.1",
+    "gulp-help": "1.6.1",
+    "gulp-plumber": "1.1.0",
+    "gulp-rename": "1.2.2",
+    "gulp-sass": "2.3.2",
+    "gulp-util": "3.0.7",
+    "sassdoc": "2.1.20",
+    "sassdoc-theme-flippant": "0.1.0"
+  }
+}

datamodels/2.x/combodo-backoffice-darkmoon-theme/vendors/nord/src/lesscss/nord.less

@@ -0,0 +1,198 @@
+/*
+++++++++++++++++++++++++++++++++++++++++++++++++++++
+title      Nord                                    +
+project    nord                                    +
+version    0.2.0                                   +
+repository https://github.com/arcticicestudio/nord +
+author     Arctic Ice Studio                       +
+email      development@arcticicestudio.com         +
+copyright  Copyright (C) 2016                      +
+++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+[References]
+KSS
+  (http://warpspire.com/kss)
+kss-node
+  (https://github.com/kss-node/kss-node)
+*/
+
+// A arctic, north-bluish color palette.
+// Created for the clean- and minimal flat design pattern to achieve a optimal focus and readability for code syntax
+// highlighting and UI.
+// It consists of a total of sixteen, carefully selected, dimmed pastel colors for a eye-comfortable, but yet colorful
+// ambiance.
+//
+// Styleguide Nord
+
+// Base component color of "Polar Night".
+//
+// Used for texts, backgrounds, carets and structuring characters like curly- and square brackets.
+//
+// Markup:
+// <div style="background-color:#2E3440; width=60; height=60"></div>
+//
+// Styleguide Nord - Polar Night
+@nord0: #2E3440;
+
+// Lighter shade color of the base component color.
+//
+// Used as a lighter background color for UI elements like status bars.
+//
+// Markup:
+// <div style="background-color:#3B4252; width=60; height=60"></div>
+//
+// Styleguide Nord - Polar Night
+@nord1: #3B4252;
+
+// Lighter shade color of the base component color.
+//
+// Used as line highlighting in the editor.  
+// In the UI scope it may be used as selection- and hightlight color.
+//
+// Markup:
+// <div style="background-color:#434C5E; width=60; height=60"></div>
+//
+// Styleguide Nord - Polar Night
+@nord2: #434C5E;
+
+// Lighter shade color of the base component color.
+//
+// Used for comments, invisibles, indent- and wrap guide marker.  
+// In the UI scope used as pseudoclass color for disabled elements.
+//
+// Markup:
+// <div style="background-color:#4C566A; width=60; height=60"></div>
+//
+// Styleguide Nord - Polar Night
+@nord3: #4C566A;
+
+// Base component color of "Snow Storm".
+//
+// Main color for text, variables, constants and attributes.
+// In the UI scope used as semi-light background depending on the theme shading design.
+//
+// Markup:
+// <div style="background-color:#D8DEE9; width=60; height=60"></div>
+//
+// Styleguide Nord - Snow Storm
+@nord4: #D8DEE9;
+
+// Lighter shade color of the base component color.
+//
+// Used as a lighter background color for UI elements like status bars.  
+// Used as semi-light background depending on the theme shading design.
+//
+// Markup:
+// <div style="background-color:#E5E9F0; width=60; height=60"></div>
+//
+// Styleguide Nord - Snow Storm
+@nord5: #E5E9F0;
+
+// Lighter shade color of the base component color.
+//
+// Used for punctuations, carets and structuring characters like curly- and square brackets.  
+// In the UI scope used as background, selection- and hightlight color depending on the theme shading design.
+//
+// Markup:
+// <div style="background-color:#ECEFF4; width=60; height=60"></div>
+//
+// Styleguide Nord - Snow Storm
+@nord6: #ECEFF4;
+
+// Bluish core color.
+//
+// Used for classes, types and documentation tags.
+//
+// Markup:
+// <div style="background-color:#8FBCBB; width=60; height=60"></div>
+//
+// Styleguide Nord - Frost
+@nord7: #8FBCBB;
+
+// Bluish core color.
+//
+// Represents the accent color of the color palette.  
+// Main color for primary UI elements and methods/functions.  
+//
+// Can be used for
+//   - Markup quotes
+//   - Markup link URLs
+//
+// Markup:
+// <div style="background-color:#88C0D0; width=60; height=60"></div>
+//
+// Styleguide Nord - Frost
+@nord8: #88C0D0;
+
+// Bluish core color.
+//
+// Used for language-specific syntactic/reserved support characters and keywords, operators, tags, units and
+// punctuations like (semi)colons,commas and braces.
+//
+// Markup:
+// <div style="background-color:#81A1C1; width=60; height=60"></div>
+//
+// Styleguide Nord - Frost
+@nord9: #81A1C1;
+
+// Bluish core color.
+//
+// Used for markup doctypes, import/include/require statements, pre-processor statements and at-rules (`@`).
+//
+// Markup:
+// <div style="background-color:#5E81AC; width=60; height=60"></div>
+//
+// Styleguide Nord - Frost
+@nord10: #5E81AC;
+
+// Colorful component color.
+//
+// Used for errors, git/diff deletion and linter marker.
+//
+// Markup:
+// <div style="background-color:#BF616A; width=60; height=60"></div>
+//
+// Styleguide Nord - Aurora
+@nord11: #BF616A;
+
+// Colorful component color.
+//
+// Used for annotations.
+//
+// Markup:
+// <div style="background-color:#D08770; width=60; height=60"></div>
+//
+// Styleguide Nord - Aurora
+@nord12: #D08770;
+
+// Colorful component color.
+//
+// Used for escape characters, regular expressions and markup entities.  
+// In the UI scope used for warnings and git/diff renamings.
+//
+// Markup:
+// <div style="background-color:#EBCB8B; width=60; height=60"></div>
+//
+// Styleguide Nord - Aurora
+@nord13: #EBCB8B;
+
+// Colorful component color.
+//
+// Main color for strings and attribute values.  
+// In the UI scope used for git/diff additions and success visualizations.
+//
+// Markup:
+// <div style="background-color:#A3BE8C; width=60; height=60"></div>
+//
+// Styleguide Nord - Aurora
+@nord14: #A3BE8C;
+
+// Colorful component color.
+//
+// Used for numbers.
+//
+// Markup:
+// <div style="background-color:#B48EAD; width=60; height=60"></div>
+//
+// Styleguide Nord - Aurora
+@nord15: #B48EAD;