X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-FE-common%2Fclient%2Fapp%2Fviews%2Fcatalog%2Fcatalog.tpl.html;h=3ba378546d67ab6637c02feb1a20cceb68bf66b4;hb=refs%2Fchanges%2F59%2F43759%2F1;hp=fd71e59b589bcf6962c2f691f2534f5eeaa5eb21;hpb=99565bb6bd87cfc46591cea73985c58c3a3697dd;p=portal.git

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..3ba37854 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
@@ -1,21 +1,39 @@
 <!--
-  ================================================================================
-  ECOMP Portal
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
+  ============LICENSE_START==========================================
+  ONAP Portal
+  ===================================================================
+  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+  ===================================================================
+ 
+  Unless otherwise specified, all software contained herein is licensed
+  under the Apache License, Version 2.0 (the "License");
+  you may not use this software except in compliance with the License.
   You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
+ 
+              http://www.apache.org/licenses/LICENSE-2.0
+ 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
-  ================================================================================
+ 
+  Unless otherwise specified, all documentation contained herein is licensed
+  under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+  you may not use this documentation except in compliance with the License.
+  You may obtain a copy of the License at
+ 
+              https://creativecommons.org/licenses/by/4.0/
+ 
+  Unless required by applicable law or agreed to in writing, documentation
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+ 
+  ============LICENSE_END============================================
+ 
+  
   -->
 <div class="w-ecomp-app-catalog">
 	<div class="app-catalog-container" id="page-content">
@@ -23,29 +41,44 @@
 			<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">	
 					<ul>	
 						<li gridster-item="item" ng-repeat="item in appCatalog"
 							ng-if="(item.select && radioValue=='Selected') || (item.access && radioValue=='Accessible') || (radioValue == 'All')">
-							<div class="gridster-box" style="{{!item.access?' color:lightgray !important':''}}">
+							<div class="gridster-box" ng-attr-style="{{!item.access?' color:lightgray !important':''}}">
 								<div class="gridster-box-header"
 									ng-show="(item.select && radioValue=='Selected') || (item.access && radioValue=='Accessible') || (radioValue == 'All')">
 									<i id="gridster-{{item.headerText.split(' ').join('-')}}-icon" class="icon-content-gridguide"></i>
@@ -54,12 +87,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 +110,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>