Modify thirdparty&image reference path

Change-Id: If50fc897be1476836acaaf50ed3732e08700e756
Signed-off-by: huangjian <huang.jian12@zte.com.cn>

diff --git a/openo-portal/portal-common/src/main/webapp/common/about.html b/openo-portal/portal-common/src/main/webapp/common/about.html
index 4cf0c67..77795cd 100644 (file)
--- a/openo-portal/portal-common/src/main/webapp/common/about.html
+++ b/openo-portal/portal-common/src/main/webapp/common/about.html
@@ -24,7 +24,7 @@
         </a>
     </div>
     <div class="info">
-        <img src="img/integration/zte_logo_ white.png" alt=""/>
+        <img src="image/integration/zte_logo_ white.png" alt=""/>
         <div class="ict_main_productname">
             <span id="com_zte_ums_ict_framework_ui_main_title" name_i18n="com_zte_ums_ict_framework_ui_i18n"></span>
         </div>

diff --git a/openo-portal/portal-common/src/main/webapp/common/css/frame-style.css b/openo-portal/portal-common/src/main/webapp/common/css/frame-style.css
index d0a95ca..3131548 100644 (file)
--- a/openo-portal/portal-common/src/main/webapp/common/css/frame-style.css
+++ b/openo-portal/portal-common/src/main/webapp/common/css/frame-style.css
@@ -96,7 +96,7 @@ padding: 0px;
   cursor:pointer;
   position:absolute;
   display: block;
-  background:url(../img/icon-color.png) center no-repeat;
+  background:url(../image/icon-color.png) center no-repeat;
 }
 
 .zte-theme-panel > .toggler:hover {
@@ -110,7 +110,7 @@ padding: 0px;
   padding:20px;
   cursor:pointer;
   position:absolute;
-  background: #3d3d3d url(../img/icon-color-close.png) center no-repeat !important;
+  background: #3d3d3d url(../image/icon-color-close.png) center no-repeat !important;
 }
 
 .zte-theme-panel > .toggler-close:hover {

diff --git a/openo-portal/portal-common/src/main/webapp/common/css/login-apk.css b/openo-portal/portal-common/src/main/webapp/common/css/login-apk.css
index 78e6783..4164406 100644 (file)
--- a/openo-portal/portal-common/src/main/webapp/common/css/login-apk.css
+++ b/openo-portal/portal-common/src/main/webapp/common/css/login-apk.css
@@ -31,7 +31,7 @@ Login page
 
 
 .login .content {
-  background: url(../../../framework/img/bg-white-lock.png) repeat;
+  background: url(../../../framework/image/bg-white-lock.png) repeat;
   width: 360px;
   margin: 0 auto; 
   margin-bottom: 0px;

diff --git a/openo-portal/portal-common/src/main/webapp/common/css/login.css b/openo-portal/portal-common/src/main/webapp/common/css/login.css
index 1ec3e34..4894c02 100644 (file)
--- a/openo-portal/portal-common/src/main/webapp/common/css/login.css
+++ b/openo-portal/portal-common/src/main/webapp/common/css/login.css
@@ -31,7 +31,7 @@ Login page
 
 
 .login .content {
-  background: url(../img/bg-white-lock.png) repeat;
+  background: url(../image/bg-white-lock.png) repeat;
   width: 360px;
   margin: 0 auto; 
   margin-bottom: 0px;

diff --git a/openo-portal/portal-common/src/main/webapp/common/css/ngict-component.css b/openo-portal/portal-common/src/main/webapp/common/css/ngict-component.css
index 3950a83..93ddbb8 100644 (file)
--- a/openo-portal/portal-common/src/main/webapp/common/css/ngict-component.css
+++ b/openo-portal/portal-common/src/main/webapp/common/css/ngict-component.css
@@ -708,7 +708,7 @@ border-bottom-width:1px;
 /*checkbox & radio*/
 input[type="checkbox"] {
     -webkit-appearance: none;
-    background: #fff url(../img/checkbox-radio/checkbox-init.png);
+    background: #fff url(../image/checkbox-radio/checkbox-init.png);
     height: 18px;
     vertical-align: middle;
     width: 18px;
@@ -718,7 +718,7 @@ input[type="checkbox"] {
 
 input[type="checkbox"]:checked {
     -webkit-appearance: none;
-    background: #fff url(../img/checkbox-radio/checkbox-checked.png);
+    background: #fff url(../image/checkbox-radio/checkbox-checked.png);
     height: 18px;
     vertical-align: middle;
     width: 18px;
@@ -731,7 +731,7 @@ input[type="checkbox"]:hover {
 
 input[type="checkbox"][disabled] {
     -webkit-appearance: none;
-    background: #fff url(../img/checkbox-radio/checkbox-disabled.png);
+    background: #fff url(../image/checkbox-radio/checkbox-disabled.png);
     height: 18px;
     vertical-align: middle;
     width: 18px;
@@ -741,7 +741,7 @@ input[type="checkbox"][disabled] {
 
 input[type="checkbox"][disabled]:checked {
     -webkit-appearance: none;
-    background: #fff url(../img/checkbox-radio/checkbox-checked-disabled.png);
+    background: #fff url(../image/checkbox-radio/checkbox-checked-disabled.png);
     height: 18px;
     vertical-align: middle;
     width: 18px;
@@ -749,7 +749,7 @@ input[type="checkbox"][disabled]:checked {
 
 input[type="radio"] {
     -webkit-appearance: none;
-    background: #fff url(../img/checkbox-radio/radio-init.png);
+    background: #fff url(../image/checkbox-radio/radio-init.png);
     height: 18px;
     vertical-align: middle;
     width: 18px;
@@ -759,7 +759,7 @@ input[type="radio"] {
 
 input[type="radio"]:checked {
     -webkit-appearance: none;
-    background: #fff url(../img/checkbox-radio/radio-checked.png);
+    background: #fff url(../image/checkbox-radio/radio-checked.png);
     height: 18px;
     vertical-align: middle;
     width: 18px;
@@ -772,7 +772,7 @@ input[type="radio"]:hover {
 
 input[type="radio"][disabled] {
     -webkit-appearance: none;
-    background: #fff url(../img/checkbox-radio/radio-disabled.png);
+    background: #fff url(../image/checkbox-radio/radio-disabled.png);
     height: 18px;
     vertical-align: middle;
     width: 18px;
@@ -782,7 +782,7 @@ input[type="radio"][disabled] {
 
 input[type="radio"][disabled]:checked {
     -webkit-appearance: none;
-    background: #fff url(../img/checkbox-radio/radio-checked-disabled.png);
+    background: #fff url(../image/checkbox-radio/radio-checked-disabled.png);
     height: 18px;
     vertical-align: middle;
     width: 18px;

diff --git a/openo-portal/portal-common/src/main/webapp/common/css/plugins.css b/openo-portal/portal-common/src/main/webapp/common/css/plugins.css
index 6fd6fb4..0abc096 100644 (file)
--- a/openo-portal/portal-common/src/main/webapp/common/css/plugins.css
+++ b/openo-portal/portal-common/src/main/webapp/common/css/plugins.css
@@ -705,11 +705,11 @@ Datatables Plugin(in v1.3)
 }
 
 .dataTable .row-details.row-details-close {
-  background: url("../img/datatable-row-openclose.png") no-repeat 0 0;
+  background: url("../image/datatable-row-openclose.png") no-repeat 0 0;
 }
 
 .dataTable .row-details.row-details-open {  
-  background: url("../img/datatable-row-openclose.png") no-repeat 0 -23px ;
+  background: url("../image/datatable-row-openclose.png") no-repeat 0 -23px ;
 }
 
 .dataTable .details {
@@ -1228,7 +1228,7 @@ Toastr Notifications
   width: 11px;
   height: 16px;
   background-repeat: no-repeat !important;
-  background-image: url("../img/portlet-remove-icon-white.png") !important;
+  background-image: url("../image/portlet-remove-icon-white.png") !important;
 }
 
 .toast-top-center {
@@ -1362,7 +1362,7 @@ jQuery File Upload
 ***/
 
 .blueimp-gallery .close {  
-  background-image: url("../img/portlet-remove-icon-white.png") !important;
+  background-image: url("../image/portlet-remove-icon-white.png") !important;
   margin-top: -2px;
 }
 

diff --git a/openo-portal/portal-common/src/main/webapp/common/css/style-custom.css b/openo-portal/portal-common/src/main/webapp/common/css/style-custom.css
index e327a31..0cae519 100644 (file)
--- a/openo-portal/portal-common/src/main/webapp/common/css/style-custom.css
+++ b/openo-portal/portal-common/src/main/webapp/common/css/style-custom.css
@@ -323,7 +323,7 @@ Metro icons
   margin-top: 3px;
   line-height: 14px;  
   vertical-align: top;
-  background-image: url(../img/syncfusion-icons.png);
+  background-image: url(../image/syncfusion-icons.png);
   background-position: 0 0;
   background-repeat: no-repeat; 
 }
@@ -334,7 +334,7 @@ Metro icons
   height: 30px; 
   margin: 6px;
   vertical-align: middle;
-  background-image: url(../img/syncfusion-icons.png);
+  background-image: url(../image/syncfusion-icons.png);
   background-position: 0 0px;
   background-repeat: no-repeat; 
 }
@@ -371,7 +371,7 @@ Metro icons
 
 /* white icon */
 .m-icon-white {
-  background-image: url(../img/syncfusion-icons-white.png);
+  background-image: url(../image/syncfusion-icons-white.png);
 }
 
 /*  Misc */
@@ -867,7 +867,7 @@ input[type="url"].spinner,
 input[type="search"].spinner,
 input[type="tel"].spinner,
 input[type="color"].spinner {
-  background-image: url("../img/input-spinner.gif") !important;
+  background-image: url("../image/input-spinner.gif") !important;
   background-repeat: no-repeat;
   background-position: right 8px;
 }
@@ -1469,7 +1469,7 @@ Bootstrap Panel
 }
 
 .accordion .accordion-toggle.accordion-toggle-styled {
-  background: url("../img/accordion-plusminus.png") no-repeat;
+  background: url("../image/accordion-plusminus.png") no-repeat;
   background-position: right -19px;
   margin-right: 15px;
 }

diff --git a/openo-portal/portal-common/src/main/webapp/common/css/style-ict-bootstrap.css b/openo-portal/portal-common/src/main/webapp/common/css/style-ict-bootstrap.css
index b65cefa..cbf38b4 100644 (file)
--- a/openo-portal/portal-common/src/main/webapp/common/css/style-ict-bootstrap.css
+++ b/openo-portal/portal-common/src/main/webapp/common/css/style-ict-bootstrap.css
@@ -714,7 +714,7 @@ body{
        background: linear-gradient(to bottom right,#bca374, #d9cf7a);
 }
 .manLieONCloud-image{
-       background-image: url('../img/mainpage/pic/1.png');
+       background-image: url('../image/mainpage/pic/1.png');
 }
 .orange-mainpage{
        background-image: -moz-linear-gradient(left top, #f09c0a, #f4be35);
@@ -729,10 +729,10 @@ body{
        background: linear-gradient(to bottom right,#e03655, #ef3a5b);
 }
 .magicCube-image{
-       background-image: url('../img/mainpage/pic/4.png');
+       background-image: url('../image/mainpage/pic/4.png');
 }
 .magicThought-image{
-       background-image: url('../img/mainpage/pic/5.png');
+       background-image: url('../image/mainpage/pic/5.png');
 }
 .grassGreen-mainpage{
        background-image: -moz-linear-gradient(left top, #008b04, #03a501);
@@ -741,48 +741,48 @@ body{
        background: linear-gradient(to bottom right,#008b04, #03a501);
 }
 .meeting-image{
-       background-image: url('../img/mainpage/pic/3.png');     
+       background-image: url('../image/mainpage/pic/3.png');   
 }
 .earth-image{
-       background-image: url('../img/mainpage/pic/2.png');
+       background-image: url('../image/mainpage/pic/2.png');
 }
 .toolsImageBrokenLine{
-       background-image: url('../img/mainpage/icon/1.png');
+       background-image: url('../image/mainpage/icon/1.png');
        height: 150px;
        width: 120px;
        margin-top: 15%;
        margin-left:-5px;
 }
 .toolsImageHierachy{
-       background-image: url('../img/mainpage/icon/2.png');
+       background-image: url('../image/mainpage/icon/2.png');
        height: 150px;
        width: 120px;
        margin-top: 15%;
        margin-left:-5px;
 }
 .toolsImageGear{
-       background-image: url('../img/mainpage/icon/3.png');
+       background-image: url('../image/mainpage/icon/3.png');
        height: 150px;
        width: 120px;
        margin-top: 15%;
        margin-left:-5px;
 }
 .toolsImagePresent{
-       background-image: url('../img/mainpage/icon/4.png');
+       background-image: url('../image/mainpage/icon/4.png');
        height: 150px;
        width: 120px;
        margin-top: 15%;
        margin-left:-5px;
 }
 .toolsImageFile{
-       background-image: url('../img/mainpage/icon/5.png');
+       background-image: url('../image/mainpage/icon/5.png');
        height: 150px;
        width: 120px;
        margin-top: 15%;
        margin-left:-5px;
 }
 .toolsImageBriefcase{
-       background-image: url('../img/mainpage/icon/6.png');
+       background-image: url('../image/mainpage/icon/6.png');
        height: 150px;
        width: 120px;
        margin-top: 15%;

diff --git a/openo-portal/portal-common/src/main/webapp/common/css/style-ict.css b/openo-portal/portal-common/src/main/webapp/common/css/style-ict.css
index 9912f22..d1c7048 100644 (file)
--- a/openo-portal/portal-common/src/main/webapp/common/css/style-ict.css
+++ b/openo-portal/portal-common/src/main/webapp/common/css/style-ict.css
@@ -704,7 +704,7 @@ body{
        background: linear-gradient(to bottom right,#bca374, #d9cf7a);
 }
 .manLieONCloud-image{
-       background-image: url('../img/mainpage/pic/1.png');
+       background-image: url('../image/mainpage/pic/1.png');
 }
 .orange-mainpage{
        background-image: -moz-linear-gradient(left top, #f09c0a, #f4be35);
@@ -719,7 +719,7 @@ body{
        background: linear-gradient(to bottom right,#e03655, #ef3a5b);
 }
 .magicCube-image{
-       background-image: url('../img/mainpage/pic/4.png');
+       background-image: url('../image/mainpage/pic/4.png');
 }
 .grassGreen-mainpage{
        background-image: -moz-linear-gradient(left top, #008b04, #03a501);
@@ -728,48 +728,48 @@ body{
        background: linear-gradient(to bottom right,#008b04, #03a501);
 }
 .meeting-image{
-       background-image: url('../img/mainpage/pic/3.png');     
+       background-image: url('../image/mainpage/pic/3.png');   
 }
 .earth-image{
-       background-image: url('../img/mainpage/pic/2.png');
+       background-image: url('../image/mainpage/pic/2.png');
 }
 .toolsImageBrokenLine{
-       background-image: url('../img/mainpage/icon/1.png');
+       background-image: url('../image/mainpage/icon/1.png');
        height: 150px;
        width: 120px;
        top: 30px;
        position: absolute;
 }
 .toolsImageHierachy{
-       background-image: url('../img/mainpage/icon/2.png');
+       background-image: url('../image/mainpage/icon/2.png');
        height: 150px;
        width: 120px;
        top: 30px;
        position: absolute;
 }
 .toolsImageGear{
-       background-image: url('../img/mainpage/icon/3.png');
+       background-image: url('../image/mainpage/icon/3.png');
        height: 150px;
        width: 120px;
        top: 30px;
        position: absolute;
 }
 .toolsImagePresent{
-       background-image: url('../img/mainpage/icon/4.png');
+       background-image: url('../image/mainpage/icon/4.png');
        height: 150px;
        width: 120px;
        top: 30px;
        position: absolute;
 }
 .toolsImageFile{
-       background-image: url('../img/mainpage/icon/5.png');
+       background-image: url('../image/mainpage/icon/5.png');
        height: 150px;
        width: 120px;
        top: 30px;
        position: absolute;
 }
 .toolsImageBriefcase{
-       background-image: url('../img/mainpage/icon/6.png');
+       background-image: url('../image/mainpage/icon/6.png');
        height: 150px;
        width: 120px;
        top: 30px;

diff --git a/openo-portal/portal-common/src/main/webapp/common/css/style.css b/openo-portal/portal-common/src/main/webapp/common/css/style.css
index ade2221..fc070b9 100644 (file)
--- a/openo-portal/portal-common/src/main/webapp/common/css/style.css
+++ b/openo-portal/portal-common/src/main/webapp/common/css/style.css
@@ -306,7 +306,7 @@ Close icon used for modal dialog and other UI element close buttons
   background-repeat: no-repeat !important;
   text-indent: -10000px;
   outline: none;
-  background-image: url("../img/remove-icon-small.png") !important;
+  background-image: url("../image/remove-icon-small.png") !important;
 }
 
 .about{
@@ -315,11 +315,11 @@ Close icon used for modal dialog and other UI element close buttons
 }
 
 .aboutmain{
-    background-image: url("../img/about/about-bg-light.png");
+    background-image: url("../image/about/about-bg-light.png");
 }
 
 .aboutinfo{
-    background-image: url("../img/about/about-bg-dark.png");
+    background-image: url("../image/about/about-bg-dark.png");
 }
 
 .about a{
@@ -841,7 +841,7 @@ Page sidebar
   display: block;
   width: 8px;
   height: 25px;
-  background-image: url("../img/sidebar-menu-arrow.png");
+  background-image: url("../image/sidebar-menu-arrow.png");
   float: right;
   position: absolute;
   right:0px;
@@ -849,7 +849,7 @@ Page sidebar
 }
 
 .page-sidebar-reversed .page-sidebar-menu > li.active > a .selected {
-  background-image: url("../img/sidebar-menu-arrow-reverse.png");
+  background-image: url("../image/sidebar-menu-arrow-reverse.png");
   right: auto;
   left:0;
 }
@@ -1477,33 +1477,33 @@ Portlets
 
 .portlet > .portlet-title > .tools > a.remove {
   margin-bottom: 2px;
-  background-image:url(../img/portlet-remove-icon.png);
+  background-image:url(../image/portlet-remove-icon.png);
   background-repeat: no-repeat;
   width: 11px;
 }
 
 .portlet > .portlet-title > .tools > a.config {
   margin-bottom: 2px;
-  background-image:url(../img/portlet-config-icon.png);
+  background-image:url(../image/portlet-config-icon.png);
   background-repeat: no-repeat;
   width: 12px;
 }
 
 .portlet > .portlet-title > .tools > a.reload {
   margin-bottom: 2px;
-  background-image:url(../img/portlet-reload-icon.png);
+  background-image:url(../image/portlet-reload-icon.png);
   width: 13px;
 }
 
 .portlet > .portlet-title > .tools > a.expand {
   margin-bottom: 2px;
-  background-image:url(../img/portlet-expand-icon.png);
+  background-image:url(../image/portlet-expand-icon.png);
   width: 14px;
 }
 
 .portlet > .portlet-title > .tools > a.collapse {
   margin-bottom: 2px;
-  background-image:url(../img/portlet-collapse-icon.png);
+  background-image:url(../image/portlet-collapse-icon.png);
   width: 14px;
 }
 
@@ -1695,27 +1695,27 @@ Box portlet
 
 .portlet.box > .portlet-title > .tools > a.remove, 
 .portlet.solid > .portlet-title > .tools > a.remove {
-  background-image:url(../img/portlet-remove-icon-white.png);
+  background-image:url(../image/portlet-remove-icon-white.png);
 }
 
 .portlet.box > .portlet-title > .tools > a.config,
 .portlet.solid > .portlet-title > .tools > a.config {
-  background-image:url(../img/portlet-config-icon-white.png);
+  background-image:url(../image/portlet-config-icon-white.png);
 }
 
 .portlet.box > .portlet-title > .tools > a.reload,
 .portlet.solid > .portlet-title > .tools > a.reload {
-  background-image:url(../img/portlet-reload-icon-white.png);
+  background-image:url(../image/portlet-reload-icon-white.png);
 }
 
 .portlet.box > .portlet-title > .tools > a.expand,
 .portlet.solid > .portlet-title > .tools > a.expand {
-  background-image:url(../img/portlet-expand-icon-white.png);
+  background-image:url(../image/portlet-expand-icon-white.png);
 }
 
 .portlet.box > .portlet-title > .tools > a.collapse,
 .portlet.solid > .portlet-title > .tools > a.collapse {
-  background-image:url(../img/portlet-collapse-icon-white.png);
+  background-image:url(../image/portlet-collapse-icon-white.png);
 }
 
 /* portlet buttons */
@@ -2284,7 +2284,7 @@ Zoom icon overlay on images
 }
 
 .zoom .zoom-icon {
-  background-image:url("../img/overlay-icon.png");
+  background-image:url("../image/overlay-icon.png");
   background-color: #222;
   background-repeat: no-repeat;
   background-position: 50%;
@@ -3321,7 +3321,7 @@ Theme Panel
   padding:20px;
   cursor:pointer;
   position:absolute;
-  background:#c9c9c9 url(../img/icon-color.png) center no-repeat;
+  background:#c9c9c9 url(../image/icon-color.png) center no-repeat;
 }
 
 .theme-panel > .toggler:hover {
@@ -3335,7 +3335,7 @@ Theme Panel
   padding:20px;
   cursor:pointer;
   position:absolute;
-  background: #3d3d3d url(../img/icon-color-close.png) center no-repeat !important;
+  background: #3d3d3d url(../image/icon-color-close.png) center no-repeat !important;
 }
 
 .theme-panel > .toggler-close:hover {
@@ -3610,7 +3610,7 @@ Horezantal Menu(new in v1.2)
     display: inline-block;
     padding: 12px 22px 12px 22px !important;
     cursor: pointer;
-    background: url(../img/hor-menu-search.png) no-repeat center;
+    background: url(../image/hor-menu-search.png) no-repeat center;
 }
 
 .header.navbar .hor-menu .hor-menu-search-form-toggler:hover {
@@ -3806,43 +3806,43 @@ Social Icons(new in v1.2.2)
   opacity: 1;
 }
 
-.social-icons .amazon {background: url(../img/social/amazon.png) no-repeat;}
-.social-icons .behance {background: url(../img/social/behance.png) no-repeat;}
-.social-icons .blogger {background: url(../img/social/blogger.png) no-repeat;}
-.social-icons .deviantart {background: url(../img/social/deviantart.png) no-repeat;}
-.social-icons .dribbble {background: url(../img/social/dribbble.png) no-repeat;}
-.social-icons .dropbox {background: url(../img/social/dropbox.png) no-repeat;}
-.social-icons .evernote {background: url(../img/social/evernote.png) no-repeat;}
-.social-icons .facebook {background: url(../img/social/facebook.png) no-repeat;}
-.social-icons .forrst {background: url(../img/social/forrst.png) no-repeat;}
-.social-icons .github {background: url(../img/social/github.png) no-repeat;}
-.social-icons .googleplus {background: url(../img/social/googleplus.png) no-repeat;}
-.social-icons .jolicloud {background: url(../img/social/jolicloud.png) no-repeat;}
-.social-icons .last-fm {background: url(../img/social/last-fm.png) no-repeat;}
-.social-icons .linkedin {background: url(../img/social/linkedin.png) no-repeat;}
-.social-icons .picasa {background: url(../img/social/picasa.png) no-repeat;}
-.social-icons .pintrest {background: url(../img/social/pintrest.png) no-repeat;}
-.social-icons .rss {background: url(../img/social/rss.png) no-repeat;}
-.social-icons .skype {background: url(../img/social/skype.png) no-repeat;}
-.social-icons .spotify {background: url(../img/social/spotify.png) no-repeat;}
-.social-icons .stumbleupon {background: url(../img/social/stumbleupon.png) no-repeat;}
-.social-icons .tumblr {background: url(../img/social/tumblr.png) no-repeat;}
-.social-icons .twitter {background: url(../img/social/twitter.png) no-repeat;}
-.social-icons .vimeo {background: url(../img/social/vimeo.png) no-repeat;}
-.social-icons .wordpress {background: url(../img/social/wordpress.png) no-repeat;}
-.social-icons .xing {background: url(../img/social/xing.png) no-repeat;}
-.social-icons .yahoo {background: url(../img/social/yahoo.png) no-repeat;}
-.social-icons .youtube {background: url(../img/social/youtube.png) no-repeat;}
-.social-icons .vk {background: url(../img/social/vk.png) no-repeat;}
-.social-icons .instagram {background: url(../img/social/instagram.png) no-repeat;}
-.social-icons .reddit {background: url(../img/social/reddit.png) no-repeat;}
-.social-icons .aboutme {background: url(../img/social/aboutme.png) no-repeat;}
-.social-icons .flickr {background: url(../img/social/flickr.png) no-repeat;}
-.social-icons .foursquare {background: url(../img/social/foursquare.png) no-repeat;}
-.social-icons .gravatar {background: url(../img/social/gravatar.png) no-repeat;}
-.social-icons .klout {background: url(../img/social/klout.png) no-repeat;}
-.social-icons .myspace {background: url(../img/social/myspace.png) no-repeat;}
-.social-icons .quora {background: url(../img/social/quora.png) no-repeat;}
+.social-icons .amazon {background: url(../image/social/amazon.png) no-repeat;}
+.social-icons .behance {background: url(../image/social/behance.png) no-repeat;}
+.social-icons .blogger {background: url(../image/social/blogger.png) no-repeat;}
+.social-icons .deviantart {background: url(../image/social/deviantart.png) no-repeat;}
+.social-icons .dribbble {background: url(../image/social/dribbble.png) no-repeat;}
+.social-icons .dropbox {background: url(../image/social/dropbox.png) no-repeat;}
+.social-icons .evernote {background: url(../image/social/evernote.png) no-repeat;}
+.social-icons .facebook {background: url(../image/social/facebook.png) no-repeat;}
+.social-icons .forrst {background: url(../image/social/forrst.png) no-repeat;}
+.social-icons .github {background: url(../image/social/github.png) no-repeat;}
+.social-icons .googleplus {background: url(../image/social/googleplus.png) no-repeat;}
+.social-icons .jolicloud {background: url(../image/social/jolicloud.png) no-repeat;}
+.social-icons .last-fm {background: url(../image/social/last-fm.png) no-repeat;}
+.social-icons .linkedin {background: url(../image/social/linkedin.png) no-repeat;}
+.social-icons .picasa {background: url(../image/social/picasa.png) no-repeat;}
+.social-icons .pintrest {background: url(../image/social/pintrest.png) no-repeat;}
+.social-icons .rss {background: url(../image/social/rss.png) no-repeat;}
+.social-icons .skype {background: url(../image/social/skype.png) no-repeat;}
+.social-icons .spotify {background: url(../image/social/spotify.png) no-repeat;}
+.social-icons .stumbleupon {background: url(../image/social/stumbleupon.png) no-repeat;}
+.social-icons .tumblr {background: url(../image/social/tumblr.png) no-repeat;}
+.social-icons .twitter {background: url(../image/social/twitter.png) no-repeat;}
+.social-icons .vimeo {background: url(../image/social/vimeo.png) no-repeat;}
+.social-icons .wordpress {background: url(../image/social/wordpress.png) no-repeat;}
+.social-icons .xing {background: url(../image/social/xing.png) no-repeat;}
+.social-icons .yahoo {background: url(../image/social/yahoo.png) no-repeat;}
+.social-icons .youtube {background: url(../image/social/youtube.png) no-repeat;}
+.social-icons .vk {background: url(../image/social/vk.png) no-repeat;}
+.social-icons .instagram {background: url(../image/social/instagram.png) no-repeat;}
+.social-icons .reddit {background: url(../image/social/reddit.png) no-repeat;}
+.social-icons .aboutme {background: url(../image/social/aboutme.png) no-repeat;}
+.social-icons .flickr {background: url(../image/social/flickr.png) no-repeat;}
+.social-icons .foursquare {background: url(../image/social/foursquare.png) no-repeat;}
+.social-icons .gravatar {background: url(../image/social/gravatar.png) no-repeat;}
+.social-icons .klout {background: url(../image/social/klout.png) no-repeat;}
+.social-icons .myspace {background: url(../image/social/myspace.png) no-repeat;}
+.social-icons .quora {background: url(../image/social/quora.png) no-repeat;}
 
 /***
 Inline Social Icons
@@ -3861,43 +3861,43 @@ Inline Social Icons
   -webkit-transition: all 0.3s ease-in-out;
 }
 
-.social-icon.amazon {background: url(../img/social/amazon.png) no-repeat;}
-.social-icon.behance {background: url(../img/social/behance.png) no-repeat;}
-.social-icon.blogger {background: url(../img/social/blogger.png) no-repeat;}
-.social-icon.deviantart {background: url(../img/social/deviantart.png) no-repeat;}
-.social-icon.dribbble {background: url(../img/social/dribbble.png) no-repeat;}
-.social-icon.dropbox {background: url(../img/social/dropbox.png) no-repeat;}
-.social-icon.evernote {background: url(../img/social/evernote.png) no-repeat;}
-.social-icon.facebook {background: url(../img/social/facebook.png) no-repeat;}
-.social-icon.forrst {background: url(../img/social/forrst.png) no-repeat;}
-.social-icon.github {background: url(../img/social/github.png) no-repeat;}
-.social-icon.googleplus {background: url(../img/social/googleplus.png) no-repeat;}
-.social-icon.jolicloud {background: url(../img/social/jolicloud.png) no-repeat;}
-.social-icon.last-fm {background: url(../img/social/last-fm.png) no-repeat;}
-.social-icon.linkedin {background: url(../img/social/linkedin.png) no-repeat;}
-.social-icon.picasa {background: url(../img/social/picasa.png) no-repeat;}
-.social-icon.pintrest {background: url(../img/social/pintrest.png) no-repeat;}
-.social-icon.rss {background: url(../img/social/rss.png) no-repeat;}
-.social-icon.skype {background: url(../img/social/skype.png) no-repeat;}
-.social-icon.spotify {background: url(../img/social/spotify.png) no-repeat;}
-.social-icon.stumbleupon {background: url(../img/social/stumbleupon.png) no-repeat;}
-.social-icon.tumblr {background: url(../img/social/tumblr.png) no-repeat;}
-.social-icon.twitter {background: url(../img/social/twitter.png) no-repeat;}
-.social-icon.vimeo {background: url(../img/social/vimeo.png) no-repeat;}
-.social-icon.wordpress {background: url(../img/social/wordpress.png) no-repeat;}
-.social-icon.xing {background: url(../img/social/xing.png) no-repeat;}
-.social-icon.yahoo {background: url(../img/social/yahoo.png) no-repeat;}
-.social-icon.youtube {background: url(../img/social/youtube.png) no-repeat;}
-.social-icon.vk {background: url(../img/social/vk.png) no-repeat;}
-.social-icon.instagram {background: url(../img/social/instagram.png) no-repeat;}
-.social-icon.reddit {background: url(../img/social/reddit.png) no-repeat;}
-.social-icon.aboutme {background: url(../img/social/aboutme.png) no-repeat;}
-.social-icon.flickr {background: url(../img/social/flickr.png) no-repeat;}
-.social-icon.foursquare {background: url(../img/social/foursquare.png) no-repeat;}
-.social-icon.gravatar {background: url(../img/social/gravatar.png) no-repeat;}
-.social-icon.klout {background: url(../img/social/klout.png) no-repeat;}
-.social-icon.myspace {background: url(../img/social/myspace.png) no-repeat;}
-.social-icon.quora {background: url(../img/social/quora.png) no-repeat;}
+.social-icon.amazon {background: url(../image/social/amazon.png) no-repeat;}
+.social-icon.behance {background: url(../image/social/behance.png) no-repeat;}
+.social-icon.blogger {background: url(../image/social/blogger.png) no-repeat;}
+.social-icon.deviantart {background: url(../image/social/deviantart.png) no-repeat;}
+.social-icon.dribbble {background: url(../image/social/dribbble.png) no-repeat;}
+.social-icon.dropbox {background: url(../image/social/dropbox.png) no-repeat;}
+.social-icon.evernote {background: url(../image/social/evernote.png) no-repeat;}
+.social-icon.facebook {background: url(../image/social/facebook.png) no-repeat;}
+.social-icon.forrst {background: url(../image/social/forrst.png) no-repeat;}
+.social-icon.github {background: url(../image/social/github.png) no-repeat;}
+.social-icon.googleplus {background: url(../image/social/googleplus.png) no-repeat;}
+.social-icon.jolicloud {background: url(../image/social/jolicloud.png) no-repeat;}
+.social-icon.last-fm {background: url(../image/social/last-fm.png) no-repeat;}
+.social-icon.linkedin {background: url(../image/social/linkedin.png) no-repeat;}
+.social-icon.picasa {background: url(../image/social/picasa.png) no-repeat;}
+.social-icon.pintrest {background: url(../image/social/pintrest.png) no-repeat;}
+.social-icon.rss {background: url(../image/social/rss.png) no-repeat;}
+.social-icon.skype {background: url(../image/social/skype.png) no-repeat;}
+.social-icon.spotify {background: url(../image/social/spotify.png) no-repeat;}
+.social-icon.stumbleupon {background: url(../image/social/stumbleupon.png) no-repeat;}
+.social-icon.tumblr {background: url(../image/social/tumblr.png) no-repeat;}
+.social-icon.twitter {background: url(../image/social/twitter.png) no-repeat;}
+.social-icon.vimeo {background: url(../image/social/vimeo.png) no-repeat;}
+.social-icon.wordpress {background: url(../image/social/wordpress.png) no-repeat;}
+.social-icon.xing {background: url(../image/social/xing.png) no-repeat;}
+.social-icon.yahoo {background: url(../image/social/yahoo.png) no-repeat;}
+.social-icon.youtube {background: url(../image/social/youtube.png) no-repeat;}
+.social-icon.vk {background: url(../image/social/vk.png) no-repeat;}
+.social-icon.instagram {background: url(../image/social/instagram.png) no-repeat;}
+.social-icon.reddit {background: url(../image/social/reddit.png) no-repeat;}
+.social-icon.aboutme {background: url(../image/social/aboutme.png) no-repeat;}
+.social-icon.flickr {background: url(../image/social/flickr.png) no-repeat;}
+.social-icon.foursquare {background: url(../image/social/foursquare.png) no-repeat;}
+.social-icon.gravatar {background: url(../image/social/gravatar.png) no-repeat;}
+.social-icon.klout {background: url(../image/social/klout.png) no-repeat;}
+.social-icon.myspace {background: url(../image/social/myspace.png) no-repeat;}
+.social-icon.quora {background: url(../image/social/quora.png) no-repeat;}
 
 .social-icon:hover {
   background-position:0 -38px;
@@ -4638,11 +4638,11 @@ height:26px !important;
 }
 
 .aboutmain{
-    background-image: url("../img/about/about-bg-light.png");
+    background-image: url("../image/about/about-bg-light.png");
 }
 
 .aboutinfo{
-    background-image: url("../img/about/about-bg-dark.png");
+    background-image: url("../image/about/about-bg-dark.png");
 }
 
 .about a{

diff --git a/openo-portal/portal-common/src/main/webapp/common/css/themes/black.css b/openo-portal/portal-common/src/main/webapp/common/css/themes/black.css
index 35572e3..c835000 100644 (file)
--- a/openo-portal/portal-common/src/main/webapp/common/css/themes/black.css
+++ b/openo-portal/portal-common/src/main/webapp/common/css/themes/black.css
@@ -71,7 +71,7 @@ Header Search
 }
 
 .header .search-form .submit {  
-  background: url(../../img/search-icon-light.png);
+  background: url(../../image/search-icon-light.png);
 }
 
 /***
@@ -109,7 +109,7 @@ Hor menu
 }
 
 .header .hor-menu .hor-menu-search-form-toggler.off {
-   background: #383838 url(../../img/hor-menu-search-close.png) no-repeat center;
+   background: #383838 url(../../image/hor-menu-search-close.png) no-repeat center;
 }
 
 .header .hor-menu .search-form {  
@@ -122,7 +122,7 @@ Hor menu
 
 .header .hor-menu .search-form .btn {
   color: #999;
-  background: url(../../img/search-icon.png) no-repeat center;
+  background: url(../../image/search-icon.png) no-repeat center;
 }
 
 .header .hor-menu .search-form form input::-webkit-input-placeholder { /* WebKit browsers */
@@ -239,13 +239,13 @@ ul.page-sidebar-menu > li.active > a .arrow.open:before {
   border-bottom: 1px solid #7d7d7d !important;
 }
 .page-sidebar .sidebar-search .submit {
-  background-image: url(../../img/search-icon.png);
+  background-image: url(../../image/search-icon.png);
 }
 /***
 Sidebar toggler
 ***/
 .sidebar-toggler {
-  background-image: url(../../img/sidebar-toggler.jpg);
+  background-image: url(../../image/sidebar-toggler.jpg);
   background-color: #242424;
 }
 /* search box bg color on expanded */
@@ -253,7 +253,7 @@ Sidebar toggler
   background-color: #3d3d3d !important;
 }
 .page-sidebar-closed .page-sidebar .sidebar-search.open .form-container .remove {
-  background-image: url("../../img/sidebar-search-close.png");
+  background-image: url("../../image/sidebar-search-close.png");
 }
 /* sub menu bg color on hover menu item */
 .page-sidebar-closed ul.page-sidebar-menu > li:hover .sub-menu {

diff --git a/openo-portal/portal-common/src/main/webapp/common/css/themes/blue.css b/openo-portal/portal-common/src/main/webapp/common/css/themes/blue.css
index 7210257..ac651e7 100644 (file)
--- a/openo-portal/portal-common/src/main/webapp/common/css/themes/blue.css
+++ b/openo-portal/portal-common/src/main/webapp/common/css/themes/blue.css
@@ -58,7 +58,7 @@ Header Search
 }
 
 .header .search-form .submit {  
-  background: url(../../img/search-icon-blue.png);
+  background: url(../../image/search-icon-blue.png);
 }
 
 /***
@@ -96,7 +96,7 @@ Hor menu
 }
 
 .header .hor-menu .hor-menu-search-form-toggler.off {
-   background: #146a9d url(../../img/hor-menu-search-close-white.png) no-repeat center;
+   background: #146a9d url(../../image/hor-menu-search-close-white.png) no-repeat center;
 }
 
 .header .hor-menu .search-form {  
@@ -109,7 +109,7 @@ Hor menu
 
 .header .hor-menu .search-form .btn {
   color: #ccc;
-  background: url(../../img/search-icon-white.png) no-repeat center;
+  background: url(../../image/search-icon-white.png) no-repeat center;
 }
 
 .header .hor-menu .search-form form input::-webkit-input-placeholder { /* WebKit browsers */
@@ -225,13 +225,13 @@ ul.page-sidebar-menu > li.active > a .arrow.open:before {
   border-bottom: 1px solid #51b1e9 !important;
 }
 .page-sidebar .sidebar-search .submit {
-  background-image: url(../../img/search-icon-blue.png);
+  background-image: url(../../image/search-icon-blue.png);
 }
 /***
 Sidebar toggler
 ***/
 .sidebar-toggler {
-  background-image: url(../../img/sidebar-toggler-blue.jpg);
+  background-image: url(../../image/sidebar-toggler-blue.jpg);
   background-color: #0f5179;
 }
 /* search box bg color on expanded */
@@ -239,7 +239,7 @@ Sidebar toggler
   background-color: #1570a6 !important;
 }
 .page-sidebar-closed .page-sidebar .sidebar-search.open .form-container .remove {
-  background-image: url("../../img/sidebar-search-close-blue.png");
+  background-image: url("../../image/sidebar-search-close-blue.png");
 }
 /* sub menu bg color on hover menu item */
 .page-sidebar-closed ul.page-sidebar-menu > li:hover .sub-menu {

diff --git a/openo-portal/portal-common/src/main/webapp/common/css/themes/brown.css b/openo-portal/portal-common/src/main/webapp/common/css/themes/brown.css
index 7fb90fb..8a9339e 100644 (file)
--- a/openo-portal/portal-common/src/main/webapp/common/css/themes/brown.css
+++ b/openo-portal/portal-common/src/main/webapp/common/css/themes/brown.css
@@ -60,7 +60,7 @@ Header Search
 }
 
 .header .search-form .submit {  
-  background: url(../../img/search-icon-brown.png);
+  background: url(../../image/search-icon-brown.png);
 }
 /***
 Hor menu
@@ -98,7 +98,7 @@ Hor menu
 }
 
 .header .hor-menu .hor-menu-search-form-toggler.off {
-   background: #5a3a16 url(../../img/hor-menu-search-close-white.png) no-repeat center;
+   background: #5a3a16 url(../../image/hor-menu-search-close-white.png) no-repeat center;
 }
 
 .header .hor-menu .search-form {  
@@ -111,7 +111,7 @@ Hor menu
 
 .header .hor-menu .search-form .btn {
   color: #ccc;
-  background: url(../../img/search-icon-white.png) no-repeat center;
+  background: url(../../image/search-icon-white.png) no-repeat center;
 }
 
 .header .hor-menu .search-form form input::-webkit-input-placeholder { /* WebKit browsers */
@@ -227,13 +227,13 @@ ul.page-sidebar-menu > li.active > a .arrow.open:before {
   border-bottom: 1px solid #845f36 !important;
 }
 .page-sidebar .sidebar-search .submit {
-  background-image: url(../../img/search-icon-brown.png);
+  background-image: url(../../image/search-icon-brown.png);
 }
 /***
 Sidebar toggler
 ***/
 .sidebar-toggler {
-  background-image: url(../../img/sidebar-toggler-brown.jpg);
+  background-image: url(../../image/sidebar-toggler-brown.jpg);
   background-color: #39250e;
 }
 /* search box bg color on expanded */
@@ -241,7 +241,7 @@ Sidebar toggler
   background-color: #623f18 !important;
 }
 .page-sidebar-closed .page-sidebar .sidebar-search.open .form-container .remove {
-  background-image: url("../../img/sidebar-search-close-brown.png");
+  background-image: url("../../image/sidebar-search-close-brown.png");
 }
 /* sub menu bg color on hover menu item */
 .page-sidebar-closed ul.page-sidebar-menu > li:hover .sub-menu {

diff --git a/openo-portal/portal-common/src/main/webapp/common/css/themes/grey.css b/openo-portal/portal-common/src/main/webapp/common/css/themes/grey.css
index dffb7cd..2524bc5 100644 (file)
--- a/openo-portal/portal-common/src/main/webapp/common/css/themes/grey.css
+++ b/openo-portal/portal-common/src/main/webapp/common/css/themes/grey.css
@@ -57,7 +57,7 @@ Header Search
 }
 
 .header .search-form .submit {  
-  background: url(../../img/search-icon-light.png);
+  background: url(../../image/search-icon-light.png);
 }
 /***
 Hor menu
@@ -94,7 +94,7 @@ Hor menu
 }
 
 .header .hor-menu .hor-menu-search-form-toggler.off {
-   background: #616161 url(../../img/hor-menu-search-close-white.png) no-repeat center;
+   background: #616161 url(../../image/hor-menu-search-close-white.png) no-repeat center;
 }
 
 .header .hor-menu .search-form {  
@@ -107,7 +107,7 @@ Hor menu
 
 .header .hor-menu .search-form .btn {
   color: #ccc;
-  background: url(../../img/search-icon-white.png) no-repeat center;
+  background: url(../../image/search-icon-white.png) no-repeat center;
 }
 
 .header .hor-menu .search-form form input::-webkit-input-placeholder { /* WebKit browsers */
@@ -223,13 +223,13 @@ ul.page-sidebar-menu > li.active > a .arrow.open:before {
   border-bottom: 1px solid #a6a6a6 !important;
 }
 .page-sidebar .sidebar-search .submit {
-  background-image: url(../../img/search-icon.png);
+  background-image: url(../../image/search-icon.png);
 }
 /***
 Sidebar toggler
 ***/
 .sidebar-toggler {
-  background-image: url(../../img/sidebar-toggler.jpg);
+  background-image: url(../../image/sidebar-toggler.jpg);
   background-color: #4d4d4d;
 }
 /* search box bg color on expanded */
@@ -237,7 +237,7 @@ Sidebar toggler
   background-color: #666666 !important;
 }
 .page-sidebar-closed .page-sidebar .sidebar-search.open .form-container .remove {
-  background-image: url("../../img/sidebar-search-close.png");
+  background-image: url("../../image/sidebar-search-close.png");
 }
 /* sub menu bg color on hover menu item */
 .page-sidebar-closed ul.page-sidebar-menu > li:hover .sub-menu {

diff --git a/openo-portal/portal-common/src/main/webapp/common/css/themes/light.css b/openo-portal/portal-common/src/main/webapp/common/css/themes/light.css
index 49939fa..f918f72 100644 (file)
--- a/openo-portal/portal-common/src/main/webapp/common/css/themes/light.css
+++ b/openo-portal/portal-common/src/main/webapp/common/css/themes/light.css
@@ -61,7 +61,7 @@ Header Search
 }
 
 .header .search-form .submit {  
-  background: url(../../img/search-icon.png);
+  background: url(../../image/search-icon.png);
 }
 /***
 Hor menu
@@ -102,7 +102,7 @@ Hor menu
 }
 
 .header .hor-menu .hor-menu-search-form-toggler.off {
-   background: #4f4f4f url(../../img/hor-menu-search-close-white.png) no-repeat center;
+   background: #4f4f4f url(../../image/hor-menu-search-close-white.png) no-repeat center;
 }
 
 .header .hor-menu .search-form {  
@@ -115,7 +115,7 @@ Hor menu
 
 .header .hor-menu .search-form .btn {
   color: #ccc;
-  background: url(../../img/search-icon-white.png) no-repeat center;
+  background: url(../../image/search-icon-white.png) no-repeat center;
 }
 
 .header .hor-menu .search-form form input::-webkit-input-placeholder { /* WebKit browsers */
@@ -192,12 +192,12 @@ ul.page-sidebar-menu > li.active > a .selected {
   top:0px;
   width: 7px;
   height: 39px;
-  background-image: url("../../img/sidebar-menu-arrow-green.png");
+  background-image: url("../../image/sidebar-menu-arrow-green.png");
 }  
 .page-sidebar-reversed ul.page-sidebar-menu > li.active > a .selected {
   right: auto;
   left:-7px;
-  background-image: url("../../img/sidebar-menu-arrow-green-reverse.png");
+  background-image: url("../../image/sidebar-menu-arrow-green-reverse.png");
 } 
 ul.page-sidebar-menu > li.active i {
   color: #fff !important;
@@ -269,14 +269,14 @@ ul.page-sidebar-menu ul.sub-menu > li > a i {
   border-bottom: 1px solid #e2e2e2 !important;
 }
 .page-sidebar .sidebar-search .submit {
-  background-image: url(../../img/search-icon-white.png);
+  background-image: url(../../image/search-icon-white.png);
 }
 
 /***
 Sidebar toggler
 ***/
 .sidebar-toggler {  
-  background-image: url(../../img/sidebar-toggler-light.jpg);
+  background-image: url(../../image/sidebar-toggler-light.jpg);
   background-color: #333;
 }
 /* search box bg color on expanded */
@@ -284,7 +284,7 @@ Sidebar toggler
   background-color: #fbfbfb !important;
 }
 .page-sidebar-closed .page-sidebar .sidebar-search.open .form-container .remove {  
-  background-image: url("../../img/sidebar-search-close-light.png");
+  background-image: url("../../image/sidebar-search-close-light.png");
 }
 /* sub menu bg color on hover menu item */
 .page-sidebar-closed ul.page-sidebar-menu > li:hover .sub-menu {

diff --git a/openo-portal/portal-common/src/main/webapp/common/css/themes/purple.css b/openo-portal/portal-common/src/main/webapp/common/css/themes/purple.css
index b4e20d6..f108f79 100644 (file)
--- a/openo-portal/portal-common/src/main/webapp/common/css/themes/purple.css
+++ b/openo-portal/portal-common/src/main/webapp/common/css/themes/purple.css
@@ -60,7 +60,7 @@ Header Search
 }
 
 .header .search-form .submit {  
-  background: url(../../img/search-icon-purple.png);
+  background: url(../../image/search-icon-purple.png);
 }
 /***
 Hor menu
@@ -97,7 +97,7 @@ Hor menu
 }
 
 .header .hor-menu .hor-menu-search-form-toggler.off {
-   background: #69147b url(../../img/hor-menu-search-close-white.png) no-repeat center;
+   background: #69147b url(../../image/hor-menu-search-close-white.png) no-repeat center;
 }
 
 .header .hor-menu .search-form {  
@@ -110,7 +110,7 @@ Hor menu
 
 .header .hor-menu .search-form .btn {
   color: #ccc;
-  background: url(../../img/search-icon-white.png) no-repeat center;
+  background: url(../../image/search-icon-white.png) no-repeat center;
 }
 
 .header .hor-menu .search-form form input::-webkit-input-placeholder { /* WebKit browsers */
@@ -226,13 +226,13 @@ ul.page-sidebar-menu > li.active > a .arrow.open:before {
   border-bottom: 1px solid #a93bc1 !important;
 }
 .page-sidebar .sidebar-search .submit {
-  background-image: url(../../img/search-icon-purple.png);
+  background-image: url(../../image/search-icon-purple.png);
 }
 /***
 Sidebar toggler
 ***/
 .sidebar-toggler {
-  background-image: url(../../img/sidebar-toggler-purple.jpg);
+  background-image: url(../../image/sidebar-toggler-purple.jpg);
   background-color: #4b0e58;
 }
 /* search box bg color on expanded */
@@ -240,7 +240,7 @@ Sidebar toggler
   background-color: #701584 !important;
 }
 .page-sidebar-closed .page-sidebar .sidebar-search.open .form-container .remove {
-  background-image: url("../../img/sidebar-search-close-purple.png");
+  background-image: url("../../image/sidebar-search-close-purple.png");
 }
 /* sub menu bg color on hover menu item */
 .page-sidebar-closed ul.page-sidebar-menu > li:hover .sub-menu {

diff --git a/openo-portal/portal-common/src/main/webapp/common/css/themes/zteblue.css b/openo-portal/portal-common/src/main/webapp/common/css/themes/zteblue.css
index a3d7101..051ad18 100644 (file)
--- a/openo-portal/portal-common/src/main/webapp/common/css/themes/zteblue.css
+++ b/openo-portal/portal-common/src/main/webapp/common/css/themes/zteblue.css
@@ -64,7 +64,7 @@ Header Search
 }
 
 .header .search-form .submit {  
-  background: url(../../img/search-icon-blue.png);
+  background: url(../../image/search-icon-blue.png);
 }
 .zte-theme-panel > .toggler:hover {
   background-color: #146a9d !important;
@@ -107,7 +107,7 @@ Hor menu
 }
 
 .header .hor-menu .hor-menu-search-form-toggler.off {
-   background: #146a9d url(../../img/hor-menu-search-close-white.png) no-repeat center;
+   background: #146a9d url(../../image/hor-menu-search-close-white.png) no-repeat center;
 }
 
 .header .hor-menu .search-form {  
@@ -120,7 +120,7 @@ Hor menu
 
 .header .hor-menu .search-form .btn {
   color: #ccc;
-  background: url(../../img/search-icon-white.png) no-repeat center;
+  background: url(../../image/search-icon-white.png) no-repeat center;
 }
 
 .header .hor-menu .search-form form input::-webkit-input-placeholder { /* WebKit browsers */
@@ -240,13 +240,13 @@ ul.page-sidebar-menu > li.active > a .arrow.open:before {
   border-bottom: 1px solid #0d638f !important;
 }
 .page-sidebar .sidebar-search .submit {
-  background-image: url(../../img/search-icon-blue.png);
+  background-image: url(../../image/search-icon-blue.png);
 }
 /***
 Sidebar toggler
 ***/
 .sidebar-toggler {
-  background-image: url(../../img/sidebar-toggler-grey.jpg);
+  background-image: url(../../image/sidebar-toggler-grey.jpg);
   background-color: #0f5179;
 }
 /* search box bg color on expanded */
@@ -254,7 +254,7 @@ Sidebar toggler
   background-color: #1b8fd3 !important;
 }
 .page-sidebar-closed .page-sidebar .sidebar-search.open .form-container .remove {
-  background-image: url("../../img/sidebar-search-close-blue.png");
+  background-image: url("../../image/sidebar-search-close-blue.png");
 }
 /* sub menu bg color on hover menu item */
 .page-sidebar-closed ul.page-sidebar-menu > li:hover .sub-menu {

diff --git a/openo-portal/portal-common/src/main/webapp/common/css/themes/ztebluelight.css b/openo-portal/portal-common/src/main/webapp/common/css/themes/ztebluelight.css
index 7146d91..7dfbb0c 100644 (file)
--- a/openo-portal/portal-common/src/main/webapp/common/css/themes/ztebluelight.css
+++ b/openo-portal/portal-common/src/main/webapp/common/css/themes/ztebluelight.css
@@ -27,7 +27,7 @@ body {
 background-color:#f1f3fa !important;
 }
 .page-sidebar-menu > li.active > a .selected{
-background-image:url("../../img/sidebar-menu-arrow-bluelight.png")
+background-image:url("../../image/sidebar-menu-arrow-bluelight.png")
 }
 /***
 Page header
@@ -74,7 +74,7 @@ Header Search
 }
 
 .header .search-form .submit {  
-  background: url(../../img/search-icon-blue.png);
+  background: url(../../image/search-icon-blue.png);
 }
 
 /***
@@ -123,7 +123,7 @@ Hor menu
 }
 
 .header .hor-menu .hor-menu-search-form-toggler.off {
-   background: #4d7ee1 url(../../img/hor-menu-search-close-white.png) no-repeat center;
+   background: #4d7ee1 url(../../image/hor-menu-search-close-white.png) no-repeat center;
 }
 
 .header .hor-menu .search-form {  
@@ -277,13 +277,13 @@ ul.page-sidebar-menu > li.active > a .arrow.open:before {
   border-bottom: 1px solid #000000 !important;
 }
 .page-sidebar .sidebar-search .submit {
-  background-image: url(../../img/search-icon-blue.png);
+  background-image: url(../../image/search-icon-blue.png);
 }
 /***
 Sidebar toggler
 ***/
 .sidebar-toggler {
- background-image: url(../../img/sidebar-toggler-grey.jpg);
+ background-image: url(../../image/sidebar-toggler-grey.jpg);
   background-color: #0f5179;
 }
 /* search box bg color on expanded */
@@ -291,7 +291,7 @@ Sidebar toggler
   background-color: #3366CC !important;
 }
 .page-sidebar-closed .page-sidebar .sidebar-search.open .form-container .remove {
-  background-image: url("../../img/sidebar-search-close-blue.png");
+  background-image: url("../../image/sidebar-search-close-blue.png");
 }
 /* sub menu bg color on hover menu item */
 .page-sidebar-closed ul.page-sidebar-menu > li:hover .sub-menu {

diff --git a/openo-portal/portal-common/src/main/webapp/common/css/themes/ztebluelight2.css b/openo-portal/portal-common/src/main/webapp/common/css/themes/ztebluelight2.css
index 57ee209..e06872a 100644 (file)
--- a/openo-portal/portal-common/src/main/webapp/common/css/themes/ztebluelight2.css
+++ b/openo-portal/portal-common/src/main/webapp/common/css/themes/ztebluelight2.css
@@ -81,7 +81,7 @@ Header Search
 }
 
 .header .search-form .submit {
-    background: url(../../img/search-icon-blue.png);
+    background: url(../../image/search-icon-blue.png);
 }
 
 /***
@@ -137,7 +137,7 @@ Hor menu
 }
 
 .header .hor-menu .hor-menu-search-form-toggler.off {
-    background: #126ed8 url(../../img/hor-menu-search-close-white.png) no-repeat center;
+    background: #126ed8 url(../../image/hor-menu-search-close-white.png) no-repeat center;
 }
 
 .header .hor-menu .search-form {
@@ -150,7 +150,7 @@ Hor menu
 
 .header .hor-menu .search-form .btn {
     color: #ccc;
-    background: url(../../img/search-icon-white.png) no-repeat center;
+    background: url(../../image/search-icon-white.png) no-repeat center;
 }
 
 .header .hor-menu .search-form form input::-webkit-input-placeholder {
@@ -280,7 +280,7 @@ ul.page-sidebar-menu > li > ul.sub-menu li.open > a {
 }
 
 .page-sidebar-menu > li.active > a .selected {
-    /* background-image: url(../../img/sidebar-menu-arrow-blue.png) !important;*/
+    /* background-image: url(../../image/sidebar-menu-arrow-blue.png) !important;*/
     border-right: 2px solid #1178ee !important;
     height: 37px !important;
     top: 2px !important;
@@ -338,14 +338,14 @@ ul.page-sidebar-menu > li.active > a .arrow.open:before {
 }
 
 .page-sidebar .sidebar-search .submit {
-    background-image: url(../../img/search-icon-blue.png);
+    background-image: url(../../image/search-icon-blue.png);
 }
 
 /***
 Sidebar toggler
 ***/
 .sidebar-toggler {
-    background-image: url(../../img/sidebar-toggler-grey.jpg);
+    background-image: url(../../image/sidebar-toggler-grey.jpg);
     background-color: #0f5179;
 }
 
@@ -355,7 +355,7 @@ Sidebar toggler
 }
 
 .page-sidebar-closed .page-sidebar .sidebar-search.open .form-container .remove {
-    background-image: url("../../img/sidebar-search-close-blue.png");
+    background-image: url("../../image/sidebar-search-close-blue.png");
 }
 
 /* sub menu bg color on hover menu item */

diff --git a/openo-portal/portal-common/src/main/webapp/common/css/themes/ztebluelight3.css b/openo-portal/portal-common/src/main/webapp/common/css/themes/ztebluelight3.css
index 1e25000..4462c0a 100644 (file)
--- a/openo-portal/portal-common/src/main/webapp/common/css/themes/ztebluelight3.css
+++ b/openo-portal/portal-common/src/main/webapp/common/css/themes/ztebluelight3.css
@@ -66,7 +66,7 @@ Header Search
 }
 
 .header .search-form .submit {  
-  background: url(../../img/search-icon.png);
+  background: url(../../image/search-icon.png);
 }
 
 /***
@@ -107,7 +107,7 @@ Hor menu
 }
 
 .header .hor-menu .hor-menu-search-form-toggler.off {
-   background: #4399bd url(../../img/hor-menu-search-close-white.png) no-repeat center;
+   background: #4399bd url(../../image/hor-menu-search-close-white.png) no-repeat center;
 }
 
 .header .hor-menu .search-form {  
@@ -120,7 +120,7 @@ Hor menu
 
 .header .hor-menu .search-form .btn {
   color: #ccc;
-  background: url(../../img/search-icon-white.png) no-repeat center;
+  background: url(../../image/search-icon-white.png) no-repeat center;
 }
 
 .header .hor-menu .search-form form input::-webkit-input-placeholder { /* WebKit browsers */
@@ -199,12 +199,12 @@ ul.page-sidebar-menu > li:hover > a {
   top:0px;
   width: 7px;
   height: 39px;
-  background-image: url("../../img/sidebar-menu-arrow-green.png");
+  background-image: url("../../image/sidebar-menu-arrow-green.png");
 }  */
 .page-sidebar-reversed ul.page-sidebar-menu > li.active > a .selected {
   right: auto;
   left:-7px;
-  background-image: url("../../img/sidebar-menu-arrow-green-reverse.png");
+  background-image: url("../../image/sidebar-menu-arrow-green-reverse.png");
 } 
 ul.page-sidebar-menu > li.active i {
   color: #fff !important;
@@ -280,14 +280,14 @@ ul.page-sidebar-menu ul.sub-menu > li > a i {
   border-bottom: 1px solid #e2e2e2 !important;
 }
 .page-sidebar .sidebar-search .submit {
-  background-image: url(../../img/search-icon-white.png);
+  background-image: url(../../image/search-icon-white.png);
 }
 
 /***
 Sidebar toggler
 ***/
 .sidebar-toggler {  
-  background-image: url(../../img/sidebar-toggler-light.jpg);
+  background-image: url(../../image/sidebar-toggler-light.jpg);
   background-color: #333;
 }
 /* search box bg color on expanded */
@@ -295,7 +295,7 @@ Sidebar toggler
   background-color: #fbfbfb !important;
 }
 .page-sidebar-closed .page-sidebar .sidebar-search.open .form-container .remove {  
-  background-image: url("../../img/sidebar-search-close-light.png");
+  background-image: url("../../image/sidebar-search-close-light.png");
 }
 /* sub menu bg color on hover menu item */
 .page-sidebar-closed ul.page-sidebar-menu > li:hover .sub-menu {

diff --git a/openo-portal/portal-common/src/main/webapp/common/css/themes/ztebluelight4.css b/openo-portal/portal-common/src/main/webapp/common/css/themes/ztebluelight4.css
index 646fdc4..c390824 100644 (file)
--- a/openo-portal/portal-common/src/main/webapp/common/css/themes/ztebluelight4.css
+++ b/openo-portal/portal-common/src/main/webapp/common/css/themes/ztebluelight4.css
@@ -83,7 +83,7 @@ Header Search
 }
 
 .header .search-form .submit {
-    background: url(../../img/search-icon.png);
+    background: url(../../image/search-icon.png);
 }
 
 /***
@@ -127,7 +127,7 @@ Hor menu
 }
 
 .header .hor-menu .hor-menu-search-form-toggler.off {
-    background: #4f4f4f url(../../img/hor-menu-search-close-white.png) no-repeat center;
+    background: #4f4f4f url(../../image/hor-menu-search-close-white.png) no-repeat center;
 }
 
 .header .hor-menu .search-form {
@@ -140,7 +140,7 @@ Hor menu
 
 .header .hor-menu .search-form .btn {
     color: #ccc;
-    background: url(../../img/search-icon-white.png) no-repeat center;
+    background: url(../../image/search-icon-white.png) no-repeat center;
 }
 
 .header .hor-menu .search-form form input::-webkit-input-placeholder {
@@ -256,13 +256,13 @@ ul.page-sidebar-menu > li.active > a:hover {
   top:0px;
   width: 7px;
   height: 39px;
-  background-image: url("../../img/sidebar-menu-arrow-green.png");*/
+  background-image: url("../../image/sidebar-menu-arrow-green.png");*/
     }
 
 .page-sidebar-reversed ul.page-sidebar-menu > li.active > a .selected {
     right: auto;
     left: -7px;
-    background-image: url("../../img/sidebar-menu-arrow-green-reverse.png");
+    background-image: url("../../image/sidebar-menu-arrow-green-reverse.png");
 }
 
 /*ul.page-sidebar-menu > li.active i {
@@ -356,14 +356,14 @@ ul.page-sidebar-menu > li.active > a:hover {
 }
 
 .page-sidebar .sidebar-search .submit {
-    background-image: url(../../img/search-icon-white.png);
+    background-image: url(../../image/search-icon-white.png);
 }
 
 /***
 Sidebar toggler
 ***/
 .sidebar-toggler {
-    background-image: url(../../img/sidebar-toggler-light.jpg);
+    background-image: url(../../image/sidebar-toggler-light.jpg);
     background-color: #333;
 }
 
@@ -373,7 +373,7 @@ Sidebar toggler
 }
 
 .page-sidebar-closed .page-sidebar .sidebar-search.open .form-container .remove {
-    background-image: url("../../img/sidebar-search-close-light.png");
+    background-image: url("../../image/sidebar-search-close-light.png");
 }
 
 /* sub menu bg color on hover menu item */

diff --git a/openo-portal/portal-common/src/main/webapp/common/default.html b/openo-portal/portal-common/src/main/webapp/common/default.html
index a26b13f..4c3719e 100644 (file)
--- a/openo-portal/portal-common/src/main/webapp/common/default.html
+++ b/openo-portal/portal-common/src/main/webapp/common/default.html
@@ -26,14 +26,14 @@
                <meta content="zte" name="author" />
                <script type="text/javascript" src="./js/core/const.js"></script>
                <script type="text/javascript" src="./js/core/hk.min.js"></script>      
-               <link href="../component/thirdparty/fakeLoader/fakeLoader.css" rel="stylesheet" type="text/css" />      
-               <script type="text/javascript" src="../component/thirdparty/jquery/jquery-1.10.2.min.js"></script>              
-               <script type="text/javascript" src="../component/thirdparty/fakeLoader/fakeLoader.min.js"></script>                             
-               <link href="../component/thirdparty/font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css" id="font_awesome" />
-               <link href="../component/thirdparty/bootstrap/css/bootstrap.min.css"    rel="stylesheet" type="text/css" />
-               <link href="../component/thirdparty/uniform/css/uniform.default.css"    rel="stylesheet" type="text/css" />
-               <link rel="stylesheet" type="text/css" href="../component/thirdparty/select2/select2.css"/>
-               <link rel="stylesheet" type="text/css" href="../component/thirdparty/select2/select2-custom.css"/>
+               <link href="thirdparty/fakeLoader/fakeLoader.css" rel="stylesheet" type="text/css" />   
+               <script type="text/javascript" src="thirdparty/jquery/jquery-1.10.2.min.js"></script>           
+               <script type="text/javascript" src="thirdparty/fakeLoader/fakeLoader.min.js"></script>                          
+               <link href="thirdparty/font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css" id="font_awesome" />
+               <link href="thirdparty/bootstrap/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
+               <link href="thirdparty/uniform/css/uniform.default.css" rel="stylesheet" type="text/css" />
+               <link rel="stylesheet" type="text/css" href="thirdparty/select2/select2.css"/>
+               <link rel="stylesheet" type="text/css" href="thirdparty/select2/select2-custom.css"/>
         <link href="./css/style-custom.css" rel="stylesheet" type="text/css" />
                <link href="./css/style.css" rel="stylesheet" type="text/css"/>
                <link href="./css/frame-style.css" rel="stylesheet"     type="text/css" />
@@ -41,7 +41,7 @@
                <link href="./css/plugins.css" rel="stylesheet" type="text/css" />
                <link href="" rel="stylesheet" type="text/css" id="style_color" />
                <link href="./css/changepwd.css" rel="stylesheet"       type="text/css" />
-               <link rel="shortcut icon" href="./img/integration/zte_logo_16.gif"      />
+               <link rel="shortcut icon" href="./image/integration/zte_logo_16.gif"    />
                <link rel="stylesheet" type="text/css" href="./css/style.css"/>
                <link rel="stylesheet" type="text/css" href="../component/css/ZteIctIcons/style.css"/>          
        </head>
@@ -53,7 +53,7 @@
                <div class="header navbar navbar-fixed-top mega-menu">
                        <div class="header-inner">
                                <a class="navbar-brand zte-navbar-brand hidden-sm hidden-xs" href="./main-page.html">
-                                       <img id="com_zte_ums_ict_framework_img_netnumenLogo" src="./img/integration/netnumenLogo.png"
+                                       <img id="com_zte_ums_ict_framework_img_netnumenLogo" src="./image/integration/netnumenLogo.png"
                                        name_img="com_zte_ums_ict_framework_img" alt="logo" style="display:none"/>
                                        <span id="com_zte_ums_ict_framework_ui_main_title" name_i18n="com_zte_ums_ict_framework_ui_i18n"
                                        class="zte-brand-text" style="display:none">
@@ -68,7 +68,7 @@
                                <ul class="nav navbar-nav pull-right">
                                        <div>
                                                <a href="javascript:;" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse" onclick="handleMavToggle(this);" navtoggledispattr="hidden">
-                                                       <img src="./img/menu-toggler.png" alt="" />
+                                                       <img src="./image/menu-toggler.png" alt="" />
                                                </a>
                                        </div>
                                        <div class="zte-theme-panel ">
@@ -270,7 +270,7 @@
                                                <a href="#" class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown"
                                                data-close-others="true">
                                                        <span>
-                                                               <img alt="" width=26 height=26 src="./img/user.png"
+                                                               <img alt="" width=26 height=26 src="./image/user.png"
                                                                />
                                                        </span>
                                                        <span class="username" id="currentUser">
@@ -344,7 +344,7 @@
                <div class="modal fade" tabindex="-1" id="changepwdDlg" style="display:none" role="dialog"
                aria-hidden="true">
                        <div class="page-loading page-loading-boxed">
-                               <img src="./img/loading-spinner-grey.gif" alt="" class="loading">
+                               <img src="./image/loading-spinner-grey.gif" alt="" class="loading">
                                <span>
                                        &nbsp;&nbsp;Loading...
                                </span>
@@ -357,7 +357,7 @@
         <div class="modal fade" tabindex="-1" id="aboutDlg" role="dialog"
              aria-hidden="true">
             <div class="page-loading page-loading-boxed">
-                <img src="img/loading-spinner-grey.gif" alt="" class="loading">
+                <img src="image/loading-spinner-grey.gif" alt="" class="loading">
                                <span>
                                        &nbsp;&nbsp;Loading...
                                </span>
@@ -457,33 +457,33 @@
                </script-->
                <!-- 重要! 加载botstrap.min.js之前请先加载jquery-ui-1.10.3.custom.min.js以避免bootstrap的tooltip与jquery
                ui的tooltip发生冲突 -->
-               <!--script type="text/javascript" src="../component/thirdparty/jquery-ui/jquery-ui-1.10.3.custom.min.js">
+               <!--script type="text/javascript" src="thirdparty/jquery-ui/jquery-ui-1.10.3.custom.min.js">
                </script-->
-               <script type="text/javascript" src="../component/thirdparty/bootstrap/js/bootstrap.min.js">
+               <script type="text/javascript" src="thirdparty/bootstrap/js/bootstrap.min.js">
                </script>
-               <script type="text/javascript" src="../component/thirdparty/jquery-validation/js/jquery.validate.min.js">
+               <script type="text/javascript" src="thirdparty/jquery-validation/js/jquery.validate.min.js">
                </script>
-               <script type="text/javascript" src="../component/thirdparty/bootstrap-hover-dropdown/bootstrap-hover-dropdown.min.js">
+               <script type="text/javascript" src="thirdparty/bootstrap-hover-dropdown/bootstrap-hover-dropdown.min.js">
                </script>
-               <script type="text/javascript" src="../component/thirdparty/jquery-blockui/jquery.blockui.min.js">
+               <script type="text/javascript" src="thirdparty/jquery-blockui/jquery.blockui.min.js">
                </script>
-               <script type="text/javascript" src="../component/thirdparty/jquery-cokie/jquery.cokie.min.js">
+               <script type="text/javascript" src="thirdparty/jquery-cokie/jquery.cokie.min.js">
                </script>
-               <script type="text/javascript" src="../component/thirdparty/uniform/jquery.uniform.min.js">
+               <script type="text/javascript" src="thirdparty/uniform/jquery.uniform.min.js">
                </script>
                <!-- 重要! 加载ict-cometd.js之前必须先加载cometd.js和jquery.cometd.js以避免cometd的ict-cometd发生内存溢出
                -->
-               <script type="text/javascript" src="../component/thirdparty/cometd/cometd.js">
+               <script type="text/javascript" src="thirdparty/cometd/cometd.js">
                </script>
-               <script type="text/javascript" src="../component/thirdparty/cometd/jquery/jquery.cometd.js">
+               <script type="text/javascript" src="thirdparty/cometd/jquery/jquery.cometd.js">
                </script>
-               <script type="text/javascript" src="../component/thirdparty/select2/select2.min.js">
+               <script type="text/javascript" src="thirdparty/select2/select2.min.js">
                </script>
-               <script type="text/javascript" src="../component/thirdparty/bootbox/bootbox.min.js">
+               <script type="text/javascript" src="thirdparty/bootbox/bootbox.min.js">
                </script>
                <script src="./js/moreOperation.js"></script>
                <script src="./js/tools.js"></script> 
-               <script type="text/javascript" src="../component/thirdparty/jquery.i18n/jquery.i18n.properties-1.0.9.js">
+               <script type="text/javascript" src="thirdparty/jquery.i18n/jquery.i18n.properties-1.0.9.js">
                </script>
                <script type="text/javascript" src="./js/international/loadi18n.js">
                </script>
@@ -531,7 +531,7 @@
                </script>
                <script type="text/javascript" src="./js/security/changepwd.js">
                </script>
-        <script type="text/javascript" src="../component/thirdparty/data-tables/jquery.dataTables.min.js">
+        <script type="text/javascript" src="thirdparty/data-tables/jquery.dataTables.min.js">
         </script>
         <script src="js/mainpage/about.js"></script>
                <script>

diff --git a/openo-portal/portal-common/src/main/webapp/common/js/core/const.js b/openo-portal/portal-common/src/main/webapp/common/js/core/const.js
index 1dba1f3..5ef2dfe 100644 (file)
--- a/openo-portal/portal-common/src/main/webapp/common/js/core/const.js
+++ b/openo-portal/portal-common/src/main/webapp/common/js/core/const.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 var fMenuSiderDivId = 'page-f-sidebar-menu';
-var ICTFRAME_CONST_SPINNER_GIF_PATH="../../iui/framework/img/loading-spinner-grey.gif";
+var ICTFRAME_CONST_SPINNER_GIF_PATH="../../iui/framework/image/loading-spinner-grey.gif";
 var ICTFRAME_CONST_IFRAME_HEIGHT_AJUST = 10;
 var ICTFRAME_CONST_IFRAME_HEIGHT_AJUST_IE = 5;
 var ICTFRAME_CONST_THEME_COLOR_CSS_PREFFIX = "css/themes/";

diff --git a/openo-portal/portal-common/src/main/webapp/common/js/login.js b/openo-portal/portal-common/src/main/webapp/common/js/login.js
index 6fda212..ee774f2 100644 (file)
--- a/openo-portal/portal-common/src/main/webapp/common/js/login.js
+++ b/openo-portal/portal-common/src/main/webapp/common/js/login.js
@@ -186,9 +186,9 @@ var Login = function () {
             handleForgetPassword();
               
                $.backstretch([
-                       "img/integration/zte_bg_1.jpg",
-                       "img/integration//zte_bg_2.jpg",
-                       "img/integration//zte_bg_3.jpg"
+                       "image/integration/zte_bg_1.jpg",
+                       "image/integration//zte_bg_2.jpg",
+                       "image/integration//zte_bg_3.jpg"
                        ], {
                          fade: 500,
                          duration: 15000

diff --git a/openo-portal/portal-common/src/main/webapp/common/json/main-page.json b/openo-portal/portal-common/src/main/webapp/common/json/main-page.json
index 4b5e169..9e0118a 100644 (file)
--- a/openo-portal/portal-common/src/main/webapp/common/json/main-page.json
+++ b/openo-portal/portal-common/src/main/webapp/common/json/main-page.json
@@ -16,7 +16,7 @@
 {
        "propertiesFileNamePrefix":"web-framework-integration-i18n",
        "productName":"Net Numen ICT",
-       "productImage":"img/integration/zte_logo_white.png",
+       "productImage":"image/integration/zte_logo_white.png",
        "modules":[
                {
                        "cover":"com_zte_ums_ict_framework_main_page_dashboard",

diff --git a/openo-portal/portal-common/src/main/webapp/common/login.html b/openo-portal/portal-common/src/main/webapp/common/login.html
index ad6cafd..1509dff 100644 (file)
--- a/openo-portal/portal-common/src/main/webapp/common/login.html
+++ b/openo-portal/portal-common/src/main/webapp/common/login.html
@@ -22,25 +22,25 @@
 <meta content="width=device-width, initial-scale=1.0" name="viewport"/>
 <meta content="" name="description"/>
 <meta content="" name="author"/>
-<link href="../component/thirdparty/fakeLoader/fakeLoader.css" rel="stylesheet" type="text/css" />
+<link href="thirdparty/fakeLoader/fakeLoader.css" rel="stylesheet" type="text/css" />
 <script> 
    if(top != window){
        top.location.href = location.href;
    }
 </script>
-<link href="../component/thirdparty/font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css"/>
-<link href="../component/thirdparty/bootstrap/css/bootstrap.min.css" rel="stylesheet" type="text/css"/>
-<link href="../component/thirdparty/uniform/css/uniform.default.css" rel="stylesheet" type="text/css"/>
+<link href="thirdparty/font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css"/>
+<link href="thirdparty/bootstrap/css/bootstrap.min.css" rel="stylesheet" type="text/css"/>
+<link href="thirdparty/uniform/css/uniform.default.css" rel="stylesheet" type="text/css"/>
 <link href="./css/style-custom.css" rel="stylesheet" type="text/css"/>
 <link href="./css/style.css" rel="stylesheet" type="text/css"/>
 <link href="./css/style-responsive.css" rel="stylesheet" type="text/css"/>
 <link href="./css/plugins.css" rel="stylesheet" type="text/css"/>
 <link href="./css/login.css" rel="stylesheet" type="text/css"/>
-<link rel="shortcut icon"  href="./img/integration/zte_logo_16.gif"/>
-<script type="text/javascript" src="../component/thirdparty/jquery/jquery-1.10.2.min.js"></script>
+<link rel="shortcut icon"  href="./image/integration/zte_logo_16.gif"/>
+<script type="text/javascript" src="thirdparty/jquery/jquery-1.10.2.min.js"></script>
 <script type="text/javascript" src="./js/core/const.js" ></script>
 <script type="text/javascript" src="./js/security/security.js"></script>
-<script type="text/javascript" src="../component/thirdparty/fakeLoader/fakeLoader.min.js"></script>
+<script type="text/javascript" src="thirdparty/fakeLoader/fakeLoader.min.js"></script>
 <script type="text/javascript" src="./js/core/hk.min.js" ></script>
 <script type="text/javascript" src="./js/tools.js"></script>
 <script type="text/javascript">
@@ -95,8 +95,8 @@ function hidetip(tipid) {
                </script>       
 <div class="logo">
        <a href="./default.html">
-               <img id="com_zte_ums_ict_framework_img_login_logo" src="./img/integration/ztelogo.png" name_img="com_zte_ums_ict_framework_img" style="display:none" alt=""/>
-               <img id="com_zte_ums_ict_framework_img_login_logo_white" src="./img/integration/zte_logo_white.png" name_img="com_zte_ums_ict_framework_img" style="display:none" alt=""/>
+               <img id="com_zte_ums_ict_framework_img_login_logo" src="./image/integration/ztelogo.png" name_img="com_zte_ums_ict_framework_img" style="display:none" alt=""/>
+               <img id="com_zte_ums_ict_framework_img_login_logo_white" src="./image/integration/zte_logo_white.png" name_img="com_zte_ums_ict_framework_img" style="display:none" alt=""/>
        </a>
 </div>
 <div class="content">
@@ -139,7 +139,7 @@ function hidetip(tipid) {
 <div class="download" id="downloadChromeFrame" style="display:none">
     <p id="notice3" i18n-html="com_zte_ums_aos_portal_login_notice_about_chromeFrame"></p>
     <div id="chromeFrameUrl">
-       <image class="browser_logo" src="./img/chrome_icon.png"/>&nbsp;&nbsp;&nbsp;&nbsp;<a href="https://www.google.com/intl/en_US/chrome/browser/" id="chromedown">Chrome</a>&nbsp;&nbsp;&nbsp;&nbsp;<image class="browser_logo" src="./img/firefox_icon.png"/>&nbsp;&nbsp;&nbsp;&nbsp;<a href="http://www.mozilla.org/" id="firefoxdown">Firefox</a>&nbsp;&nbsp;&nbsp;&nbsp;<br/>
+       <image class="browser_logo" src="./image/chrome_icon.png"/>&nbsp;&nbsp;&nbsp;&nbsp;<a href="https://www.google.com/intl/en_US/chrome/browser/" id="chromedown">Chrome</a>&nbsp;&nbsp;&nbsp;&nbsp;<image class="browser_logo" src="./image/firefox_icon.png"/>&nbsp;&nbsp;&nbsp;&nbsp;<a href="http://www.mozilla.org/" id="firefoxdown">Firefox</a>&nbsp;&nbsp;&nbsp;&nbsp;<br/>
     </div>
 </div>
 </center>
@@ -152,15 +152,15 @@ function hidetip(tipid) {
        <script src="/ngict/iui/component/thirdparty/respond/respond.min.js"></script>
        <script src="/ngict/iui/component/thirdparty/excanvas/excanvas.min.js"></script> 
        <![endif]-->
-<script src="../component/thirdparty/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
-<script src="../component/thirdparty/jquery-blockui/jquery.blockui.min.js" type="text/javascript"></script>
-<script src="../component/thirdparty/uniform/jquery.uniform.min.js" type="text/javascript"></script>
-<script src="../component/thirdparty/jquery-validation/js/jquery.validate.min.js" type="text/javascript"></script>
-<script src="../component/thirdparty/backstretch/jquery.backstretch.min.js" type="text/javascript"></script>
+<script src="thirdparty/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
+<script src="thirdparty/jquery-blockui/jquery.blockui.min.js" type="text/javascript"></script>
+<script src="thirdparty/uniform/jquery.uniform.min.js" type="text/javascript"></script>
+<script src="thirdparty/jquery-validation/js/jquery.validate.min.js" type="text/javascript"></script>
+<script src="thirdparty/backstretch/jquery.backstretch.min.js" type="text/javascript"></script>
 <script src="./js/security/aes.js" type="text/javascript"></script>
 <script src="./js/security/framework-util.js" type="text/javascript"></script>
 <script src="./js/login.js" type="text/javascript"></script>
-<script src="../component/thirdparty/jquery.i18n/jquery.i18n.properties-1.0.9.js" type="text/javascript"></script>
+<script src="thirdparty/jquery.i18n/jquery.i18n.properties-1.0.9.js" type="text/javascript"></script>
 <script src="./js/international/loadi18n-login.js" type="text/javascript"></script>
 
 <script>

diff --git a/openo-portal/portal-common/src/main/webapp/common/main-page.html b/openo-portal/portal-common/src/main/webapp/common/main-page.html
index d700a20..d8dc2f7 100644 (file)
--- a/openo-portal/portal-common/src/main/webapp/common/main-page.html
+++ b/openo-portal/portal-common/src/main/webapp/common/main-page.html
@@ -22,17 +22,17 @@
                <meta name="description" content="ICT Main Page" />
                <meta name="keywords" content="javascript, dynamic, grid, layout, jquery plugin, fit zone"/>
                <link rel="stylesheet" type="text/css" href="css/style-ict-bootstrap.css" />
-               <link rel="shortcut icon"  href="img/integration/zte_logo_16.gif"/>
-               <link href="../component/thirdparty/fakeLoader/fakeLoader.css" rel="stylesheet" type="text/css" />
-               <link href="../component/thirdparty/bootstrap/css/bootstrap.min.css" rel="stylesheet"/> 
-               <script type="text/javascript" src="../component/thirdparty/jquery/jquery-1.10.2.min.js"></script>
+               <link rel="shortcut icon"  href="image/integration/zte_logo_16.gif"/>
+               <link href="thirdparty/fakeLoader/fakeLoader.css" rel="stylesheet" type="text/css" />
+               <link href="thirdparty/bootstrap/css/bootstrap.min.css" rel="stylesheet"/>      
+               <script type="text/javascript" src="thirdparty/jquery/jquery-1.10.2.min.js"></script>
                <script type="text/javascript" src="./js/core/const.js"></script>
                <script type="text/javascript" src="./appRes/js/custom.js" ></script>
                <script type="text/javascript" src="./js/core/hk.min.js"></script>
-               <script type="text/javascript" src="../component/thirdparty/fakeLoader/fakeLoader.min.js"></script>                     
+               <script type="text/javascript" src="thirdparty/fakeLoader/fakeLoader.min.js"></script>                  
                <script type="text/javascript" src="js/tools.js"></script>
-               <script type="text/javascript" src="../component/thirdparty/jquery.i18n/jquery.i18n.properties-1.0.9.js"></script>                              
-               <script type="text/javascript" src="../component/thirdparty/jquery-cokie/jquery.cokie.min.js"></script>         
+               <script type="text/javascript" src="thirdparty/jquery.i18n/jquery.i18n.properties-1.0.9.js"></script>                           
+               <script type="text/javascript" src="thirdparty/jquery-cokie/jquery.cokie.min.js"></script>              
                <script type="text/javascript" src="./js/international/loadi18n.js"></script>
                <script type="text/javascript" src="./js/mainpage/ict.main.page.js"></script>           
                <script type="text/javascript" src="./js/core/pym.min.js"></script>

diff --git a/openo-portal/portal-common/src/main/webapp/common/thirdparty/bootstrap-fileinput/css/fileinput.min.css b/openo-portal/portal-common/src/main/webapp/common/thirdparty/bootstrap-fileinput/css/fileinput.min.css
index 42815e9..3d50954 100644 (file)
--- a/openo-portal/portal-common/src/main/webapp/common/thirdparty/bootstrap-fileinput/css/fileinput.min.css
+++ b/openo-portal/portal-common/src/main/webapp/common/thirdparty/bootstrap-fileinput/css/fileinput.min.css
@@ -8,4 +8,4 @@
  * Author: Kartik Visweswaran
  * Year: 2015
  * For more Yii related demos visit http://demos.krajee.com
- */.file-input{overflow-x:auto}.file-loading{top:0;right:0;width:25px;height:25px;font-size:999px;text-align:right;color:#fff;background:transparent url(../img/loading.gif) top left no-repeat;border:none}.btn-file{position:relative;overflow:hidden}.btn-file input[type=file]{position:absolute;top:0;right:0;min-width:100%;min-height:100%;text-align:right;filter:alpha(opacity=0);opacity:0;background:none repeat scroll 0 0 transparent;cursor:inherit;display:block}.file-caption .glyphicon{display:inline-block;min-width:18px;margin-top:2px}.file-caption-name{display:inline-block;overflow:hidden;max-height:20px;padding-right:10px;word-break:break-all}.file-caption-ellipsis{position:absolute;right:10px;margin-top:-6px;font-size:1.2em;display:none;font-weight:700;cursor:default}.kv-has-ellipsis .file-caption-ellipsis{display:inline}.kv-has-ellipsis{padding-right:17px}.kv-search-container .kv-search-clear{position:absolute;padding:10px;right:0}.file-error-message{background-color:#f2dede;color:#a94442;text-align:center;border-radius:5px;padding:5px}.file-error-message pre,.file-error-message ul{margin:5px 0;text-align:left}.file-caption-disabled{background-color:#EEE;cursor:not-allowed;opacity:1}.file-input .btn .disabled,.file-input .btn[disabled]{cursor:not-allowed}.file-preview{border-radius:5px;border:1px solid #ddd;padding:5px;width:100%;margin-bottom:5px}.file-preview-frame{display:table;margin:8px;height:100px;border:1px solid #ddd;box-shadow:1px 1px 5px 0 #a2958a;padding:6px;float:left;text-align:center;vertical-align:middle}.file-preview-frame:hover{box-shadow:3px 3px 5px 0 #333}.file-preview-image{height:160px;vertical-align:text-center}.file-preview-text{width:160px;color:#428bca;font-size:11px;text-align:center}.file-preview-other{padding-top:20px;text-align:center}.file-preview-other i{font-size:2.4em}.file-other-error{width:100%;padding-top:30px;text-align:right}.file-input-ajax-new .fileinput-remove-button,.file-input-ajax-new .fileinput-upload-button,.file-input-new .close,.file-input-new .file-preview,.file-input-new .fileinput-remove-button,.file-input-new .fileinput-upload-button,.file-input-new .glyphicon-file{display:none}.loading{background:transparent url(../img/loading.gif) no-repeat scroll center center content-box!important}.wrap-indicator{font-weight:700;color:#245269;cursor:pointer}.file-actions{text-align:left}.file-footer-buttons{float:right}.file-thumbnail-footer .file-caption-name{padding-top:4px;font-size:11px;color:#777}.file-upload-indicator{padding-top:2px;cursor:default}.file-upload-indicator:hover{font-size:1.2em;font-weight:700;padding-top:0}.file-drop-zone{border:1px dashed #aaa;border-radius:4px;height:100%;text-align:center;vertical-align:middle;margin:12px 15px 12px 12px;padding:5px}.file-drop-zone-title{color:#aaa;font-size:30px;padding:20px 10px}.highlighted{border:2px dashed #999!important;background-color:#f0f0f0}.file-uploading{background-image:url(../img/loading-sm.gif);background-position:center bottom 10px;background-repeat:no-repeat;opacity:.6}.file-icon-large{font-size:1.2em}
\ No newline at end of file
+ */.file-input{overflow-x:auto}.file-loading{top:0;right:0;width:25px;height:25px;font-size:999px;text-align:right;color:#fff;background:transparent url(../image/loading.gif) top left no-repeat;border:none}.btn-file{position:relative;overflow:hidden}.btn-file input[type=file]{position:absolute;top:0;right:0;min-width:100%;min-height:100%;text-align:right;filter:alpha(opacity=0);opacity:0;background:none repeat scroll 0 0 transparent;cursor:inherit;display:block}.file-caption .glyphicon{display:inline-block;min-width:18px;margin-top:2px}.file-caption-name{display:inline-block;overflow:hidden;max-height:20px;padding-right:10px;word-break:break-all}.file-caption-ellipsis{position:absolute;right:10px;margin-top:-6px;font-size:1.2em;display:none;font-weight:700;cursor:default}.kv-has-ellipsis .file-caption-ellipsis{display:inline}.kv-has-ellipsis{padding-right:17px}.kv-search-container .kv-search-clear{position:absolute;padding:10px;right:0}.file-error-message{background-color:#f2dede;color:#a94442;text-align:center;border-radius:5px;padding:5px}.file-error-message pre,.file-error-message ul{margin:5px 0;text-align:left}.file-caption-disabled{background-color:#EEE;cursor:not-allowed;opacity:1}.file-input .btn .disabled,.file-input .btn[disabled]{cursor:not-allowed}.file-preview{border-radius:5px;border:1px solid #ddd;padding:5px;width:100%;margin-bottom:5px}.file-preview-frame{display:table;margin:8px;height:100px;border:1px solid #ddd;box-shadow:1px 1px 5px 0 #a2958a;padding:6px;float:left;text-align:center;vertical-align:middle}.file-preview-frame:hover{box-shadow:3px 3px 5px 0 #333}.file-preview-image{height:160px;vertical-align:text-center}.file-preview-text{width:160px;color:#428bca;font-size:11px;text-align:center}.file-preview-other{padding-top:20px;text-align:center}.file-preview-other i{font-size:2.4em}.file-other-error{width:100%;padding-top:30px;text-align:right}.file-input-ajax-new .fileinput-remove-button,.file-input-ajax-new .fileinput-upload-button,.file-input-new .close,.file-input-new .file-preview,.file-input-new .fileinput-remove-button,.file-input-new .fileinput-upload-button,.file-input-new .glyphicon-file{display:none}.loading{background:transparent url(../image/loading.gif) no-repeat scroll center center content-box!important}.wrap-indicator{font-weight:700;color:#245269;cursor:pointer}.file-actions{text-align:left}.file-footer-buttons{float:right}.file-thumbnail-footer .file-caption-name{padding-top:4px;font-size:11px;color:#777}.file-upload-indicator{padding-top:2px;cursor:default}.file-upload-indicator:hover{font-size:1.2em;font-weight:700;padding-top:0}.file-drop-zone{border:1px dashed #aaa;border-radius:4px;height:100%;text-align:center;vertical-align:middle;margin:12px 15px 12px 12px;padding:5px}.file-drop-zone-title{color:#aaa;font-size:30px;padding:20px 10px}.highlighted{border:2px dashed #999!important;background-color:#f0f0f0}.file-uploading{background-image:url(../image/loading-sm.gif);background-position:center bottom 10px;background-repeat:no-repeat;opacity:.6}.file-icon-large{font-size:1.2em}
\ No newline at end of file