From 4e353a0bb9c5976faf504ff7fa643ba3b4425898 Mon Sep 17 00:00:00 2001 From: phamt Date: Fri, 14 Jan 2011 20:25:14 +0000 Subject: [PATCH] Reorganized images so that images are grouped under a plugin folder. git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8661 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-UI/css/jquery.dataTables.css | 2 +- xCAT-UI/css/jstree.css | 2 +- xCAT-UI/css/style.css | 4 +-- xCAT-UI/css/superfish.css | 2 +- .../{ => contextmenu}/context-menu-bg.gif | Bin .../context-menu-item-hover.gif | Bin .../images/{ => datatables}/back_disabled.jpg | Bin .../images/{ => datatables}/back_enabled.jpg | Bin .../{ => datatables}/forward_disabled.jpg | Bin .../{ => datatables}/forward_enabled.jpg | Bin xCAT-UI/images/{ => datatables}/sort_asc.png | Bin .../{ => datatables}/sort_asc_disabled.png | Bin xCAT-UI/images/{ => datatables}/sort_both.png | Bin xCAT-UI/images/{ => datatables}/sort_desc.png | Bin .../{ => datatables}/sort_desc_disabled.png | Bin xCAT-UI/images/dot_for_ie.gif | Bin 43 -> 0 bytes xCAT-UI/images/icons.png | Bin 6680 -> 0 bytes xCAT-UI/images/{ => jstree}/jstree.gif | Bin xCAT-UI/images/{ => jstree}/jstree.png | Bin xCAT-UI/images/{ => nodes}/1ufsp.jpg | Bin xCAT-UI/images/{ => nodes}/2ufsp.jpg | Bin xCAT-UI/images/{ => nodes}/42ufsp.jpg | Bin xCAT-UI/images/{ => nodes}/4ufsp.jpg | Bin xCAT-UI/images/{ => nodes}/bpa.jpg | Bin xCAT-UI/images/{ => nodes}/green.gif | Bin xCAT-UI/images/{ => nodes}/grey.gif | Bin xCAT-UI/images/{ => nodes}/red.gif | Bin xCAT-UI/images/{ => nodes}/s-green.gif | Bin xCAT-UI/images/{ => nodes}/s-grey.gif | Bin xCAT-UI/images/{ => nodes}/s-red.gif | Bin xCAT-UI/images/{ => nodes}/s-yellow.gif | Bin .../images/{ => nodes}/ui-icon-comment.png | Bin .../images/{ => nodes}/ui-icon-no-comment.png | Bin xCAT-UI/images/{ => nodes}/yellow.gif | Bin .../images/{ => serverbrowser}/desktop.png | Bin .../images/{ => serverbrowser}/documents.png | Bin xCAT-UI/images/{ => serverbrowser}/folder.png | Bin .../images/{ => serverbrowser}/loading.gif | Bin .../images/{ => serverbrowser}/unknown.png | Bin .../images/{ => superfish}/arrows-ffffff.png | Bin xCAT-UI/images/throbber.gif | Bin 1844 -> 0 bytes xCAT-UI/js/monitor/gangliamon.js | 6 ++-- xCAT-UI/js/nodes/nodes.js | 28 ++++++++++-------- xCAT-UI/js/nodes/physical.js | 6 ++-- xCAT-UI/js/nodes/updatenode.js | 8 ++--- xCAT-UI/js/provision/images.js | 24 +++++++-------- 46 files changed, 43 insertions(+), 39 deletions(-) rename xCAT-UI/images/{ => contextmenu}/context-menu-bg.gif (100%) rename xCAT-UI/images/{ => contextmenu}/context-menu-item-hover.gif (100%) rename xCAT-UI/images/{ => datatables}/back_disabled.jpg (100%) rename xCAT-UI/images/{ => datatables}/back_enabled.jpg (100%) rename xCAT-UI/images/{ => datatables}/forward_disabled.jpg (100%) rename xCAT-UI/images/{ => datatables}/forward_enabled.jpg (100%) rename xCAT-UI/images/{ => datatables}/sort_asc.png (100%) rename xCAT-UI/images/{ => datatables}/sort_asc_disabled.png (100%) rename xCAT-UI/images/{ => datatables}/sort_both.png (100%) rename xCAT-UI/images/{ => datatables}/sort_desc.png (100%) rename xCAT-UI/images/{ => datatables}/sort_desc_disabled.png (100%) delete mode 100644 xCAT-UI/images/dot_for_ie.gif delete mode 100644 xCAT-UI/images/icons.png rename xCAT-UI/images/{ => jstree}/jstree.gif (100%) rename xCAT-UI/images/{ => jstree}/jstree.png (100%) rename xCAT-UI/images/{ => nodes}/1ufsp.jpg (100%) rename xCAT-UI/images/{ => nodes}/2ufsp.jpg (100%) rename xCAT-UI/images/{ => nodes}/42ufsp.jpg (100%) rename xCAT-UI/images/{ => nodes}/4ufsp.jpg (100%) rename xCAT-UI/images/{ => nodes}/bpa.jpg (100%) rename xCAT-UI/images/{ => nodes}/green.gif (100%) rename xCAT-UI/images/{ => nodes}/grey.gif (100%) rename xCAT-UI/images/{ => nodes}/red.gif (100%) rename xCAT-UI/images/{ => nodes}/s-green.gif (100%) rename xCAT-UI/images/{ => nodes}/s-grey.gif (100%) rename xCAT-UI/images/{ => nodes}/s-red.gif (100%) rename xCAT-UI/images/{ => nodes}/s-yellow.gif (100%) rename xCAT-UI/images/{ => nodes}/ui-icon-comment.png (100%) rename xCAT-UI/images/{ => nodes}/ui-icon-no-comment.png (100%) rename xCAT-UI/images/{ => nodes}/yellow.gif (100%) rename xCAT-UI/images/{ => serverbrowser}/desktop.png (100%) rename xCAT-UI/images/{ => serverbrowser}/documents.png (100%) rename xCAT-UI/images/{ => serverbrowser}/folder.png (100%) rename xCAT-UI/images/{ => serverbrowser}/loading.gif (100%) rename xCAT-UI/images/{ => serverbrowser}/unknown.png (100%) rename xCAT-UI/images/{ => superfish}/arrows-ffffff.png (100%) delete mode 100644 xCAT-UI/images/throbber.gif 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 c0cc5fda7cfb9539720de442a3caca9c9a3fc4cb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 43 vcmZ?wbhEHbWMW`qXkcKFla>7c|G(l-7DfgJMg|=QAOOiQFfqBrF<1it%E1S( diff --git a/xCAT-UI/images/icons.png b/xCAT-UI/images/icons.png deleted file mode 100644 index b12618a80b8c6e24b32b7ee56024cfe7cb6a8a41..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6680 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 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',