diff --git a/xCAT-UI/css/jquery.dataTables.css b/xCAT-UI/css/jquery.dataTables.css index df551e870..34a5548b2 100644 --- a/xCAT-UI/css/jquery.dataTables.css +++ b/xCAT-UI/css/jquery.dataTables.css @@ -1 +1 @@ -.dataTables_wrapper{position:relative;min-height:302px;clear:both;_height:302px;zoom:1;}.dataTables_processing{position:absolute;top:50%;left:50%;width:250px;height:30px;margin-left:-125px;margin-top:-15px;padding:14px 0 2px 0;border:1px solid #ddd;text-align:center;color:#999;font-size:14px;background-color:white;}.dataTables_length{width:40%;float:left;}.dataTables_filter{width:50%;float:right;text-align:right;}.dataTables_info{width:60%;float:left;}.dataTables_paginate{width:44px;* width:50px;float:right;text-align:right;}.paginate_disabled_previous,.paginate_enabled_previous,.paginate_disabled_next,.paginate_enabled_next{height:19px;width:19px;margin-left:3px;float:left;}.paginate_disabled_previous{background-image:url('../images/back_disabled.jpg');}.paginate_enabled_previous{background-image:url('../images/back_enabled.jpg');}.paginate_disabled_next{background-image:url('../images/forward_disabled.jpg');}.paginate_enabled_next{background-image:url('../images/forward_enabled.jpg');}table.display{margin:0 auto;clear:both;width:100%;}table.display thead th{padding:3px 18px 3px 10px;border-bottom:1px solid black;font-weight:bold;cursor:pointer;* cursor:hand;}table.display tfoot th{padding:3px 18px 3px 10px;border-top:1px solid black;font-weight:bold;}table.display tr.heading2 td{border-bottom:1px solid #aaa;}table.display td{padding:3px 10px;}table.display td.center{text-align:center;}.sorting_asc{background:url('../images/sort_asc.png') no-repeat center right;}.sorting_desc{background:url('../images/sort_desc.png') no-repeat center right;}.sorting{background:url('../images/sort_both.png') no-repeat center right;}.sorting_asc_disabled{background:url('../images/sort_asc_disabled.png') no-repeat center right;}.sorting_desc_disabled{background:url('../images/sort_desc_disabled.png') no-repeat center right;}table.display tr.odd.gradeA{background-color:#dfd;}table.display tr.even.gradeA{background-color:#efe;}table.display tr.odd.gradeC{background-color:#ddf;}table.display tr.even.gradeC{background-color:#eef;}table.display tr.odd.gradeX{background-color:#fdd;}table.display tr.even.gradeX{background-color:#fee;}table.display tr.odd.gradeU{background-color:#ddd;}table.display tr.even.gradeU{background-color:#eee;}tr.odd{background-color:#E2E4FF;}tr.even{background-color:white;}.dataTables_scroll{clear:both;}.dataTables_scrollBody{* margin-top:-1px;}.top,.bottom{padding:15px;background-color:#F5F5F5;border:1px solid #CCC;}.top .dataTables_info{float:none;}.clear{clear:both;}.dataTables_empty{text-align:center;}tfoot input{margin:.5em 0;width:100%;color:#444;}tfoot input.search_init{color:#999;}td.group{background-color:#d1cfd0;border-bottom:2px solid #A19B9E;border-top:2px solid #A19B9E;}td.details{background-color:#d1cfd0;border:2px solid #A19B9E;}.example_alt_pagination div.dataTables_info{width:40%;}.paging_full_numbers{width:400px;height:22px;line-height:22px;}.paging_full_numbers span.paginate_button,.paging_full_numbers span.paginate_active{border:1px solid #aaa;-webkit-border-radius:5px;-moz-border-radius:5px;padding:2px 5px;margin:0 3px;cursor:pointer;* cursor:hand;}.paging_full_numbers span.paginate_button{background-color:#ddd;}.paging_full_numbers span.paginate_button:hover{background-color:#ccc;}.paging_full_numbers span.paginate_active{background-color:#99B3FF;}table.display tr.even.row_selected td{background-color:#B0BED9;}table.display tr.odd.row_selected td{background-color:#9FAFD1;}tr.odd td.sorting_1{background-color:#D3D6FF;}tr.odd td.sorting_2{background-color:#DADCFF;}tr.odd td.sorting_3{background-color:#E0E2FF;}tr.even td.sorting_1{background-color:#EAEBFF;}tr.even td.sorting_2{background-color:#F2F3FF;}tr.even td.sorting_3{background-color:#F9F9FF;}tr.odd.gradeA td.sorting_1{background-color:#c4ffc4;}tr.odd.gradeA td.sorting_2{background-color:#d1ffd1;}tr.odd.gradeA td.sorting_3{background-color:#d1ffd1;}tr.even.gradeA td.sorting_1{background-color:#d5ffd5;}tr.even.gradeA td.sorting_2{background-color:#e2ffe2;}tr.even.gradeA td.sorting_3{background-color:#e2ffe2;}tr.odd.gradeC td.sorting_1{background-color:#c4c4ff;}tr.odd.gradeC td.sorting_2{background-color:#d1d1ff;}tr.odd.gradeC td.sorting_3{background-color:#d1d1ff;}tr.even.gradeC td.sorting_1{background-color:#d5d5ff;}tr.even.gradeC td.sorting_2{background-color:#e2e2ff;}tr.even.gradeC td.sorting_3{background-color:#e2e2ff;}tr.odd.gradeX td.sorting_1{background-color:#ffc4c4;}tr.odd.gradeX td.sorting_2{background-color:#ffd1d1;}tr.odd.gradeX td.sorting_3{background-color:#ffd1d1;}tr.even.gradeX td.sorting_1{background-color:#ffd5d5;}tr.even.gradeX td.sorting_2{background-color:#ffe2e2;}tr.even.gradeX td.sorting_3{background-color:#ffe2e2;}tr.odd.gradeU td.sorting_1{background-color:#c4c4c4;}tr.odd.gradeU td.sorting_2{background-color:#d1d1d1;}tr.odd.gradeU td.sorting_3{background-color:#d1d1d1;}tr.even.gradeU td.sorting_1{background-color:#d5d5d5;}tr.even.gradeU td.sorting_2{background-color:#e2e2e2;}tr.even.gradeU td.sorting_3{background-color:#e2e2e2;}.ex_highlight #example tbody tr.even:hover,#example tbody tr.even td.highlighted{background-color:#ECFFB3;}.ex_highlight #example tbody tr.odd:hover,#example tbody tr.odd td.highlighted{background-color:#E6FF99;}.ex_highlight_row #example tr.even:hover{background-color:#ECFFB3;}.ex_highlight_row #example tr.even:hover td.sorting_1{background-color:#DDFF75;}.ex_highlight_row #example tr.even:hover td.sorting_2{background-color:#E7FF9E;}.ex_highlight_row #example tr.even:hover td.sorting_3{background-color:#E2FF89;}.ex_highlight_row #example tr.odd:hover{background-color:#E6FF99;}.ex_highlight_row #example tr.odd:hover td.sorting_1{background-color:#D6FF5C;}.ex_highlight_row #example tr.odd:hover td.sorting_2{background-color:#E0FF84;}.ex_highlight_row #example tr.odd:hover td.sorting_3{background-color:#DBFF70;}table.KeyTable td{border:3px solid transparent;}table.KeyTable td.focus{border:3px solid #36F;}table.display tr.gradeA{background-color:#efe;}table.display tr.gradeC{background-color:#ddf;}table.display tr.gradeX{background-color:#fdd;}table.display tr.gradeU{background-color:#ddd;}div.box{height:100px;padding:10px;overflow:auto;border:1px solid #8080FF;background-color:#E5E5FF;} \ No newline at end of file +.dataTables_wrapper{position:relative;min-height:302px;clear:both;_height:302px;zoom:1;}.dataTables_processing{position:absolute;top:50%;left:50%;width:250px;height:30px;margin-left:-125px;margin-top:-15px;padding:14px 0 2px 0;border:1px solid #ddd;text-align:center;color:#999;font-size:14px;background-color:white;}.dataTables_length{width:40%;float:left;}.dataTables_filter{width:50%;float:right;text-align:right;}.dataTables_info{width:60%;float:left;}.dataTables_paginate{width:44px;* width:50px;float:right;text-align:right;}.paginate_disabled_previous,.paginate_enabled_previous,.paginate_disabled_next,.paginate_enabled_next{height:19px;width:19px;margin-left:3px;float:left;}.paginate_disabled_previous{background-image:url('../images/datatables/back_disabled.jpg');}.paginate_enabled_previous{background-image:url('../images/datatables/back_enabled.jpg');}.paginate_disabled_next{background-image:url('../images/datatables/forward_disabled.jpg');}.paginate_enabled_next{background-image:url('../images/datatables/forward_enabled.jpg');}table.display{margin:0 auto;clear:both;width:100%;}table.display thead th{padding:3px 18px 3px 10px;border-bottom:1px solid black;font-weight:bold;cursor:pointer;* cursor:hand;}table.display tfoot th{padding:3px 18px 3px 10px;border-top:1px solid black;font-weight:bold;}table.display tr.heading2 td{border-bottom:1px solid #aaa;}table.display td{padding:3px 10px;}table.display td.center{text-align:center;}.sorting_asc{background:url('../images/datatables/sort_asc.png') no-repeat center right;}.sorting_desc{background:url('../images/datatables/sort_desc.png') no-repeat center right;}.sorting{background:url('../images/datatables/sort_both.png') no-repeat center right;}.sorting_asc_disabled{background:url('../images/datatables/sort_asc_disabled.png') no-repeat center right;}.sorting_desc_disabled{background:url('../images/datatables/sort_desc_disabled.png') no-repeat center right;}table.display tr.odd.gradeA{background-color:#dfd;}table.display tr.even.gradeA{background-color:#efe;}table.display tr.odd.gradeC{background-color:#ddf;}table.display tr.even.gradeC{background-color:#eef;}table.display tr.odd.gradeX{background-color:#fdd;}table.display tr.even.gradeX{background-color:#fee;}table.display tr.odd.gradeU{background-color:#ddd;}table.display tr.even.gradeU{background-color:#eee;}tr.odd{background-color:#E2E4FF;}tr.even{background-color:white;}.dataTables_scroll{clear:both;}.dataTables_scrollBody{* margin-top:-1px;}.top,.bottom{padding:15px;background-color:#F5F5F5;border:1px solid #CCC;}.top .dataTables_info{float:none;}.clear{clear:both;}.dataTables_empty{text-align:center;}tfoot input{margin:.5em 0;width:100%;color:#444;}tfoot input.search_init{color:#999;}td.group{background-color:#d1cfd0;border-bottom:2px solid #A19B9E;border-top:2px solid #A19B9E;}td.details{background-color:#d1cfd0;border:2px solid #A19B9E;}.example_alt_pagination div.dataTables_info{width:40%;}.paging_full_numbers{width:400px;height:22px;line-height:22px;}.paging_full_numbers span.paginate_button,.paging_full_numbers span.paginate_active{border:1px solid #aaa;-webkit-border-radius:5px;-moz-border-radius:5px;padding:2px 5px;margin:0 3px;cursor:pointer;* cursor:hand;}.paging_full_numbers span.paginate_button{background-color:#ddd;}.paging_full_numbers span.paginate_button:hover{background-color:#ccc;}.paging_full_numbers span.paginate_active{background-color:#99B3FF;}table.display tr.even.row_selected td{background-color:#B0BED9;}table.display tr.odd.row_selected td{background-color:#9FAFD1;}tr.odd td.sorting_1{background-color:#D3D6FF;}tr.odd td.sorting_2{background-color:#DADCFF;}tr.odd td.sorting_3{background-color:#E0E2FF;}tr.even td.sorting_1{background-color:#EAEBFF;}tr.even td.sorting_2{background-color:#F2F3FF;}tr.even td.sorting_3{background-color:#F9F9FF;}tr.odd.gradeA td.sorting_1{background-color:#c4ffc4;}tr.odd.gradeA td.sorting_2{background-color:#d1ffd1;}tr.odd.gradeA td.sorting_3{background-color:#d1ffd1;}tr.even.gradeA td.sorting_1{background-color:#d5ffd5;}tr.even.gradeA td.sorting_2{background-color:#e2ffe2;}tr.even.gradeA td.sorting_3{background-color:#e2ffe2;}tr.odd.gradeC td.sorting_1{background-color:#c4c4ff;}tr.odd.gradeC td.sorting_2{background-color:#d1d1ff;}tr.odd.gradeC td.sorting_3{background-color:#d1d1ff;}tr.even.gradeC td.sorting_1{background-color:#d5d5ff;}tr.even.gradeC td.sorting_2{background-color:#e2e2ff;}tr.even.gradeC td.sorting_3{background-color:#e2e2ff;}tr.odd.gradeX td.sorting_1{background-color:#ffc4c4;}tr.odd.gradeX td.sorting_2{background-color:#ffd1d1;}tr.odd.gradeX td.sorting_3{background-color:#ffd1d1;}tr.even.gradeX td.sorting_1{background-color:#ffd5d5;}tr.even.gradeX td.sorting_2{background-color:#ffe2e2;}tr.even.gradeX td.sorting_3{background-color:#ffe2e2;}tr.odd.gradeU td.sorting_1{background-color:#c4c4c4;}tr.odd.gradeU td.sorting_2{background-color:#d1d1d1;}tr.odd.gradeU td.sorting_3{background-color:#d1d1d1;}tr.even.gradeU td.sorting_1{background-color:#d5d5d5;}tr.even.gradeU td.sorting_2{background-color:#e2e2e2;}tr.even.gradeU td.sorting_3{background-color:#e2e2e2;}.ex_highlight #example tbody tr.even:hover,#example tbody tr.even td.highlighted{background-color:#ECFFB3;}.ex_highlight #example tbody tr.odd:hover,#example tbody tr.odd td.highlighted{background-color:#E6FF99;}.ex_highlight_row #example tr.even:hover{background-color:#ECFFB3;}.ex_highlight_row #example tr.even:hover td.sorting_1{background-color:#DDFF75;}.ex_highlight_row #example tr.even:hover td.sorting_2{background-color:#E7FF9E;}.ex_highlight_row #example tr.even:hover td.sorting_3{background-color:#E2FF89;}.ex_highlight_row #example tr.odd:hover{background-color:#E6FF99;}.ex_highlight_row #example tr.odd:hover td.sorting_1{background-color:#D6FF5C;}.ex_highlight_row #example tr.odd:hover td.sorting_2{background-color:#E0FF84;}.ex_highlight_row #example tr.odd:hover td.sorting_3{background-color:#DBFF70;}table.KeyTable td{border:3px solid transparent;}table.KeyTable td.focus{border:3px solid #36F;}table.display tr.gradeA{background-color:#efe;}table.display tr.gradeC{background-color:#ddf;}table.display tr.gradeX{background-color:#fdd;}table.display tr.gradeU{background-color:#ddd;}div.box{height:100px;padding:10px;overflow:auto;border:1px solid #8080FF;background-color:#E5E5FF;} \ No newline at end of file diff --git a/xCAT-UI/css/jstree.css b/xCAT-UI/css/jstree.css index f19aa3955..0cb2fda3e 100644 --- a/xCAT-UI/css/jstree.css +++ b/xCAT-UI/css/jstree.css @@ -1 +1 @@ -.jstree-default li,.jstree-default ins{background-image:url("../images/jstree.png");background-repeat:no-repeat;background-color:transparent;}.jstree-default li{background-position:-90px 0;background-repeat:repeat-y;}.jstree-default li.jstree-last{background:transparent;}.jstree-default .jstree-open>ins{background-position:-72px 0;}.jstree-default .jstree-closed>ins{background-position:-54px 0;}.jstree-default .jstree-leaf>ins{background-position:-36px 0;}.jstree-default .jstree-hovered{background:#e7f4f9;border:1px solid #d8f0fa;padding:0 2px 0 1px;}.jstree-default .jstree-clicked{background:#C0E2FF;border:1px solid #79B7E7;padding:0 2px 0 1px;}.jstree-default a .jstree-icon{background-position:-56px -19px;}.jstree-default a.jstree-loading .jstree-icon{background:url("../images/throbber.gif") center center no-repeat!important;}.jstree-default .jstree-no-dots li,.jstree-default .jstree-no-dots .jstree-leaf>ins{background:transparent;}.jstree-default .jstree-no-dots .jstree-open>ins{background-position:-18px 0;}.jstree-default .jstree-no-dots .jstree-closed>ins{background-position:0 0;}.jstree-default .jstree-no-icons a .jstree-icon{display:none;}.jstree-default .jstree-search{font-style:italic;}.jstree-default .jstree-no-icons .jstree-checkbox{display:inline-block;}.jstree-default .jstree-no-checkboxes .jstree-checkbox{display:none!important;}.jstree-default .jstree-checked>a>.jstree-checkbox{background-position:-38px -19px;}.jstree-default .jstree-unchecked>a>.jstree-checkbox{background-position:-2px -19px;}.jstree-default .jstree-undetermined>a>.jstree-checkbox{background-position:-20px -19px;}.jstree-default .jstree-checked>a>.jstree-checkbox:hover{background-position:-38px -37px;}.jstree-default .jstree-unchecked>a>.jstree-checkbox:hover{background-position:-2px -37px;}.jstree-default .jstree-undetermined>a>.jstree-checkbox:hover{background-position:-20px -37px;}#vakata-dragged.jstree-default ins{background:transparent!important;}#vakata-dragged.jstree-default .jstree-ok{background:url("../images/jstree.png") -2px -53px no-repeat!important;}#vakata-dragged.jstree-default .jstree-invalid{background:url("../images/jstree.png") -18px -53px no-repeat!important;}#jstree-marker.jstree-default{background:url("../images/jstree.png") -41px -57px no-repeat!important;}.jstree-default a.jstree-search{color:aqua;}#vakata-contextmenu.jstree-default-context,#vakata-contextmenu.jstree-default-context li ul{background:#f0f0f0;border:1px solid #979797;-moz-box-shadow:1px 1px 2px #999;-webkit-box-shadow:1px 1px 2px #999;box-shadow:1px 1px 2px #999;}#vakata-contextmenu.jstree-default-context a{color:black;}#vakata-contextmenu.jstree-default-context a:hover,#vakata-contextmenu.jstree-default-context .vakata-hover>a{padding:0 5px;background:#e8eff7;border:1px solid #aecff7;color:black;-moz-border-radius:2px;-webkit-border-radius:2px;border-radius:2px;}#vakata-contextmenu.jstree-default-context li.jstree-contextmenu-disabled a,#vakata-contextmenu.jstree-default-context li.jstree-contextmenu-disabled a:hover{color:silver;background:transparent;border:0;padding:1px 4px;}#vakata-contextmenu.jstree-default-context li.vakata-separator{background:white;border-top:1px solid #e0e0e0;margin:0;}#vakata-contextmenu.jstree-default-context li ul{margin-left:-4px;}.jstree-default li,.jstree-default ins,#vakata-dragged.jstree-default .jstree-invalid,#vakata-dragged.jstree-default .jstree-ok,#jstree-marker.jstree-default{_background-image:url("../images/jstree.gif");}.jstree-default .jstree-open ins{_background-position:-72px 0;}.jstree-default .jstree-closed ins{_background-position:-54px 0;}.jstree-default .jstree-leaf ins{_background-position:-36px 0;}.jstree-default a ins.jstree-icon{_background-position:-56px -19px;}#vakata-contextmenu.jstree-default-context ins{_display:none;}#vakata-contextmenu.jstree-default-context li{_zoom:1;}.jstree-default .jstree-undetermined a .jstree-checkbox{_background-position:-20px -19px;}.jstree-default .jstree-checked a .jstree-checkbox{_background-position:-38px -19px;}.jstree-default .jstree-unchecked a .jstree-checkbox{_background-position:-2px -19px;} \ No newline at end of file +.jstree-default li,.jstree-default ins{background-image:url("../images/jstree/jstree.png");background-repeat:no-repeat;background-color:transparent;}.jstree-default li{background-position:-90px 0;background-repeat:repeat-y;}.jstree-default li.jstree-last{background:transparent;}.jstree-default .jstree-open>ins{background-position:-72px 0;}.jstree-default .jstree-closed>ins{background-position:-54px 0;}.jstree-default .jstree-leaf>ins{background-position:-36px 0;}.jstree-default .jstree-hovered{background:#e7f4f9;border:1px solid #d8f0fa;padding:0 2px 0 1px;}.jstree-default .jstree-clicked{background:#C0E2FF;border:1px solid #79B7E7;padding:0 2px 0 1px;}.jstree-default a .jstree-icon{background-position:-56px -19px;}.jstree-default a.jstree-loading .jstree-icon{background:url("../images/loader.gif") center center no-repeat!important;}.jstree-default .jstree-no-dots li,.jstree-default .jstree-no-dots .jstree-leaf>ins{background:transparent;}.jstree-default .jstree-no-dots .jstree-open>ins{background-position:-18px 0;}.jstree-default .jstree-no-dots .jstree-closed>ins{background-position:0 0;}.jstree-default .jstree-no-icons a .jstree-icon{display:none;}.jstree-default .jstree-search{font-style:italic;}.jstree-default .jstree-no-icons .jstree-checkbox{display:inline-block;}.jstree-default .jstree-no-checkboxes .jstree-checkbox{display:none!important;}.jstree-default .jstree-checked>a>.jstree-checkbox{background-position:-38px -19px;}.jstree-default .jstree-unchecked>a>.jstree-checkbox{background-position:-2px -19px;}.jstree-default .jstree-undetermined>a>.jstree-checkbox{background-position:-20px -19px;}.jstree-default .jstree-checked>a>.jstree-checkbox:hover{background-position:-38px -37px;}.jstree-default .jstree-unchecked>a>.jstree-checkbox:hover{background-position:-2px -37px;}.jstree-default .jstree-undetermined>a>.jstree-checkbox:hover{background-position:-20px -37px;}#vakata-dragged.jstree-default ins{background:transparent!important;}#vakata-dragged.jstree-default .jstree-ok{background:url("../images/jstree/jstree.png") -2px -53px no-repeat!important;}#vakata-dragged.jstree-default .jstree-invalid{background:url("../images/jstree/jstree.png") -18px -53px no-repeat!important;}#jstree-marker.jstree-default{background:url("../images/jstree/jstree.png") -41px -57px no-repeat!important;}.jstree-default a.jstree-search{color:aqua;}#vakata-contextmenu.jstree-default-context,#vakata-contextmenu.jstree-default-context li ul{background:#f0f0f0;border:1px solid #979797;-moz-box-shadow:1px 1px 2px #999;-webkit-box-shadow:1px 1px 2px #999;box-shadow:1px 1px 2px #999;}#vakata-contextmenu.jstree-default-context a{color:black;}#vakata-contextmenu.jstree-default-context a:hover,#vakata-contextmenu.jstree-default-context .vakata-hover>a{padding:0 5px;background:#e8eff7;border:1px solid #aecff7;color:black;-moz-border-radius:2px;-webkit-border-radius:2px;border-radius:2px;}#vakata-contextmenu.jstree-default-context li.jstree-contextmenu-disabled a,#vakata-contextmenu.jstree-default-context li.jstree-contextmenu-disabled a:hover{color:silver;background:transparent;border:0;padding:1px 4px;}#vakata-contextmenu.jstree-default-context li.vakata-separator{background:white;border-top:1px solid #e0e0e0;margin:0;}#vakata-contextmenu.jstree-default-context li ul{margin-left:-4px;}.jstree-default li,.jstree-default ins,#vakata-dragged.jstree-default .jstree-invalid,#vakata-dragged.jstree-default .jstree-ok,#jstree-marker.jstree-default{_background-image:url("../images/jstree/jstree.gif");}.jstree-default .jstree-open ins{_background-position:-72px 0;}.jstree-default .jstree-closed ins{_background-position:-54px 0;}.jstree-default .jstree-leaf ins{_background-position:-36px 0;}.jstree-default a ins.jstree-icon{_background-position:-56px -19px;}#vakata-contextmenu.jstree-default-context ins{_display:none;}#vakata-contextmenu.jstree-default-context li{_zoom:1;}.jstree-default .jstree-undetermined a .jstree-checkbox{_background-position:-20px -19px;}.jstree-default .jstree-checked a .jstree-checkbox{_background-position:-38px -19px;}.jstree-default .jstree-unchecked a .jstree-checkbox{_background-position:-2px -19px;} \ No newline at end of file diff --git a/xCAT-UI/css/style.css b/xCAT-UI/css/style.css index 4f0b2b587..15c980358 100644 --- a/xCAT-UI/css/style.css +++ b/xCAT-UI/css/style.css @@ -449,7 +449,7 @@ legend { /*--------------- jQuery context menu ---------------*/ .context-menu-theme-vista { - background: #FAFAFA url(../images/context-menu-bg.gif) repeat-y left top + background: #FAFAFA url(../images/contextmenu/context-menu-bg.gif) repeat-y left top ; border: 1px solid #868686; } @@ -470,7 +470,7 @@ legend { } .context-menu-theme-vista .context-menu-item-hover { - background: transparent url(../images/context-menu-item-hover.gif) + background: transparent url(../images/contextmenu/context-menu-item-hover.gif) repeat-x left center; border: 1px solid #D7D0B3; } diff --git a/xCAT-UI/css/superfish.css b/xCAT-UI/css/superfish.css index 51772e061..5afdd87a6 100644 --- a/xCAT-UI/css/superfish.css +++ b/xCAT-UI/css/superfish.css @@ -1 +1 @@ -.sf-menu,.sf-menu *{margin:0;padding:0;list-style:none;}.sf-menu{line-height:1.0;}.sf-menu ul{position:absolute;top:-999em;width:10em;}.sf-menu ul li{width:100%;}.sf-menu li{float:left;position:relative;}.sf-menu a{display:block;position:relative;}.sf-menu li:hover ul,.sf-menu li.sfHover ul{left:0;top:2.5em;z-index:99;}ul.sf-menu li:hover li ul,ul.sf-menu li.sfHover li ul{top:-999em;}ul.sf-menu li li:hover ul,ul.sf-menu li li.sfHover ul{left:10em;top:0;}ul.sf-menu li li:hover li ul,ul.sf-menu li li.sfHover li ul{top:-999em;}ul.sf-menu li li li:hover ul,ul.sf-menu li li li.sfHover ul{left:10em;top:0;}.sf-menu{float:left;margin-bottom:.5em;border:1px solid #79B7E7;-moz-border-radius:.5em;-webkit-border-radius:.5em;font-size:12px;background:#E6E6E6 url(../images/jquery/ui-bg_glass_85_dfeffc_1x400.png) 50% 50% repeat-x;}.sf-menu .sf-menu{float:left;margin-bottom:.5em;border:1px solid #79B7E7;-moz-border-radius:.5em;-webkit-border-radius:.5em;font-size:12px;}.sf-menu a{padding:.3em 1em;text-decoration:none;color:#2E6E9E;}.sf-menu li:hover,.sf-menu li.sfHover{background:url(../images/jquery/ui-bg_inset-hard_100_f5f8f9_1x100.png) 50% 50% repeat-x;outline:0;}.sf-menu a.sf-with-ul{padding-right:2.25em;min-width:1px;}.sf-sub-indicator{position:absolute;display:block;right:.75em;top:1.05em;width:10px;height:10px;text-indent:-999em;overflow:hidden;background:url('../images/arrows-ffffff.png') no-repeat -10px -100px;}a>.sf-sub-indicator{top:.8em;background-position:0 -100px;}a:focus>.sf-sub-indicator,a:hover>.sf-sub-indicator,a:active>.sf-sub-indicator,li:hover>a>.sf-sub-indicator,li.sfHover>a>.sf-sub-indicator{background-position:-10px -100px;}.sf-menu ul .sf-sub-indicator{background-position:-10px 0;}.sf-menu ul a>.sf-sub-indicator{background-position:0 0;}.sf-menu ul a:focus>.sf-sub-indicator,.sf-menu ul a:hover>.sf-sub-indicator,.sf-menu ul a:active>.sf-sub-indicator,.sf-menu ul li:hover>a>.sf-sub-indicator,.sf-menu ul li.sfHover>a>.sf-sub-indicator{background-position:-10px 0;}.sf-shadow ul{padding:0 9px 9px 0;}.sf-shadow ul.sf-shadow-off{background:transparent;} \ No newline at end of file +.sf-menu,.sf-menu *{margin:0;padding:0;list-style:none;}.sf-menu{line-height:1.0;}.sf-menu ul{position:absolute;top:-999em;width:10em;}.sf-menu ul li{width:100%;}.sf-menu li{float:left;position:relative;}.sf-menu a{display:block;position:relative;}.sf-menu li:hover ul,.sf-menu li.sfHover ul{left:0;top:2.5em;z-index:99;}ul.sf-menu li:hover li ul,ul.sf-menu li.sfHover li ul{top:-999em;}ul.sf-menu li li:hover ul,ul.sf-menu li li.sfHover ul{left:10em;top:0;}ul.sf-menu li li:hover li ul,ul.sf-menu li li.sfHover li ul{top:-999em;}ul.sf-menu li li li:hover ul,ul.sf-menu li li li.sfHover ul{left:10em;top:0;}.sf-menu{float:left;margin-bottom:.5em;border:1px solid #79B7E7;-moz-border-radius:.5em;-webkit-border-radius:.5em;font-size:12px;background:#E6E6E6 url(../images/jquery/ui-bg_glass_85_dfeffc_1x400.png) 50% 50% repeat-x;}.sf-menu .sf-menu{float:left;margin-bottom:.5em;border:1px solid #79B7E7;-moz-border-radius:.5em;-webkit-border-radius:.5em;font-size:12px;}.sf-menu a{padding:.3em 1em;text-decoration:none;color:#2E6E9E;}.sf-menu li:hover,.sf-menu li.sfHover{background:url(../images/jquery/ui-bg_inset-hard_100_f5f8f9_1x100.png) 50% 50% repeat-x;outline:0;}.sf-menu a.sf-with-ul{padding-right:2.25em;min-width:1px;}.sf-sub-indicator{position:absolute;display:block;right:.75em;top:1.05em;width:10px;height:10px;text-indent:-999em;overflow:hidden;background:url('../images/superfish/arrows-ffffff.png') no-repeat -10px -100px;}a>.sf-sub-indicator{top:.8em;background-position:0 -100px;}a:focus>.sf-sub-indicator,a:hover>.sf-sub-indicator,a:active>.sf-sub-indicator,li:hover>a>.sf-sub-indicator,li.sfHover>a>.sf-sub-indicator{background-position:-10px -100px;}.sf-menu ul .sf-sub-indicator{background-position:-10px 0;}.sf-menu ul a>.sf-sub-indicator{background-position:0 0;}.sf-menu ul a:focus>.sf-sub-indicator,.sf-menu ul a:hover>.sf-sub-indicator,.sf-menu ul a:active>.sf-sub-indicator,.sf-menu ul li:hover>a>.sf-sub-indicator,.sf-menu ul li.sfHover>a>.sf-sub-indicator{background-position:-10px 0;}.sf-shadow ul{padding:0 9px 9px 0;}.sf-shadow ul.sf-shadow-off{background:transparent;} \ No newline at end of file diff --git a/xCAT-UI/images/context-menu-bg.gif b/xCAT-UI/images/contextmenu/context-menu-bg.gif similarity index 100% rename from xCAT-UI/images/context-menu-bg.gif rename to xCAT-UI/images/contextmenu/context-menu-bg.gif diff --git a/xCAT-UI/images/context-menu-item-hover.gif b/xCAT-UI/images/contextmenu/context-menu-item-hover.gif similarity index 100% rename from xCAT-UI/images/context-menu-item-hover.gif rename to xCAT-UI/images/contextmenu/context-menu-item-hover.gif diff --git a/xCAT-UI/images/back_disabled.jpg b/xCAT-UI/images/datatables/back_disabled.jpg similarity index 100% rename from xCAT-UI/images/back_disabled.jpg rename to xCAT-UI/images/datatables/back_disabled.jpg diff --git a/xCAT-UI/images/back_enabled.jpg b/xCAT-UI/images/datatables/back_enabled.jpg similarity index 100% rename from xCAT-UI/images/back_enabled.jpg rename to xCAT-UI/images/datatables/back_enabled.jpg diff --git a/xCAT-UI/images/forward_disabled.jpg b/xCAT-UI/images/datatables/forward_disabled.jpg similarity index 100% rename from xCAT-UI/images/forward_disabled.jpg rename to xCAT-UI/images/datatables/forward_disabled.jpg diff --git a/xCAT-UI/images/forward_enabled.jpg b/xCAT-UI/images/datatables/forward_enabled.jpg similarity index 100% rename from xCAT-UI/images/forward_enabled.jpg rename to xCAT-UI/images/datatables/forward_enabled.jpg diff --git a/xCAT-UI/images/sort_asc.png b/xCAT-UI/images/datatables/sort_asc.png similarity index 100% rename from xCAT-UI/images/sort_asc.png rename to xCAT-UI/images/datatables/sort_asc.png diff --git a/xCAT-UI/images/sort_asc_disabled.png b/xCAT-UI/images/datatables/sort_asc_disabled.png similarity index 100% rename from xCAT-UI/images/sort_asc_disabled.png rename to xCAT-UI/images/datatables/sort_asc_disabled.png diff --git a/xCAT-UI/images/sort_both.png b/xCAT-UI/images/datatables/sort_both.png similarity index 100% rename from xCAT-UI/images/sort_both.png rename to xCAT-UI/images/datatables/sort_both.png diff --git a/xCAT-UI/images/sort_desc.png b/xCAT-UI/images/datatables/sort_desc.png similarity index 100% rename from xCAT-UI/images/sort_desc.png rename to xCAT-UI/images/datatables/sort_desc.png diff --git a/xCAT-UI/images/sort_desc_disabled.png b/xCAT-UI/images/datatables/sort_desc_disabled.png similarity index 100% rename from xCAT-UI/images/sort_desc_disabled.png rename to xCAT-UI/images/datatables/sort_desc_disabled.png diff --git a/xCAT-UI/images/dot_for_ie.gif b/xCAT-UI/images/dot_for_ie.gif deleted file mode 100644 index c0cc5fda7..000000000 Binary files a/xCAT-UI/images/dot_for_ie.gif and /dev/null differ diff --git a/xCAT-UI/images/icons.png b/xCAT-UI/images/icons.png deleted file mode 100644 index b12618a80..000000000 Binary files a/xCAT-UI/images/icons.png and /dev/null differ diff --git a/xCAT-UI/images/jstree.gif b/xCAT-UI/images/jstree/jstree.gif similarity index 100% rename from xCAT-UI/images/jstree.gif rename to xCAT-UI/images/jstree/jstree.gif diff --git a/xCAT-UI/images/jstree.png b/xCAT-UI/images/jstree/jstree.png similarity index 100% rename from xCAT-UI/images/jstree.png rename to xCAT-UI/images/jstree/jstree.png diff --git a/xCAT-UI/images/1ufsp.jpg b/xCAT-UI/images/nodes/1ufsp.jpg similarity index 100% rename from xCAT-UI/images/1ufsp.jpg rename to xCAT-UI/images/nodes/1ufsp.jpg diff --git a/xCAT-UI/images/2ufsp.jpg b/xCAT-UI/images/nodes/2ufsp.jpg similarity index 100% rename from xCAT-UI/images/2ufsp.jpg rename to xCAT-UI/images/nodes/2ufsp.jpg diff --git a/xCAT-UI/images/42ufsp.jpg b/xCAT-UI/images/nodes/42ufsp.jpg similarity index 100% rename from xCAT-UI/images/42ufsp.jpg rename to xCAT-UI/images/nodes/42ufsp.jpg diff --git a/xCAT-UI/images/4ufsp.jpg b/xCAT-UI/images/nodes/4ufsp.jpg similarity index 100% rename from xCAT-UI/images/4ufsp.jpg rename to xCAT-UI/images/nodes/4ufsp.jpg diff --git a/xCAT-UI/images/bpa.jpg b/xCAT-UI/images/nodes/bpa.jpg similarity index 100% rename from xCAT-UI/images/bpa.jpg rename to xCAT-UI/images/nodes/bpa.jpg diff --git a/xCAT-UI/images/green.gif b/xCAT-UI/images/nodes/green.gif similarity index 100% rename from xCAT-UI/images/green.gif rename to xCAT-UI/images/nodes/green.gif diff --git a/xCAT-UI/images/grey.gif b/xCAT-UI/images/nodes/grey.gif similarity index 100% rename from xCAT-UI/images/grey.gif rename to xCAT-UI/images/nodes/grey.gif diff --git a/xCAT-UI/images/red.gif b/xCAT-UI/images/nodes/red.gif similarity index 100% rename from xCAT-UI/images/red.gif rename to xCAT-UI/images/nodes/red.gif diff --git a/xCAT-UI/images/s-green.gif b/xCAT-UI/images/nodes/s-green.gif similarity index 100% rename from xCAT-UI/images/s-green.gif rename to xCAT-UI/images/nodes/s-green.gif diff --git a/xCAT-UI/images/s-grey.gif b/xCAT-UI/images/nodes/s-grey.gif similarity index 100% rename from xCAT-UI/images/s-grey.gif rename to xCAT-UI/images/nodes/s-grey.gif diff --git a/xCAT-UI/images/s-red.gif b/xCAT-UI/images/nodes/s-red.gif similarity index 100% rename from xCAT-UI/images/s-red.gif rename to xCAT-UI/images/nodes/s-red.gif diff --git a/xCAT-UI/images/s-yellow.gif b/xCAT-UI/images/nodes/s-yellow.gif similarity index 100% rename from xCAT-UI/images/s-yellow.gif rename to xCAT-UI/images/nodes/s-yellow.gif diff --git a/xCAT-UI/images/ui-icon-comment.png b/xCAT-UI/images/nodes/ui-icon-comment.png similarity index 100% rename from xCAT-UI/images/ui-icon-comment.png rename to xCAT-UI/images/nodes/ui-icon-comment.png diff --git a/xCAT-UI/images/ui-icon-no-comment.png b/xCAT-UI/images/nodes/ui-icon-no-comment.png similarity index 100% rename from xCAT-UI/images/ui-icon-no-comment.png rename to xCAT-UI/images/nodes/ui-icon-no-comment.png diff --git a/xCAT-UI/images/yellow.gif b/xCAT-UI/images/nodes/yellow.gif similarity index 100% rename from xCAT-UI/images/yellow.gif rename to xCAT-UI/images/nodes/yellow.gif diff --git a/xCAT-UI/images/desktop.png b/xCAT-UI/images/serverbrowser/desktop.png similarity index 100% rename from xCAT-UI/images/desktop.png rename to xCAT-UI/images/serverbrowser/desktop.png diff --git a/xCAT-UI/images/documents.png b/xCAT-UI/images/serverbrowser/documents.png similarity index 100% rename from xCAT-UI/images/documents.png rename to xCAT-UI/images/serverbrowser/documents.png diff --git a/xCAT-UI/images/folder.png b/xCAT-UI/images/serverbrowser/folder.png similarity index 100% rename from xCAT-UI/images/folder.png rename to xCAT-UI/images/serverbrowser/folder.png diff --git a/xCAT-UI/images/loading.gif b/xCAT-UI/images/serverbrowser/loading.gif similarity index 100% rename from xCAT-UI/images/loading.gif rename to xCAT-UI/images/serverbrowser/loading.gif diff --git a/xCAT-UI/images/unknown.png b/xCAT-UI/images/serverbrowser/unknown.png similarity index 100% rename from xCAT-UI/images/unknown.png rename to xCAT-UI/images/serverbrowser/unknown.png diff --git a/xCAT-UI/images/arrows-ffffff.png b/xCAT-UI/images/superfish/arrows-ffffff.png similarity index 100% rename from xCAT-UI/images/arrows-ffffff.png rename to xCAT-UI/images/superfish/arrows-ffffff.png diff --git a/xCAT-UI/images/throbber.gif b/xCAT-UI/images/throbber.gif deleted file mode 100644 index 95ff649d4..000000000 Binary files a/xCAT-UI/images/throbber.gif and /dev/null differ diff --git a/xCAT-UI/js/monitor/gangliamon.js b/xCAT-UI/js/monitor/gangliamon.js index 45f8c69f2..322fd1d41 100644 --- a/xCAT-UI/js/monitor/gangliamon.js +++ b/xCAT-UI/js/monitor/gangliamon.js @@ -1,7 +1,7 @@ /** * Global variables */ -var gangliaTableId = 'gangliaDatatable'; +var gangliaTableId = 'nodesDatatable'; var gangliaNodesList; /** @@ -542,10 +542,10 @@ function loadNodes4Ganglia(data) { // Instead refresh the ping status and power status pingCol.find('span a').bind('click', function(event) { - refreshNodeStatus(group); + refreshNodeStatus(group, gangliaTableId); }); powerCol.find('span a').bind('click', function(event) { - refreshPowerStatus(group); + refreshPowerStatus(group, gangliaTableId); }); gangliaCol.bind('click', function(event) { refreshGangliaStatus(group); diff --git a/xCAT-UI/js/nodes/nodes.js b/xCAT-UI/js/nodes/nodes.js index ae357c287..9336cc42d 100644 --- a/xCAT-UI/js/nodes/nodes.js +++ b/xCAT-UI/js/nodes/nodes.js @@ -518,9 +518,9 @@ function loadNodes(data) { var iconSrc; if (!comments) { comments = 'No comments'; - iconSrc = 'images/ui-icon-no-comment.png'; + iconSrc = 'images/nodes/ui-icon-no-comment.png'; } else { - iconSrc = 'images/ui-icon-comment.png'; + iconSrc = 'images/nodes/ui-icon-comment.png'; } // Create comments icon @@ -810,10 +810,10 @@ function loadNodes(data) { // Instead refresh the node status and power status pingCol.find('span a').click(function() { - refreshNodeStatus(group); + refreshNodeStatus(group, nodesTableId); }); powerCol.find('span a').click(function() { - refreshPowerStatus(group); + refreshPowerStatus(group, nodesTableId); }); // Create tooltip for status @@ -1163,9 +1163,9 @@ function addNodes2Table(data) { var iconSrc; if (!comments) { comments = 'No comments'; - iconSrc = 'images/ui-icon-no-comment.png'; + iconSrc = 'images/nodes/ui-icon-no-comment.png'; } else { - iconSrc = 'images/ui-icon-comment.png'; + iconSrc = 'images/nodes/ui-icon-comment.png'; } // Create icon for node comments @@ -1333,15 +1333,17 @@ function loadPowerStatus(data) { * * @param group * Group name + * @param tableId + * Table to update node status * @return Nothing */ -function refreshPowerStatus(group) { +function refreshPowerStatus(group, tableId) { // Show power loader - var powerCol = $('#' + nodesTableId + ' thead tr th').eq(3); + var powerCol = $('#' + tableId + ' thead tr th').eq(3); powerCol.find('img').show(); // Get power status for nodes shown - var nodes = getNodesShown(nodesTableId); + var nodes = getNodesShown(tableId); // Get power status $.ajax( { @@ -1395,15 +1397,17 @@ function loadNodeStatus(data) { * * @param group * Group name + * @param tableId + * Table to update node status * @return Nothing */ -function refreshNodeStatus(group) { +function refreshNodeStatus(group, tableId) { // Show ping loader - var pingCol = $('#' + nodesTableId + ' thead tr th').eq(2); + var pingCol = $('#' + tableId + ' thead tr th').eq(2); pingCol.find('img').show(); // Get power status for nodes shown - var nodes = getNodesShown(nodesTableId); + var nodes = getNodesShown(tableId); // Get the node status $.ajax( { diff --git a/xCAT-UI/js/nodes/physical.js b/xCAT-UI/js/nodes/physical.js index 3f62919a4..8aab387bc 100644 --- a/xCAT-UI/js/nodes/physical.js +++ b/xCAT-UI/js/nodes/physical.js @@ -502,7 +502,7 @@ function createFspDiv(fspName, mtm, fsp){ } var lparName = fsp[fspName]['children'][lparIndex]; var color = statusMap(lparList[lparName]); - lparStatusRow += ''; + lparStatusRow += ''; } //select the backgroud @@ -632,12 +632,12 @@ function changeNode(lparName, status){ var checkFlag = true; if ('select' == status){ selectNode[lparName] = 1; - imgUrl = 'url(images/s-'+ statusMap(lparList[lparName]) + '.gif)'; + imgUrl = 'url(images/nodes/s-'+ statusMap(lparList[lparName]) + '.gif)'; checkFlag = true; } else{ delete selectNode[lparName]; - imgUrl = 'url(images/'+ statusMap(lparList[lparName]) + '.gif)'; + imgUrl = 'url(images/nodes/'+ statusMap(lparList[lparName]) + '.gif)'; checkFlag = false; } $('#graphTable [name=' + lparName + ']').css('background-image', imgUrl); diff --git a/xCAT-UI/js/nodes/updatenode.js b/xCAT-UI/js/nodes/updatenode.js index 8f9921432..e5414e75d 100644 --- a/xCAT-UI/js/nodes/updatenode.js +++ b/xCAT-UI/js/nodes/updatenode.js @@ -96,8 +96,8 @@ function loadUpdatenodePage(tgtNodes) { image : 'desktop.png', path : '/install' } ], - imageUrl : 'images/', - systemImageUrl : 'images/', + imageUrl : 'images/serverbrowser/', + systemImageUrl : 'images/serverbrowser/', handlerUrl : 'lib/getpath.php', title : 'Browse', requestMethod : 'POST', @@ -143,8 +143,8 @@ function loadUpdatenodePage(tgtNodes) { image : 'desktop.png', path : '/install' } ], - imageUrl : 'images/', - systemImageUrl : 'images/', + imageUrl : 'images/serverbrowser/', + systemImageUrl : 'images/serverbrowser/', handlerUrl : 'lib/getpath.php', title : 'Browse', requestMethod : 'POST', diff --git a/xCAT-UI/js/provision/images.js b/xCAT-UI/js/provision/images.js index 59705c0ce..48fa1d84f 100644 --- a/xCAT-UI/js/provision/images.js +++ b/xCAT-UI/js/provision/images.js @@ -480,8 +480,8 @@ function loadEditImagePage(tgtImage) { image : 'desktop.png', path : '/install' }], - imageUrl : 'images/', - systemImageUrl : 'images/', + imageUrl : 'images/serverbrowser/', + systemImageUrl : 'images/serverbrowser/', handlerUrl : 'lib/getpath.php', title : 'Browse', requestMethod : 'POST', @@ -504,8 +504,8 @@ function loadEditImagePage(tgtImage) { image : 'desktop.png', path : '/install' }], - imageUrl : 'images/', - systemImageUrl : 'images/', + imageUrl : 'images/serverbrowser/', + systemImageUrl : 'images/serverbrowser/', handlerUrl : 'lib/getpath.php', title : 'Browse', requestMethod : 'POST', @@ -528,8 +528,8 @@ function loadEditImagePage(tgtImage) { image : 'desktop.png', path : '/install' }], - imageUrl : 'images/', - systemImageUrl : 'images/', + imageUrl : 'images/serverbrowser/', + systemImageUrl : 'images/serverbrowser/', handlerUrl : 'lib/getpath.php', title : 'Browse', requestMethod : 'POST', @@ -552,8 +552,8 @@ function loadEditImagePage(tgtImage) { image : 'desktop.png', path : '/install' }], - imageUrl : 'images/', - systemImageUrl : 'images/', + imageUrl : 'images/serverbrowser/', + systemImageUrl : 'images/serverbrowser/', handlerUrl : 'lib/getpath.php', title : 'Browse', requestMethod : 'POST', @@ -576,8 +576,8 @@ function loadEditImagePage(tgtImage) { image : 'desktop.png', path : '/install' }], - imageUrl : 'images/', - systemImageUrl : 'images/', + imageUrl : 'images/serverbrowser/', + systemImageUrl : 'images/serverbrowser/', handlerUrl : 'lib/getpath.php', title : 'Browse', requestMethod : 'POST', @@ -769,8 +769,8 @@ function loadCopyCdPage() { image : 'desktop.png', path : '/install' } ], - imageUrl : 'images/', - systemImageUrl : 'images/', + imageUrl : 'images/serverbrowser/', + systemImageUrl : 'images/serverbrowser/', handlerUrl : 'lib/getpath.php', title : 'Browse', requestMethod : 'POST',