aboutsummaryrefslogtreecommitdiffstats
path: root/openo-portal/portal-catalog/src
diff options
context:
space:
mode:
authornancylizi <li.zi30@zte.com.cn>2016-10-13 09:26:34 +0800
committernancylizi <li.zi30@zte.com.cn>2016-10-13 09:26:34 +0800
commite4f056591d946208a016e25f637ca834c2bc3bf3 (patch)
tree293a8da34569ab66c9125fb9d8ef91716045630c /openo-portal/portal-catalog/src
parente02b6549e9154cb2d7b7a8619c07b9206fa7f135 (diff)
Fix the bug "A message showed in a wrong time when upload package." and modify the css of select vim dialog.
Change-Id: If5b05fbef0eedf496e50c37245826af422885693 Issue-id:GSO-18 Signed-off-by: nancylizi <li.zi30@zte.com.cn>
Diffstat (limited to 'openo-portal/portal-catalog/src')
-rw-r--r--openo-portal/portal-catalog/src/main/webapp/catalog/csarPackage.html6
-rw-r--r--openo-portal/portal-catalog/src/main/webapp/catalog/css/package.css9
-rw-r--r--openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-en-US.properties2
-rw-r--r--openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmUtil.js2
4 files changed, 16 insertions, 3 deletions
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/csarPackage.html b/openo-portal/portal-catalog/src/main/webapp/catalog/csarPackage.html
index 827f13e7..c1611414 100644
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/csarPackage.html
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/csarPackage.html
@@ -226,7 +226,11 @@
</thead>
<tbody ms-each-rest="resource.vimSelectItems">
<tr>
- <td ms-text="rest.name"></td>
+ <td>
+ <div class="tdCenter">
+ {{rest.name}}
+ </div>
+ </td>
<td>
<div class="checkbox">
<input type="radio" name="testEnvRadios" ms-attr-id="testEnvRadios{{$index}}"
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/css/package.css b/openo-portal/portal-catalog/src/main/webapp/catalog/css/package.css
index aa7027bb..a7adcfa0 100644
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/css/package.css
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/css/package.css
@@ -458,4 +458,13 @@ span.status:hover {
width:100%;
table-layout: fixed;
word-wrap:break-word;
+}
+
+.tdCenter
+{
+ display: block;
+ min-height: 20px;
+ margin-top: 10px;
+ margin-bottom: 10px;
+ text-align:center;
} \ No newline at end of file
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-en-US.properties b/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-en-US.properties
index 3de07cbd..3b2cf39a 100644
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-en-US.properties
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-en-US.properties
@@ -80,7 +80,7 @@ nfv-package-iui-message-upload-success=Csar package imported successfully.
nfv-package-iui-message-upload-fail=Csar package imported failed.
nfv-package-iui-message-delete-confirm=Do you want to delete the current package?
nfv-package-iui-message-delete-success=Csar package deleted successfully.
-nfv-package-iui-message-upload-csar-exist=The package already exists, whether to re upload?
+nfv-package-iui-message-upload-csar-exist=There is a package in the same name, they may be the same package, whether still upload this package?
nfv-package-iui-message-upload-csar-deletionpending=This package is referenced in an instance. whether to re upload?
nfv-package-iui-message-onBoarded = Already onBoarded, no need for onBoarding.
nfv-package-iui-message-onBoard-error = Onboarding error.
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmUtil.js b/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmUtil.js
index c694c51f..9b8d10e3 100644
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmUtil.js
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmUtil.js
@@ -99,7 +99,7 @@ pmUtil.getExistPackageByName = function(name) {
}
var result = $.ajax({
type : "GET",
- url : vm.$restUrl.queryPackageInfoUrl + "?csarName=" + name,
+ url : vm.$restUrl.queryPackageInfoUrl + "?name=" + name,
async: false
});
var data = result.responseJSON;