cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r606936 - in /cocoon/trunk/blocks/cocoon-portal: cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/resources/ cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/resources/js/ cocoon-portal-sample/src/main/resources/...
Date Wed, 26 Dec 2007 18:59:07 GMT
Author: cziegeler
Date: Wed Dec 26 10:59:06 2007
New Revision: 606936

URL: http://svn.apache.org/viewvc?rev=606936&view=rev
Log:
Fix resolving portal javascript.

Added:
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/resources/js/
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/resources/js/cocoon-portal.js
      - copied unchanged from r606795, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/resources/cocoon-portal.js
Removed:
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/resources/cocoon-portal.js
Modified:
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/skins/modern/styles/portal-page.xsl

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/sitemap.xmap?rev=606936&r1=606935&r2=606936&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/sitemap.xmap
Wed Dec 26 10:59:06 2007
@@ -341,25 +341,6 @@
         <map:redirect-to uri="login"/>
       </map:match>
       
-      	<!-- ==== P O R T A L   T O O L S ==== -->
-	
-	<!-- mount sitemap of the portal tools -->
-	<map:match pattern="tools/**"> 
-		<map:act type="cauth-is-logged-in">
-			<map:parameter name="application" value="portal"/> 
-			
-			<map:mount uri-prefix="tools" src="tools/sitemap.xmap"/>
-		</map:act>
-	</map:match>
-	
-    <!-- portal tools image reader -->
-	<map:match pattern="toolImages/*/*.jpg">
-		<map:read mime-type="image/jpg" src="tools/skins/{1}/images/{2}.jpg"/>
-	</map:match>
-	<map:match pattern="userImages/*.jpg">
-		<map:read mime-type="image/jpg" src="tools/plugins/userManagement/userImages/{1}.jpg"/>
-	</map:match>
-
       <!-- Everything else redirect to the portal -->
       <map:match pattern="**">
         <map:redirect-to uri="portal"/>

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/skins/modern/styles/portal-page.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/skins/modern/styles/portal-page.xsl?rev=606936&r1=606935&r2=606936&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/skins/modern/styles/portal-page.xsl
(original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/skins/modern/styles/portal-page.xsl
Wed Dec 26 10:59:06 2007
@@ -31,6 +31,7 @@
         <link type="text/css" rel="stylesheet" href="{$rsrcprefix}skin/{$skin}/css/page.css"/>
         <link type="text/css" rel="stylesheet" href="{$rsrcprefix}skin/{$skin}/css/wsrp.css"/>
         <link type="text/css" rel="stylesheet" href="{$rsrcprefix}skin/{$skin}/css/portal-page.css"/>
+        <script src="resources/portal/js/cocoon-portal.js" type="text/javascript"/>
       </head>
       <body>
         <div class="cocoon-portal-header">



Mime
View raw message