diff --git a/ng6-seed/src/app/layouts/admin/admin-layout.component.html b/ng6-seed/src/app/layouts/admin/admin-layout.component.html index 3b54dc446..ab2b53993 100755 --- a/ng6-seed/src/app/layouts/admin/admin-layout.component.html +++ b/ng6-seed/src/app/layouts/admin/admin-layout.component.html @@ -92,9 +92,22 @@
- -
-
+ +
+
+ +
+
-
- -
+
-
+
diff --git a/ng6-seed/src/app/layouts/admin/admin-layout.component.ts b/ng6-seed/src/app/layouts/admin/admin-layout.component.ts index 3bd4d7939..fbd00a204 100755 --- a/ng6-seed/src/app/layouts/admin/admin-layout.component.ts +++ b/ng6-seed/src/app/layouts/admin/admin-layout.component.ts @@ -35,7 +35,7 @@ export class AdminLayoutComponent implements OnInit, OnDestroy { sidebarBg: boolean = true; currentLang = 'en'; layoutDir = 'ltr'; - menuLayout : any = 'vertical-menu'; + menuLayout : any = 'top-menu'; selectedSidebarImage : any = 'bg-1'; selectedSidebarColor : any = 'sidebar-red'; selectedHeaderColor : any = 'header-default'; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/allocation-view-more/allocation-view-more.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/allocation-view-more/allocation-view-more.component.html old mode 100644 new mode 100755 diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/allocation-view-more/allocation-view-more.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/allocation-view-more/allocation-view-more.component.scss old mode 100644 new mode 100755 diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/allocation-view-more/allocation-view-more.component.spec.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/allocation-view-more/allocation-view-more.component.spec.ts old mode 100644 new mode 100755 diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/allocation-view-more/allocation-view-more.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/allocation-view-more/allocation-view-more.component.ts old mode 100644 new mode 100755 diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.html index 6db4829c2..8411c320e 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.html @@ -12,14 +12,15 @@
- -
+
+
- - + + +
@@ -54,6 +55,7 @@
+ @@ -62,7 +64,7 @@ - +
@@ -71,13 +73,14 @@ [pageSizeOptions]="[5, 10, 25, 100]" (page)="pageEvent = $event; pageChange($event)"> -->
-
+
+
II Full   II Smart
diff --git a/ng6-seed/src/app/shared/menu-items/horizontal-menu-items.ts b/ng6-seed/src/app/shared/menu-items/horizontal-menu-items.ts index a1f82d488..6e9485485 100755 --- a/ng6-seed/src/app/shared/menu-items/horizontal-menu-items.ts +++ b/ng6-seed/src/app/shared/menu-items/horizontal-menu-items.ts @@ -22,200 +22,43 @@ export interface Menu { } const HORIZONTALMENUITEMS = [ - { - state: 'home', - name: 'HOME', - type: 'link', - icon: 'home' - }, - { - state: 'apps', - name: 'APPS', - type: 'sub', - icon: 'apps', - children: [ - {state: 'apps/calendar', name: 'CALENDAR'}, - {state: 'apps/messages', name: 'MESSAGES'}, - {state: 'apps/social', name: 'SOCIAL'}, - {state: 'apps/chat', name: 'CHAT'} - ] - }, - { - state: 'features', - name: 'FEATURES', - type: 'sub', - icon: 'library_books', - children: [ - {state: 'features/colorpicker', name: 'COLOR PICKER'}, - {state: 'features/cropper', name: 'CROPPER'}, - {state: 'features/dragula', name: 'DRAGULA'}, - {state: 'features/sortable', name: 'SORTABLE'}, - { - state: 'charts', - name: 'CHARTS', - type: 'super-sub', - icon: 'show_chart', - subchildren: [ - {state: 'charts/bar-charts', name: 'BAR'}, - {state: 'charts/pie-charts', name: 'PIE'}, - {state: 'charts/line-charts', name: 'LINE'}, - {state: 'charts/mixed-charts', name: 'MIXED'}, - {state: 'charts/ng2-charts', name: 'NG2 CHARTS'}, - ] - }, - { - state: 'maps', - name: 'MAPS', - type: 'super-sub', - icon: 'navigation', - subchildren: [ - {state: 'maps/google', name: 'GOOGLE'}, - {state: 'maps/leaflet', name: 'LEAFLET'} - ] - } - ] - }, - { + // { + // state: 'home', + // name: 'HOME', + // type: 'link', + // icon: 'home' + // }, + { state:'setting', name:'Settings', - type:'sub', + type:'multi', icon:'settings', - children:[ - {state:'mastermodule',name:'Master Details'}, - // {state:'entitymodule',name:'Entity Type'} + children:[ + {state:'setting/users',name:'Users'}, + {state:'setting/mastermodule',name:'Master Details'}, + {state:'setting/entity',name:'Entities'}, + {state:'setting/pdteamlist',name:'PD Team'}, + {state:'template/questions', name: 'Questions'}, + {state:'template/templates', name: 'Templates'}, ] }, - // { - // state:'pdtrigger', - // name:'PD Trigger', - // type:'sub', - // icon:'bubble_chart', - // children:[ - // {state:'pdtriggerlist',name:'Pd Trigger Listing'} - // ] - // }, + { - state: 'material', - name: 'MATERIAL', - type: 'sub', - icon: 'equalizer', - children: [ - {state: 'material/button', name: 'BUTTON'}, - {state: 'material/cards', name: 'CARDS'}, - {state: 'material/select', name: 'SELECT'}, - {state: 'material/autocomplete', name: 'AUTOCOMPLETE'}, - {state: 'material/chips', name: 'CHIPS'}, - {state: 'material/input', name: 'INPUT'}, - {state: 'material/checkbox', name: 'CHECKBOX'}, - {state: 'material/radio', name: 'RADIO'}, - {state: 'material/toolbar', name: 'TOOLBAR'}, - {state: 'material/lists', name: 'LISTS'}, - {state: 'material/grid', name: 'GRID'}, - {state: 'material/progress', name: 'PROGRESS'}, - {state: 'material/tabs', name: 'TABS'}, - {state: 'material/switch', name: 'SWITCH'}, - {state: 'material/tooltip', name: 'TOOLTIP'}, - {state: 'material/menu', name: 'MENU'}, - {state: 'material/slider', name: 'SLIDER'}, - {state: 'material/snackbar', name: 'SNACKBAR'}, - {state: 'material/dialog', name: 'DIALOG'} - ] + state:'personal_discussion', + name:'Personal Discussion', + type:'link', + icon:'forum', + + // children:[ + // {state:'pdtriggerlist',name:'Pd Trigger Listing'} + // ] }, { - state: 'forms', - name: 'FORMS', - type: 'sub', - icon: 'looks_3', - children: [ - {state: 'forms/editor', name: 'EDITOR'}, - {state: 'forms/validation', name: 'VALIDATION'}, - {state: 'forms/upload', name: 'UPLOAD'}, - {state: 'forms/tree', name: 'TREE'}, - ] + state:'quality_check_discussion', + name:'Quality Check', + type:'link', + icon:'done_all', }, - { - state: 'tables', - name: 'TABLES', - type: 'sub', - icon: 'format_line_spacing', - children: [ - {state: 'tables/fullscreen', name: 'FULLSCREEN'}, - {state: 'tables/editing', name: 'EDITING'}, - {state: 'tables/filter', name: 'FILTER'}, - {state: 'tables/tables/paging', name: 'PAGING'}, - {state: 'tables/sorting', name: 'SORTING'}, - {state: 'tables/pinning', name: 'PINNING'}, - {state: 'tables/selection', name: 'SELECTION'}, - ] - }, - { - state: 'pages', - name: 'PAGES', - type: 'sub', - icon: 'web', - children: [ - {state: 'pages/about', name: 'ABOUT'}, - {state: 'pages/contact', name: 'CONTACT'}, - {state: 'pages/pricing', name: 'PRICING'}, - {state: 'pages/blank', name: 'BLANK'}, - { - state: 'user-pages', - name: 'USERS', - type: 'super-sub', - icon: 'person', - subchildren: [ - {state: 'user-pages/userlist', name: 'USER LIST'}, - {state: 'user-pages/userprofile', name: 'USER PROFILE'}, - ] - }, - { - state: 'gallery', - name: 'GALLERY', - type: 'super-sub', - icon: 'person', - subchildren: [ - {state: 'gallery/gallery-v1', name: 'GALLERY SIMPLE'}, - {state: 'gallery/gallerygallery-v2', name: 'GALLERY ADVANCED'}, - {state: 'gallery/gallery-v3', name: 'GALLERY 3RD PARTY'} - ] - }, - { - state: 'ecommerce', - name: 'ECOMMERCE', - type: 'super-sub', - icon: 'person', - subchildren: [ - {state: 'ecommerce/ecommerce-product', name: 'PRODUCT LISTING'}, - {state: 'ecommerce/ecommerce-product-detail', name: 'PRODUCT DETAIL'}, - {state: 'ecommerce/ecommerce-cart', name: 'CART'}, - {state: 'ecommerce/ecommerce-checkout', name: 'CHECKOUT'} - ] - } - ] - }, - { - state: 'authentication', - name: 'AUTHENTICATION', - type: 'sub', - icon: 'security', - children: [ - {state: 'authentication/login', name: 'LOGIN'}, - {state: 'authentication/register', name: 'REGISTER'}, - {state: 'authentication/forgot-password', name: 'FORGOT'}, - {state: 'authentication/lockscreen', name: 'LOCKSCREEN'}, - { - state: 'error', - name: 'ERROR', - type: 'super-sub', - icon: 'error_outline', - subchildren: [ - {state: 'error/404', name: '404'}, - {state: 'error/503', name: '503'} - ] - } - ] - } - ]; @Injectable() @@ -226,4 +69,4 @@ export class HorizontalMenuItems { add(menu: Menu) { // HORIZONTALMENUITEMS.push(Menu); } -} +} \ No newline at end of file