Author: musachy
Date: Tue Dec 9 11:36:00 2008
New Revision: 724847
URL: http://svn.apache.org/viewvc?rev=724847&view=rev
Log:
WW-2913 fix layout for showcase, tested on FF 3, IE 7 and IE 6. It ain't pretty
but it works.
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/styles/layout-navtop-localleft.css
struts/struts2/trunk/apps/showcase/src/main/webapp/styles/layout.css
struts/struts2/trunk/apps/showcase/src/main/webapp/styles/nav-horizontal.css
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp?rev=724847&r1=724846&r2=724847&view=diff
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
Tue Dec 9 11:36:00 2008
@@ -54,39 +54,38 @@
</div><!-- end header -->
<div id="content" class="clearfix">
-
- <decorator:body/>
-
<div id="nav">
<div class="wrapper">
<h2 class="accessibility">Navigation</h2>
<ul class="clearfix">
- <li><a href="<s:url value="/showcase.jsp"/>">Home</a></li>
- <li><a href="<s:url value="/ajax/index.jsp"/>">Ajax</a></li>
- <li><a href="<s:url value="/chat/index.jsp"/>">Ajax Chat</a></li>
- <li><a href="<s:url action="actionChain1!input"
namespace="/actionchaining" includeParams="none" />">Action Chaining</a></li>
- <li><a href="<s:url action="index" namespace="/config-browser"
includeParams="none" />">Config Browser</a></li>
- <li><a href="<s:url
value="/conversion/index.jsp"/>">Conversion</a></li>
- <li><a href="<s:url value="/empmanager/index.jsp"/>">CRUD</a></li>
- <li><a href="<s:url value="/wait/index.jsp"/>">Execute & Wait</a></li>
- <li><a href="<s:url value="/filedownload/index.jsp"/>">File
Download</a></li>
- <li><a href="<s:url value="/fileupload/index.jsp" />">File
Upload</a></li>
- <li><a href="<s:url value="/freemarker/index.jsp"/>">Freemarker</a>
- <li><a href="<s:url action="hangmanMenu"
namespace="/hangman"/>">Hangman</a></li>
- <li><a href="<s:url value="/jsf/index.jsp"/>">JavaServer Faces</a></li>
- <li><a href="<s:url value="/person/index.jsp"/>">Person
Manager</a></li>
- <li><a href="<s:url value="/tags/index.jsp"/>">Tags</a></li>
- <li><a href="<s:url value="/tiles/index.action" />">Tiles</a></li>
- <li><a href="<s:url value="/token/index.jsp"/>">Token</a></li>
- <li><a href="<s:url
value="/validation/index.jsp"/>">Validation</a></li>
- <li><a href="<s:url value="/interactive/index.jsp"/>">Interactive
Demo</a></li>
- <li class="last"><a href="<s:url value="/help.jsp"/>">Help</a></li>
+ <li><a href="<s:url value="/showcase.jsp"/>">Home</a></li>
+ <li><a href="<s:url
value="/ajax/index.jsp"/>">Ajax</a></li>
+ <li><a href="<s:url value="/chat/index.jsp"/>">Ajax
Chat</a></li>
+ <li><a href="<s:url action="actionChain1!input"
namespace="/actionchaining" includeParams="none" />">Action Chaining</a></li>
+ <li><a href="<s:url action="index"
namespace="/config-browser" includeParams="none" />">Config Browser</a></li>
+ <li><a href="<s:url
value="/conversion/index.jsp"/>">Conversion</a></li>
+ <li><a href="<s:url
value="/empmanager/index.jsp"/>">CRUD</a></li>
+ <li><a href="<s:url value="/wait/index.jsp"/>">Execute &
Wait</a></li>
+ <li><a href="<s:url
value="/filedownload/index.jsp"/>">File Download</a></li>
+ <li><a href="<s:url value="/fileupload/index.jsp" />">File
Upload</a></li>
+ <li><a href="<s:url
value="/freemarker/index.jsp"/>">Freemarker</a>
+ <li><a href="<s:url action="hangmanMenu"
namespace="/hangman"/>">Hangman</a></li>
+ <li><a href="<s:url value="/jsf/index.jsp"/>">JavaServer
Faces</a></li>
+ <li><a href="<s:url
value="/tags/index.jsp"/>">Tags</a></li>
+ <li><a href="<s:url value="/tiles/index.action"
/>">Tiles</a></li>
+ <li><a href="<s:url
value="/token/index.jsp"/>">Token</a></li>
+ <li><a href="<s:url
value="/validation/index.jsp"/>">Validation</a></li>
+ <li><a href="<s:url
value="/interactive/index.jsp"/>">Interactive Demo</a></li>
+ <li><a href="<s:url value="/person/index.jsp"/>">Person
Manager</a></li>
+ <li class="last"><a href="<s:url
value="/help.jsp"/>">Help</a></li>
</ul>
</div>
<hr/>
</div><!-- end nav -->
+ <decorator:body/>
+
</div><!-- end content -->
<div>
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/styles/layout-navtop-localleft.css
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/styles/layout-navtop-localleft.css?rev=724847&r1=724846&r2=724847&view=diff
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/styles/layout-navtop-localleft.css
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/styles/layout-navtop-localleft.css
Tue Dec 9 11:36:00 2008
@@ -7,7 +7,7 @@
position: relative;
width: 98%;
- margin: 5em auto 20px auto;
+ margin: 5px auto 20px auto;
padding: 0;
text-align: left;
@@ -26,8 +26,6 @@
display: none;
}
div#nav {
- position: absolute;
- top: -15px;
left: 0;
width: 100%;
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/styles/layout.css
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/styles/layout.css?rev=724847&r1=724846&r2=724847&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/styles/layout.css
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/styles/layout.css Tue
Dec 9 11:36:00 2008
@@ -27,6 +27,7 @@
background: #818EBD;
text-align: left;
+ height: 70px;
}
div#branding {
float: left;
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/styles/nav-horizontal.css
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/styles/nav-horizontal.css?rev=724847&r1=724846&r2=724847&view=diff
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/styles/nav-horizontal.css
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/styles/nav-horizontal.css
Tue Dec 9 11:36:00 2008
@@ -10,7 +10,6 @@
/* end hide */
}
div#nav div.wrapper {
- position: absolute;
left: 0;
bottom: 0;
width: 100%;
