diff options
6 files changed, 36 insertions, 8 deletions
diff --git a/lifecyclemgr/src/main/webapp/lifecyclemgr/css/style.css b/lifecyclemgr/src/main/webapp/lifecyclemgr/css/style.css index e7de35c5..954ad091 100644 --- a/lifecyclemgr/src/main/webapp/lifecyclemgr/css/style.css +++ b/lifecyclemgr/src/main/webapp/lifecyclemgr/css/style.css @@ -188,4 +188,10 @@ select { .delete-icon {
background: url("../images/delete.png") no-repeat;
height: 16px;
+}
+
+.containerh{
+ background-color:white !important;
+ min-height:500px;
+
}
\ No newline at end of file diff --git a/lifecyclemgr/src/main/webapp/lifecyclemgr/index.html b/lifecyclemgr/src/main/webapp/lifecyclemgr/index.html index b64eed68..15cf0359 100644 --- a/lifecyclemgr/src/main/webapp/lifecyclemgr/index.html +++ b/lifecyclemgr/src/main/webapp/lifecyclemgr/index.html @@ -47,7 +47,7 @@ <body ng-app="lcApp">
-<div class="homecontent center lcmanager">
+<div class="homecontent center lcmanager containerh">
<div class="col-md-12 col-sm-12 col-lg-12 container ">
<div class="lifecycleHeader">Life Cycle Manager</div>
<div class="separator-line"></div>
diff --git a/lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js b/lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js index 6c3dac4e..78233c77 100644 --- a/lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js +++ b/lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js @@ -286,19 +286,19 @@ var app = angular.module("lcApp", ["ui.router", "ngTable"])/*, 'ui.bootstrap', ' .then(function (tmplatesResponse) {
console.log("Data Template :: ");
$log.info(tmplatesResponse);
- // var templatesInfo = translateToTemplatesInfo(tmplatesResponse);
- // document.getElementById("svcTempl").innerHTML = templatesInfo;
- $scope.optionsValue = tmplatesResponse;
+ var templatesInfo = translateToTemplatesInfo(tmplatesResponse);
+ document.getElementById("svcTempl").innerHTML = templatesInfo;
+ /* $scope.optionsValue = tmplatesResponse;
var dropSimple_data = {
"errmsg" : "Service template is required.",
"modalVar" : "lifecycleData.optSelect",
"labelField" : "templateName",
- "optionsValue" : JSON.stringify(tmplatesResponse),
+ "optionsValue" : JSON.stringify(templatesInfo),
"errtag":"lcdropdownErr",
"errfunc":"validatedropdown",
"required":true
- }
- $('#myModal #plainDropDown').html($compile(Mustache.to_html(dropDown, dropSimple_data))($scope));
+ }*/
+ //$('#myModal #plainDropDown').html($compile(Mustache.to_html(dropDown, dropSimple_data))($scope));
}, function (reason) {
$scope.error = "Error ! " + reason;
});
diff --git a/resmgr/src/main/webapp/resmgr/css/style.css b/resmgr/src/main/webapp/resmgr/css/style.css new file mode 100644 index 00000000..97faca8a --- /dev/null +++ b/resmgr/src/main/webapp/resmgr/css/style.css @@ -0,0 +1,21 @@ +/* Copyright 2017, Huawei Technologies Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+.containerheight{
+ background-color:white !important;
+ min-height:500px;
+
+}
\ No newline at end of file diff --git a/resmgr/src/main/webapp/resmgr/index.html b/resmgr/src/main/webapp/resmgr/index.html index 69a41ea7..b0e82587 100644 --- a/resmgr/src/main/webapp/resmgr/index.html +++ b/resmgr/src/main/webapp/resmgr/index.html @@ -32,6 +32,7 @@ <!--<link rel="stylesheet" href="framework/css/RMain.css"> <link rel="stylesheet" href="framework/css/VMMain.css">--> <link href="/openoui/framework/css/open-ostyle.css" rel="stylesheet"/> + <link href="/openoui/resmgr/css/style.css" rel="stylesheet"/> <!--<link href="css/style.css" rel="stylesheet"/>--> <!--TODO: <script src="../common/thirdparty/js/angular.min.js"></script>--> diff --git a/resmgr/src/main/webapp/resmgr/templates/resource.html b/resmgr/src/main/webapp/resmgr/templates/resource.html index 3428c96d..cb01af39 100644 --- a/resmgr/src/main/webapp/resmgr/templates/resource.html +++ b/resmgr/src/main/webapp/resmgr/templates/resource.html @@ -14,7 +14,7 @@ */-->
-<div class="homecontent center">
+<div class="homecontent center containerh">
<div class="col-md-12 col-sm-12 col-lg-12 container">
<div class="row">
<div class="col-sm-4 col-md-2 col-lg-2">
|