aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorseshukm <seshu.kumar.m@huawei.com>2017-04-04 12:00:29 +0530
committerseshukm <seshu.kumar.m@huawei.com>2017-04-04 14:35:41 +0530
commit416a3ade21c5d1692259988050193f40cdbddf0b (patch)
tree6ecad5c7c66e95b40027f348a66b5298e5942487
parent23b9f39b94c8924f3ecd5a365802dee1066f358b (diff)
images added to the framework
ISSUEID : CLIENT-189 Change-Id: Ifa74c349c7306190fa4de0079e4e7b86d478d7e9 Signed-off-by: seshukm <seshu.kumar.m@huawei.com>
-rw-r--r--common/src/main/webapp/framework/browser/thirdparty/images/delete.pngbin0 -> 1100 bytes
-rw-r--r--common/src/main/webapp/framework/browser/thirdparty/images/edit.pngbin0 -> 3045 bytes
-rw-r--r--resmgr/src/main/webapp/resmgr/css/style.css2
-rw-r--r--resmgr/src/main/webapp/resmgr/index.html5
4 files changed, 3 insertions, 4 deletions
diff --git a/common/src/main/webapp/framework/browser/thirdparty/images/delete.png b/common/src/main/webapp/framework/browser/thirdparty/images/delete.png
new file mode 100644
index 00000000..737f8797
--- /dev/null
+++ b/common/src/main/webapp/framework/browser/thirdparty/images/delete.png
Binary files differ
diff --git a/common/src/main/webapp/framework/browser/thirdparty/images/edit.png b/common/src/main/webapp/framework/browser/thirdparty/images/edit.png
new file mode 100644
index 00000000..68d76257
--- /dev/null
+++ b/common/src/main/webapp/framework/browser/thirdparty/images/edit.png
Binary files differ
diff --git a/resmgr/src/main/webapp/resmgr/css/style.css b/resmgr/src/main/webapp/resmgr/css/style.css
index 97faca8a..76865689 100644
--- a/resmgr/src/main/webapp/resmgr/css/style.css
+++ b/resmgr/src/main/webapp/resmgr/css/style.css
@@ -14,7 +14,7 @@
*/
-.containerheight{
+.containerh{
background-color:white !important;
min-height:500px;
diff --git a/resmgr/src/main/webapp/resmgr/index.html b/resmgr/src/main/webapp/resmgr/index.html
index b0e82587..2e3551c9 100644
--- a/resmgr/src/main/webapp/resmgr/index.html
+++ b/resmgr/src/main/webapp/resmgr/index.html
@@ -32,9 +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>-->
<script type="text/javascript" src="/openoui/thirdparty/js/angular.min.js"></script>
<script type="text/javascript" src="/openoui/thirdparty/js/angular-ui-router.min.js"></script>
@@ -45,6 +43,7 @@
<script type="text/javascript" src="/openoui/thirdparty/js/jquery-ui.js"></script>
<script type="text/javascript" src="/openoui/thirdparty/js/bootstrap.min.js"></script>
<script type="text/javascript" src="/openoui/thirdparty/js/mustache.js"></script>
+ <link href="/openoui/resmgr/css/style.css" rel="stylesheet"/>
<script type="text/javascript" src="/openoui/resmgr/js/app.js"></script>
<script type="text/javascript" src="/openoui/resmgr/js/DataService.js"></script>
<script type="text/javascript" src="/openoui/resmgr/sdn-resmgr/link/linkRest.js"></script>