From 5cba4bb121a736e3801d1f436263ff818a68a389 Mon Sep 17 00:00:00 2001 From: Seshu-Kumar-M Date: Wed, 28 Sep 2016 17:49:37 +0800 Subject: Changes for the LCM integration and new GSO design Change-Id: I319237a9386cea88fae887c73ae2feff217f6f85 Signed-off-by: Seshu-Kumar-M --- .../src/main/webapp/lifecyclemgr/css/RMain.css | 295 ++++--- .../src/main/webapp/lifecyclemgr/css/VMMain.css | 850 +++++++++------------ .../src/main/webapp/lifecyclemgr/gsolcmmain.html | 504 +++++++++--- .../src/main/webapp/lifecyclemgr/js/rest.js | 77 +- .../src/main/webapp/lifecyclemgr/overlayvpn.html | 70 +- .../src/main/webapp/lifecyclemgr/underlayvpn.html | 54 +- 6 files changed, 1067 insertions(+), 783 deletions(-) (limited to 'openo-portal') diff --git a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/css/RMain.css b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/css/RMain.css index 0a74032c..c40182ba 100644 --- a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/css/RMain.css +++ b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/css/RMain.css @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -14,226 +14,197 @@ */ #iemp_layout_container { - padding: 0px; - margin: 1px auto; - width: 100%; - height: 100%; + padding: 0px; + margin: 1px auto; + width: 100%; + height: 100%; } - #iemp_layout_container .three-cols-layout { - width: 100%; - height: 100%; - border-collapse: collapse; - margin-left: 0px; - margin-top: 0px; - margin-right: 0px; - margin-bottom: 0px; + width: 100%; + height: 100%; + border-collapse: collapse; + margin-left: 0px; + margin-top: 0px; + margin-right: 0px; + margin-bottom: 0px; } - #iemp_layout_container .three-cols-layout { - width: 100%; - height: 100%; - border-collapse: collapse; - margin-left: 0px; - margin-top: 0px; - margin-right: 0px; - margin-bottom: 0px; + width: 100%; + height: 100%; + border-collapse: collapse; + margin-left: 0px; + margin-top: 0px; + margin-right: 0px; + margin-bottom: 0px; } - #iemp_layout_container .three-cols-column.three-cols-left { - width: 215px; - background-color: #f5f5f5; + width: 215px; + background-color: #f5f5f5; } - .accordion_parent { - position: relative; - width: 220px; - background-color: #f5f5f5; + position: relative; + width: 220px; + background-color: #f5f5f5; } - .openo-accordion-resizable-handle { - z-index: 1 !important; - cursor: e-resize; - width: 7px; - right: -5px; - top: 0; - height: 100%; - position: absolute; - font-size: .1px; - display: block; + z-index: 1!important; + cursor: e-resize; + width: 7px; + right: -5px; + top: 0; + height: 100%; + position: absolute; + font-size: .1px; + display: block; } - .openoAccordian_accordionmenu { - width: 100%; - margin: 0; - padding: 0; - list-style-type: none; - line-height: 17px; + width: 100%; + margin: 0; + padding: 0; + list-style-type: none; + line-height: 17px; } - .openoAccordian_accordionmenu li { - min-width: 75px; - margin: 0; - padding: 0; - list-style-type: none; - color: #000; - clear: both; + min-width: 75px; + margin: 0; + padding: 0; + list-style-type: none; + color: #000; + clear: both; } - .openo_accordion_ui-icon-collapse, .openo_accordion_ui-icon-expand { - display: block; - float: left; - margin-bottom: -1px; - border-bottom: 1px solid #e5e5e5; - cursor: pointer; - width: 13px; - padding-top: 26px; + display: block; + float: left; + margin-bottom: -1px; + border-bottom: 1px solid #e5e5e5; + cursor: pointer; + width: 13px; + padding-top: 26px; } - .openo_accordion_ui-icon-expand { - background: url(../images/collapse_arrow.png) right 20px no-repeat; - margin-top: 8px; + background: url(../images/collapse_arrow.png) right 20px no-repeat; + margin-top: 8px; } - -.openo_accordion_ui-icon-expand.current { - background: url(../images/expand_arrow.png) right 20px no-repeat; +.openo_accordion_ui-icon-expand.current{ + background: url(../images/expand_arrow.png) right 20px no-repeat; } - .openoAccordian_showHideArrow_hide, .openoAccordian_showHideArrow_show { - display: block; - position: absolute; - right: 0; - top: 4px; - width: 18px; - height: 41px; - cursor: pointer; - background-color: #f5f5f5; + display: block; + position: absolute; + right: 0; + top: 4px; + width: 18px; + height: 41px; + cursor: pointer; + background-color: #f5f5f5; } - .openoAccordian_showHideArrow_hide { - background-image: url(../images/openo.png); - background-position: -7px 0 !important; - border-collapse: separate; - /*box-shadow: inset -1px 0 0 #e5e5e5;*/ + background-image: url(../images/openo.png); + background-position: -7px 0!important; + border-collapse: separate; + /*box-shadow: inset -1px 0 0 #e5e5e5;*/ } - a.header.opened, a.header.closed { - font-size: 16px; - padding-top: 24px; - padding-bottom: 25px; - color: #999999; + font-size: 16px; + padding-top: 24px; + padding-bottom: 25px; + color: #999999; } - .openoAccordian_accordionmenu .closed, .openoAccordian_accordionmenu .opened { - padding-right: 10px; - background-position: 98% 50%; - background-repeat: no-repeat; + padding-right: 10px; + background-position: 98% 50%; + background-repeat: no-repeat; } - .openoAccordian_accordionmenu li a { - padding: 11px 10px 12px; - color: #333333; - margin-right: 1px; - margin-top: -1px; - text-align: left !important; - font-family: "Microsoft Yahei", SimSun, Arial, Tahoma; - font-size: 14px; - text-overflow: ellipsis; - white-space: nowrap; - overflow: hidden; - border-top: 1px solid #e5e5e5; - border-bottom: 1px solid #e5e5e5; - /*height: 19px;*/ + padding: 11px 10px 12px; + color: #333333; + margin-right: 1px; + margin-top: -1px; + text-align: left!important; + font-family: "Microsoft Yahei",SimSun,Arial,Tahoma; + font-size: 14px; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + border-top: 1px solid #e5e5e5; + border-bottom: 1px solid #e5e5e5; + /*height: 19px;*/ } - .openoAccordian_accordionmenu ul { - margin: 0; - padding: 0; - overflow: hidden; + margin: 0; + padding: 0; + overflow: hidden; } - .openoAccordian_accordionmenu a { - display: block; - text-decoration: none; + display: block; + text-decoration: none; } - a { - color: #428bca; - text-decoration: none; - background: 0 0; + color: #428bca; + text-decoration: none; + background: 0 0; } - -.bar { +.bar{ height: 834px; width: 18px; background: #f8f8f8; display: none; } - -.bar span { +.bar span{ width: 13px; height: 34px; background-image: url(../images/openo.png); - background-position: -39px 0 !important; - display: block; - /*margin-top: -430px;*/ + background-position: -39px 0!important; + display: block; + /*margin-top: -430px;*/ } - -#accordionmenuid_ul_0_0_brAppTopMenuID_UL li { +#accordionmenuid_ul_0_0_brAppTopMenuID_UL li{ cursor: pointer; } - -#puer_base_openo { +#puer_base_openo{ border: 1px solid #ddd; } - .openo_accordion_selected { - margin-left: 0; - margin-right: 0; - background: #fafafa; - border-left: 3px solid #4ac9ff !important; - box-shadow: none; - position: relative; + margin-left: 0; + margin-right: 0; + background: #fafafa; + border-left: 3px solid #4ac9ff!important; + box-shadow: none; + position: relative; } - -a:hover { - color: #4ac9ff !important; +a:hover{ + color: #4ac9ff!important; } - .openoAccordian_accordionmenu li.openo_accordion_selected a { - position: relative; - left: -3px; - color: #009ae7; + position: relative; + left: -3px; + color: #009ae7; } - .openo-accordion-resizable-handle { - z-index: 1 !important; - cursor: e-resize; - width: 7px; - right: -5px; - top: 0; - height: 100%; - position: absolute; - font-size: .1px; - display: block; + z-index: 1!important; + cursor: e-resize; + width: 7px; + right: -5px; + top: 0; + height: 100%; + position: absolute; + font-size: .1px; + display: block; } - #iframeContainer iframe { - width: 100%; - height: 100%; - border: 0; + width: 100%; + height: 100%; + border: 0; } - #accordionContent, #iframeContainer { - margin: 0; - padding: 0; - border: 0; - width: 100%; - height: 100%; + margin: 0; + padding: 0; + border: 0; + width: 100%; + height: 100%; } - .openoAccordian_showHideArrow_show { - background-image: url(../images/openo.png); - background-position: -39px 0 !important; - box-shadow: inset 1px 0 0 #e5e5e5, inset -1px 0 0 #e5e5e5; + background-image: url(../images/openo.png); + background-position: -39px 0!important; + box-shadow: inset 1px 0 0 #e5e5e5,inset -1px 0 0 #e5e5e5; } \ No newline at end of file diff --git a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/css/VMMain.css b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/css/VMMain.css index a1c08668..48e82b59 100644 --- a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/css/VMMain.css +++ b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/css/VMMain.css @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,202 +13,181 @@ * limitations under the License. */ -body { +body{ font-family: '微软雅黑'; font-size: 12px; color: #333; background: #fafafa; } - -button { +button{ outline: none; } - -ul, li { +ul,li{ list-style: none; - padding: 0; - margin: 0; + padding:0; + margin:0; } - -.titleFont { +.titleFont{ font-size: 16px; } - -.separator-line { +.separator-line{ height: 1px; width: 100%; - border: 1px solid #ddd; + border:1px solid #ddd; margin: 6px 0 15px 0; } - -.uploadBtn { +.uploadBtn{ overflow: hidden; } - .creat-btn { - padding: 0 14px; - height: 24px; + padding: 0 14px; + height: 24px; float: left; cursor: pointer; text-decoration: none; outline: 0; border: 1px solid #d3d3d3; text-align: center; - box-shadow: 0 1px 1px rgba(0, 0, 0, .05); + box-shadow: 0 1px 1px rgba(0,0,0,.05); background: #fafafa; - background: -moz-linear-gradient(top, #fff, #fafafa); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #fff), color-stop(100%, #fafafa)); - background: -webkit-linear-gradient(top, #fff, #fafafa); - background: linear-gradient(to bottom, #fff, #fafafa); + background: -moz-linear-gradient(top,#fff,#fafafa); + background: -webkit-gradient(linear,left top,left bottom,color-stop(0,#fff),color-stop(100%,#fafafa)); + background: -webkit-linear-gradient(top,#fff,#fafafa); + background: linear-gradient(to bottom,#fff,#fafafa); border-radius: 6px; background: #fff url(../images/add.png) no-repeat 5px center; padding-left: 20px; } - .creat-btn:hover { - color: #009ae7; - border: 1px solid #4AC9FF + color: #009ae7; + border: 1px solid #4AC9FF } - .creat-btn:active { - color: #000; - border: 1px solid #4AC9FF + color: #000; + border: 1px solid #4AC9FF } -/*.creat-btn{ - background: #fff url(../image/add.png) no-repeat 5px center; - border: 1px solid #ddd; - float: left; +.nav-tabs>li.active>a, .nav-tabs>li.active>a:hover, .nav-tabs>li.active>a:focus { + color: #009ae7; + background-color: #fff; + } -.creat-btn:hover{ - background: #428bca; - color: #fff; - border:1px solid #428bca; -}*/ -.search { + +.search{ width: 310px; height: 30px; - float: right; + float:right; } - -.search-text { +.search-text{ width: 250px; float: left; margin-right: 6px; } - -.search-btn { +.search-btn{ height: 30px; background: #fff; border: 1px solid #ddd; float: left; } - -#ict_virtualApplication_table_div { +#ict_virtualApplication_table_div{ margin-top: 15px; } - -.table > thead > tr.active > th { - border: 1px solid #ddd !important; +.table>thead>tr.active>th{ + border: 1px solid #ddd!important; border-bottom: 0; background: #f0f0f0; } - /*.table tbody tr:hover{ background: #e6fbe0!important; }*/ -.table tbody tr:last-child { +.table tbody tr:last-child{ border-bottom: 1px solid #ddd; } - -.table-btn { +.table-btn{ border: 1px solid #ccc; border-radius: 3px; } - -.delete-btn { +.delete-btn{ background: url(../image/delete.png) no-repeat; width: 16px; height: 16px; border: none; } - -.detail-btn { +.detail-btn{ background: url(../image/openo.png) no-repeat -343px -283px; width: 16px; height: 16px; border: none; } - -.detail-btn.current { +.detail-btn.current{ background-position: -7px -314px; } -.detail { - height: 200px; +.detail-top ul li:hover{ + color: #4ac9ff; +} +.detail{ + border: 1px solid #ddd; margin-top: 60px; + } -.detail-top ul { - height: 50px; - line-height: 50px; +.detailModal{ + height: 200px; + border: 1px solid #ddd; + +} + +.detail-top ul{ + height: 30px; + line-height: 30px; border-bottom: 1px solid #ddd; padding-left: 0px; - background: #fafafa; + background: #fafafa; } - -.detail-top ul li { - float: left; +.detail-top ul li{ + float:left; width: 120px; text-align: center; border-right: 1px solid #ddd; cursor: pointer; } - -.detail-top ul li.current { +.detail-top ul li.current{ background: #fff; } - -.vmapp-margin { +.vmapp-margin{ margin-bottom: 10px; } - -.control-label .required { +.control-label .required{ color: #e02222; font-size: 12px; padding-left: 2px; } - -.form-group .control-label { +.form-group .control-label{ font-size: 12px; font-weight: 400; } - -legend { +legend{ font-size: 12px; font-weight: bold; } - -.pageGro { +.pageGro{ width: 250px; float: right; } - -.pageUp, .pageDown, .pageList, .pageList li { +.pageUp,.pageDown,.pageList,.pageList li{ float: left; cursor: pointer; } - -.pageUp, .pageDown { +.pageUp,.pageDown{ width: 60px; height: 30px; border: 1px solid #ddd; text-align: center; line-height: 30px; } - -.pageList li { +.pageList li{ width: 30px; height: 30px; border: 1px solid #ddd; @@ -216,543 +195,466 @@ legend { line-height: 30px; border-left: none; } - -.pageList li.active { +.pageList li.active{ background: #428bca; color: #fff; border-color: #428bca; } - -.pageDown { +.pageDown{ border-left: none; } - -.headerLinkP { +.headerLinkP{ padding-top: 17px; } - -.headerLinkP span { +.headerLinkP span{ font-size: 12px; color: #666; - font-weight: normal !important; + font-weight: normal!important; } - -label { - font-weight: normal !important; +label{ + font-weight: normal!important; } - table.userform tbody tr td { - display: table-cell; - padding-right: 10px; - padding-top: 10px; - font-size: 12px; - color: #333; + display: table-cell; + padding-right: 10px; + padding-top: 10px; + font-size: 12px; + color: #333; } - -.table th, .table td { - padding-top: 3px !important; - padding-bottom: 3px !important; +.table th,.table td{ + padding-top: 3px!important; + padding-bottom: 3px!important; } - .openoBrowseButton_element { - display: table; + display: table; } - .openo { - font-family: "Microsoft Yahei", SimSun, Arial, Tahoma; - font-size: 12px; - color: #000; + font-family: "Microsoft Yahei",SimSun,Arial,Tahoma; + font-size: 12px; + color: #000; } - .openoBrowseButton_input { - width: 198px; - position: relative; - border: 1px solid #c3c3c3 !important; - height: 26px; - background-color: #f3f3f3; - border-radius: 4px 0 0 4px; - border-right: none; - padding: 0; + width: 198px; + position: relative; + border: 1px solid #c3c3c3!important; + height: 26px; + background-color: #f3f3f3; + border-radius: 4px 0 0 4px; + border-right: none; + padding: 0; } - .buttonClassDefault, .buttonClassDefault:active { - cursor: pointer; - background-image: url(../images/openo.png); - background-position: -154px -7px !important; + cursor: pointer; + background-image: url(../images/openo.png); + background-position: -154px -7px!important; } - .openoBrowseButton_button { - width: 27px; - border: 0; - float: right; - position: relative; - height: 26px; - right: 0; - top: 0; - border-radius: 0 4px 4px 0; - border-right: 1px solid #c3c3c3; - border-left: none; + width: 27px; + border: 0; + float: right; + position: relative; + height: 26px; + right: 0; + top: 0; + border-radius: 0 4px 4px 0; + border-right: 1px solid #c3c3c3; + border-left: none; } - .openo .openo-input, .openo.openo-input { - outline: 0; - border: 1px solid #c3c3c3; - box-shadow: 1px 1px #f6f6f6 inset; - background-color: #fff; - height: 26px; + outline: 0; + border: 1px solid #c3c3c3; + box-shadow: 1px 1px #f6f6f6 inset; + background-color: #fff; + height: 26px; } - .openoInput_openoDefaultText { - padding: 0 0 0 6px; - border-radius: 4px; - color: #000; - display: inline-block; - outline: 0; - box-shadow: 1px 1px #f6f6f6 inset; - font-size: 12px; - background: #fff; + padding: 0 0 0 6px; + border-radius: 4px; + color: #000; + display: inline-block; + outline: 0; + box-shadow: 1px 1px #f6f6f6 inset; + font-size: 12px; + background: #fff; } - div.openo-select { - border: 1px solid #c3c3c3; - border-radius: 4px; - background: url(../images/arrow-down-enable.png) right no-repeat #fff; - line-height: 24px; - padding-left: 3px; - display: block; -} - -div.openo-select > input.openo-select-input { - border: none; - outline: 0; - line-height: 21px; - height: 21px; - padding-left: 3px; - border-right: solid 1px #c3c3c3; + border: 1px solid #c3c3c3; + border-radius: 4px; + background: url(../images/arrow-down-enable.png) right no-repeat #fff; + line-height: 24px; + padding-left: 3px; + display: block; +} +div.openo-select>input.openo-select-input { + border: none; + outline: 0; + line-height: 21px; + height: 21px; + padding-left: 3px; + border-right: solid 1px #c3c3c3; } - .openo .openo-ellipsis, .openo.openo-ellipsis { - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; } - a.openoButton_buttonClass, a.openoButton_buttonDisableClass, div.openoButton_buttonClass, div.openoButton_buttonDisableClass { - height: 26px; - float: left; - cursor: pointer; - text-decoration: none; - outline: 0; - border: 1px solid #d3d3d3; - text-align: center; - box-shadow: 0 1px 1px rgba(0, 0, 0, .05); - background: #fafafa; - background: -moz-linear-gradient(top, #fff, #fafafa); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #fff), color-stop(100%, #fafafa)); - background: -webkit-linear-gradient(top, #fff, #fafafa); - background: linear-gradient(to bottom, #fff, #fafafa); - border-radius: 6px; -} - -.openoButton_buttonInnerClass { - padding: 0 19px; - border-radius: 6px; + height: 26px; + float: left; + cursor: pointer; + text-decoration: none; + outline: 0; + border: 1px solid #d3d3d3; + text-align: center; + box-shadow: 0 1px 1px rgba(0,0,0,.05); + background: #fafafa; + background: -moz-linear-gradient(top,#fff,#fafafa); + background: -webkit-gradient(linear,left top,left bottom,color-stop(0,#fff),color-stop(100%,#fafafa)); + background: -webkit-linear-gradient(top,#fff,#fafafa); + background: linear-gradient(to bottom,#fff,#fafafa); + border-radius: 6px; +} +.openoButton_buttonInnerClass{ + padding: 0 19px; + border-radius: 6px; } - .openoButton_buttonCenterText { - color: #000; - line-height: 24px; - white-space: nowrap; - width: auto !important; + color: #000; + line-height: 24px; + white-space: nowrap; + width: auto!important; } - .userHeader { - clear: left; - overflow: hidden; - margin-bottom: 10px; - padding: 10px 10px 0px 0px; + clear: left; + overflow: hidden; + margin-bottom: 10px; + padding: 10px 10px 0px 0px; } - .openoButton_buttonGroupClass { - display: inline; + display: inline; } - .openoButton_buttonGroupClass div.openoButton_buttonClass_parent:first-child { - margin-left: 0; + margin-left: 0; } - .openoButton_buttonLeftImg { - margin-right: 5px; + margin-right: 5px; } - .openoButton_buttonLeftImg, .openoButton_buttonRightImg { - display: inline-block; - vertical-align: top; - width: 16px; - height: 16px; - margin-top: 4px; + display: inline-block; + vertical-align: top; + width: 16px; + height: 16px; + margin-top: 4px; } - .openo-table-pagination-wrapper { - height: 37px; + height: 37px; } - .openo-pagination { - display: block; - float: left; - overflow: hidden; - padding: 5px 0 0; - margin-top: 8px; + display: block; + float: left; + overflow: hidden; + padding: 5px 0 0; + margin-top: 8px; } - .openoPagination_openoPaginationLengthOptions:not(msie8) { - line-height: 24px; + line-height: 24px; } - .openoPagination_openoPaginationLengthOptions { - white-space: normal; - height: 24px; - float: left; - outline: 0; - line-height: 20px; - margin: 0 5px; + white-space: normal; + height: 24px; + float: left; + outline: 0; + line-height: 20px; + margin: 0 5px; } - .openo-pagination-select { - height: 26px; - line-height: 22px; - text-align: center; - margin-right: -2px; - border: 1px solid #e0e0e0; - border-radius: 5px 0 0 5px; - padding: 1px; + height: 26px; + line-height: 22px; + text-align: center; + margin-right: -2px; + border: 1px solid #e0e0e0; + border-radius: 5px 0 0 5px; + padding: 1px; } - .openoPagination_openoPaginationLengthOptions span { - background-color: #fff !important; + background-color: #fff!important; } - .openo-pagination-theme a, .openo-pagination-theme span { - float: left; - color: #666; - font: 12px Lucida Grande, Verdana, Arial, Helvetica, sans-serif; - line-height: 24px; - font-weight: 400; - text-align: center; - border: 1px solid #e0e0e0; - text-decoration: none !important; - padding: 0 7px; - border-radius: 3px; - background: #fff; + float: left; + color: #666; + font: 12px Lucida Grande,Verdana,Arial,Helvetica,sans-serif; + line-height: 24px; + font-weight: 400; + text-align: center; + border: 1px solid #e0e0e0; + text-decoration: none!important; + padding: 0 7px; + border-radius: 3px; + background: #fff; } - .openo-pagination-selectspan { - background: url(../images/ideo_default_select.png) left no-repeat !important; - float: right !important; - width: 26px; - height: 26px; - cursor: pointer; + background: url(../images/ideo_default_select.png) left no-repeat!important; + float: right!important; + width: 26px; + height: 26px; + cursor: pointer; } - .openo-pagination-theme label { - padding-top: 6px; - vertical-align: middle; - margin-right: 20px; - margin-top: -1px; - float: left; - display: inline-block; - height: 20px; - font: 12px Lucida Grande, Verdana, Arial, Helvetica, sans-serif; + padding-top: 6px; + vertical-align: middle; + margin-right: 20px; + margin-top: -1px; + float: left; + display: inline-block; + height: 20px; + font: 12px Lucida Grande,Verdana,Arial,Helvetica,sans-serif; } - .openo-pagination li, .openo-pagination ul { - list-style: none; - padding: 0; - margin: 0; - float: left; + list-style: none; + padding: 0; + margin: 0; + float: left; } - dd, dl, dt, li { - color: #000; + color: #000; } - .openo-pagination-theme a, .openo-pagination-theme span.current { - margin: 0 5px 0 0; + margin: 0 5px 0 0; } - .openo .openo-disabled, .openo.openo-disabled { - border-color: #c3c3c3 !important; - color: #666 !important; - opacity: .3; - filter: alpha(opacity=30); + border-color: #c3c3c3!important; + color: #666!important; + opacity: .3; + filter: alpha(opacity=30); } - .openo-pagination-theme .prev { - background: 0 0; - float: left; + background: 0 0; + float: left; } - .openo-pagination-theme .current { - text-decoration: none !important; - float: left; - padding-left: 6px; - height: 24px; - color: #fff; - display: inline; - border-color: #00adf5; - background: #4ad2ff; + text-decoration: none!important; + float: left; + padding-left: 6px; + height: 24px; + color: #fff; + display: inline; + border-color: #00adf5; + background: #4ad2ff; } - .openo-pagination-theme a, .openo-pagination-theme span { - float: left; - color: #666; - font: 12px Lucida Grande, Verdana, Arial, Helvetica, sans-serif; - line-height: 24px; - font-weight: 400; - text-align: center; - border: 1px solid #e0e0e0; - text-decoration: none !important; - padding: 0 7px; - border-radius: 3px; - background: #fff; + float: left; + color: #666; + font: 12px Lucida Grande,Verdana,Arial,Helvetica,sans-serif; + line-height: 24px; + font-weight: 400; + text-align: center; + border: 1px solid #e0e0e0; + text-decoration: none!important; + padding: 0 7px; + border-radius: 3px; + background: #fff; } - .openo-pagination-theme .prev.openo-disabled:before { - background: url(../images/page_left_disabled.png) 50% 45% no-repeat; + background: url(../images/page_left_disabled.png) 50% 45% no-repeat; } - .openo-pagination-theme .prev.openo-disabled:before { - background: url(../images/page_left_disabled.png) 50% 45% no-repeat; + background: url(../images/page_left_disabled.png) 50% 45% no-repeat; } - .openo-pagination-theme .prev:before { - background: url(../images/page_l.png) 50% 45% no-repeat; + background: url(../images/page_l.png) 50% 45% no-repeat; } - .openo-pagination-theme .next:after, .openo-pagination-theme .prev:before { - display: inline-block; - content: ""; - vertical-align: middle; - width: 10px; - height: 24px; + display: inline-block; + content: ""; + vertical-align: middle; + width: 10px; + height: 24px; } - .openo-pagination-theme .prev:before { - background: url(../images/page_l.png) 50% 45% no-repeat; + background: url(../images/page_l.png) 50% 45% no-repeat; } - .openo-pagination-theme .next:after, .openo-pagination-theme .prev:before { - display: inline-block; - content: ""; - vertical-align: middle; - width: 10px; - height: 24px; + display: inline-block; + content: ""; + vertical-align: middle; + width: 10px; + height: 24px; } - pagination ul { - list-style: none; - padding: 0; - margin: 0; - float: left; + list-style: none; + padding: 0; + margin: 0; + float: left; } - .openo-pagination li, .openo-pagination ul { - list-style: none; - padding: 0; - margin: 0; - float: left; + list-style: none; + padding: 0; + margin: 0; + float: left; } - .openoPagination_gototext { - background: #FFF; - outline: 0; - width: 29px; - float: left; - height: 26px; - line-height: 24px; - border-radius: 4px; - border: 1px solid #c3c3c3; - padding: 0 0 0 5px; - margin: 0; - color: #666; - min-width: 50px; + background: #FFF; + outline: 0; + width: 29px; + float: left; + height: 26px; + line-height: 24px; + border-radius: 4px; + border: 1px solid #c3c3c3; + padding: 0 0 0 5px; + margin: 0; + color: #666; + min-width: 50px; } - .openoPagination_gotoimage { - width: 29px; - height: 26px; - line-height: 26px; - background-color: #FFF; - background-image: url(/portal/themes/default/components/openo/images/openo.png); - padding-left: 21px; - float: left; - margin-left: 5px; - border: 1px solid #e0e0e0; - border-radius: 4px; - box-sizing: border-box; - -moz-box-sizing: border-box; - background-position: -184px -181px !important; + width: 29px; + height: 26px; + line-height: 26px; + background-color: #FFF; + background-image: url(/portal/themes/default/components/openo/images/openo.png); + padding-left: 21px; + float: left; + margin-left: 5px; + border: 1px solid #e0e0e0; + border-radius: 4px; + box-sizing: border-box; + -moz-box-sizing: border-box; + background-position: -184px -181px!important; } - .openo-pagination-theme .ellipse { - float: left; - margin-left: -8px; - margin-right: -4px; - background: 0 0; - border: none; - border-radius: 0; - box-shadow: none; - font-weight: 700; - cursor: default; + float: left; + margin-left: -8px; + margin-right: -4px; + background: 0 0; + border: none; + border-radius: 0; + box-shadow: none; + font-weight: 700; + cursor: default; } - .openo.openo-disabled { - border-color: #c3c3c3 !important; - color: #666 !important; - opacity: .3; - filter: alpha(opacity=30); + border-color: #c3c3c3!important; + color: #666!important; + opacity: .3; + filter: alpha(opacity=30); } - .openo-pagination-theme .prev { - background: 0 0; - float: left; + background: 0 0; + float: left; } - .openo-pagination-theme .current { - text-decoration: none !important; - float: left; - padding-left: 6px; - height: 26px; - color: #fff; - display: inline; - /*border-color: #00adf5; - background: #4ad2ff;*/ + text-decoration: none!important; + float: left; + padding-left: 6px; + height: 26px; + color: #fff; + display: inline; + /*border-color: #00adf5; + background: #4ad2ff;*/ border: 1px solid #e0e0e0; } - .openo-pagination-theme .next:after { - background: url(../images/page_r.png) 50% 45% no-repeat; + background: url(../images/page_r.png) 50% 45% no-repeat; } - .openoButton_buttonGroupClass div.openoButton_buttonClass_parent, .openoButton_buttonRightImg { - margin-left: 5px; + margin-left: 5px; } html, body { - height: 99%; - width: 98%; + height: 99%; + width: 98%; } - .cotentBody { - padding: 0px 20px 0px 20px; + padding: 0px 20px 0px 20px; } div.openoButton_buttonClass:hover { - border: 1px solid #4ac9ff; + border: 1px solid #4ac9ff; } - div.openoButton_button_default:hover .openoButton_buttonCenterText { - color: #009ae7; + color: #009ae7; } - .header_lineimg { - height: 1px; - width: 100%; - margin-top: 17px; + height: 1px; + width: 100%; + margin-top: 17px; } - .openo.openo-hide { - display: none; + display: none; } - div.openo-select-popup-container { - position: absolute; - border: 1px solid #4ac9ff; - border-top: none; - border-radius: 0 0 4px 4px; - max-height: 202px; - overflow-y: auto; - background-color: #fff; - z-index: 880; -} - -div.openo-select-popup-container > div.openo-select-item { - display: block; + position: absolute; + border: 1px solid #4ac9ff; + border-top: none; + border-radius: 0 0 4px 4px; + max-height: 202px; + overflow-y: auto; + background-color: #fff; + z-index: 880; +} +div.openo-select-popup-container>div.openo-select-item { + display: block; } - .openo .openo-ellipsis, .openo.openo-ellipsis { - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; } - -div.openo-select-popup-container > div.openo-select-item > label { - padding-top: 3px; - padding-bottom: 3px; - line-height: 20px; +div.openo-select-popup-container>div.openo-select-item>label { + padding-top: 3px; + padding-bottom: 3px; + line-height: 20px; } - .openo .openo-ellipsis, .openo.openo-ellipsis { - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; } - .openo-select-item label { - margin-left: 4px; - margin-right: 4px; - white-space: nowrap; + margin-left: 4px; + margin-right: 4px; + white-space: nowrap; } - -div.openo-select-popup-container > div.openo-select-item.openo-item-selected, div.openo-select-popup-container > div.openo-select-item:hover { - background-color: #f1f1f1; - color: #008fd6; +div.openo-select-popup-container>div.openo-select-item.openo-item-selected, div.openo-select-popup-container>div.openo-select-item:hover { + background-color: #f1f1f1; + color: #008fd6; } - div.openo-select.openo-focus { - border: 1px solid #4ac9ff; - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; - border-bottom-color: #ddd; + border: 1px solid #4ac9ff; + border-bottom-left-radius: 0; + border-bottom-right-radius: 0; + border-bottom-color: #ddd; } - .openo-pagination-theme a:hover { - border-color: #4ac9ff; - cursor: pointer; + border-color: #4ac9ff; + cursor: pointer; } - -.SDBtn { - background: #fff; - color: #333; - border: 1px solid #ddd; +.SDBtn{ + background: #fff; + color: #333; + border: 1px solid #ddd; } - -.SDBtn:hover { +.SDBtn:hover{ color: #009ae7; - border: 1px solid #4AC9FF + border: 1px solid #4AC9FF } - -table tbody tr.even:hover td, table tbody tr.odd:hover td { - background-color: #e6fbe0; -} - +/*table tbody tr.even:hover td, table tbody tr.odd:hover td { + background-color: #e6fbe0; +}*/ table tr.openoTable_row_selected td { - background: #e8f8fe !important; - border-bottom: 1px solid #e8e8e8 !important; + background: #e8f8fe!important; + border-bottom: 1px solid #e8e8e8!important; } - -.modal-body { - padding: 0 !important; +.modal-body{ + padding: 0!important; } - -.form-control { - height: 26px !important; +.form-control{ + height: 26px!important; } - .form-group .control-label { - margin-left: 20px; + margin-left: 20px; } .form-horizontal .control-label { - text-align: left; + text-align: left; } \ No newline at end of file diff --git a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/gsolcmmain.html b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/gsolcmmain.html index 507a8904..b373f3ae 100644 --- a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/gsolcmmain.html +++ b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/gsolcmmain.html @@ -28,14 +28,50 @@ + + +

Life Cycle Manager

- +
@@ -77,64 +229,57 @@
-
+
- - - - +
+ + + + - - @@ -150,97 +295,234 @@ + + + + +
+ data-formatter="operateFormatterServiceName" data-field="serviceName" + data-sortable="true">
- Service Name -
+ Service Name + + 		+ data-field="templateName" data-sortable="true">
- Template Name -
+ Template Name + + 		+ + + data-field="createTime" data-sortable="true">
- Create Time + Create Time
+ data-field="creator" data-sortable="true">
- Creator + Creator
- -