2 files changed, 50 insertions, 33 deletions

diff --git a/catalog-ui/src/app/view-models/catalog/catalog-view-model.ts b/catalog-ui/src/app/view-models/catalog/catalog-view-model.ts
index 0e7e4aaeae..ec9e888eed 100644
--- a/catalog-ui/src/app/view-models/catalog/catalog-view-model.ts
+++ b/catalog-ui/src/app/view-models/catalog/catalog-view-model.ts
@@ -1,3 +1,23 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      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.
+ * ============LICENSE_END=========================================================
+ */
+
 'use strict';
 import {Component, IMainCategory, IGroup, IConfigStatuses, IAppMenu, IAppConfigurtaion, IUserProperties, ISubCategory} from "app/models";
 import {EntityService, IUserResourceClass, CacheService} from "app/services";
@@ -97,7 +117,7 @@ export class CatalogViewModel {
         let onSuccess = (followedResponse:Array<Component>):void => {
             this.$scope.catalogFilterdItems = followedResponse;
             this.$scope.isAllItemDisplay = this.$scope.numberOfItemToDisplay >= this.$scope.catalogFilterdItems.length;
-            this.$scope.categories = this.cacheService.get('serviceCategories').concat(this.cacheService.get('resourceCategories')).concat(this.cacheService.get('productCategories'));
+            this.$scope.categories = this.cacheService.get('serviceCategories').concat(this.cacheService.get('resourceCategories'));
             this.$scope.gui.isLoading = false;
         };
 
@@ -117,7 +137,7 @@ export class CatalogViewModel {
         //this.$scope.categories = this.cacheService.get('categoriesMap');
         this.$scope.sdcMenu = this.sdcMenu;
         this.$scope.confStatus = this.sdcMenu.statuses;
-        this.$scope.expandedSection = ["type", "category", "product-category", "status"];
+        this.$scope.expandedSection = ["type", "category", "status"];
         this.$scope.user = this.userResourceService.getLoggedinUser();
         this.$scope.catalogMenuItem = this.sdcMenu.catalogMenuItem;
         this.$scope.version = this.cacheService.get('version');
@@ -127,8 +147,8 @@ export class CatalogViewModel {
 
         // Checklist init
         this.$scope.checkboxes = <Checkboxes>{};
-        this.$scope.checkboxes.componentTypes = ['Resource', 'Service', 'Product'];
-        this.$scope.checkboxes.resourceSubTypes = ['VF', 'VFC', 'CP', 'VL'];
+        this.$scope.checkboxes.componentTypes = ['Resource', 'Service'];
+        this.$scope.checkboxes.resourceSubTypes = ['VF', 'VFC', 'PNF', 'CP', 'VL'];
 
         // Checkboxes filter init
         this.$scope.checkboxesFilter = <CheckboxesFilter>{};
diff --git a/catalog-ui/src/app/view-models/catalog/catalog.less b/catalog-ui/src/app/view-models/catalog/catalog.less
index 9db9192167..1f473c9638 100644
--- a/catalog-ui/src/app/view-models/catalog/catalog.less
+++ b/catalog-ui/src/app/view-models/catalog/catalog.less
@@ -9,10 +9,29 @@
         padding: 0;
         margin: 0;
 
+        .i-sdc-designer-leftbar-section-content-ul-li {
+            margin-top: 5px;
+
+            .tlv-checkbox {
+                font-size: 13px;
+                font-family: @font-opensans-medium;
+                color: @func_color_s;
+            }
+        }
+
         .i-sdc-catalog-subcategories-checkbox {
             padding: 0 0 0 20px;
             margin: 0;
 
+            > li {
+                margin-top: 5px;
+
+                .tlv-checkbox {
+                    font-size:13px;
+                    font-family: @font-opensans-regular;
+                }
+            }
+
             .i-sdc-catalog-grouping-checkbox {
                 padding: 0 0 0 20px;
                 margin: 0;
@@ -48,28 +67,6 @@
         //text-indent: -10px;
     }
 
-    /*Added by - Ikram */
-     .i-sdc-product-input,
-    .i-sdc-product-select {
-        border: 1px solid @border_color_f;
-        min-height: 30px;
-        padding: 0;
-        width: 100%;
-        margin: 1px 0;
-        background-color: #F2F2F2;
-        outline: none;
-
-        &:disabled {
-            .disabled;
-        }
-        optgroup{
-            color: @color_u;
-            option{
-                color: @color_b;
-            }
-        }
-    }
-
     .i-sdc-categories-list-item-icon {
         display: inline-block;
         float: right;
@@ -163,7 +160,7 @@
         padding: 10px 12px;
     }
     .w-sdc-dashboard-catalog-header {
-        .b_9;
+        .b_3;
         display: inline-block;
         font-style: italic;
         font-weight: bold;
@@ -171,28 +168,28 @@
     }
 
     .w-sdc-dashboard-catalog-header-order {
-        .b_9;
+        .b_3;
         font-weight: 800;
     }
 
     .w-sdc-dashboard-catalog-sort {
-        .b_9;
+        .b_3;
         font-weight: bold;
         white-space:pre;
         &:hover{
             .hand;
             text-decoration: none;
-            .a_9;
+            .a_3;
         }
         &.blue {
-            .a_9;
+            .a_3;
         }
     }
 
     .w-sdc-catalog-sort-arrow{
         display: inline-block;
         &.up{
-            .b_9;
+            .b_3;
             width: 0;
             height: 0;
             border-left: 5px solid transparent;
@@ -200,7 +197,7 @@
             border-bottom: 5px solid ;
         }
         &.down{
-            .b_9;
+            .b_3;
             width: 0;
             height: 0;
             border-left: 5px solid transparent;