Skip to content

Commit 12acd66

Browse files
dkonecny-oracledkonecny-oracle
committed
upgrade to new VBRT, switch to Redwood Stable theme
1 parent 7add0e0 commit 12acd66

20 files changed

+134
-234
lines changed

‎DashboardTemplate/DashboardTemplate.zip

-1.15 KB
Binary file not shown.

‎DashboardTemplate/resources/LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2019, 2021 Oracle and/or its affiliates. All rights reserved.
1+
Copyright (c) 2019, 2022 Oracle and/or its affiliates. All rights reserved.
22
The Universal Permissive License (UPL), Version 1.0
33

44
Subject to the condition set forth below, permission is hereby granted to any person obtaining a copy of this software, associated documentation and/or data (collectively the "Software"), free of charge and under any and all copyright rights in the Software, and any and all patent rights owned or freely licensable by each licensor hereunder covering either (i) the unmodified Software as contributed to or provided by such licensor, or (ii) the Larger Works (as defined below), to deal in both

‎DashboardTemplate/resources/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"grunt": "^1.0.3",
77
"grunt-cli": "^1.3.2",
88
"load-grunt-tasks": "^4.0.0",
9-
"@oracle/grunt-vb-build": "https://static.oracle.com/cdn/vb/tools/npm/grunt-vb-build/grunt-vb-build-2201.0.11.tar.gz",
10-
"@oracle/grunt-vb-audit": "https://static.oracle.com/cdn/vb/tools/npm/grunt-vb-audit/grunt-vb-audit-2201.1.1.tar.gz"
9+
"@oracle/grunt-vb-build": "https://static.oracle.com/cdn/vb/tools/npm/grunt-vb-build/grunt-vb-build-2204.0.8.tar.gz",
10+
"@oracle/grunt-vb-audit": "https://static.oracle.com/cdn/vb/tools/npm/grunt-vb-audit/grunt-vb-audit-2204.0.5.tar.gz"
1111
},
1212
"com_oracle_visual_builder": {
1313
"upgrade": "micro"

‎DashboardTemplate/resources/visual-application.json

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,21 @@
11
{
2-
"vbcs.dt.version": "20211019-22.01.99",
2+
"vbcs.dt.version": "20220315-22.07.0",
33
"dependencies": {
44
"upgrade": "micro",
55
"paths": {
6-
"jet": "https://static.oracle.com/cdn/jet/11.0.7",
7-
"telemetry": "https://static.oracle.com/cdn/trace/4.0.1",
8-
"visualRuntime": "https://static.oracle.com/cdn/vb/2201.0.0"
6+
"jet": "https://static.oracle.com/cdn/jet/11.1.6",
7+
"telemetry": "https://static.oracle.com/cdn/trace/5.0.0",
8+
"visualRuntime": "https://static.oracle.com/cdn/vb/2204.4.0"
99
}
1010
},
1111
"rootURL": "dashboard-template",
12-
"version": "1.0",
13-
"source.version": "2201"
12+
"version": "1.0.9",
13+
"source.version": "2204",
14+
"migration": {
15+
"2204": [
16+
"ActionsJsonMigrator",
17+
"ACTJsSpecsMigrator",
18+
"AppUIRootPageMigrator"
19+
]
20+
}
1421
}

‎DashboardTemplate/resources/webApps/app/app-flow.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c)2020, 2021, Oracle and/or its affiliates.
2+
* Copyright (c)2020, 2022, Oracle and/or its affiliates.
33
* Licensed under The Universal Permissive License (UPL), Version 1.0
44
* as shown at https://oss.oracle.com/licenses/upl/
55
*/

‎DashboardTemplate/resources/webApps/app/flows/home/home-flow.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c)2020, 2021, Oracle and/or its affiliates.
2+
* Copyright (c)2020, 2022, Oracle and/or its affiliates.
33
* Licensed under The Universal Permissive License (UPL), Version 1.0
44
* as shown at https://oss.oracle.com/licenses/upl/
55
*/

‎DashboardTemplate/resources/webApps/app/flows/home/pages/home-start-page.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
Copyright (c)2020, 2021, Oracle and/or its affiliates.
2+
Copyright (c)2020, 2022, Oracle and/or its affiliates.
33
Licensed under The Universal Permissive License (UPL), Version 1.0
44
as shown at https://oss.oracle.com/licenses/upl/
55
-->

‎DashboardTemplate/resources/webApps/app/flows/home/pages/home-start-page.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c)2020, 2021, Oracle and/or its affiliates.
2+
* Copyright (c)2020, 2022, Oracle and/or its affiliates.
33
* Licensed under The Universal Permissive License (UPL), Version 1.0
44
* as shown at https://oss.oracle.com/licenses/upl/
55
*/

‎DashboardTemplate/resources/webApps/app/flows/placeholder/pages/placeholder-start-page.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
Copyright (c)2020, 2021, Oracle and/or its affiliates.
2+
Copyright (c)2020, 2022, Oracle and/or its affiliates.
33
Licensed under The Universal Permissive License (UPL), Version 1.0
44
as shown at https://oss.oracle.com/licenses/upl/
55
-->

‎DashboardTemplate/resources/webApps/app/flows/placeholder/pages/placeholder-start-page.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c)2020, 2021, Oracle and/or its affiliates.
2+
* Copyright (c)2020, 2022, Oracle and/or its affiliates.
33
* Licensed under The Universal Permissive License (UPL), Version 1.0
44
* as shown at https://oss.oracle.com/licenses/upl/
55
*/

‎DashboardTemplate/resources/webApps/app/flows/placeholder/placeholder-flow.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c)2020, 2021, Oracle and/or its affiliates.
2+
* Copyright (c)2020, 2022, Oracle and/or its affiliates.
33
* Licensed under The Universal Permissive License (UPL), Version 1.0
44
* as shown at https://oss.oracle.com/licenses/upl/
55
*/

‎DashboardTemplate/resources/webApps/app/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE html>
22
<!--
3-
Copyright (c)2020, 2021, Oracle and/or its affiliates.
3+
Copyright (c)2020, 2022, Oracle and/or its affiliates.
44
Licensed under The Universal Permissive License (UPL), Version 1.0
55
as shown at https://oss.oracle.com/licenses/upl/
66
-->

‎DashboardTemplate/resources/webApps/app/pages/shell-page-chains/NavigationListSelectionChangeChain.json

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,8 @@
11
{
22
"description": "",
3-
"root": "callFunctionCloseDrawer",
3+
"root": "if",
44
"actions": {
5-
"callFunctionCloseDrawer": {
6-
"module": "vb/action/builtin/callModuleFunctionAction",
7-
"parameters": {
8-
"module": "[[ $functions ]]",
9-
"functionName": "closeDrawer"
10-
},
11-
"outcomes": {
12-
"success": "navigateToVariablesSelection"
13-
}
14-
},
5+
156
"navigateToVariablesSelection": {
167
"module": "vb/action/builtin/navigateAction",
178
"@dt": {
@@ -20,6 +11,27 @@
2011
"parameters": {
2112
"flow": "[[ $variables.selection.endsWith('_placeholder') ? 'placeholder' : 'home' ]]"
2213
}
14+
},
15+
"assignVariablesOpenDrawer": {
16+
"module": "vb/action/builtin/assignVariablesAction",
17+
"parameters": {
18+
"$page.variables.openDrawer": {
19+
"source": "{{ !$page.variables.openDrawer }}"
20+
}
21+
},
22+
"outcomes": {
23+
"success": "navigateToVariablesSelection"
24+
}
25+
},
26+
"if": {
27+
"module": "vb/action/builtin/ifAction",
28+
"parameters": {
29+
"condition": "[[ $application.responsive.lgUp ]]"
30+
},
31+
"outcomes": {
32+
"false": "assignVariablesOpenDrawer",
33+
"true": "navigateToVariablesSelection"
34+
}
2335
}
2436
},
2537
"variables": {

‎DashboardTemplate/resources/webApps/app/pages/shell-page-chains/initNavigationMenu.json

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎DashboardTemplate/resources/webApps/app/pages/shell-page-chains/toggleNavigation.json

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,13 @@
11
{
22
"description": "",
3-
"root": "if",
3+
"root": "assignVariables",
44
"actions": {
5-
"if": {
6-
"module": "vb/action/builtin/ifAction",
5+
"assignVariables": {
6+
"module": "vb/action/builtin/assignVariablesAction",
77
"parameters": {
8-
"condition": "[[ $application.responsive.lgUp ]]"
9-
},
10-
"outcomes": {
11-
"true": "callFunctionAnimateNavMenu",
12-
"false": "callFunctionToggleDrawer"
13-
}
14-
},
15-
"callFunctionAnimateNavMenu": {
16-
"module": "vb/action/builtin/callModuleFunctionAction",
17-
"parameters": {
18-
"module": "[[ $functions ]]",
19-
"functionName": "animateNavMenu"
20-
}
21-
},
22-
"callFunctionToggleDrawer": {
23-
"module": "vb/action/builtin/callModuleFunctionAction",
24-
"parameters": {
25-
"module": "[[ $functions ]]",
26-
"functionName": "toggleDrawer"
8+
"$page.variables.openDrawer": {
9+
"source": "{{ !$page.variables.openDrawer }}"
10+
}
2711
}
2812
}
2913
},

‎DashboardTemplate/resources/webApps/app/pages/shell-page.html

Lines changed: 68 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -1,110 +1,93 @@
11
<!--
2-
Copyright (c)2020, 2021, Oracle and/or its affiliates.
2+
Copyright (c)2020, 2022, Oracle and/or its affiliates.
33
Licensed under The Universal Permissive License (UPL), Version 1.0
44
as shown at https://oss.oracle.com/licenses/upl/
55
-->
66

77
<div id="pageWrapper" class="oj-offcanvas-outer-wrapper oj-offcanvas-page" style="height: 100%;">
8-
<div id="startDrawer" role="navigation" class="demo-contrast-marker oj-web-applayout-offcanvas oj-offcanvas-start">
9-
<oj-navigation-list data="[[ $functions.getNavigationContent()]]"
10-
item.selectable="[[ $page.functions.itemSelectable ]]"
11-
expanded="[[ $functions.getExpandedMenu() ]]"
12-
class="oj-flex-item oj-sm-align-self-flex-start oj-navigationlist-nofollow-link" drill-mode="collapsible"
13-
on-selection-changed="[[$listeners.ojNavigationListSelection]]">
14-
<template slot="itemTemplate" data-oj-as="item">
15-
<li>
16-
<a style="cursor: pointer">
17-
<oj-bind-if test="[[item.data.attr.node]]">
18-
<i :class="[[ 'oj-navigationlist-item-icon oj-ux-ico-' + (item.data.attr.icon ? item.data.attr.icon : 'box')]]"></i>
19-
<oj-bind-text value="[[item.data.attr.name]]"></oj-bind-text>
20-
</oj-bind-if>
21-
<oj-bind-if test="[[!item.data.attr.node]]">
22-
<i :class="[[ 'oj-typography-body-md oj-navigationlist-item-icon oj-ux-ico-' + (item.data.attr.icon ? item.data.attr.icon : 'box') + ' oj-sm-padding-4x-start']]"></i>
23-
<span class="oj-typography-body-md">
24-
<oj-bind-text value="[[item.data.attr.name]]"></oj-bind-text>
25-
</span>
26-
</oj-bind-if>
27-
<oj-bind-if test="[[item.data.attr.badge]]">
28-
<span :class="[[ ['oj-badge', 'oj-badge-'+item.data.attr.badgeType, 'oj-navigationlist-item-end'] ]]"><oj-bind-text value="[[item.data.attr.badge]]"></oj-bind-text></span>
29-
</oj-bind-if>
30-
</a>
31-
</li>
32-
</template>
33-
</oj-navigation-list>
34-
</div>
35-
<div id="page" class="oj-web-applayout-page" style="height: 100%;">
36-
<header role="banner" class="oj-web-applayout-header">
37-
<div class="oj-flex-bar oj-sm-align-items-center">
38-
<div class="oj-flex-bar-start oj-sm-align-items-center">
39-
<oj-button id="toggleNavListButtonSmall" class="toggleNavListButton oj-button-lg" chroming="borderless"
40-
display="icons" on-oj-action="[[$listeners.toggleNavListButtonSmallOjAction]]">
41-
<span slot="startIcon" class="oj-ux-ico-menu"></span>
8+
<div id="page" class="oj-web-applayout-page" style="height: 100%;">
9+
<header role="banner" class="oj-web-applayout-header">
10+
<div class="oj-flex-bar oj-sm-align-items-center">
11+
<div class="oj-flex-bar-start oj-sm-align-items-center">
12+
<oj-button id="toggleNavListButton" class="toggleNavListButton oj-button-lg" chroming="borderless"
13+
display="icons" on-oj-action="[[$listeners.toggleNavListButtonSmallOjAction]]">
14+
<span slot="startIcon" class="oj-ux-ico-menu"></span>
4215
<span>Application Navigation</span>
43-
</oj-button>
16+
</oj-button>
4417
<span
4518
class="oj-flex-item oj-typography-body-md oj-typography-bold oj-sm-padding-2x-start oj-sm-only-hide">Long Application Name</span>
4619
<span
4720
class="oj-flex-item oj-typography-body-md oj-typography-bold oj-sm-padding-2x-start oj-md-hide">Short Name</span>
48-
</div>
49-
<div class="oj-flex-bar-end">
50-
<oj-toolbar id="toolbar1">
51-
<oj-menu-button id="userMenu" display="[[$application.responsive.smOnly ? 'icons' : 'all']]" chroming="borderless">
52-
<span slot="endIcon" :class="[[{'oj-ux-ico-human-8': $application.responsive.smOnly , 'oj-component-icon oj-button-menu-dropdown-icon': !$application.responsive.smOnly}]]"></span>
53-
<oj-bind-text value="[[ $application.user.email ]]"></oj-bind-text>
54-
<oj-menu id="menu1" slot="menu" style="display:none">
55-
<oj-option id="out" value="out"><oj-bind-text value="[[ $application.translations.app.app_sign_out ]]"></oj-bind-text></oj-option>
56-
</oj-menu>
57-
</oj-menu-button>
58-
</oj-toolbar>
21+
</div>
22+
<div class="oj-flex-bar-end">
23+
<oj-toolbar id="toolbar1">
24+
<oj-menu-button id="userMenu" display="[[$application.responsive.smOnly ? 'icons' : 'all']]"
25+
chroming="borderless">
26+
<span slot="endIcon" :class="[[{'oj-ux-ico-human-8': $application.responsive.smOnly , 'oj-component-icon oj-button-menu-dropdown-icon': !$application.responsive.smOnly}]]"></span>
27+
<oj-bind-text value="[[ $application.user.email ]]"></oj-bind-text>
28+
<oj-menu id="menu1" slot="menu" style="display:none">
29+
<oj-option id="out" value="out">
30+
<oj-bind-text value="[[ $application.translations.app.app_sign_out ]]"></oj-bind-text>
31+
</oj-option>
32+
</oj-menu>
33+
</oj-menu-button>
34+
</oj-toolbar>
35+
</div>
5936
</div>
60-
</div>
61-
</header>
37+
</header>
6238

63-
<!-- for message notifications -->
64-
<oj-messages id="vbDefaultNotifier" position="{}" display="general" messages="{{$page.variables.messagesADP}}" on-oj-close="[[$listeners.onMessageClose]]"></oj-messages>
39+
<!-- for message notifications -->
40+
<oj-messages id="vbDefaultNotifier" position="{}" display="general" messages="{{$page.variables.messagesADP}}"
41+
on-oj-close="[[$listeners.onMessageClose]]"></oj-messages>
6542

66-
<div class="oj-web-applayout-content-nopad oj-web-spacing oj-flex">
67-
<div id="animationMenu" class="oj-flex-item oj-flex oj-sm-flex-wrap-nowrap" style="overflow-x: auto; position: relative">
68-
<div id="navigation-div" style="min-width: 300px; max-width: 300px; height: 100%" class="oj-flex demo-contrast-marker tree-navigation-menu-panel">
43+
<div class="oj-web-applayout-content-nopad oj-web-spacing oj-flex">
44+
<oj-drawer-layout start-opened="{{ $page.variables.openDrawer }}" class="drawer-layout" id="drawer-layout">
45+
<div slot="start" class="demo-contrast-marker demo-contrast-background" style="min-width:300px; height:100%">
46+
6947
<oj-navigation-list data="[[ $functions.getNavigationContent()]]"
70-
item.selectable="[[ $page.functions.itemSelectable ]]"
71-
class="demo-contrast-background oj-flex-item oj-navigationlist-nofollow-link" drill-mode="collapsible"
72-
on-selection-changed="[[$listeners.ojNavigationListSelection]]" expanded="[[ $functions.getExpandedMenu() ]]">
48+
item.selectable="[[ $page.functions.itemSelectable ]]"
49+
class="oj-flex-item oj-navigationlist-nofollow-link" drill-mode="collapsible"
50+
on-selection-changed="[[$listeners.ojNavigationListSelection]]"
51+
expanded="[[ $functions.getExpandedMenu() ]]">
7352
<template slot="itemTemplate" data-oj-as="item">
74-
<li>
75-
<a style="cursor: pointer">
76-
<oj-bind-if test="[[item.data.attr.node]]">
77-
<i :class="[[ 'oj-navigationlist-item-icon oj-ux-ico-' + (item.data.attr.icon ? item.data.attr.icon : 'box')]]"></i>
78-
<oj-bind-text value="[[item.data.attr.name]]"></oj-bind-text>
79-
</oj-bind-if>
80-
<oj-bind-if test="[[!item.data.attr.node]]">
81-
<i :class="[[ 'oj-typography-body-md oj-navigationlist-item-icon oj-ux-ico-' + (item.data.attr.icon ? item.data.attr.icon : 'box') + ' oj-sm-padding-4x-start']]"></i>
82-
<span class="oj-typography-body-md">
53+
<li>
54+
<a style="cursor: pointer">
55+
<oj-bind-if test="[[item.data.attr.node]]">
56+
<i :class="[[ 'oj-navigationlist-item-icon oj-ux-ico-' + (item.data.attr.icon ? item.data.attr.icon : 'box')]]"></i>
57+
<oj-bind-text value="[[item.data.attr.name]]"></oj-bind-text>
58+
</oj-bind-if>
59+
<oj-bind-if test="[[!item.data.attr.node]]">
60+
<i :class="[[ 'oj-typography-body-md oj-navigationlist-item-icon oj-ux-ico-' + (item.data.attr.icon ? item.data.attr.icon : 'box') + ' oj-sm-padding-4x-start']]"></i>
61+
<span class="oj-typography-body-md">
8362
<oj-bind-text value="[[item.data.attr.name]]"></oj-bind-text>
8463
</span>
85-
</oj-bind-if>
86-
<oj-bind-if test="[[item.data.attr.badge]]">
87-
<span :class="[[ ['oj-badge', 'oj-badge-'+item.data.attr.badgeType, 'oj-navigationlist-item-end'] ]]"><oj-bind-text value="[[item.data.attr.badge]]"></oj-bind-text></span>
88-
</oj-bind-if>
89-
</a>
90-
</li>
91-
</template>
92-
</oj-navigation-list>
64+
</oj-bind-if>
65+
<oj-bind-if test="[[item.data.attr.badge]]">
66+
<span :class="[[ ['oj-badge', 'oj-badge-'+item.data.attr.badgeType, 'oj-navigationlist-item-end'] ]]"><oj-bind-text value="[[item.data.attr.badge]]"></oj-bind-text></span>
67+
</oj-bind-if>
68+
</a>
69+
</li>
70+
</template>
71+
</oj-navigation-list>
9372
</div>
9473
<div class="oj-flex-item oj-flex oj-sm-flex-direction-column tree-navigation-content-panel" style="overflow-x: auto;">
9574
<!-- Where Visual Pages will be rendered -->
9675
<oj-vb-content id="vbRouterContent" class="vbcs-pages-module oj-flex-item" config="[[vbRouterFlow]]" style="max-width: 100%;"></oj-vb-content>
9776
</div>
77+
</oj-drawer-layout>
9878
</div>
99-
</div>
10079

101-
<footer class="oj-web-applayout-footer" role="contentinfo">
102-
<div class="oj-web-applayout-footer-item">
103-
<ul>
104-
<li><a id="about" href=""><oj-bind-text value="[[ $application.translations.app.app_footer_about_link ]]"></oj-bind-text></a></li>
105-
</ul>
106-
</div>
107-
<div class="oj-web-applayout-footer-item oj-text-color-secondary oj-typography-body-sm"><oj-bind-text value="[[ $application.translations.app.app_footer_copyright ]]"></oj-bind-text></div>
108-
</footer>
109-
</div>
110-
</div>
80+
<footer class="oj-web-applayout-footer" role="contentinfo">
81+
<div class="oj-web-applayout-footer-item">
82+
<ul>
83+
<li><a id="about" href="">
84+
<oj-bind-text value="[[ $application.translations.app.app_footer_about_link ]]"></oj-bind-text>
85+
</a></li>
86+
</ul>
87+
</div>
88+
<div class="oj-web-applayout-footer-item oj-text-color-secondary oj-typography-body-sm">
89+
<oj-bind-text value="[[ $application.translations.app.app_footer_copyright ]]"></oj-bind-text>
90+
</div>
91+
</footer>
92+
</div>
93+
</div>

0 commit comments

Comments
 (0)