roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r289235 - in /incubator/roller/branches/roller_2.0: src/org/roller/presentation/ web/theme/ web/theme/blue/ web/theme/sun/ web/theme/tan/
Date Thu, 15 Sep 2005 13:56:21 GMT
Author: snoopdave
Date: Thu Sep 15 06:56:10 2005
New Revision: 289235

URL: http://svn.apache.org/viewcvs?rev=289235&view=rev
Log:
Kenneth Kolano's fix for for transparent PNG logo in IE

Removed:
    incubator/roller/branches/roller_2.0/web/theme/sun/logo.gif
    incubator/roller/branches/roller_2.0/web/theme/tan/logo.gif
Modified:
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/MainPageAction.java
    incubator/roller/branches/roller_2.0/web/theme/banner.jsp
    incubator/roller/branches/roller_2.0/web/theme/blue/colors.css
    incubator/roller/branches/roller_2.0/web/theme/roller.css
    incubator/roller/branches/roller_2.0/web/theme/sun/colors.css
    incubator/roller/branches/roller_2.0/web/theme/tan/colors.css

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/MainPageAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/MainPageAction.java?rev=289235&r1=289234&r2=289235&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/MainPageAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/MainPageAction.java Thu
Sep 15 06:56:10 2005
@@ -48,7 +48,10 @@
         req.setAttribute("version",rctx.getRollerVersion());
         req.setAttribute("buildTime",rctx.getRollerBuildTime());
         req.setAttribute("baseURL", rctx.getContextUrl(req));
-        req.setAttribute("data", new MainPageData(req));
+        
+        MainPageData model = new MainPageData(req, res, mapping);
+        req.setAttribute("model", model);
+        req.setAttribute("data", model);
         
         // Determines if register new sers
         boolean allowNewUsers = 
@@ -79,12 +82,16 @@
     /**
      * Page model. 
      */
-    public static class MainPageData 
+    public static class MainPageData extends BasePageModel
     {
         private HttpServletRequest mRequest = null;
         
-        public MainPageData(HttpServletRequest req) 
+        public MainPageData(
+                HttpServletRequest req, 
+                HttpServletResponse res, 
+                ActionMapping mapping) 
         {
+            super("dummyTitleKey", req, res, mapping);
             mRequest = req;
         }
         

Modified: incubator/roller/branches/roller_2.0/web/theme/banner.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/banner.jsp?rev=289235&r1=289234&r2=289235&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/banner.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/theme/banner.jsp Thu Sep 15 06:56:10 2005
@@ -6,10 +6,25 @@
 String logourl = "/theme/" + theme + "/logo.gif";
 request.setAttribute("logourl", logourl);
 %>
+<!--
 <div class="bannerBox">
     <div id="logoshadow">
        <div id="logoimage">
        </div>
     </div>
 </div>
+-->
 
+<div class="bannerBox">
+
+<!-- Transparent PNG fix for IE, thanks to Kenneth M. Kolano -->
+<div id="logoshadow" 
+   style="_background-image:none; filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<c:out
value='${model.baseURL}' />/theme/logo-shadow.png',sizingMethod='crop');">
+   <div id="logobackground">
+      <a href='<c:out value="${model.baseURL}" />/main.do' id="logoimage" 
+         style="_background-image:none; filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<c:out
value='${model.baseURL}' />/theme/transparent-logo.png', sizingMethod='crop');">
+      </a>
+   </div>
+</div>
+
+</div>
\ No newline at end of file

Modified: incubator/roller/branches/roller_2.0/web/theme/blue/colors.css
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/blue/colors.css?rev=289235&r1=289234&r2=289235&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/blue/colors.css (original)
+++ incubator/roller/branches/roller_2.0/web/theme/blue/colors.css Thu Sep 15 06:56:10 2005
@@ -4,6 +4,9 @@
 /* ------------------------------------------------------------------------ */
 /* add colors and images to roller.css */
 
+#logobackground {
+    background: #00038a !important; 
+}
 .bannerBox {
     background: url("two-banner.png") repeat-x top;
 }

Modified: incubator/roller/branches/roller_2.0/web/theme/roller.css
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/roller.css?rev=289235&r1=289234&r2=289235&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/roller.css (original)
+++ incubator/roller/branches/roller_2.0/web/theme/roller.css Thu Sep 15 06:56:10 2005
@@ -516,24 +516,33 @@
 .padleft {
     padding-left: 8px;
 }
-
+.bannerBox {
+    height: 78px;
+    width: 100%;
+    background:#f00;
+}
+/* Transparent PNG fix for IE, thanks to Kenneth M. Kolano */
 #logoshadow {
-    position: absolute;
+    position: relative;
     top: 15px;
-    left: 15px;    
+    left: 15px;
     width: 165px;
     height: 50px;
-    background: url("logo-shadow.png") top left;
-    _background: #600 url("/roller20/theme/spacer.png") repeat;
-    filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/roller20/theme/logo-shadow.png',
sizingMethod='crop');
+    _background: transparent !important;
+    background-image: url(logo-shadow.png); 
+}
+#logobackground {
+    width: 159px;
+    height: 44px;
 }
 #logoimage {
     width: 159px;
-    height: 44px;  
-    background: url("transparent-logo.png") top left;
-    _background: #600 url("/roller20/theme/spacer.png") repeat;
-    filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/roller20/theme/transparent-logo.png',
sizingMethod='crop');
+    height: 44px;
+    display: block;
+    cursor: pointer; /* Make IE show correct cursor for link */
+    background-image: url(transparent-logo.png);
 }
+
 
 
 

Modified: incubator/roller/branches/roller_2.0/web/theme/sun/colors.css
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/sun/colors.css?rev=289235&r1=289234&r2=289235&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/sun/colors.css (original)
+++ incubator/roller/branches/roller_2.0/web/theme/sun/colors.css Thu Sep 15 06:56:10 2005
@@ -4,8 +4,8 @@
 /* ------------------------------------------------------------------------ */
 /* add colors and images to roller.css */
 
-#logoimage {
-    background-color: #e77100;
+#logobackground {
+    background: #e77100 !important; 
 }
 .bannerBox {
     background: url("two-banner.gif") repeat-x top;

Modified: incubator/roller/branches/roller_2.0/web/theme/tan/colors.css
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/tan/colors.css?rev=289235&r1=289234&r2=289235&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/tan/colors.css (original)
+++ incubator/roller/branches/roller_2.0/web/theme/tan/colors.css Thu Sep 15 06:56:10 2005
@@ -4,8 +4,8 @@
 /* ------------------------------------------------------------------------ */
 /* add colors and images to roller.css */
 
-#logoimage {
-    background-color: #ad3431;
+#logobackground {
+    background: #ad3431 !important; 
 }
 .bannerBox {
     background: url("two-banner.gif") repeat-x top;



Mime
View raw message