Deliver centralized role management feature

Repair multiple defects also.
Revise deployment to use docker-compose.
Remove all zip archives.

Issue: PORTAL-21, PORTAL-25, PORTAL-28, PORTAL-52, PORTAL-69,
    PORTAL-74, PORTAL-76, PORTAL-80, PORTAL-82
Change-Id: Ie72fec7d35ba78beb162bba6ed27b2caee340c61
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>

3 files changed, 198 insertions, 23 deletions

diff --git a/ecomp-portal-FE-common/client/app/views/catalog/add-catalog-dialogs/new-catalog.modal.less b/ecomp-portal-FE-common/client/app/views/catalog/add-catalog-dialogs/new-catalog.modal.less
new file mode 100644
index 00000000..39eb8ab9
--- /dev/null
+++ b/ecomp-portal-FE-common/client/app/views/catalog/add-catalog-dialogs/new-catalog.modal.less
@@ -0,0 +1,132 @@
+.new-catalog-modal {
+  height: 430px;
+
+  .user-catalog-roles{
+    .title{
+      //.n18r;
+      .dGray18r;  //Dark Gray
+      border-bottom: @portalDBlue 3px solid;
+    }
+    
+       input:not([type="button"]) {
+    height: 13px;
+} 
+    .display-userApp-Catalog-Roles
+    {
+    padding-left: 16px;
+    padding-top: 10px;
+    font-family: Omnes-ECOMP-W02,Arial;
+    font-size: 18px;
+    color: #5a5a5a;
+    }
+	
+	#pending-checkbox{	
+	font-family: Omnes-ECOMP-W02,Arial;
+	font-size: 15px; 
+	color: #5a5a5a;
+	}
+    .app-catalog-roles-list{
+      height: 286px;
+      
+      
+      .app-catalog-item{
+        border: 1px solid @portalLGray;
+        border-radius: 2px;
+        background-color: @funcBkgGray;
+
+        padding: 10px;
+        margin-top: 8px;
+        //margin-right: 6px;
+        //margin-left: 6px;
+
+        .app-catalog-item-left{
+          padding-top: 0;
+          line-height: 30px;
+          height: 30px;
+          vertical-align: middle;
+          display:inline-block;
+          width: 45%;
+          border-radius: 2px;
+          border: 1px solid @portalLGray;
+          margin-right: 10px;
+          padding-left: 4px;
+          background: @portalWhite;
+          white-space: nowrap;
+
+        }
+        .app-catalog-item-right{
+          display:inline-block;
+          width: 45%;
+          border-radius: 2px;
+          border: 1px solid @portalLGray;
+          background: @portalWhite;
+          vertical-align: middle;
+        }
+
+        .app-catalog-item-right-error{
+          .portalRed;
+          padding: 7px 7px 7px 7px;
+          display:inline-block;
+          width: 45%;
+          border-radius: 2px;
+          border: 1px solid @portalLGray;
+          background: @portalWhite;
+          vertical-align: middle;
+        }
+
+        .app-catalog-item-right-contacting{
+          .portalGreen;
+          padding: 7px 7px 7px 7px;
+          display:inline-block;
+          width: 45%;
+          border-radius: 2px;
+          border: 1px solid @portalLGray;
+          background: @portalWhite;
+          vertical-align: middle;
+        }
+
+        .app-select-left{
+          width: 45%;
+          margin-right: 10px;
+          vertical-align: middle;
+
+
+          .select-field{
+            padding-top: 0;
+            line-height: 30px;
+            height: 30px;
+            vertical-align: middle;
+            border-radius: 2px;
+            border: 1px solid @portalLGray;
+            margin-right: 10px;
+            padding-left: 4px;
+            background: @portalWhite;
+            display:inline-block;
+          }
+        }
+
+
+        .app-item-delete{
+          .ico_trash_default;
+          display: inline-block;
+          vertical-align: 2px;
+          cursor: pointer;
+          position: relative;
+          top: 6px;
+          color: transparent;
+          margin-left: 8px;
+
+        }
+
+      }
+    }
+
+  }
+  
+ .userApp-Catalog-Roles-value {
+ 	height: 150px; 
+ 	width: 200px; 
+ 	overflow-y: auto;
+ }
+ 
+}
diff --git a/ecomp-portal-FE-common/client/app/views/catalog/catalog.less b/ecomp-portal-FE-common/client/app/views/catalog/catalog.less
index dc5e4671..bbff8517 100644
--- a/ecomp-portal-FE-common/client/app/views/catalog/catalog.less
+++ b/ecomp-portal-FE-common/client/app/views/catalog/catalog.less
@@ -389,9 +389,14 @@ ul {
     right: 10px;
     position: absolute;
 }
+.checkbox input{
+ margin: 6px;
+    left: 112px;
+    top: -20px;
+    }
 .checkbox .skin {
     left: 125px;
-    top: -24px;
+    top: -18px;
 }
 .form-row {
     margin-top: -14px;
@@ -409,5 +414,19 @@ margin-left: 126px;
 .checkbox, .radio {
     min-height: 0px; 
     padding-left: 0px; 
+}
+
+.access-request-txt {
+	text-align: right;
+}
 
-}
\ No newline at end of file
+.catalog-radio-div{ 
+	display:inline-block; 
+	margin-right:5px; 
+} 
+ 
+ 
+.radio input:checked + .skin:after{ 
+	width:22px; 
+	height:22px; 
+}
diff --git a/ecomp-portal-FE-common/client/app/views/catalog/catalog.tpl.html b/ecomp-portal-FE-common/client/app/views/catalog/catalog.tpl.html
index fd71e59b..d3c10441 100644
--- a/ecomp-portal-FE-common/client/app/views/catalog/catalog.tpl.html
+++ b/ecomp-portal-FE-common/client/app/views/catalog/catalog.tpl.html
@@ -23,22 +23,37 @@
 			<h1 class="heading-page">Application Catalog</h1>
 		</div>
 		<div class="app-catalog-list">
-			<div class="simulateCatGridHeader">
-				<span class="simulateCatGridHeaderDetails"> Click the check
-					boxes below to choose which applications are shown on the <a
-					href="applicationsHome">home page</a>.
-				</span> <br> <br> <label id="label-all"
-					class="simulateCatGridHeaderRadio"> Filter: <input
-					id="radio-button-all" type="radio" ng-model="radioValue"
-					value="All"> All
-				</label> <label id="label-accessible" class="simulateCatGridHeaderRadio">
-					<input id="radio-button-accessible" type="radio"
-					ng-model="radioValue" value="Accessible"> Accessible
-				</label> <label id="label-homepage" class="simulateCatGridHeaderRadio">
-					<input id="radio-button-homepage" type="radio"
-					ng-model="radioValue" value="Selected"> On Home Page
-				</label>
-
+			<div class="simulateCatGridHeader"> 
+				<span class="simulateCatGridHeaderDetails"> Click the check 
+					boxes below to choose which applications are shown on the <a 
+					href="applicationsHome">home page</a>. 
+				</span> <br> <br> 
+				<div class="catalog-radio-div"> 
+					<label for="radio-button-all" class="radio"> 
+						<span>Filter: </span> 
+					</label> 
+				</div> 
+				<div class="catalog-radio-div"> 
+					<label for="radio-button-all" class="radio"> 
+		                <input type="radio" ng-model="radioValue" id="radio-button-all" name="All" value="All" > 
+		                <i class="skin"></i> 
+		                <span>All</span> 
+		            </label> 
+				</div> 
+				<div class="catalog-radio-div"> 
+		            <label for="radio-button-accessible" class="radio"> 
+		                <input type="radio" ng-model="radioValue" id="radio-button-accessible" name="Accessible" value="Accessible" > 
+		                <i class="skin"></i> 
+		                <span>Accessible</span> 
+		            </label> 
+	            </div> 
+	            <div class="catalog-radio-div"> 
+		            <label for="radio-button-homepage" class="radio"> 
+		                <input type="radio" ng-model="radioValue" id="radio-button-homepage" name="Selected" value="Selected"> 
+		                <i class="skin"></i> 
+		                <span>On Home Page</span> 
+		            </label> 
+				</div> 
 			</div>
 			<div class="appCatalogue-boarder" >
 				<div gridster="catalog.gridsterOpts">	
@@ -54,12 +69,21 @@
 								            <div class="form-row" ng-show="item.access || isAdminPortalAdmin">
 								                <label class="checkbox">
 								                    <input id="gridster-{{item.headerText.split(' ').join('-')}}-icon-checkbox" type="checkbox" ng-model="item.select" ng-change="catalog.storeSelection(item)">
-								                    <i class="skin"></i> 
+								                    <i id="gridster-{{item.headerText.split(' ').join('-')}}-icon-checkbox" class="skin"></i> 
 								                </label> 
 								                <i ng-show="item.pending" class="icon-tickets-contested"></i>							                      								                
 									</div>
-								</div>								
-								<div ng-include src="'app/views/catalog/get-accessswitch.html'"></div>
+								</div>
+								<div class="gridster-box-content"
+									ng-style="{'cursor':'pointer',
+										'background-image': 'url('+(item.imageLink)+')',
+										'order': item.order, 
+										'background-color':'white',
+										'background-repeat': 'no-repeat',
+										'background-size': '168px 118px'}"
+									ng-click="catalog.openAddRoleModal(item)"
+									ng-hide="users.isLoadingTable && !users.getAppCatalogIsDone">
+								</div>
 							</div>
 						</li>
 					</ul>
@@ -68,9 +92,9 @@
 			
 			<br>
 
-			<div style="text-align: right;">
+			<div class="access-request-txt">
 				To request access to an application, please visit the <a
-				id="get-access-page-link" ng-href="getAccess">Get Access</a> page.
+					id="get-access-page-link" ng-href="getAccess">Get Access</a> page.
 			</div>
 
 			<br>