fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in feature/PMCORE-3138 (pull request #8317)

Browse Source 
PMCORE-3138

Approved-by: Julio Cesar Laura Avendaño
This commit is contained in:
Rodrigo Quelca
2021-12-08 14:57:47 +00:00
committed by Julio Cesar Laura Avendaño
parent 8e777c2248 d1d5c8c3bb
commit b0b709e07e
10 changed files with 656 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/assets/js/components/search/AdvancedFilter.vue
View File

@@ -692,7 +692,7 @@ export default {
},
};
</script>
<style scoped>
<style lang="scss">
.bv-example-row .row + .row {
margin-top: 1rem;
}

8
resources/assets/js/components/search/CasesFilter.vue
View File

@@ -36,7 +36,7 @@
</template>
</SearchPopover>
<div class="p-1 v-flex">
<div class="p-1 filter-field">
<h5 class="v-search-title">{{ title }}</h5>
<div class="pm-in-text-icon">
<i :class="icon"></i>
@@ -530,7 +530,7 @@ export default {
},
};
</script>
<style scoped>
<style lang="scss">
.bv-example-row .row + .row {
margin-top: 1rem;
}
@@ -543,8 +543,8 @@ export default {
background-color: #0099dd;
}
.v-flex {
display: flex;
.filter-field {
display: flex;
}
.v-search-title {

8
resources/assets/js/components/search/CustomFilter.vue
View File

@@ -29,7 +29,7 @@
</template>
</SearchPopover>
<div class="p-1 v-flex">
<div class="p-1 filter-field">
<h5 class="v-search-title">{{ title }}</h5>
<div class="pm-in-text-icon">
<i :class="icon"></i>
@@ -343,7 +343,7 @@ export default {
},
};
</script>
<style scoped>
<style lang="scss">
.bv-example-row .row + .row {
margin-top: 1rem;
}
@@ -356,8 +356,8 @@ export default {
background-color: #0099dd;
}
.v-flex {
display: flex;
.filter-field {
display: flex;
}
.v-search-title {

6
resources/assets/js/components/search/MyCasesFilter.vue
View File

@@ -37,7 +37,7 @@
</template>
</SearchPopover>
<div class="p-1 v-flex">
<div class="p-1 filter-field">
<h5 class="v-search-title">{{ title }}</h5>
<div class="pm-mc-text-icon">
<i :class="icon"></i>
@@ -453,7 +453,7 @@ export default {
}
};
</script>
<style scoped>
<style lang="scss">
.bv-example-row .row + .row {
margin-top: 1rem;
}
@@ -465,7 +465,7 @@ export default {
background-color: #0099dd;
}
.v-flex {
.filter-field {
display: flex;
}

4
workflow/engine/methods/cases/viena_init.php
View File

@@ -10,8 +10,6 @@ use ProcessMaker\Model\User;
$conf = new Configurations();
$oHeadPublisher = headPublisher::getSingleton();
$oHeadPublisher->addExtJsScript("cases/main", false); //Adding a javascript file .js
$oHeadPublisher->addContent("cases/main"); //Adding a html file .html.
$keyMem = "USER_PREFERENCES" . $_SESSION["USER_LOGGED"];
$memcache = PMmemcached::getSingleton(config("system.workspace"));
@@ -163,4 +161,4 @@ ScriptVariables::add('userId', User::getId($_SESSION['USER_LOGGED']));
ScriptVariables::add('userConfig', array(
"usr_uid" => $_SESSION['USER_LOGGED']
));
echo View::make('Views::home.home', compact("userCanAccess"))->render();
G::RenderPage("publish", "viena");

3
workflow/engine/skinEngine/neoclassic/config.xml
View File

@@ -48,5 +48,8 @@
<cssFile file="sprite.css" enabledBrowsers="ALL" disabledBrowsers="ie7"></cssFile>
<cssFile file="rtl.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
</extjs>
<viena>
<cssFile file="app.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
</viena>
</cssFiles>
</skinConfiguration>

595
workflow/engine/skinEngine/neoclassic/css/app.css Normal file
View File

File diff suppressed because it is too large Load Diff

18
workflow/engine/skinEngine/neoclassic/layout-viena.html Normal file
View File

@@ -0,0 +1,18 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<link rel="stylesheet" href="/webapp/css/app.css">
</head>
<body>
{bodyTemplate}
<div id="app">
</div>
</body>
<script type="text/javascript" src="/webapp/js/home/main.js"></script>
{header}
</html>

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

@@ -36,6 +36,7 @@ class SkinEngine
private $layoutFileRaw = array();
private $layoutFileTracker = array();
private $layoutFileSubmenu = array();
private $layoutFileViena = array();
private $cssFileName = '';
@@ -93,7 +94,7 @@ class SkinEngine
$layoutFileRaw = $this->skinsBasePath . 'base' . PATH_SEP . 'layout-raw.html';
$layoutFileTracker = $this->skinsBasePath . 'base' . PATH_SEP . 'layout-tracker.html';
$layoutFileSubmenu = $this->skinsBasePath . 'base' . PATH_SEP . 'layout-submenu.html';
$layoutFileViena = $this->skinsBasePath . 'base' . PATH_SEP . 'layout-viena.html';
//Based on requested Skin look if there is any registered with that name
if (strtolower($this->mainSkin) != "classic") {
@@ -137,6 +138,9 @@ class SkinEngine
if (file_exists($skinObject . PATH_SEP . 'layout-submenu.html')) {
$layoutFileSubmenu = $skinObject . PATH_SEP . 'layout-submenu.html';
}
if (file_exists($skinObject . PATH_SEP . 'layout-viena.html')) {
$layoutFileViena = $skinObject . PATH_SEP . 'layout-viena.html';
}
}
$this->layoutFile = pathInfo($layoutFile);
@@ -145,6 +149,7 @@ class SkinEngine
$this->layoutFileTracker = pathInfo($layoutFileTracker);
$this->layoutFileRaw = pathInfo($layoutFileRaw);
$this->layoutFileSubmenu = pathInfo($layoutFileSubmenu);
$this->layoutFileViena = pathInfo($layoutFileViena);
$this->cssFileName = $this->mainSkin;
@@ -329,6 +334,26 @@ class SkinEngine
echo $template->getOutputContent();
}
private function _viena()
{
$oHeadPublisher = headPublisher::getSingleton();
$styles = "";
$header = $oHeadPublisher->getExtJsVariablesScript();
$header = $oHeadPublisher->getExtJsStylesheets($this->cssFileName . "-viena");
$templateFile = $this->layoutFile['dirname'] . PATH_SEP . $this->layoutFileViena['basename'];
if (file_exists($templateFile)) {
$body = ScriptVariables::render();
$template = new TemplatePower($templateFile);
$template->prepare();
$template->assign('header', $header);
$template->assign('bodyTemplate', $body);
echo $template->getOutputContent();
} else {
$userCanAccess = 1;
echo View::make('Views::home.home', compact("userCanAccess"))->render();
}
}
private function _blank()
{

2
workflow/engine/templates/designer/index.html
View File

@@ -15,7 +15,7 @@
{/foreach}
<link rel="stylesheet" type="text/css" href="/lib-dev/css/jquery.layout.css" />
<link rel="stylesheet" type="text/css" href="/lib-dev/css/jquery-ui-1.10.3.custom.min.css" />
<link rel="stylesheet" type="text/css" href="/lib-dev/css/jquery-ui.min.css" />
<!--<link rel="stylesheet" type="text/css" href="/lib/css/jquery.dataTables.css">-->
<link rel="stylesheet" type="text/css" href="/css/fonts.css" />
<link rel="stylesheet" type="text/css" href="/fonts/styles.php" />