Author: agilliland
Date: Tue Jun 5 13:01:57 2007
New Revision: 544615
URL: http://svn.apache.org/viewvc?view=rev&rev=544615
Log:
fixing up UI head includes. we no longer need overlib, only the ajax-head
needs the calendar stuff, and we don't need the struts2 s:head anymore.
Modified:
roller/trunk/apps/weblogger/web/WEB-INF/jsps/tiles/head-ajax.jsp
roller/trunk/apps/weblogger/web/WEB-INF/jsps/tiles/head.jsp
Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/tiles/head-ajax.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/tiles/head-ajax.jsp?view=diff&rev=544615&r1=544614&r2=544615
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/tiles/head-ajax.jsp (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/tiles/head-ajax.jsp Tue Jun 5
13:01:57 2007
@@ -4,28 +4,20 @@
--%>
<%@ 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='<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="<s:url value="/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>
+<script type="text/javascript" src="<s:url
value="/theme/scripts/roller.js"/>"></script>
+<script type="text/javascript" src='<s:url
value="/roller-ui/scripts/calendar.js"/>'></script>
+
+<%-- struts2 head disabled until we need it --%>
+<%-- <s:head theme="ajax"/> --%>
-<s:head theme="ajax"/>
<script type="text/javascript" src="<s:url
value="/roller-ui/scripts/scriptaculous/prototype.js"/>" ></script>
<script type="text/javascript" src="<s:url
value="/roller-ui/scripts/scriptaculous/scriptaculous.js"/>" ></script>
-<script type="text/javascript" src="<s:url
value="/roller-ui/scripts/roller-autocomplete.js"/>" ></script>
\ No newline at end of file
+<script type="text/javascript" src="<s:url
value="/roller-ui/scripts/roller-autocomplete.js"/>" ></script>
Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/tiles/head.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/tiles/head.jsp?view=diff&rev=544615&r1=544614&r2=544615
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/tiles/head.jsp (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/tiles/head.jsp Tue Jun 5
13:01:57 2007
@@ -4,23 +4,11 @@
--%>
<%@ 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='<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="<%= 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>
+<script type="text/javascript" src="<s:url value="/theme/scripts/roller.js"
/>"></script>
