Author: taylor
Date: Wed Oct 28 02:47:19 2009
New Revision: 830425
URL: http://svn.apache.org/viewvc?rev=830425&view=rev
Log:
https://issues.apache.org/jira/browse/JS2-1057
removing some hard coding
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/css/portal.css
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp?rev=830425&r1=830424&r2=830425&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp
Wed Oct 28 02:47:19 2009
@@ -49,8 +49,8 @@
<meta http-equiv="content-type" content="<%=encoding%>"/>
<title><%=jetui.getTitle(rc)%></title>
<link rel="shortcut icon" href="<%=baseUrl%>images/jetspeed.jpg"
type="image/x-icon" />
-<script type="text/javascript"
src="/jetspeed/javascript/yui/build/yui/yui-min.js"></script>
-<link rel="stylesheet" type="text/css" href="/jetspeed/jetui/css/portal.css"/>
+<script type="text/javascript"
src="<%=request.getContextPath()%>/javascript/yui/build/yui/yui-min.js"></script>
+<link rel="stylesheet" type="text/css"
href="<%=request.getContextPath()%>/jetui/css/portal.css"/>
<%=jetui.includeHeaderResources(rc)%>
@@ -168,9 +168,9 @@
</body>
<script language="javascript">
var assetsDir = "assets/";
-var buildDir = "/jetspeed/javascript/yui/build/" ;
-var yuiConfig = {base:"/jetspeed/javascript/yui/build/", timeout: 10000,
debug: true, useBrowserConsole: true}; // ({classNamePrefix: 'jet'})
+var buildDir = "<%=request.getContextPath()%>/javascript/yui/build/" ;
+var yuiConfig = {base:"<%=request.getContextPath()%>/javascript/yui/build/",
timeout: 10000, debug: true, useBrowserConsole: true}; // ({classNamePrefix:
'jet'})
</script>
-<script src="/jetspeed/jetui/engine/portal.js"></script>
+<script src="<%=request.getContextPath()%>/jetui/engine/portal.js"></script>
</html>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/css/portal.css
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/css/portal.css?rev=830425&r1=830424&r2=830425&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/css/portal.css
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/css/portal.css
Wed Oct 28 02:47:19 2009
@@ -16,17 +16,13 @@
border: 1px dotted black;
}
-.jstbMoveMode {
- background: url("/jetspeed/images/portlets/small/x-office-document.png");
-}
-
.jstbToggle1 {
- background:transparent url("/jetspeed/jetui/css/layout_sprite.png")
no-repeat -20px -120px;
+ background:transparent url("layout_sprite.png") no-repeat -20px -120px;
height: 14px;
width: 18px;
}
.jstbToggle2 {
- background:transparent url("/jetspeed/jetui/css/layout_sprite.png")
no-repeat -20px -140px;
+ background:transparent url("layout_sprite.png") no-repeat -20px -140px;
height: 14px;
width: 18px;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
