You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2005/07/29 14:15:48 UTC
svn commit: r226356 - in /incubator/roller/branches/roller_2.0/web/theme:
footer.jsp header.jsp
Author: snoopdave
Date: Fri Jul 29 05:15:45 2005
New Revision: 226356
URL: http://svn.apache.org/viewcvs?rev=226356&view=rev
Log:
Group blogging UI almost complete
Modified:
incubator/roller/branches/roller_2.0/web/theme/footer.jsp
incubator/roller/branches/roller_2.0/web/theme/header.jsp
Modified: incubator/roller/branches/roller_2.0/web/theme/footer.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/footer.jsp?rev=226356&r1=226355&r2=226356&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/footer.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/theme/footer.jsp Fri Jul 29 05:15:45 2005
@@ -1,25 +1,39 @@
-
- <div id="footer">
-
- <a href="http://www.rollerweblogger.org">
- Powered by Roller Weblogger</a> |
-
- <a href="http://opensource.atlassian.com/projects/roller/Dashboard.jspa">
- <fmt:message key="footer.reportIssue" /></a> |
-
- <a href="http://www.rollerweblogger.org/wiki/Wiki.jsp?page=UserGuide">
- <fmt:message key="footer.userGuide" /></a> |
-
- <a href="http://www.rollerweblogger.org/wiki/Wiki.jsp?page=RollerMacros">
- <fmt:message key="footer.macros" /></a> |
-
- <a href="http://sourceforge.net/mail/?group_id=47722">
- <fmt:message key="footer.mailingLists" /></a>
- </div>
-
-</div> <%-- content --%>
-
-</body>
+
+<br />
+<br />
+
+ <div id="footer" class="clearfix">
+ <a href="http://www.rollerweblogger.org">
+ Powered by Roller Weblogger</a> |
+
+ <a href="http://opensource.atlassian.com/projects/roller/Dashboard.jspa">
+ <fmt:message key="footer.reportIssue" /></a> |
+
+ <a href="http://www.rollerweblogger.org/wiki/Wiki.jsp?page=UserGuide">
+ <fmt:message key="footer.userGuide" /></a> |
+
+ <a href="http://www.rollerweblogger.org/wiki/Wiki.jsp?page=RollerMacros">
+ <fmt:message key="footer.macros" /></a> |
+
+ <a href="http://sourceforge.net/mail/?group_id=47722">
+ <fmt:message key="footer.mailingLists" /></a>
+ </div><!-- end footer -->
+
+</div> <!-- end centercontent -->
+
+<div id="rightcontent">
+ <c:import url="/theme/status.jsp" />
+ <c:if test="${!empty leftPage}">
+ <c:import url="${leftPage}" />
+ </c:if>
+</div>
+
+</div> <!-- end wrapper -->
+
+</body>
</html>
+
<% } catch (Exception e) { e.printStackTrace(); } %>
+
+
Modified: incubator/roller/branches/roller_2.0/web/theme/header.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/header.jsp?rev=226356&r1=226355&r2=226356&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/header.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/theme/header.jsp Fri Jul 29 05:15:45 2005
@@ -5,43 +5,31 @@
<%-- this is included so cached pages can still set contentType --%>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<script type="text/javascript"
- src="<%= request.getContextPath() %>/theme/scripts/roller.js"></script>
+ src="<%= request.getContextPath() %>/theme/scripts/roller.js"></script>
<link rel="stylesheet" type="text/css" media="all"
href="<%= request.getContextPath() %>/theme/layout.css" />
<link rel="stylesheet" type="text/css" media="all"
href="<%= request.getContextPath() %>/theme/roller.css" />
<link rel="stylesheet" type="text/css" media="all"
href="<%= request.getContextPath() %>/theme/menu.css" />
- <link rel="stylesheet" type="text/css" media="all"
- href="<%= request.getContextPath() %>/theme/calendar.css" />
+ <link rel="stylesheet" type="text/css" media="all"
+ href="<%= request.getContextPath() %>/theme/calendar.css" />
<script type="text/javascript"
src="<%= request.getContextPath() %>/tags/calendar.js"></script>
<script type="text/javascript"
src="<%= request.getContextPath() %>/theme/scripts/overlib.js"
- ><!-- overLIB (c) Erik Bosrup --></script>
-</head>
-<body>
- <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>
- <div id="header">
- <roller:NavigationBar />
- <div style="clear:both">
- <roller:Menu model="editor-menu.xml" view="/menu-tabbed.vm" />
- </div>
- </div>
-
- <div id="left" class="left">
- <c:if test="${!empty leftPage}">
- <c:import url="${leftPage}" />
- </c:if>
- </div>
+ ><!-- overLIB (c) Erik Bosrup --></script>
+</head>
+<body>
+
+<div id="wrapper">
+
+<div id="banner">
+</div>
+
+<div id="centercontent">
+
+ <roller:Menu model="editor-menu.xml" view="/menu-tabbed.vm" />
- <div id="content">
- <%
- Roller roller = RollerFactory.getRoller();
- String userName = roller.getUser().getUserName();
- if ( !userName.equals(UserData.ANONYMOUS_USER.getUserName())
- && !userName.equals(UserData.SYSTEM_USER.getUserName())) { %>
- <fmt:message key="mainPage.loggedInAs" /> [<%= userName %>]<br /><br />
- <% } %>
<%@ include file="messages.jsp" %>