From 57dbba269d19bc59fad89160200bb2dbcccb9003 Mon Sep 17 00:00:00 2001
From: shentao <shentao@chinamobile.com>
Date: Fri, 1 Sep 2017 11:57:47 +0800
Subject: Upload Monitor function code

Change-Id: I33ad76221b4cb771a298ff240245fc24be664efb
Issue-Id: USECASEUI-6
Signed-off-by: shentao <shentao@chinamobile.com>
---
 .../DS2-view-models/ds2-admin/admin-menu-edit.html | 102 ++++++++++++
 .../scripts/DS2-view-models/ds2-admin/admin.html   |  69 ++++++++
 .../ds2-admin/admin_closed_loop.html               |  17 ++
 .../ds2-admin/collaborate-list.html                |  76 +++++++++
 .../DS2-view-models/ds2-admin/collaboration.html   | 182 +++++++++++++++++++++
 .../DS2-view-models/ds2-admin/jcs_admin.html       |  73 +++++++++
 .../ds2-admin/modals/admin-menu-del-confirm.html   |  22 +++
 .../ds2-admin/modals/cache-menu-clear-confirm.html |  22 +++
 .../modals/cache-menu-clear-region-confirm.html    |  22 +++
 .../ds2-admin/modals/clearItem-region-confirm.html |  22 +++
 ...laborate-list-toggle-profile-active-status.html |  22 +++
 .../ds2-admin/modals/popup-modal-fn-menu-edit.html | 129 +++++++++++++++
 .../ds2-admin/modals/popup-modal-fnmenu-add.html   | 136 +++++++++++++++
 .../ds2-admin/modals/role-child-add-confirm.html   |  25 +++
 .../ds2-admin/modals/role-confirm-activation.html  |  23 +++
 .../ds2-admin/modals/role-delete-confirm.html      |  22 +++
 .../ds2-admin/modals/role-fun-add-confirm.html     |  25 +++
 .../modals/role-fun-role-del-confirm.html          |  22 +++
 .../ds2-admin/modals/role-function-add.html        |  32 ++++
 .../modals/role-function-del-confirm.html          |  22 +++
 .../ds2-admin/modals/role-function-edit.html       |  22 +++
 .../modals/role-functions-child-roles-modal.html   |  33 ++++
 .../ds2-admin/modals/role-functions-modal.html     |  36 ++++
 .../DS2-view-models/ds2-admin/role-function.html   |  67 ++++++++
 .../scripts/DS2-view-models/ds2-admin/role.html    |  61 +++++++
 .../DS2-view-models/ds2-admin/role_list.html       |  45 +++++
 .../scripts/DS2-view-models/ds2-admin/usage.html   |  43 +++++
 27 files changed, 1372 insertions(+)
 create mode 100644 usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/admin-menu-edit.html
 create mode 100644 usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/admin.html
 create mode 100644 usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/admin_closed_loop.html
 create mode 100644 usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/collaborate-list.html
 create mode 100644 usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/collaboration.html
 create mode 100644 usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/jcs_admin.html
 create mode 100644 usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/admin-menu-del-confirm.html
 create mode 100644 usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/cache-menu-clear-confirm.html
 create mode 100644 usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/cache-menu-clear-region-confirm.html
 create mode 100644 usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/clearItem-region-confirm.html
 create mode 100644 usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/collaborate-list-toggle-profile-active-status.html
 create mode 100644 usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/popup-modal-fn-menu-edit.html
 create mode 100644 usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/popup-modal-fnmenu-add.html
 create mode 100644 usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-child-add-confirm.html
 create mode 100644 usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-confirm-activation.html
 create mode 100644 usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-delete-confirm.html
 create mode 100644 usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-fun-add-confirm.html
 create mode 100644 usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-fun-role-del-confirm.html
 create mode 100644 usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-function-add.html
 create mode 100644 usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-function-del-confirm.html
 create mode 100644 usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-function-edit.html
 create mode 100644 usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-functions-child-roles-modal.html
 create mode 100644 usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-functions-modal.html
 create mode 100644 usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/role-function.html
 create mode 100644 usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/role.html
 create mode 100644 usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/role_list.html
 create mode 100644 usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/usage.html

(limited to 'usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin')

diff --git a/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/admin-menu-edit.html b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/admin-menu-edit.html
new file mode 100644
index 00000000..913b10ed
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/admin-menu-edit.html
@@ -0,0 +1,102 @@
+<div id="page-content">
+	<div>
+		<h1 class="heading-page" id="AdminMenuItems">Admin Menu Items</h1>
+	</div>
+	<div>
+		<button type="submit" ng-click="addNewFnMenuItemModalPopup();" class="btn btn-alt btn-small" style="position: initial;">Add Menu Item</button>
+	</div>
+    
+    <h3 class="heading-small">
+    	Existing menu items
+    </h3>
+
+	<div ng-show="showLoader" class="span loader-container">
+		<i class="icon-primary-spinner" role="img" aria-label="Please wait while we load your content"></i>
+	</div>
+
+	<div ng-hide="showLoader">
+			<table>
+				<thead>
+					<tr>
+					<th  sortable="true" key="id" default-sort="a">Menu ID</th>
+					<th  sortable="true" key="label">Label</th>
+					<th  sortable="true" key="ParentId">ParentId</th>
+					<th  sortable="true" key="sortOrder">Sort Order</th>
+					<th  sortable="true" key="action">Action</th>
+					<th  sortable="true" key="functionCd">Function</th>
+					<th  sortable="true" key="active">Active</th>
+					<th  sortable="true" key="servlet">Servlet</th>
+					<th  sortable="true" key="queryString">Query String</th>
+					<th  sortable="true" key="externalUrl">External	URL</th>
+					<th  sortable="true" key="target">Target</th>
+					<th  sortable="true" key="menuSetCode">Menu	Set Code</th>
+					<th  sortable="true" key="separator">Separator</th>
+					<th  sortable="true" key="imageSrc">Image Source</th>
+					<th  sortable="false" key="edit">Edit</th>
+					<th  sortable="false" key="delete">Delete</th>
+					</tr>
+				</thead>
+				<tbody ng-repeat="fnMenuItem in tableFnMenuItems" >
+				<tr>
+					<td  ng-bind="fnMenuItem.id"></td>
+					<td  ng-bind="fnMenuItem.label"></td>
+					<td style="word-break: break-all;" ng-bind="fnMenuItem.parentId"></td>
+					<td style="word-break: break-all;" ng-bind="fnMenuItem.sortOrder"></td>
+					<td  ng-bind="fnMenuItem.action"></td>
+					<td  ng-bind="fnMenuItem.functionCd"></td>
+					<td style="word-break: break-all;" ng-bind="fnMenuItem.active ? 'Y' : 'N'"></td>
+					<td style="word-break: break-all;" ng-bind="fnMenuItem.servlet"></td>
+					<td style="word-break: break-all;" ng-bind="fnMenuItem.queryString"></td>
+					<td style="word-break: break-all;" ng-bind="fnMenuItem.externalUrl"></td>
+					<td style="word-break: break-all;" ng-bind="fnMenuItem.target"></td>
+					<td style="word-break: break-all;" ng-bind="fnMenuItem.menuSetCode"></td>
+					<td style="word-break: break-all;" ng-bind="fnMenuItem.separator ? 'Y' : 'N'"></td>
+					<td style="word-break: break-all;" ng-bind="fnMenuItem.imageSrc"></td>
+					<td >
+						<div ng-click="editMenuItemModalPopup(fnMenuItem);"
+							style="font-size: 20px;"><a href="javascript:void(0)" class="icon-misc-pen"></a>
+						</div>
+					</td>
+					<td>
+						<div ng-click="removeMenuItem(fnMenuItem);"><a href="javascript:void(0)" class="icon-misc-trash"></a>
+						</div>
+					</td>
+				</tr>
+			</tbody>
+		</table>
+
+		<div class="well" style="padding-bottom: 35px;">
+				<div class="row ddh-page short">
+					<div b2b-pagination="" total-pages="totalPages1"
+						current-page="currentPage1" click-handler="customHandler1"
+						role="navigation" aria-label="Customer Data Pages"></div>
+				</div>
+				
+					<!-- <div class="row span10 offset1">
+					<div class="span6">
+						<div class="form-row">
+							<label for="totalPages1">Total Pages:</label>
+							<div class="field-group">
+								<input id="totalPages1" type="number" class="span12"
+									only-digits="" name="totalPages1" ng-model="totalPages1"
+									title="Total Pages {{totalPages1}}"style="pointer-events: none;">
+							</div>
+						</div>
+					</div>
+					<div class="span6 font-clearview">
+						<div class="form-row">
+							<label for="currentPage1">Current Page:</label>
+							<div class="field-group">
+								<input id="currentPage1" type="number" class="span12"
+									only-digits="" name="currentPage1" ng-model="currentPage1"
+									title="Current Page {{currentPage1}}">
+							</div>
+						</div>
+					</div>
+				</div> -->
+			</div>
+		</div>
+
+</div>
+
+</div>
\ No newline at end of file
diff --git a/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/admin.html b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/admin.html
new file mode 100644
index 00000000..ecab06a0
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/admin.html
@@ -0,0 +1,69 @@
+<!DOCTYPE html>
+<!-- Single-page application for EPSDK-App admin pages using DS2 look and feel -->
+<html>
+<head>
+	<meta charset="ISO-8859-1">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge, chrome=1" />
+	
+	<title>Admin</title>
+
+	<!-- B2b Library -->
+	<link rel="stylesheet" type="text/css" href="app/fusion/external/b2b/css/b2b-angular/b2b-angular.css">
+	<link rel="stylesheet" type="text/css" href="app/fusion/external/b2b/css/b2b-angular/font_icons.css">
+	
+	<!-- icons in open source -->
+	<link rel="stylesheet" type="text/css" href="app/fusion/external/ds2/css/digital-ng-library/ionicons.css">
+	<link rel="stylesheet" type="text/css" href="app/fusion/external/ds2/css/digital-ng-library/ecomp-ionicons.css">
+	
+	
+
+	<link rel="stylesheet" type="text/css" href="app/fusion/styles/ecomp.css">
+	
+	<!-- Common scripts -->	
+	<script src="app/fusion/external/angular-1.4.8/angular.js"></script>	
+	<script src="app/fusion/external/angular-1.4.8/angular-messages.js"></script>
+	<script src="app/fusion/external/angular-1.4.8/angular-touch.js"></script>
+	<script src="app/fusion/external/angular-1.4.8/angular-sanitize.js"></script>	
+	<script src="app/fusion/external/angular-1.4.8/angular-route.min.js"></script>
+	<script src="app/fusion/external/angular-1.4.8/angular-cookies.min.js"></script>
+	<script src="app/fusion/external/jquery/dist/jquery.min.js"></script>
+	
+	<script src="app/fusion/external/javascript-detect-element-resize/jquery.resize.js"></script>
+	<script src="app/fusion/external/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
+	<script src="app/fusion/external/angular-gridster/dist/angular-gridster.min.js"></script>
+	
+	<!-- B2b Library -->
+	<script src="app/fusion/external/b2b/js/b2b-angular/b2b-library.min.js"></script>
+	
+	<script src="app/fusion/scripts/DS2-services/ds2-modal/modalService.js"></script>
+	<script src="app/fusion/external/ds2/js/appDS2.js"></script>	
+	<script src="app/fusion/scripts/DS2-services/userInfoServiceDS2.js"></script>	 
+	<script src="app/fusion/scripts/DS2-services/headerServiceDS2.js"></script>
+	<script src="app/fusion/scripts/DS2-services/leftMenuServiceDS2.js"></script>
+	<script src="app/fusion/scripts/DS2-services/manifestService.js"></script>
+	
+	<script src="app/fusion/scripts/DS2-directives/footer.js"></script>
+	<script src="app/fusion/scripts/DS2-directives/ds2Header.js"></script>
+	<script src="app/fusion/scripts/DS2-directives/ds2LeftMenu.js"></script>
+	<script src="app/fusion/scripts/DS2-directives/b2b-leftnav-ext.js"></script> 
+	<!-- Page-specific items -->
+	<script src="app/fusion/scripts/DS2-controllers/admin-controller.js"></script>
+	<script src="app/fusion/scripts/DS2-controllers/admin-route.js"></script>
+	<script src="app/fusion/scripts/DS2-controllers/admin-menu-edit.js"></script> 
+	<script src="app/fusion/scripts/DS2-services/adminService.js"></script> 
+	<script src="app/fusion/scripts/DS2-services/adminMenuService.js"></script>
+	<script src="app/fusion/scripts/DS2-services/userInfoServiceDS2.js"></script>	  
+	<script src="app/fusion/scripts/DS2-controllers/usage-list-controller.js"></script>	  	
+	<script src="app/fusion/scripts/DS2-controllers/fn-menu-add-popup-controller.js"></script>
+ 	<script src="app/fusion/scripts/DS2-controllers/collaborate-list-controller.js"></script>
+ 	<script src="app/fusion/scripts/DS2-controllers/admin-closed-cloop.js"></script>
+	<script src="app/fusion/scripts/DS2-controllers/admin-whitelist.js"></script>
+ 	
+</head>
+	<body class="appBody" ng-app="abs">
+		<div ds2-Header class="header-container" ></div>
+ 		<div ds2-menu id="menuContainer" class="menu-container" ></div>
+		<div ng-view id="rightContentProfile" class="content-container"></div>	
+		<div ds2-Footer class="footer-container"></div>
+	</body>
+</html>
diff --git a/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/admin_closed_loop.html b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/admin_closed_loop.html
new file mode 100644
index 00000000..4f65e7b3
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/admin_closed_loop.html
@@ -0,0 +1,17 @@
+<div style=" margin-right:50px;" id="fnMenueContent"> 		
+	<div id="page-content" class="pageTitle" align="left">
+
+	        <h1 class="heading1" style="margin-top:20px;">Closed Loop</h1>
+	        <br/>
+	 <br>	        
+	</div>
+	<div id="page-content" style="margin-right: 20px;text-align: justify;text-align-last:auto;">
+	Cloop Server
+	</div>
+	<br>
+ <div id="hiddenCamundaDiv" style="width:500px;"></div>
+    <br>
+	<iframe id="camundaFrame" style=" margin-left: 250px;"
+		ng-src="{{camunda_cockpit_url}}"
+		width="100%" height="500"></iframe> 
+</div>
diff --git a/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/collaborate-list.html b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/collaborate-list.html
new file mode 100644
index 00000000..05c316c8
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/collaborate-list.html
@@ -0,0 +1,76 @@
+
+<div id="page-content">
+	<div>
+	<div align="right">
+	<a href="JavaScript:void(0);" style= "color:#00547A" onClick="downloadScreenCaptureExtenstion()" id="install-button" >
+		Please download the extension for ScreenCapture and refresh page</a>
+	</div>
+		<div>
+			<h1 class="heading-page">User List</h1>
+		</div>
+		<div ng-show="showLoader" class="span loader-container">
+			<i class="icon-primary-spinner" role="img"	aria-label="Please wait while we load your content"></i>
+		</div>
+		<div>
+		
+			<table class="striped" table-data="tableCollbItems">
+
+			    <thead>
+					<tr>
+						<th  key="id">User ID</th>
+			            <th  key="lastName">Last Name</th>        
+			            <th  key="firstName">First Name</th>    
+			            <th  key="email">Email</th>
+			            <th  key="orgUserId">Organization User ID</th>        
+			            <th  key="online">Online/Offline</th>         
+			        </tr>
+
+			    </thead>
+			    <tbody  type="body" ng-repeat="rowData in tableCollbItems">
+			        <tr>
+		            	<td  ng-bind="rowData['id']">{{rowData.id}}</td>
+		            	<td  ng-bind="rowData['lastName']">{{rowData.lastName}}</td>
+		            	<td  ng-bind="rowData['firstName']">{{rowData.firstName}}</td>
+		            	<td ng-bind="rowData['email']">{{rowData.email}}</td>
+		            	<td  ng-bind="rowData['orgUserId']">{{rowData.loginId}}</td>
+		        		<td>
+		        		   <div ng-hide="rowData.online" ng-click="rowData.isActive=true;openCollaboration(rowData.chatId)"><span class="icon-misc-lightsoff" ></span>Offline</div>
+						   <div ng-show="rowData.online"ng-click="rowData.isActive=false;openCollaboration(rowData.chatId)"><span class="icon-misc-bulb" ></span>Online</div>				
+		        	   </td>
+			        </tr>     
+			    </tbody>	  
+			</table>
+		</div>
+	
+			<div class="well" style="padding-bottom: 35px;">
+				<div class="row">
+					<div b2b-pagination="" total-pages="totalPages1"
+						current-page="currentPage1" click-handler="customHandler1"
+						role="navigation" aria-label="Customer Data Pages"></div>
+				</div>
+				
+				<!-- 	<div class="row span10 offset1">
+					<div class="span6">
+						<div class="form-row">
+							<label for="totalPages1">Total Pages:</label>
+							<div class="field-group">
+								<input id="totalPages1" type="number" class="span12"
+									only-digits="" name="totalPages1" ng-model="totalPages1"
+									title="Total Pages {{totalPages1}}"style="pointer-events: none;">
+							</div>
+						</div>
+					</div>
+					<div class="span6 font-clearview">
+						<div class="form-row">
+							<label for="currentPage1">Current Page:</label>
+							<div class="field-group">
+								<input id="currentPage1" type="number" class="span12"
+									only-digits="" name="currentPage1" ng-model="currentPage1"
+									title="Current Page {{currentPage1}}">
+							</div>
+						</div>
+					</div>
+				</div> -->
+			</div>
+	</div>
+<div id="peerBroadcastSection"></div>
diff --git a/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/collaboration.html b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/collaboration.html
new file mode 100644
index 00000000..cca54a6b
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/collaboration.html
@@ -0,0 +1,182 @@
+
+ <link rel="stylesheet" type="text/css" href="app/fusion/external/b2b/css/b2b-angular/b2b-angular.css">
+	<link rel="stylesheet" type="text/css" href="app/fusion/external/b2b/css/b2b-angular/font_icons.css">
+	
+	<link rel="stylesheet" type="text/css" href="app/fusion/styles/ecomp.css">
+
+		<style type="text/css">
+	/*
+	 *	NOTE: All CSS is purely cosmetic - it does not affect functionality
+	 *  http://layout.jquery-dev.com/demos.cfm
+	 */
+
+	/* customize borders to avoid double-borders around inner-layouts */
+	.ui-layout-pane {
+		border:			0; /* override layout-default-latest.css */
+		border-top:		1px solid #BBB;
+		border-bottom:	1px solid #BBB;
+	}
+	.ui-layout-pane-north ,
+	.ui-layout-pane-south {
+		border:			1px solid #BBB;
+		overflow:		auto;
+	}
+	.ui-layout-pane-west ,
+	.ui-layout-pane-east {
+	}
+	.ui-layout-pane-center	{
+		border-left:	0;
+		border-right:	0;
+		}
+		.inner-center {
+			border:		1px solid #BBB;
+		}
+
+	/* add shading to outer sidebar-panes */
+	.outer-west ,
+	.outer-east {
+		background-color: #EEE;
+	}
+	.middle-west ,
+	.middle-east {
+		background-color: #F8F8F8;
+	}
+
+	/* remove padding & scrolling from panes that are 'containers' for nested layouts */
+	.outer-center ,
+	.middle-center {
+		border:			0; /* cosmetic */
+		padding:		0;
+		overflow:		auto;
+	}
+
+	/*
+	 *	customize borders on panes/resizers to make pretty
+	 */
+	.ui-layout-pane-west		{ border-right:		0; }
+	.ui-layout-resizer-west		{ border-left:		1px solid #BBB; }
+	.ui-layout-pane-east		{ border-left:		0; }
+	.ui-layout-resizer-east		{ border-right:		1px solid #BBB; }
+	.ui-layout-pane-north		{ border-bottom:	0; }
+	.ui-layout-resizer-north	{ border-top:		1px solid #BBB; }
+	.ui-layout-pane-south		{ border-top:		0; }
+	.ui-layout-resizer-south	{ border-bottom: 	1px solid #BBB; }
+	/*
+	 *	add borders to resizers when pane is 'closed'
+	 *
+	 *.ui-layout-resizer-closed	{ border:			1px solid #BBB; }
+	 */
+	/*
+	 *	show both borders when the resizer is 'dragging'
+	 */
+	.ui-layout-resizer-west-dragging ,
+	.ui-layout-resizer-east-dragging {
+		border-left:		1px solid #BBB;
+		border-right:		1px solid #BBB;
+	}
+	.ui-layout-resizer-north-dragging ,
+	.ui-layout-resizer-south-dragging {
+		border-top:		1px solid #BBB;
+		border-bottom:	1px solid #BBB;
+	}
+	
+	
+	/*
+	layout toggler background image
+	*/
+	.ui-layout-toggler-west, .ui-layout-toggler-east {
+	border-width: 1px 0;
+	background-image: url("static/fusion/images/layout/panel-e-w-toggle.png");
+	background-size: 10px 10px;
+    background-repeat: no-repeat;
+    background-position: center; 
+	}
+	
+	.ui-layout-toggler-north, .ui-layout-toggler-south {
+	border-width: 0 1px;
+	background-image: url("static/fusion/images/layout/panel-n-s-toggle.png");
+	background-size: 10px 10px;
+	background-repeat: no-repeat;
+	 background-position: center; 
+	}
+	
+	body{background-color:#fff;font-size:14px;font-size:.875rem;margin:0;padding:0px 0 20px;position:relative}
+
+	</style>
+<!-- LAYOUT v 1.3.0 -->
+	<script type="text/javascript" src="app/fusion/scripts/layout/jquery-latest.js"></script>
+	<script type="text/javascript" src="app/fusion/scripts/layout/jquery-ui-latest.js"></script>
+	<script type="text/javascript" src="app/fusion/scripts/layout/jquery.layout-latest.js"></script>
+	<script type="text/javascript" src="app/fusion/scripts/webrtc/RTCMultiConnection.js"></script>
+    <script type="text/javascript" src="app/fusion/scripts/socket/peerBroadcast.js"></script>
+	<script type="text/javascript" src="app/fusion/scripts/layout/debug.js"></script>
+	
+		<script src="app/fusion/external/angular-1.4.8/angular.min.js"></script>
+	<script src="app/fusion/external/angular-1.4.8/angular-messages.js"></script>
+	<script src="app/fusion/external/angular-1.4.8/angular-touch.js"></script>
+	<script src="app/fusion/external/angular-1.4.8/angular-sanitize.js"></script>	
+	<script src="app/fusion/external/angular-1.4.8/angular-route.min.js"></script>
+	<script src="app/fusion/external/angular-1.4.8/angular-cookies.min.js"></script>
+	<script src="app/fusion/external/ds2/js/appDS2.js"></script>	
+ 
+	
+	<script src="app/fusion/scripts/DS2-services/ds2-modal/modalService.js"></script>
+	
+
+	<script type="text/javascript" src= "app/fusion/scripts/DS2-controllers/collaboration-controller.js"></script>	
+		
+<div class="outer-center" style="position: absolute; left: 12px; right: 0px; top: 0px;bottom: 0px;">
+	<div class="inner-center">
+	
+	<!-- 	<jsp:include page="/WEB-INF/fusion/zul/chatOne.zul" /> -->
+	
+	
+	
+	<table style="width: 100%;">
+				<tbody><tr>
+                    <td>
+                        <button type="button" id="share-screen"  class="btn btn-alt btn-small setup">Start Session</button>
+    				    <button id="stop-share-screen"  class="btn btn-alt btn-small setup">Stop Session</button>
+    					<button id="view-screen" class="btn btn-alt btn-small setup">View</button>       
+	
+                    </td>
+    
+                </tr>
+            </tbody>
+	
+                <tbody><tr>
+                    <td>
+                         <input type="text" id="chat-input" style="font-size: 1.2em;visibility:collapse;" placeholder="type here.."/>
+                         <div id="chat-output"></div>
+                    </td>
+                    <!-- 
+                    <td style="background: white;">
+                        <input type="file" id="file">
+                        <div id="file-progress"></div>
+                    </td>
+                     -->
+                </tr>
+            </tbody>
+    </table>
+	
+		
+	</div>
+	<div id="inner-south" class="ui-layout-south">
+		<div class="videoContainer1"></div>
+		<div class="videoContainer2"></div>
+ 		
+	</div>
+</div>
+
+<div class="outer-west">
+   <div class="screenContainer1"></div>
+   <div class="screenContainer2"></div>
+   <div ng-controller="collaborationControllerDS2">
+   </div>
+</div>
+
+
+
+
+
+
diff --git a/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/jcs_admin.html b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/jcs_admin.html
new file mode 100644
index 00000000..fd8a5302
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/jcs_admin.html
@@ -0,0 +1,73 @@
+<div id="page-content" style=" width: 100%">
+
+	<div>
+		<h1 class="heading-page" id="CacheRegions">Cache Regions</h1>
+	</div>
+
+  	<div style="margin-right:20px; text-align:justify; text-align-last:auto;">
+  	<p>
+  	These are the regions which are currently defined in the cache. 'Items'	and 'Bytes' refer to the elements currently in memory (not spooled).
+  	You can clear all items for a region by clicking on the Clear icon next	to the desired region below. You can also <a href="admin#/jcs_admin"  ng-click="clearAllFuncPopUp();">clear all regions</a> 
+  	which empties the entire cache.</p>
+  	</div>
+	
+	<!-- This implements an accordion table in place -->
+		<div style="border-top: 1px solid #c4c4c4; margin-top: 0px; margin-bottom:30px; margin-right: 20px; background-color: #fff; padding: 10px 0; color: #646464s">
+		<div class="row" style="margin: 0 20px 10px 0px; float: left; width: 97%;">
+			<div class="col-md-4" style=" width: 16.6666666667%;"><b>Cache Name</b></div>
+			<div class="col-md-2" style=" width: 8.3333333333%;"><b># of Items</b></div>
+			<div class="col-md-2" style=" width: 8.3333333333%;"><b>Bytes</b></div>
+			<div class="col-md-2" style=" width: 8.3333333333%;"><b>Status</b></div>
+			<div class="col-md-3" style=" width: 12.5%;"><b>Memory Hits</b></div>
+			<div class="col-md-3" style=" width: 12.5%;"><b>Aux Hits</b></div>
+			<div class="col-md-3" style=" width: 12.5%;"><b>Not Found Misses</b></div>
+			<div class="col-md-3" style=" width:12.5%;"><b>Expired Misses</b></div>
+			<div class="col-md-1" style=" width: 4.1666666667%;"><b>Clear?</b></div>
+			<div class="col-md-1" style=" width: 4.1666666667%;"><b>Items</b></div>
+		</div>
+		
+		<div  ng-repeat="region in regions">
+			<div class="row" style="margin: 0 20px 10px 0px; float: left; width: 97%;">
+			<div class="col-md-4" style=" width: 16.6666666667%;">
+				<a b2b-tooltip="Click to Show Region Details" ng-click="showRegionDetails(region.cacheName);" href="admin#/jcs_admin">{{region.cacheName}}</a></div>
+				<div class="col-md-2" style=" width: 8.3333333333%;">{{region.size}}</div>
+				<div class="col-md-2" style=" width: 8.3333333333%;">{{region.byteCount}}</div>
+				<div class="col-md-2" style=" width: 8.3333333333%;">{{region.status}}</div>
+				<div class="col-md-3" style=" width: 12.5%;">{{region.hitCountRam}}</div>
+				<div class="col-md-3" style=" width: 12.5%;">{{region.hitCountAux}}</div>
+				<div class="col-md-3" style=" width: 12.5%;">{{region.missCountNotFound}}</div>
+				<div class="col-md-3" style=" width: 12.5%;">{{region.missCountExpired}}</div>
+				<div class="col-md-1" style=" width: 4.1666666667%;">
+					<div ng-click="clearRegionFuncPopUp(region.cacheName);" style="font-size:20px;">
+					<a href="javascript:void(0)" class="icon-misc-trash"></a></div>
+				</div>
+				<div class="col-md-1"><i class="icon-primary-accordion-plus" ng-class="{true: 'icon-primary-accordion-plus', false: 'icon-primary-accordion-minus'}[ !bling$index]"  ng-click="bling$index = !bling$index" style="display: block;"></i></div>
+			</div>
+			<div class="row" style="margin: 0px 20px 0px 30px; float: left; width: 95%; border-top: 1px solid #e4e4e4; padding-top: 10px"
+				ng-show="bling$index">
+				<span style="height: 20px; width: 20px; display: inline-block; float: left"></span>
+				<div class="col-md-12" style=" width: 50%;"><b>Key</b></div>
+				<div class="col-md-2" style=" width: 8.3333333333%"><b>Eternal?</b></div>
+				<div class="col-md-4" style=" width: 16.6666666667%;"><b>Created</b></div>
+				<div class="col-md-2" style=" width: 8.3333333333%;"><b>Max Life</b></div>
+				<div class="col-md-2" style=" width: 8.3333333333%;"><b>Expires</b></div>
+				<div class="col-md-1" style=" width: 4.1666666667%;"><b>Clear?</b></div>
+			</div>
+			<div ng-repeat="item in region.items">
+				<div class="row" style="margin: 0px 20px 0px 30px; float: left; width: 95%;" ng-show="bling$index">
+					<span style="height: 20px; width: 20px; display: inline-block; float: left"></span>
+					<div class="col-md-12" style=" width: 50%;"><a href="#" tooltip="Click to Show Item Details" ng-click="showItemDetails(region.cacheName,item.key);">{{item.key}}</a></div>
+					<div class="col-md-2" style=" width: 8.3333333333%;">{{item.eternal}}</div>
+					<div class="col-md-4" style=" width: 16.6666666667%;">{{item.createTime}}</div>
+					<div class="col-md-2" style=" width: 8.3333333333%;">{{item.maxLifeSeconds}}</div>
+					<div class="col-md-2"  style=" width: 8.3333333333%;">{{item.expiresInSeconds}}</div>
+					<div class="col-md-1" style=" width: 4.1666666667%;">
+						<div ng-click="clearItemFuncPopUp(region.cacheName,item.key);" style="font-size:20px;"><a href="javascript:void(0)" class="icon-misc-trash"></a></div>
+					</div>
+				</div>
+			</div>
+			<div style="clear: both"></div>
+		</div>
+	
+	</div>
+</div>
diff --git a/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/admin-menu-del-confirm.html b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/admin-menu-del-confirm.html
new file mode 100644
index 00000000..5d6cb16c
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/admin-menu-del-confirm.html
@@ -0,0 +1,22 @@
+<div>
+	<div class="b2b-modal-header ng-scope">
+		<h2 id="myModalLabel" modal-title=""> Menu Item Deletion</h2>
+		<div class="corner-button in">
+			<button type="button" class="close" aria-label="Close"
+				ng-click="$dismiss('cancel')"></button>
+		</div>
+	</div>
+	<div class="b2b-modal-body ng-scope ng-isolate-scope" tabindex="0"
+		role="region" aria-label="Modal header text content"
+		style="height: 145px;">
+	You are about to delete '{{fnMenuItem.label}}' Menu Item. Please click 'OK' to continue.
+	</div>
+	<div class="b2b-modal-footer ng-scope ng-isolate-scope">
+		<div class="cta-button-group in">
+			<button class="btn btn-alt btn-small" type="button"
+				ng-click="deleteMenuItem(fnMenuItem);">Ok</button>
+			<button class="btn btn-small" type="button"
+				ng-click="$dismiss('cancel')">Cancel</button>
+		</div>
+	</div>
+</div>
diff --git a/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/cache-menu-clear-confirm.html b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/cache-menu-clear-confirm.html
new file mode 100644
index 00000000..d3eda5e4
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/cache-menu-clear-confirm.html
@@ -0,0 +1,22 @@
+<div>
+	<div class="b2b-modal-header ng-scope">
+		<h2 id="myModalLabel" modal-title="">Clear All Cache Regions</h2>
+		<div class="corner-button in">
+			<button type="button" class="close" aria-label="Close"
+				ng-click="$dismiss('cancel')"></button>
+		</div>
+	</div>
+	<div class="b2b-modal-body ng-scope ng-isolate-scope in" tabindex="0"
+		role="region" aria-label="Modal header text content"
+		style="height: 145px;">
+		You are about to clear all cache regions. Please click 'OK' to continue.
+	</div>
+	<div class="b2b-modal-footer ng-scope ng-isolate-scope in">
+		<div class="cta-button-group in">
+			<button class="btn btn-alt btn-small" type="button"
+				ng-click="deleteFun(roleFun);">Ok</button>
+			<button class="btn btn-small" type="button"
+				ng-click="$dismiss('cancel')">Cancel</button>
+		</div>
+	</div>
+</div>
diff --git a/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/cache-menu-clear-region-confirm.html b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/cache-menu-clear-region-confirm.html
new file mode 100644
index 00000000..5f43e2a0
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/cache-menu-clear-region-confirm.html
@@ -0,0 +1,22 @@
+<div>
+	<div class="b2b-modal-header ng-scope">
+		<h2 id="myModalLabel" modal-title="">Clear Cache Region</h2>
+		<div class="corner-button in">
+			<button type="button" class="close" aria-label="Close"
+				ng-click="$dismiss('cancel')"></button>
+		</div>
+	</div>
+	<div class="b2b-modal-body ng-scope ng-isolate-scope in" tabindex="0"
+		role="region" aria-label="Modal header text content"
+		style="height: 145px;">
+		You are about to clear all of the items in the cache region {{msg.text}}. Please click 'OK' to continue.
+	</div>
+	<div class="b2b-modal-footer ng-scope ng-isolate-scope in">
+		<div class="cta-button-group in">
+			<button class="btn btn-alt btn-small" type="button"
+				ng-click="deleteFun(roleFun);">Ok</button>
+			<button class="btn btn-small" type="button"
+				ng-click="$dismiss('cancel')">Cancel</button>
+		</div>
+	</div>
+</div>
diff --git a/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/clearItem-region-confirm.html b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/clearItem-region-confirm.html
new file mode 100644
index 00000000..004b49d8
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/clearItem-region-confirm.html
@@ -0,0 +1,22 @@
+<div>
+	<div class="b2b-modal-header ng-scope">
+		<h2 id="myModalLabel" modal-title="">Clear Item Cache Region</h2>
+		<div class="corner-button in">
+			<button type="button" class="close" aria-label="Close"
+				ng-click="$dismiss('cancel')"></button>
+		</div>
+	</div>
+	<div class="b2b-modal-body ng-scope ng-isolate-scope" tabindex="0"
+		role="region" aria-label="Modal header text content"
+		style="height: 145px;">
+		You are about to clear this item from the cache region {{msg.text}}. Please click 'OK' to continue.
+	</div>
+	<div class="b2b-modal-footer ng-scope ng-isolate-scope in">
+		<div class="cta-button-group in">
+			<button class="btn btn-alt btn-small" type="button"
+				ng-click="deleteFun(roleFun);">Ok</button>
+			<button class="btn btn-small" type="button"
+				ng-click="$dismiss('cancel')">Cancel</button>
+		</div>
+	</div>
+</div>
diff --git a/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/collaborate-list-toggle-profile-active-status.html b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/collaborate-list-toggle-profile-active-status.html
new file mode 100644
index 00000000..6a91cb0a
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/collaborate-list-toggle-profile-active-status.html
@@ -0,0 +1,22 @@
+<div>
+	<div class="b2b-modal-header ng-scope">
+		<h2 id="myModalLabel" modal-title="">Change User Status</h2>
+		<div class="corner-button in">
+			<button type="button" class="close" aria-label="Close"
+				ng-click="$dismiss('cancel')"></button>
+		</div>
+	</div>
+	<div class="b2b-modal-body ng-scope ng-isolate-scope" tabindex="0"
+		role="region" aria-label="Modal header text content"
+		style="height: 145px;">
+		You are about to change user's active status. Please click 'OK' to continue.
+	</div>
+	<div class="b2b-modal-footer ng-scope ng-isolate-scope">
+		<div class="cta-button-group in">
+			<button class="btn btn-alt btn-small" type="button"
+				ng-click="deleteFun(roleFun);">Ok</button>
+			<button class="btn btn-small" type="button"
+				ng-click="$dismiss('cancel')">Cancel</button>
+		</div>
+	</div>
+</div>
diff --git a/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/popup-modal-fn-menu-edit.html b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/popup-modal-fn-menu-edit.html
new file mode 100644
index 00000000..2ccdf2af
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/popup-modal-fn-menu-edit.html
@@ -0,0 +1,129 @@
+<script type="text/ng-template" id="edit_menu_item_popup.html">
+
+          <div class="modal__informative font-showcase" style="width:1100px;">
+            <div class="modal__header">
+                <h2 class="font-showcase-font-name" style="width: 500px;">{{label}}</h2>
+            </div>
+            <div class="divider-container"><hr> </div>
+			      
+            <div class="modal__content" > 
+				<table>
+					<tr>
+						<td>
+							<div class="fn-ebz-container" >
+								<label class="fn-ebz-text-label"><sup><b>*</b></sup>Label:</label><br>
+								<input id="popupAddMenuItemLabel" type="text" class="fn-ebz-text" ng-model="addFnMenuItem.label" maxlength="30" /> 
+							</div>
+						</td>
+						<td>
+							<div class="fn-ebz-container" style = "display:none" >
+								<label class="fn-ebz-text-label"><sup><b>*</b></sup>Parent:</label><br>
+								<input id="popupAddMenuItemParentId" type="text" class="fn-ebz-text" ng-model="addFnMenuItem.parentId" ng-disabled="disableParentId" maxlength="30" /> 
+							</div>
+							<div class="fn-ebz-container" ng-init="getParentData();">
+  								<form name="parentListForm">
+    							<label class="fn-ebz-text-label" for="parentSelect"><sup><b>*</b></sup>Parent:</label><br>
+    							<select class="form-field" name="parentSelect" id="parentSelect" ng-model="addFnMenuItem.parentId">
+								<option>{{getParentLabel(addFnMenuItem.parentId, parentListSelectData)}}</option>
+      							<option ng-repeat="option in parentListSelectData" value="{{option[0]}}" "{{(addFnMenuItem.parentId===option[0]) ? 'selected' : '' }}">{{option[1]}}</option>
+    							</select>
+  								</form>
+							</div>
+						</td>
+						<td>
+							<div class="fn-ebz-container" >
+								<label class="fn-ebz-text-label"><sup><b>*</b></sup>Sort Order:</label><br>
+								<input id="popupAddMenuItemSortOrder" type="text" class="fn-ebz-text" ng-model="addFnMenuItem.sortOrder" ng-disabled="disableSortOrder"	maxlength="30" /> 
+							</div>
+						</td>
+						<td>
+							<div class="fn-ebz-container" >
+								<label class="fn-ebz-text-label"><sup><b>*</b></sup>Action:</label><br>
+								<input id="popupAddMenuItemAction" type="text" class="fn-ebz-text" ng-model="addFnMenuItem.action" ng-disabled="disableAction" maxlength="30" /> 
+					        </div>
+						</td>		
+					</tr>
+					
+					<tr>
+						<td>
+							<div class="fn-ebz-container" ng-init="getFunctionCDselectData();">
+  								<form name="functionCDform">
+    							<label class="fn-ebz-text-label" for="repeatSelect"><sup><b>*</b></sup>Function:</label><br>
+    							<select class="form-field" name="repeatSelect" id="repeatSelect" ng-model="addFnMenuItem.functionCd">
+								<option>{{addFnMenuItem.functionCd}}</option>
+      							<option ng-repeat="option in functionCDselectData" value="{{option}}" >{{option}}</option>
+    							</select>
+  								</form>
+							</div>
+						</td>
+						<td>
+						<div class="fn-ebz-container">
+								<label class="fn-ebz-text-label"><sup><b>*</b></sup>Active:</label><br>
+								<select class="form-field" name="selectActive" ng-model="addFnMenuItem.active">
+  								<option ng-repeat="active in activeStatusOptions" value="{{active.value}}" ng-selected="{{active.value}}=={{addFnMenuItem.active}}" >{{active.title}}</option>
+								</select>
+							</div>
+						</td>
+						<td>
+							<div class="fn-ebz-container" >
+								<label class="fn-ebz-text-label"><sup><b></b></sup>Servlet:</label><br>
+								<input id="popupAddMenuItemServlet" type="text" class="fn-ebz-text" ng-model="addFnMenuItem.servlet" ng-disabled="disableServlet" maxlength="30" /> 
+							</div>
+						</td>
+						<td>
+							<div class="fn-ebz-container" >
+								<label class="fn-ebz-text-label"><sup><b></b></sup>Query String:</label><br>
+								<input id="popupAddMenuItemQueryString" type="text" class="fn-ebz-text" ng-model="addFnMenuItem.queryString" ng-disabled="disableQueryString" maxlength="30" /> 
+							</div>
+						</td>
+					</tr>
+					
+					<tr>
+						<td>
+							<div class="fn-ebz-container" >
+								<label class="fn-ebz-text-label"><sup><b></b></sup>External URL:</label><br>
+								<input id="popupAddMenuItemExternalUrl" type="text" class="fn-ebz-text" ng-model="addFnMenuItem.externalUrl" ng-disabled="disableExternalUrl" maxlength="30" /> 
+							</div>
+						</td>
+						<td>
+							<div class="fn-ebz-container" >
+								<label class="fn-ebz-text-label"><sup><b></b></sup>Target:</label><br>
+								<input id="popupAddMenuItemTarget" type="text" class="fn-ebz-text" ng-model="addFnMenuItem.target" ng-disabled="disableTarget" maxlength="30" /> 
+							</div>
+						</td>
+						<td>
+							<div class="fn-ebz-container" >
+								<label class="fn-ebz-text-label"><sup><b>*</b></sup>Menu Set Code:</label><br>
+								<input id="popupAddMenuItemMenuSetCode" type="text" class="fn-ebz-text" ng-model="addFnMenuItem.menuSetCode" ng-disabled="disableMenuSetCode" maxlength="30" /> 
+							</div>
+						</td>
+						<td>
+							<div class="fn-ebz-container" >
+								<label class="fn-ebz-text-label"><sup><b>*</b></sup>Separator:</label><br>
+								<select class="form-field" name="select" ng-model="addFnMenuItem.separator">
+  								<option ng-repeat="separator in separatorStatusOptions" value="{{separator.value}}" ng-selected="{{separator.value}}=={{addFnMenuItem.separator}}" >{{separator.title}}</option>
+								</select>
+							</div>
+						</td>
+					</tr>
+					
+					<tr>
+						<td>
+							<div class="fn-ebz-container" >
+								<label class="fn-ebz-text-label"><sup><b></b></sup>Image Source:</label><br>
+								<input id="popupAddMenuItemImageSrc" type="text" class="fn-ebz-text" ng-model="addFnMenuItem.imageSrc" ng-disabled="disableImageSrc" maxlength="30" /> 
+							</div>
+						</td>
+					</tr>
+				</table>
+            </div>
+                <button class="button button--primary button--small" herf="javascript:void(0)" ng-click="updateFnMenu(addFnMenuItem);">Save</button>
+				<button class="button button--primary button--small" herf="javascript:void(0)" ng-click="close()">Close</button>
+			<!--
+            <div class="modal__footer">
+            </div>
+			-->
+        </div>
+</script>
+
+
diff --git a/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/popup-modal-fnmenu-add.html b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/popup-modal-fnmenu-add.html
new file mode 100644
index 00000000..167defb7
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/popup-modal-fnmenu-add.html
@@ -0,0 +1,136 @@
+<div>
+	<div class="b2b-modal-header ng-scope">
+		<h2 id="myModalLabel" modal-title="">{{label}}</h2>
+		<div class="corner-button in">
+			<button type="button" class="close" aria-label="Close"
+				ng-click="$dismiss('cancel')"></button>
+		</div>
+	</div>
+	<div class="b2b-modal-body ng-scope ng-isolate-scope" tabindex="0"
+		role="region" aria-label="Modal header text content">
+
+	<table>
+		<tr>
+			<td>
+			
+				<div class="fn-ebz-container" >
+					<label class="fn-ebz-text-label"><sup><b>*</b></sup>Label:</label><br>
+					<input id="popupAddMenuItemLabel" type="text" class="fn-ebz-text" ng-model="addFnMenuItem.label" maxlength="30" /> 
+				</div>
+			</td>
+			<td>
+				<div class="fn-ebz-container" style = "display:none" >
+					<label class="fn-ebz-text-label"><sup><b>*</b></sup>Parent:</label><br>
+					<input id="popupAddMenuItemParentId" type="text" class="fn-ebz-text" ng-model="addFnMenuItem.parentId" ng-disabled="disableParentId" maxlength="30" /> 
+				</div>
+				<div class="fn-ebz-container" ng-init="getParentData();">
+							<form name="parentListForm">
+ 							<label class="fn-ebz-text-label" for="parentSelect"><sup><b>*</b></sup>Parent:</label><br>
+					<select name="select_projects" id="select_projects" ng-model="addFnMenuItem.parentIdAsString">
+				
+						<optgroup label="" ng-repeat="header in childListSelectData">
+							<option label="{{header.label}}" value="{{header.menuId}}" style="color:black;font-weight:bold;">{{header.label}}</option>	
+     									<option  ng-repeat="child in header.children" value="{{child.menuId}}" ng-selected="child.menuId == addFnMenuItem.parentId">{{child.label}}</option>
+						</optgroup>
+					</select>
+							</form>
+				</div>
+			</td>
+			<td>
+				<div class="fn-ebz-container" >
+					<label class="fn-ebz-text-label"><sup><b>*</b></sup>Sort Order:</label><br>
+					<input id="popupAddMenuItemSortOrder" type="text" class="fn-ebz-text" ng-model="addFnMenuItem.sortOrder" ng-disabled="disableSortOrder"	maxlength="30" /> 
+				</div>
+			</td>
+			<td>
+				<div class="fn-ebz-container" >
+					<label class="fn-ebz-text-label"><sup><b>*</b></sup>Action:</label><br>
+					<input id="popupAddMenuItemAction" type="text" class="fn-ebz-text" ng-model="addFnMenuItem.action" ng-disabled="disableAction" maxlength="200" /> 
+		        </div>
+			</td>		
+		</tr>
+		<tr>
+			<td>
+				<div class="fn-ebz-container" ng-init="getFunctionCDselectData();">
+							<form name="functionCDform">
+ 							<label class="fn-ebz-text-label" for="repeatSelect"><sup><b>*</b></sup>Function:</label><br>
+ 							<select class="form-field" name="repeatSelect" id="repeatSelect" ng-model="addFnMenuItem.functionCd">
+					<option>{{addFnMenuItem.functionCd}}</option>
+   							<option ng-repeat="option in functionCDselectData" value="{{option}}" ng-selected="option==addFnMenuItem.functionCd">{{option}}</option>
+ 							</select>
+							</form>
+				</div>
+			</td>
+			<td>
+			<div class="fn-ebz-container">
+					<label class="fn-ebz-text-label"><sup><b>*</b></sup>Active:</label><br>
+					<select class="form-field" name="selectActive" ng-model="addFnMenuItem.activeAsString" >
+							<option ng-repeat="active in activeStatusOptions" value="{{active.value}}" ng-selected="{{active.value}} == {{addFnMenuItem.active}}" >{{active.title}}</option>
+					</select>
+				</div>
+			</td>
+			<td>
+				<div class="fn-ebz-container" >
+					<label class="fn-ebz-text-label"><sup><b></b></sup>Servlet:</label><br>
+					<input id="popupAddMenuItemServlet" type="text" class="fn-ebz-text" ng-model="addFnMenuItem.servlet" ng-disabled="disableServlet" maxlength="30" /> 
+				</div>
+			</td>
+			<td>
+				<div class="fn-ebz-container" >
+					<label class="fn-ebz-text-label"><sup><b></b></sup>Query String:</label><br>
+					<input id="popupAddMenuItemQueryString" type="text" class="fn-ebz-text" ng-model="addFnMenuItem.queryString" ng-disabled="disableQueryString" maxlength="30" /> 
+				</div>
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<div class="fn-ebz-container" >
+					<label class="fn-ebz-text-label"><sup><b></b></sup>External URL:</label><br>
+					<input id="popupAddMenuItemExternalUrl" type="text" class="fn-ebz-text" ng-model="addFnMenuItem.externalUrl" ng-disabled="disableExternalUrl" maxlength="30" /> 
+				</div>
+			</td>
+			<td>
+				<div class="fn-ebz-container" >
+					<label class="fn-ebz-text-label"><sup><b></b></sup>Target:</label><br>
+					<input id="popupAddMenuItemTarget" type="text" class="fn-ebz-text" ng-model="addFnMenuItem.target" ng-disabled="disableTarget" maxlength="30" /> 
+				</div>
+			</td>
+			<td>
+				<div class="fn-ebz-container" >
+					<label class="fn-ebz-text-label"><sup><b>*</b></sup>Menu Set Code:</label><br>
+					<input id="popupAddMenuItemMenuSetCode" type="text" class="fn-ebz-text" ng-model="addFnMenuItem.menuSetCode" ng-disabled="disableMenuSetCode" maxlength="30" /> 
+				</div>
+			</td>
+			<td>
+				<div class="fn-ebz-container" >
+					<label class="fn-ebz-text-label"><sup><b>*</b></sup>Separator:</label><br>
+					<select class="form-field" name="select" ng-model="addFnMenuItem.separatorAsString">
+							<option ng-repeat="separator in separatorStatusOptions" value="{{separator.value}}" ng-selected="{{separator.value}}=={{addFnMenuItem.separator}}" >{{separator.title}}</option>
+					</select>
+				</div>
+			</td>
+		</tr>
+		
+		<tr>
+			<td>
+				<div class="fn-ebz-container" >
+					<label class="fn-ebz-text-label"><sup><b></b></sup>Image Source:</label><br>
+					<input id="popupAddMenuItemImageSrc" type="text" class="fn-ebz-text" ng-model="addFnMenuItem.imageSrc" ng-disabled="disableImageSrc" maxlength="30" /> 
+				</div>
+			</td>
+		</tr>
+	</table>
+	</div>
+	<div class="b2b-modal-footer ng-scope ng-isolate-scope">
+		<div class="cta-button-group in">
+			<button class="btn btn-alt btn-small" type="button"
+				ng-click="updateFnMenu(addFnMenuItem);">Save</button>
+			<button class="btn btn-small" type="button"
+				ng-click="$dismiss('cancel')">Cancel</button>
+		</div>
+	</div>
+</div>
+
+
+
+
diff --git a/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-child-add-confirm.html b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-child-add-confirm.html
new file mode 100644
index 00000000..8a944d76
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-child-add-confirm.html
@@ -0,0 +1,25 @@
+<div>
+	<div class="b2b-modal-header ng-scope in">
+		<h1><i class="icon-primary-alert"></i></h1>
+		<h2 id="myModalLabel" modal-title="">Confirm</h2>
+		<div class="corner-button in">
+			<button type="button" class="close" aria-label="Close"
+				ng-click="$dismiss('cancel')"></button>
+		</div>
+	</div>
+	<div class="b2b-modal-body ng-scope ng-isolate-scope in" tabindex="0"
+		role="region" aria-label="Modal header text content"
+		style="height: 55px;">
+		You are about to add the child role {{msg.roleFun}} to the role for {{msg.role}}. Do you want to continue?
+	</div>
+	<div class="b2b-modal-footer ng-scope ng-isolate-scope in">
+		<div class="cta-button-group in">
+			<button ng-if="!msg.selected" class="btn btn-alt btn-medium" type="button"
+				ng-click="confirmRoleChildRemove(msg.selected,msg.availableRole,msg.availableRole.id);">Yes</button>
+			<button ng-if="msg.selected" class="btn btn-alt btn-medium" type="button"
+				ng-click="confirmRoleChildAdd(msg.selected,msg.availableRole,msg.availableRole.id);">Yes</button>
+			<button class="btn btn-clear btn-medium" type="button"
+				ng-click="$dismiss('cancel')">Cancel</button>
+		</div>
+	</div>
+</div>
diff --git a/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-confirm-activation.html b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-confirm-activation.html
new file mode 100644
index 00000000..7a663cf3
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-confirm-activation.html
@@ -0,0 +1,23 @@
+<div>
+	<div class="b2b-modal-header ng-scope in">
+		<h1><i class="icon-primary-alert"></i></h1>
+		<h2 id="myModalLabel" modal-title="">Confirm</h2>
+		<div class="corner-button in">
+			<button type="button" class="close" aria-label="Close"
+				ng-click="$dismiss('cancel')"></button>
+		</div>
+	</div>
+	<div class="b2b-modal-body ng-scope ng-isolate-scope in" tabindex="0"
+		role="region" aria-label="Modal header text content"
+		style="height: 55px;">
+		You are about to {{msg.text}} the {{msg.roleName}} role. Do you want to continue?
+	</div>
+	<div class="b2b-modal-footer ng-scope ng-isolate-scope in">
+		<div class="cta-button-group in">
+			<button class="btn btn-alt btn-medium" type="button"
+				ng-click="roleActivate(msg.selected,msg.availableRole);">Ok</button>
+			<button class="btn btn-clear btn-medium" type="button"
+				ng-click="cancelRoleSwitch(msg)">Cancel</button>
+		</div>
+	</div>
+</div>
diff --git a/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-delete-confirm.html b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-delete-confirm.html
new file mode 100644
index 00000000..45e5ddfc
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-delete-confirm.html
@@ -0,0 +1,22 @@
+<div>
+	<div class="b2b-modal-header ng-scope in">
+		<h2 id="heading-medium" modal-title="">Confrim</h2>
+		<div class="corner-button in">
+			<button type="button" class="close" aria-label="Close"
+				ng-click="$dismiss('cancel')"></button>
+		</div>
+	</div>
+	<div class="b2b-modal-body ng-scope ng-isolate-scope in" tabindex="0"
+		role="region" aria-label="Modal header text content"
+		style="height: 55px;">
+		You are about to delete {{msg.roleName}} role. Click 'OK' to continue.
+	</div>
+	<div class="b2b-modal-footer ng-scope ng-isolate-scope in">
+		<div class="cta-button-group in">
+			<button class="btn btn-alt btn-medium" type="button"
+				ng-click="delRole(msg.availableRole);">Ok</button>
+			<button class="btn btn-clear btn-medium" type="button"
+				ng-click="$dismiss('cancel')">Cancel</button>
+		</div>
+	</div>
+</div>
diff --git a/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-fun-add-confirm.html b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-fun-add-confirm.html
new file mode 100644
index 00000000..ff5ac253
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-fun-add-confirm.html
@@ -0,0 +1,25 @@
+<div>
+	<div class="b2b-modal-header ng-scope in">
+		<h1><i class="icon-primary-alert"></i></h1>
+		<h2 id="myModalLabel" modal-title="">Confirm</h2>
+		<div class="corner-button in">
+			<button type="button" class="close" aria-label="Close"
+				ng-click="$dismiss('cancel')"></button>
+		</div>
+	</div>
+	<div class="b2b-modal-body ng-scope ng-isolate-scope in" tabindex="0"
+		role="region" aria-label="Modal header text content"
+		style="height: 55px;">
+		You are about to add the role function {{msg.roleFun}} to the role for {{msg.role}}. Do you want to continue?
+	</div>
+	<div class="b2b-modal-footer ng-scope ng-isolate-scope in">
+		<div class="cta-button-group in">
+			<button ng-if="!msg.selected" class="btn btn-alt btn-medium" type="button"
+				ng-click="confirmRoleFunRemove(msg.selected,msg.availableRole,msg.roleId);">Yes</button>
+			<button ng-if="msg.selected" class="btn btn-alt btn-medium" type="button"
+				ng-click="confirmRoleFunAdd(msg.selected,msg.availableRole,msg.roleId);">Yes</button>
+			<button class="btn btn-clear btn-medium" type="button"
+				ng-click="cancelRoleFunSwitch(msg)">Cancel</button>
+		</div>
+	</div>
+</div>
diff --git a/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-fun-role-del-confirm.html b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-fun-role-del-confirm.html
new file mode 100644
index 00000000..322c6624
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-fun-role-del-confirm.html
@@ -0,0 +1,22 @@
+<div>
+	<div class="b2b-modal-header">
+		<h2 id="myModalLabel" modal-title="">Role</h2>
+		<div class="corner-button in">
+			<button type="button" class="close" aria-label="Close"
+				ng-click="$dismiss('cancel')"></button>
+		</div>
+	</div>
+	<div class="b2b-modal-body ng-scope ng-isolate-scope in" tabindex="0"
+		role="region" aria-label="Modal header text content"
+		style="height: 55px;">
+		You are about to delete this Role Function. Click 'OK' to continue.
+	</div>
+	<div class="b2b-modal-footer ng-scope ng-isolate-scope in">
+		<div class="cta-button-group in">
+			<button class="btn btn-alt btn-medium" type="button"
+				ng-click="roleFunRemoveRole(msg.roleFunction)">Ok</button>
+			<button class="btn btn-clear btn-medium" type="button"
+				ng-click="$dismiss('cancel')">Cancel</button>
+		</div>
+	</div>
+</div>
diff --git a/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-function-add.html b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-function-add.html
new file mode 100644
index 00000000..a6912571
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-function-add.html
@@ -0,0 +1,32 @@
+<div>
+	<div class="b2b-modal-header ng-scope in">
+		<h2 id="myModalLabel" modal-title="">Role Function Create</h2>
+		<div class="corner-button in">
+			<button type="button" class="close" aria-label="Close"
+				ng-click="$dismiss('cancel')"></button>
+		</div>
+	</div>
+	
+	<div class="b2b-modal-body ng-scope ng-isolate-scope in" tabindex="0"
+		role="region" aria-label="Modal header text content"
+		style="height: 145px;">
+
+		<div class="field-group">
+			Name <input id="textinputID-2a" ddh-reset ng-model="roleFun['name']"
+				placeholder="Name" class="span12" type="text">
+		</div>
+		<div class="field-group">
+			Code <input id="textinputID-2a" ddh-reset ng-model="roleFun['code']"
+				placeholder="Code" class="span12" type="text">
+
+		</div>
+	</div>
+	<div class="b2b-modal-footer ng-scope ng-isolate-scope in">
+		<div class="cta-button-group in">
+			<button class="btn btn-alt btn-medium" type="button"
+				ng-click="save(roleFun);">Create</button>
+			<button class="btn btn-medium" type="button"
+				ng-click="$dismiss('cancel')">Cancel</button>
+		</div>
+	</div>
+</div>
diff --git a/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-function-del-confirm.html b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-function-del-confirm.html
new file mode 100644
index 00000000..31109112
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-function-del-confirm.html
@@ -0,0 +1,22 @@
+<div>
+	<div class="b2b-modal-header ng-scope in">
+		<h2 id="myModalLabel" modal-title="">Role Function Delete</h2>
+		<div class="corner-button in">
+			<button type="button" class="close" aria-label="Close"
+				ng-click="$dismiss('cancel')"></button>
+		</div>
+	</div>
+	<div class="b2b-modal-body ng-scope ng-isolate-scope in" tabindex="0"
+		role="region" aria-label="Modal header text content"
+		style="height: 55px;">
+		You are about to delete this role function, '{{msg.text}}'. Click 'OK' to continue.
+	</div>
+	<div class="b2b-modal-footer ng-scope ng-isolate-scope in">
+		<div class="cta-button-group in">
+			<button class="btn btn-alt btn-medium" type="button"
+				ng-click="deleteFun(roleFun);">Ok</button>
+			<button class="btn btn-medium" type="button"
+				ng-click="$dismiss('cancel')">Cancel</button>
+		</div>
+	</div>
+</div>
diff --git a/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-function-edit.html b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-function-edit.html
new file mode 100644
index 00000000..ecf69b5a
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-function-edit.html
@@ -0,0 +1,22 @@
+<div>
+	<div class="b2b-modal-header">
+		<h2 id="myModalLabel" b2b-modal-title>Role Function Edit</h2>
+		<div class="corner-button in">
+			<button type="button" class="close" aria-label="Close"	ng-click="$dismiss('cancel')"></button>
+		</div>
+	</div>
+	<div class="b2b-modal-body" tabindex="0" role="region" aria-label="Modal header text content" style="height: 145px;">
+		<div class="field-group">
+			Name <input id="textinputID-2a" ng-model="roleFun['name']" placeholder="Name" class="span12" type="text">
+		</div>
+		<div class="field-group">
+			Code <input id="textinputID-2a" ng-model="roleFun['code']" disabled placeholder="Code" class="span12" type="text">
+		</div>
+	</div>
+	<div class="b2b-modal-footer">
+		<div class="cta-button-group"> 
+			<button class="btn btn-alt btn-medium" type="button" ng-click="save(roleFun);">Save</button>
+			<button class="btn btn-medium" type="button" ng-click="$dismiss('cancel')">Cancel</button>
+		</div>
+	</div>
+</div>
diff --git a/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-functions-child-roles-modal.html b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-functions-child-roles-modal.html
new file mode 100644
index 00000000..ec8b2b8e
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-functions-child-roles-modal.html
@@ -0,0 +1,33 @@
+<div>
+	<div class="b2b-modal-header">
+	<br/>
+		<h1 class="heading-medium" id="SelectRole">Select Child Roles</h1>
+	</div>
+	<br/>
+	<div class="b2b-modal-body"  tabindex="0" aria-label="Modal header text content" role="region">
+		<table class="striped">
+						<thead>
+							<tr>
+								<th></th>						
+								<th>Role</th>
+							</tr>
+						</thead>
+						<tbody type="body" ng-repeat="role in msg.roleChildFunctions">
+							<tr>
+								<td>
+									<label class="btn-switch-label" tabindex="0" role="option"> 
+										<input ng-click="activateRoleChildConfirmPopUp(role.active, role);" type="checkbox" b2b-switches ng-model="role.active" size-class="modal-small modal-alert">
+									</label>
+								</td>
+								<td>{{ role.name }}</td>								
+							</tr>			  
+						</tbody>
+			</table>
+	</div>
+	<div class="b2b-modal-footer">
+		<div class="cta-button-group in">
+			<button style="float: right; margin-right: 20px;" class="btn btn-alt btn-small" ng-click="$dismiss('cancel')">Close</button>
+		</div>
+		<br/>
+	</div>
+</div>
\ No newline at end of file
diff --git a/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-functions-modal.html b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-functions-modal.html
new file mode 100644
index 00000000..dbe9d1c6
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-functions-modal.html
@@ -0,0 +1,36 @@
+	<div class="b2b-modal-header">
+		<h2 class="myModalLabel" id="SelectRole">Select Role Functions</h2>
+		<div class="corner-button in">
+			<button type="button" class="close" aria-label="Close"	ng-click="$dismiss('cancel')"></button>
+		</div>
+	</div>
+
+	<div class="b2b-modal-body" tabindex="0" aria-label="Modal header text content" role="region">
+		<table class="striped">
+			<thead>
+				<tr>
+					<th></th>
+					<th>Role Function</th>
+				</tr>
+			</thead>
+			<tbody type="body"	ng-repeat="roleFunction in msg.availableRoleFunctions">
+				<tr>
+					<td>
+						<label class="btn-switch-label" tabindex="0" role="option"> 
+							<input ng-click="activateRoleConfirmPopUp(roleFunction.selected,roleFunction);" type="checkbox" b2b-switches ng-model="roleFunction.selected" size-class="modal-small modal-alert">
+						</label>
+					</td>
+					<td>{{roleFunction.name}}</td>
+				</tr>
+			</tbody>
+		</table>
+	</div>
+
+	<div class="b2b-modal-footer">
+		<div class="cta-button-group in">
+			<button style="float: right; margin-right: 20px;"
+				class="btn btn-alt btn-small"
+				ng-click="$dismiss('cancel')">Close</button>
+		</div>
+		<br />
+	</div>
diff --git a/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/role-function.html b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/role-function.html
new file mode 100644
index 00000000..cab8c682
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/role-function.html
@@ -0,0 +1,67 @@
+<div id="page-content">
+	<h1 class="heading-page" id="profileSearch">Role Function</h1>
+	<div ng-show="showLoader" class="span loader-container">
+		<i class="icon-primary-spinner" role="img"
+			aria-label="Please wait while we load your content"></i>
+	</div>
+	<div ng-hide="showLoader">
+		<div class="row-nowrap">
+			<div class="span12">
+				<div class="form-row">
+					<div class="field-group">
+						<button class="btn btn-alt btn-medium" type="button"
+							ng-click="addRoleFuncPopUp(rowData);">Create</button>
+					</div>
+				</div>
+			</div>
+			<div class="span12">
+				<div class="form-row">
+					<div style="float: right;">
+						<div class="form-field form-field__small">
+							<input type="text" placeholder="Search role functions" ng-model="searchString" />
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+
+		<div ng-show="showLoader" class="span loader-container">
+			<i class="icon-primary-spinner" role="img"
+				aria-label="Please wait while we load your content"></i>
+		</div>
+	
+		<div b2b-table class="b2b-table-div" table-data="tableData"
+			search-string="searchString" current-page="currentPage"
+			next-sort="nextSort">
+			<table>
+				<thead b2b-table-row type="header">
+					<tr>
+						<th b2b-table-header key="name">Name</th>
+						<th b2b-table-header key="code">Code</th>
+						<th b2b-table-header sortable="false">Edit</th>
+						<th b2b-table-header sortable="false">Delete</th>
+					</tr>
+				</thead>
+				<tbody b2b-table-row type="body" row-repeat="rowData in tableData">
+					<tr>
+						<td b2b-table-body ng-bind="rowData['name']"></td>
+						<td b2b-table-body ng-bind="rowData['code']"></td>
+						<td b2b-table-body>
+							<div style="font-size: 20px;">
+								<a ng-click="saveRoleFuncPopUp(rowData);" class="icon-misc-pen"></a>
+							</div>
+						</td>
+						<td b2b-table-body>
+							<div style="font-size: 20px;">
+								<a href="javascript:void(0)"
+									ng-click="delRoleFuncConfirmPopUp(rowData);"
+									class="icon-misc-trash"></a>
+							</div>
+						</td>
+	
+					</tr>
+				</tbody>
+			</table>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/role.html b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/role.html
new file mode 100644
index 00000000..f4c9d0c6
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/role.html
@@ -0,0 +1,61 @@
+<div id="page-content">
+	<div>
+		<h1 class="heading-page" id="Roles">Manage Roles</h1>
+	</div>
+	<div ng-show="showLoader" class="span loader-container">
+		<i class="icon-primary-spinner" role="img" 	aria-label="Please wait while we load your content"></i>
+	</div>
+	<div ng-hide="showLoader">
+		<div>
+			<h2 class="heading-small-content">Please edit the role details below: </h2>
+		</div>
+		
+		<div>
+			<label>*Name: &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
+				<input type="text" ng-model="role.name"
+					maxlength="300" />
+			</label>
+		</div>
+		
+		<div>
+			<label>Priority: &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
+				<input type="text" ng-model="role.priority"
+					maxlength="30"/>
+			</label>
+		</div>
+		
+		<div>
+			<button style="margin-left: 105px;" class="btn btn-small" onClick="window.location='admin'">Cancel</button>
+			<button class="btn btn-alt btn-small" ng-click="saveRole();">Save</button>
+		</div> 
+		<br/>
+		<div ng-if="routeRoleId != 0">
+			<div>
+				<h3 class="heading-small-emphasis">Role Functions</h3>    		
+				<button class="btn btn-alt btn-small" ng-click="addNewRoleFunctionModalPopup(role.roleFunctions,role.name, role);">Manage Role Functions</button>
+				
+				<table class="striped" ng-if="role.roleFunctions.length">
+							<thead>
+								<tr>
+									<th>Role Function Name</th>						
+									<th>Remove</th>
+								</tr>
+							</thead>
+							<tbody type="body" ng-repeat="roleFunction in role.roleFunctions">
+								<tr>
+									<td width="70%">{{ roleFunction.name }}</td>						
+									<td width="10%">
+							    		<div ng-click="removeRoleFunction(roleFunction);"><a href="javascript:void(0)" class="icon-misc-trash"></a></div>
+							    	</td>
+								</tr>			  
+							</tbody>
+				</table>
+			</div>
+			<br/>
+			<br/>
+			<div>
+				<a href="admin#/role_function_list">Manage Role Functions</a><br><br>
+			</div>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/role_list.html b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/role_list.html
new file mode 100644
index 00000000..5c407390
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/role_list.html
@@ -0,0 +1,45 @@
+<div id="page-content">
+	<div>
+		<h1 class="heading-page" id="Roles">Roles</h1>
+	</div>
+	<div ng-show="showLoader" class="span loader-container">
+		<i class="icon-primary-spinner" role="img"
+			aria-label="Please wait while we load your content"></i>
+	</div>
+	<div ng-hide="showLoader">
+		<div>
+			 <button type="submit" onClick="window.location='admin#/role/0';" class="btn btn-alt btn-small">Add New Role</button>
+		</div>
+		<h2 class="heading-small">Click on a Role to view its details.</h2>
+			<table class="striped" ng-if="availableRoleFunctions" style="width: auto;">
+				<thead> 
+					<tr>
+						<th>Name</th>
+						<th>Priority</th>
+						<th>Edit</th>
+						<th>Active?</th>
+						<th>Delete?</th>
+					</tr>
+				</thead>
+				<tbody type="body" ng-repeat="availableRole in  ociavailableRoles">
+					<tr>
+						<td>{{ availableRole.name }}</td>
+						<td>{{ availableRole.priority }}</td>
+						<td>
+							<a href="admin#/role/{{availableRole.id}}" class="icon-misc-pen"></a>
+						</td>
+						<td>
+					    	<div >
+					    		<label class="btn-switch-label" tabindex="0" role="option">
+									<input type="checkbox" b2b-switches ng-model="availableRole.active" ng-click="activateRoleConfirmPopUp(availableRole.active,availableRole);" >
+							    </label> 
+					    	</div>
+				    	</td>
+				    	<td width="10%">
+				    		<div ng-click="delRoleConfirmPopUp(availableRole);"><a href="javascript:void(0)" class="icon-misc-trash"></a></div>
+				     	</td>
+					</tr>
+				</tbody>
+			</table>
+	</div>
+</div>
\ No newline at end of file
diff --git a/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/usage.html b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/usage.html
new file mode 100644
index 00000000..8e411141
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/usage.html
@@ -0,0 +1,43 @@
+<div id="page-content">
+	<div>
+		<h1 class="heading-page" id="Usage">Current Usage</h1>
+	</div>
+    
+    <h3 class="heading-small">
+    	The following table shows all current user sessions. Click the icon to end a user's session.
+    </h3>
+
+	<!-- A simple table requires no b2b tags -->
+	<table style="width: auto;">
+	  	
+	 	<thead>
+	  		<tr>
+	  			<th key="0" sortable="false" width="10%" align="center">User Id</th>
+	  			<th key="1" sortable="true" width="10%" align="center">User Name</th>
+	  			<th key="2" sortable="false" width="10%" align="center">Email</th>
+	  			<th key="3" sortable="true" width="10%" align="center">Last Access Time (minutes)</th>
+	  			<th key="4" sortable="false" width="10%" align="center">Time Remaining (minutes)</th>
+	  			<th key="5" sortable="false" width="10%" align="center">Expire User Session?</th>
+	  		</tr>
+	  	</thead>
+	  	
+	  	<tbody ng-repeat="user in users" style="max-height: 980px;" >
+		  <tr>
+		    <td width="10%">{{user.id}}</td>
+		    <td width="10%">{{user.lastName}}</td>
+		    <td width="10%">{{user.email}}</td>
+		    <td width="10%">{{user.lastAccess}}</td>
+		    <td width="10%">{{user.remaining}}</td>
+		    <td width="10%"><div ng-hide="user.delete=='yes'">Current Session</div>
+		    	<div ng-click="removeSession(user.sessionId);" 
+		    		ng-hide="user.delete=='no'" 
+		    		style="font-size:20px;text-align:center">
+		    		<a href="javascript:void(0)" class="icon-misc-trash"></a>
+		    	</div>
+		    </td>
+		  </tr>
+		</tbody>
+		
+	</table>
+
+</div>
\ No newline at end of file
-- 
cgit 1.2.3-korg