[UI] Logo image name

-Logo image name is now generic
labos · May 30, 2013 · 346a8ca · 346a8ca
1 parent ddd27a2
commit 346a8ca
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 5 deletions.
diff --git a/webroot/WEB-INF/jsp/homeNotLogged.jsp b/webroot/WEB-INF/jsp/homeNotLogged.jsp
@@ -20,7 +20,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <jsp:include page="layout/header.jsp"/>
       <div id="home">
-      	<h1><s:text name="title"/></h1>
+      	<h1><s:text name="titleExtended"/></h1>
       	<p><s:text name="homeWelcomeMessage"/>.</p>
       	<p id="home_images">
       	<a href="<s:property value="url_login"/>">

diff --git a/webroot/WEB-INF/jsp/layout/header.jsp b/webroot/WEB-INF/jsp/layout/header.jsp
@@ -71,7 +71,7 @@
       			</div>
       			<h1>
         			<span>
-          				<img src="images/logo_locanda.png" alt="" class="left" height="100%"/>
+          				<img src="images/logo.png" alt="" class="left" height="100%"/>
         			</span>
         			<em>&nbsp;</em>
       			</h1> 

diff --git a/webroot/WEB-INF/jsp/layout/header_menu.jsp b/webroot/WEB-INF/jsp/layout/header_menu.jsp
@@ -72,7 +72,7 @@
 				<h1>
 					<a href="<s:property value="url_home"/>?sect=planner">
 						<span>
-							<img src="images/logo_locanda.png" alt="" class="left" height="100%"/>
+							<img src="images/logo.png" alt="" class="left" height="100%"/>
 						</span>	
 					</a>
 					<em>&nbsp;</em>

diff --git a/webroot/css/screen/basemod_slidingdoor.css b/webroot/css/screen/basemod_slidingdoor.css
@@ -29,8 +29,6 @@ margin-right:15px;
 }
 
 h1 span {
-/*background:url("../../images/logo_locanda_small.png") no-repeat scroll 0 0 transparent;
-/*background-size: contain ;*/
 height:100%;
 margin-top: -45px;
 margin-left: -10px;

diff --git a/webroot/images/logo_locanda.png → webroot/images/logo.png b/webroot/images/logo_locanda.png → webroot/images/logo.png
diff --git a/webroot/images/logo_locanda_small.png b/webroot/images/logo_locanda_small.png
-Original file line number
+Diff line change
@@ Expand Up / @@ -71,7 +71,7 @@ @@
           			</div>
           			<h1>
             			<span>
-              				<img src="images/logo_locanda.png" alt="" class="left" height="100%"/>
+              				<img src="images/logo.png" alt="" class="left" height="100%"/>
             			</span>
             			<em>&nbsp;</em>
           			</h1>
@@ Expand Down @@