fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HOR-4408

Browse Source
This commit is contained in:
Paula Quispe
2018-03-07 16:01:39 -04:00
parent c480a8b65e 8901d064d3
commit bfed67d0c2
301 changed files with 64229 additions and 68335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
workflow/engine/skinEngine/base/baseCss/ext-all-notheme.css
View File

@@ -2093,6 +2093,14 @@ div.x-toolbar-no-items {
position:relative;
overflow:hidden;
}
/* enable select text*/
.selectText {
-webkit-user-select: text;
-khtml-user-select: text;
-moz-user-select: text;
-ms-user-select: text;
user-select: text;
}
.x-grid-panel .x-panel-body {
overflow:hidden !important;

3
workflow/engine/skinEngine/neoclassic/css/rtl.css
View File

@@ -672,3 +672,6 @@ td.x-date-mp-sep {
.ext-ie .x-menu-item-checked .x-menu-group-item .x-menu-item-icon {
right: 0x !important;
}
span:after, font:after {
content: "\200E‎";
}

2
workflow/engine/skinEngine/simplified/templates/appListSearch.html
View File

@@ -219,7 +219,7 @@
'</td><td>' +
'<h3>'+r.USR_FIRSTNAME+' '+r.USR_LASTNAME+' ('+r.USR_USERNAME+')</h3>' +
'<p><pre>'+r.NOTE_CONTENT+'</pre>' +
'<div class="appMessageDate">{translate label="ID_POSTED_AT"} '+r.NOTE_DATE+'</div>' +
'<div class="appMessageDate">{/literal}{translate label="ID_POSTED_AT"}{literal} ' + r.NOTE_DATE + '</div>' +
'</td></tr></table></div>';
content.append(s);

32
workflow/engine/skinEngine/skinEngine.php
View File

@@ -344,7 +344,7 @@ class SkinEngine
}
$smarty->assign('username',
(isset($_SESSION['USR_USERNAME']) ? '(' . $_SESSION['USR_USERNAME'] . ' ' . G::LoadTranslation('ID_IN') . ' ' . SYS_SYS . ')' : ''));
(isset($_SESSION['USR_USERNAME']) ? '(' . $_SESSION['USR_USERNAME'] . ' ' . G::LoadTranslation('ID_IN') . ' ' . config("system.workspace") . ')' : ''));
$smarty->assign('header', $header);
$smarty->force_compile = $this->forceTemplateCompile;
@@ -380,7 +380,7 @@ class SkinEngine
$header = '';
if (isset($oHeadPublisher)) {
$oHeadPublisher->title = isset($_SESSION['USR_USERNAME']) ? '(' . $_SESSION['USR_USERNAME'] . ' ' . G::LoadTranslation('ID_IN') . ' ' . SYS_SYS . ')' : '';
$oHeadPublisher->title = isset($_SESSION['USR_USERNAME']) ? '(' . $_SESSION['USR_USERNAME'] . ' ' . G::LoadTranslation('ID_IN') . ' ' . config("system.workspace") . ')' : '';
$header = $oHeadPublisher->printHeader();
$header .= $oHeadPublisher->getExtJsStylesheets($this->cssFileName);
}
@@ -438,7 +438,7 @@ class SkinEngine
$smarty->assign('rolename', isset($_SESSION['USR_ROLENAME']) ? $_SESSION['USR_ROLENAME'] . '' : '');
$smarty->assign('pipe', isset($_SESSION['USR_USERNAME']) ? ' | ' : '');
$smarty->assign('logout', G::LoadTranslation('ID_LOGOUT'));
$smarty->assign('workspace', defined('SYS_SYS') ? SYS_SYS : '');
$smarty->assign('workspace', !empty(config("system.workspace")) ? config("system.workspace") : '');
$uws = (isset($_SESSION['USR_ROLENAME']) && $_SESSION['USR_ROLENAME'] != '') ? strtolower(G::LoadTranslation('ID_WORKSPACE_USING')) : G::LoadTranslation('ID_WORKSPACE_USING');
$smarty->assign('workspace_label', $uws);
@@ -450,8 +450,8 @@ class SkinEngine
$smarty->assign('user', $name);
}
if (defined('SYS_SYS')) {
$logout = '/sys' . SYS_SYS . '/' . SYS_LANG . '/' . SYS_SKIN . '/login/login';
if (!empty(config("system.workspace"))) {
$logout = '/sys' . config("system.workspace") . '/' . SYS_LANG . '/' . SYS_SKIN . '/login/login';
} else {
$logout = '/sys/' . SYS_LANG . '/' . SYS_SKIN . '/login/login';
}
@@ -496,7 +496,7 @@ class SkinEngine
$header = '';
if (isset($oHeadPublisher)) {
$oHeadPublisher->title = isset($_SESSION['USR_USERNAME']) ? '(' . $_SESSION['USR_USERNAME'] . ' ' . G::LoadTranslation('ID_IN') . ' ' . SYS_SYS . ')' : '';
$oHeadPublisher->title = isset($_SESSION['USR_USERNAME']) ? '(' . $_SESSION['USR_USERNAME'] . ' ' . G::LoadTranslation('ID_IN') . ' ' . config("system.workspace") . ')' : '';
$header = $oHeadPublisher->printHeader();
}
@@ -697,8 +697,8 @@ class SkinEngine
}
if (isset($oHeadPublisher)) {
if (defined('SYS_SYS')) {
$oHeadPublisher->title = isset($_SESSION['USR_USERNAME']) ? '(' . $_SESSION['USR_USERNAME'] . ' ' . G::LoadTranslation('ID_IN') . ' ' . SYS_SYS . ')' : '';
if (!empty(config("system.workspace"))) {
$oHeadPublisher->title = isset($_SESSION['USR_USERNAME']) ? '(' . $_SESSION['USR_USERNAME'] . ' ' . G::LoadTranslation('ID_IN') . ' ' . config("system.workspace") . ')' : '';
}
$header = $enableJsScript ? $oHeadPublisher->printHeader() : '';
$header .= $oHeadPublisher->getExtJsStylesheets($this->cssFileName);
@@ -768,7 +768,7 @@ class SkinEngine
$smarty->assign('rolename', isset($_SESSION['USR_ROLENAME']) ? $_SESSION['USR_ROLENAME'] . '' : '');
$smarty->assign('pipe', isset($_SESSION['USR_USERNAME']) ? ' | ' : '');
$smarty->assign('logout', G::LoadTranslation('ID_LOGOUT'));
$smarty->assign('workspace', defined('SYS_SYS') ? SYS_SYS : '');
$smarty->assign('workspace', !empty(config("system.workspace")) ? config("system.workspace") : '');
$uws = (isset($_SESSION['USR_ROLENAME']) && $_SESSION['USR_ROLENAME'] != '') ? strtolower(G::LoadTranslation('ID_WORKSPACE_USING')) : G::LoadTranslation('ID_WORKSPACE_USING');
$smarty->assign('workspace_label', $uws);
@@ -780,7 +780,7 @@ class SkinEngine
$smarty->assign('user', $name);
}
if (defined('SYS_SYS')) {
if (!empty(config("system.workspace"))) {
$pmLicenseManagerO = &PmLicenseManager::getSingleton();
$expireIn = $pmLicenseManagerO->getExpireIn();
$expireInLabel = $pmLicenseManagerO->getExpireInLabel();
@@ -796,8 +796,8 @@ class SkinEngine
}
}
if (defined('SYS_SYS')) {
$logout = "/sys" . SYS_SYS . "/" . SYS_LANG . "/" . SYS_SKIN . ((SYS_COLLECTION != "tracker") ? "/login/login" : "/tracker/login");
if (!empty(config("system.workspace"))) {
$logout = "/sys" . config("system.workspace") . "/" . SYS_LANG . "/" . SYS_SKIN . ((SYS_COLLECTION != "tracker") ? "/login/login" : "/tracker/login");
} else {
$logout = '/sys/' . SYS_LANG . '/' . SYS_SKIN . '/login/login';
}
@@ -809,7 +809,7 @@ class SkinEngine
$oLogoR = new ReplacementLogo();
if (defined("SYS_SYS")) {
if (!empty(config("system.workspace"))) {
$aFotoSelect = $oLogoR->getNameLogo((isset($_SESSION['USER_LOGGED'])) ? $_SESSION['USER_LOGGED'] : '');
if (is_array($aFotoSelect)) {
@@ -817,11 +817,11 @@ class SkinEngine
$sWspaceSelect = trim($aFotoSelect['WORKSPACE_LOGO_NAME']);
}
}
if (class_exists('ProcessMaker\Plugins\PluginRegistry') && defined("SYS_SYS")) {
if (class_exists('ProcessMaker\Plugins\PluginRegistry') && !empty(config("system.workspace"))) {
$oPluginRegistry = PluginRegistry::loadSingleton();
if (isset($sFotoSelect) && $sFotoSelect != '' && !(strcmp($sWspaceSelect, SYS_SYS))) {
if (isset($sFotoSelect) && $sFotoSelect != '' && !(strcmp($sWspaceSelect, config("system.workspace")))) {
$sCompanyLogo = $oPluginRegistry->getCompanyLogo($sFotoSelect);
$sCompanyLogo = "/sys" . SYS_SYS . "/" . SYS_LANG . "/" . SYS_SKIN . "/setup/showLogoFile.php?id=" . base64_encode($sCompanyLogo);
$sCompanyLogo = "/sys" . config("system.workspace") . "/" . SYS_LANG . "/" . SYS_SKIN . "/setup/showLogoFile.php?id=" . base64_encode($sCompanyLogo);
} else {
$sCompanyLogo = $oPluginRegistry->getCompanyLogo('/images/processmaker.logo.jpg');
}