Author: ghuber
Date: Wed Mar 26 08:16:22 2014
New Revision: 1581739
URL: http://svn.apache.org/r1581739
Log:
Place css in correct location.
Modified:
roller/trunk/app/src/main/webapp/WEB-INF/jsps/taglibs-struts2.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/taglibs-struts2.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/taglibs-struts2.jsp?rev=1581739&r1=1581738&r2=1581739&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/taglibs-struts2.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/taglibs-struts2.jsp Wed Mar
26 08:16:22 2014
@@ -23,4 +23,4 @@
<%@ taglib uri="/struts-tags" prefix="s" %>
<%@ taglib uri="http://jakarta.apache.org/taglibs/string-1.1"; prefix="str" %>
-<link rel="stylesheet" type="text/css" href='<s:url
value="/roller-ui/yui/tabview/assets/skins/sam/tabview.css"></s:url>'/>
+<%-- <link rel="stylesheet" type="text/css" href='<s:url
value="/roller-ui/yui/tabview/assets/skins/sam/tabview.css"></s:url>'/> --%>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp?rev=1581739&r1=1581738&r2=1581739&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp Wed Mar 26
08:16:22 2014
@@ -6,14 +6,12 @@ You can override it with your own file v
<link rel="stylesheet" type="text/css" media="all" href="<s:url
value='/roller-ui/yui/reset-fonts-grids/reset-fonts-grids.css'/>" />
<link rel="stylesheet" type="text/css" media="all" href="<s:url
value='/roller-ui/yui/base/base-min.css'/>" />
+<link rel="stylesheet" type="text/css" media="all" href='<s:url
value="/roller-ui/yui/tabview/assets/skins/sam/tabview.css"></s:url>'/>
<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" />
+<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>
-
-
