images added to the framework

ISSUEID : CLIENT-189

Change-Id: Ifa74c349c7306190fa4de0079e4e7b86d478d7e9
Signed-off-by: seshukm <seshu.kumar.m@huawei.com>

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 (file)
index 0000000..737f879
Binary files /dev/null and b/common/src/main/webapp/framework/browser/thirdparty/images/delete.png 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 (file)
index 0000000..68d7625
Binary files /dev/null and b/common/src/main/webapp/framework/browser/thirdparty/images/edit.png differ

diff --git a/resmgr/src/main/webapp/resmgr/css/style.css b/resmgr/src/main/webapp/resmgr/css/style.css
index 97faca8..7686568 100644 (file)
--- a/resmgr/src/main/webapp/resmgr/css/style.css
+++ b/resmgr/src/main/webapp/resmgr/css/style.css
@@ -14,7 +14,7 @@
  */\r
  \r
 \r
-.containerheight{\r
+.containerh{\r
        background-color:white !important;\r
        min-height:500px;\r
 \r

diff --git a/resmgr/src/main/webapp/resmgr/index.html b/resmgr/src/main/webapp/resmgr/index.html
index b0e8258..2e3551c 100644 (file)
--- 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>