Commit 04c2c301 authored by a001188's avatar a001188
Browse files

New menu structure

parent 0d0b35e7
......@@ -10,16 +10,16 @@ function ec_ciColumnDef(){
width: '1%',
display: renderEcCiSubTable
},
family_type_id: {
title: 'Familjetyp',
options: '/cmdb/api/v1/options/family_type',
width: '5%'
},
family_id: {
title: 'Familj',
options: '/cmdb/api/v1/options/families',
width: '5%'
},
// family_type_id: {
// title: 'Familjetyp',
// options: '/cmdb/api/v1/options/family_type',
// width: '5%'
// },
// family_id: {
// title: 'Familj',
// options: '/cmdb/api/v1/options/families',
// width: '5%'
// },
id: {
title: 'id',
width: '1%',
......@@ -28,19 +28,19 @@ function ec_ciColumnDef(){
},
display_name: {
title: 'Namn',
width: '10%'
width: '8%'
},
description: {
title: 'Beskrivning',
width: '15%'
width: '10%'
},
kst: {
title: 'Kostnadsställe',
width: '5%'
width: '3%'
},
product: {
title: 'Produkt',
width: '5%'
width: '3%'
},
sla: {
title: 'SLA',
......@@ -52,20 +52,20 @@ function ec_ciColumnDef(){
},
attribute_information: {
title: 'Attribut',
width: '20%'
width: '15%'
},
// account_group: {
// title: 'Grupper',
// width: '15%'
// },
// account_id: {
// title: 'Konton',
// width: '15%'
// },
// contacts: {
// title: 'Kontaktpersoner',
// width: '15%'
// }
account_id: {
title: 'Konto',
width: '5%'
},
account_group: {
title: 'Grupp',
width: '5%'
},
contacts: {
title: 'Kontaktperson',
width: '5%'
}
}
return cd;
}
......@@ -74,7 +74,7 @@ function ec_ciColumnDef(){
function createEcCiTable(ciColumnDef){
var table = {
title: "Konfigurationselement CI",
title: "IT-Tjänst: Drift av System (CI)",
paging: false, //Enable paging
pageSize: 10, //Set page size (default: 10)
pageList: 'minimal',
......
......@@ -202,10 +202,6 @@ router.get('/edges', (req, res, next) => {
router.get('/node/:id', (req, res, next) => {
var pool = new pg.Pool({
connectionString: connectionString,
......@@ -288,32 +284,6 @@ router.get('/edge/:id', (req, res, next) => {
});
router.get('/list/nodes/:centralNode', (req, res, next) => {
var pool = new pg.Pool({
connectionString: connectionString
......@@ -414,5 +384,4 @@ limit 10
});
module.exports = router;
......@@ -5,7 +5,7 @@ html
title= title
link(rel='stylesheet', href='/stylesheets/cmdbgui.css')
link(rel='stylesheet', href='/stylesheets/network-graph.css')
link(rel='stylesheet', href='/javascripts/jtable/themes/lightcolor/blue/jtable.min.css')
link(rel='stylesheet', href='/javascripts/jtable/themes/lightcolor/gray/jtable.min.css')
link(rel='stylesheet', href='//code.jquery.com/ui/1.10.4/themes/smoothness/jquery-ui.css')
link(rel='stylesheet', href='/javascripts/vis/dist/vis.css')
script(type='text/javascript', src='//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js')
......
......@@ -4,9 +4,12 @@ block menu
table(class='cmdbguiSmallText')
tr
td(style='text-align: left') CMDB-Viewer
td(style='text-align: left')
p(class='cmdbguiSmallText') CMDB-Viewer by Peter Lundin
td(style='text-align: center')
p(class='cmdbguiSmallText') databaseschema: jasper.cmdb on postresql-utv.smhi.se user jasper.u
td(style='text-align: right')
a(href="https://git.smhi.se/a001188/cmdb") git.smhi.se/a001188/cmdb
a(class='cmdbguiSmallText' href="https://git.smhi.se/a001188/cmdb") git.smhi.se/a001188/cmdb
nav
ul(class='nav')
li
......@@ -19,12 +22,22 @@ block menu
li
a(href="/view/relation-types/1") Relationstyper
li
a(href="#") Teknisk konfiguration
a(href="#") IT-Tjänster
ul
li
a(href="/view/ec-ci/1") Företagstjänster (CI)
a(href="/view/ec-ci/1") Drift av System (CI)
li
a(href="/view/tfo-ci/1") Infrastruktur (CI)
a(href="/") Kontorsarbetsplats (CI) - Ej implementerad
li
a(href="/") Filtjänst (CI) - Ej implementerad
li
a(href="#") Infrastruktur
ul
li
a(href="/view/tfo-ci/1") Teknikområden (CI)
li
a(href="#") Behörighet
ul
li
a(href="/view/access/2") Behörighet
li
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment