Skip to content

Commit 02ee956

Browse files
authored
Merge pull request #863 from udeshrl/Feature-CAT-2417
Fix for ssl certificate
2 parents c026790 + 987d8fc commit 02ee956

18 files changed

+6
-2133
lines changed

client/cat3/main.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,6 @@
105105
<script src="src/partials/sections/dashboard/bots/botsCtrl.js"></script>
106106
<script src="src/partials/sections/dashboard/bots/controller/libraryCtrl.js"></script>
107107
<script src="src/partials/sections/dashboard/design/designCtrl.js"></script>
108-
<script src="src/partials/sections/dashboard/design/controllers/blueprintCreateCtrl.js"></script>
109-
<script src="src/partials/sections/dashboard/design/controllers/blueprintListCtrl.js"></script>
110108
<script src="src/partials/sections/dashboard/help/helpCtrl.js"></script>
111109
<script src="src/partials/sections/dashboard/setting/organization/organizationCtrl.js"></script>
112110
<script src="src/partials/sections/dashboard/setting/organization/organizationListCtrl.js"></script>

client/cat3/src/partials/sections/dashboard/design/controllers/appUrlCreateCtrl.js

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

client/cat3/src/partials/sections/dashboard/design/controllers/blueprintCreateCtrl.js

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

client/cat3/src/partials/sections/dashboard/design/controllers/blueprintListCtrl.js

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

client/cat3/src/partials/sections/dashboard/design/controllers/createCompositeCtrl.js

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

client/cat3/src/partials/sections/dashboard/design/data/providers.json

Lines changed: 0 additions & 30 deletions
This file was deleted.
Lines changed: 1 addition & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,2 @@
1-
<div id="analyticsPage" class='fluid-container'>
2-
<div class='col-xs-12 col-sm-12 col-md-12 col-lg-12 panelLeft no-padding'>
3-
<link rel="stylesheet" type="text/css" href="catalyst/partials/sections/dashboard/analytics/view/analyticsTreeMenu.css"/>
4-
<link rel="stylesheet" type="text/css" href="catalyst/partials/globals/treeComponent/treeDirective.css"/>
51

6-
<div id='analyticsTreeMenuPage'>
7-
<div id='navigPage' ng-mouseover="showTreeOverlay()" ng-mouseleave="hideTreeOverlay()" ng-class="{'show-left-tree':showTree}">
8-
<div id='navigPage-inner'>
9-
<div id="treeParent">
10-
<ul class="tree-ul">
11-
<li ng-repeat="provider in desCtrl.providersMenu">
12-
<div class="liContents">
13-
<i class="icon fa fa-building label-spacing"></i>
14-
<span>{{provider.name}}</span>
15-
<div data-ng-hide="node.collapsed" data-tree-id="relevancelab" data-analytics-tree-model="node.nodes" data-node-id="rowid" data-node-label="text" data-node-children="nodes">
16-
<ul class="tree-ul">
17-
<li ng-repeat='tempType in desCtrl.templateTypes | inArray:provider.filterArray:"templatetype"' ui-sref="dashboard.design.list({provider:provider.name,templateObj:tempType})" class="pointer-cursor" >
18-
<div class="liContents">
19-
<div class="liContents-wrapper">
20-
<i class="icon fa fa-money label-spacing"></i>
21-
<span>{{tempType.templatetypename}}</span>
22-
<i class="caret-spacing fa fa-caret-left pull-right" ng-show="stateItems.filterView.cost"></i>
23-
</div>
24-
</div>
25-
</li>
26-
</ul>
27-
</div>
28-
</div>
29-
</li>
30-
</ul>
31-
</div>
32-
</div>
33-
</div>
34-
</div>
35-
</div>
36-
<div id="sidebar-wrapper" ng-class="{'show-wrapper':isOpenSidebar === true}">
37-
<form>
38-
<div>
39-
<div class="repo-job-details-wrapper-inner marginbottom10" >Filter:</div>
40-
41-
<div class="col-lg-12 col-md-12 form-group" ng-show="stateItems.filterView.org">
42-
<label for="">Organization</label>
43-
<select ng-model="organNewEnt.org" class="chooseProjectExisting width-100 form-control" ng-change="getProviders(organObject[organNewEnt.org].rowid)">
44-
<option value="">Select</option>
45-
<option ng-repeat="org in organObject" value="{{organObject.indexOf(org)}}" >{{org.name}}</option>
46-
</select>
47-
</div>
48-
<div class="col-lg-12 col-md-12 marginbottom5">
49-
<button type="button" class="btn btn-primary" ng-click="applyFilter(true,filterNewEnt.period);isOpenSidebar=false;"><i class="fa fa-filter fa-2 white" aria-hidden="true"></i>&nbsp;Apply</button>
50-
<button type="button" class="btn btn-default" ng-click="applyFilter(false,filterNewEnt.period);isOpenSidebar=false;"><i class="fa fa-times fa-2" aria-hidden="true"></i>&nbsp;Clear</button>
51-
</div>
52-
</div>
53-
</form>
54-
<br/>
55-
</div>
56-
57-
<div class="panelRight">
58-
<div id='rightPanel' class='container-fluid'>
59-
<ul class="nav nav-tabs" >
60-
<li ng-class="{'active':analytic.tabShowChat === true}"><a ng-click="tabShow(true,false)" ><i class="fa fa-area-chart fa-2" aria-hidden="true"></i> Dashboard</a></li>
61-
<li ng-class="{'active':analytic.tabShowReport === true}"><a ng-click="tabShow(false,true)" ><i class="fa fa-file-text fa-2" aria-hidden="true"></i> Reports</a></li>
62-
<li class="form-group pull-right filter-btn" >
63-
<button type="button" class="btn btn-xs cat-btn-update ng-scope pull-right margin-left6" ng-click="isOpenSidebar = !isOpenSidebar">
64-
<i class="fa fa-filter fa-2 white" aria-hidden="true"></i>&nbsp;Filter
65-
</button>
66-
</li>
67-
</ul>
68-
<div ui-view></div>
69-
</div>
70-
</div>
71-
</div>
2+
design

0 commit comments

Comments
 (0)