Author: agilliland
Date: Wed May 2 09:47:26 2007
New Revision: 534538
URL: http://svn.apache.org/viewvc?view=rev&rev=534538
Log:
a little clean up on struts2 tiles head.jsp and adding new head-ajax.jsp for
view pages which are going to make use of ajax support from struts2.
Added:
roller/trunk/web/WEB-INF/jsps/tiles/struts2/head-ajax.jsp
Modified:
roller/trunk/web/WEB-INF/jsps/tiles/struts2/head.jsp
Added: roller/trunk/web/WEB-INF/jsps/tiles/struts2/head-ajax.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/tiles/struts2/head-ajax.jsp?view=auto&rev=534538
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/tiles/struts2/head-ajax.jsp (added)
+++ roller/trunk/web/WEB-INF/jsps/tiles/struts2/head-ajax.jsp Wed May 2
09:47:26 2007
@@ -0,0 +1,28 @@
+<%--
+This default stuff goes in the HTML head element of each page
+You can override it with your own file via WEB-INF/tiles-def.xml
+--%>
+<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
+
+<link rel="stylesheet" type="text/css" media="all"
+ href='<s:url value="/roller-ui/styles/layout.css"/>'>
+<link rel="stylesheet" type="text/css" media="all"
+ href='<s:url value="/roller-ui/styles/roller.css"/>'>
+<link rel="stylesheet" type="text/css" media="all"
+ href='<s:url value="/roller-ui/styles/menu.css"/>'>
+<link rel="stylesheet" type="text/css" media="all"
+ href='<s:url value="/roller-ui/styles/calendar.css"/>'>
+
+<link rel="stylesheet" type="text/css" media="all"
+ href="<%= request.getContextPath() %>/roller-ui/theme/<s:property
value="getProp('editor.theme')"/>/colors.css" />
+
+<script type="text/javascript"
+ src="<%= request.getContextPath() %>/theme/scripts/roller.js"></script>
+<script type="text/javascript"
+ src='<s:url value="/roller-ui/scripts/calendar.js"/>'></script>
+<script type="text/javascript"
+ src='<s:url value="/roller-ui/scripts/overlib.js"/>'>
+ <!-- overLIB (c) Erik Bosrup -->
+</script>
+
+<s:head theme="ajax"/>
\ No newline at end of file
Modified: roller/trunk/web/WEB-INF/jsps/tiles/struts2/head.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/tiles/struts2/head.jsp?view=diff&rev=534538&r1=534537&r2=534538
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/tiles/struts2/head.jsp (original)
+++ roller/trunk/web/WEB-INF/jsps/tiles/struts2/head.jsp Wed May 2 09:47:26
2007
@@ -5,13 +5,13 @@
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
<link rel="stylesheet" type="text/css" media="all"
- href='<c:url value="/roller-ui/styles/layout.css"/>'>
+ href='<s:url value="/roller-ui/styles/layout.css"/>'>
<link rel="stylesheet" type="text/css" media="all"
- href='<c:url value="/roller-ui/styles/roller.css"/>'>
+ href='<s:url value="/roller-ui/styles/roller.css"/>'>
<link rel="stylesheet" type="text/css" media="all"
- href='<c:url value="/roller-ui/styles/menu.css"/>'>
+ href='<s:url value="/roller-ui/styles/menu.css"/>'>
<link rel="stylesheet" type="text/css" media="all"
- href='<c:url value="/roller-ui/styles/calendar.css"/>'>
+ href='<s:url value="/roller-ui/styles/calendar.css"/>'>
<link rel="stylesheet" type="text/css" media="all"
href="<%= request.getContextPath() %>/roller-ui/theme/<s:property
value="getProp('editor.theme')"/>/colors.css" />
@@ -19,11 +19,8 @@
<script type="text/javascript"
src="<%= request.getContextPath() %>/theme/scripts/roller.js"></script>
<script type="text/javascript"
- src='<c:url value="/roller-ui/scripts/calendar.js"/>'></script>
+ src='<s:url value="/roller-ui/scripts/calendar.js"/>'></script>
<script type="text/javascript"
- src='<c:url value="/roller-ui/scripts/overlib.js"/>'>
+ src='<s:url value="/roller-ui/scripts/overlib.js"/>'>
<!-- overLIB (c) Erik Bosrup -->
-</script>
-
-
-
+</script>
