portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vku...@apache.org
Subject svn commit: r703140 - in /portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade: applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/ components/jetspeed-layout-portlets/src/main/java/org/apache/jetspeed/portlets/layout/ ...
Date Thu, 09 Oct 2008 11:41:06 GMT
Author: vkumar
Date: Thu Oct  9 04:41:05 2008
New Revision: 703140

URL: http://svn.apache.org/viewvc?rev=703140&view=rev
Log:
Fixing jira issue https://issues.apache.org/jira/browse/JS2-863 and updating url of jetspeed
demo's in pluto branch too.

Modified:
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout.vm
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-layout-portlets/src/main/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/xdocs/guides/guide-demo.xml

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout.vm?rev=703140&r1=703139&r2=703140&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout.vm
(original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout.vm
Thu Oct  9 04:41:05 2008
@@ -172,7 +172,7 @@
          ####### Take all fragments and apply style	  
         #if($allowChangePortletDecorator)          
         <div>
-          <input type="hidden" name="fragment" value="">
+          <input type="hidden" name="fragment" value="$myFragment.id">
           <input type="hidden" name="move" value="">
           <input type="hidden" name="remove" value="">
           <label for="decorators">$messages.getString("portal.page.editing.portlet.decorator")</label>

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-layout-portlets/src/main/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-layout-portlets/src/main/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java?rev=703140&r1=703139&r2=703140&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-layout-portlets/src/main/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java
(original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-layout-portlets/src/main/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java
Thu Oct  9 04:41:05 2008
@@ -964,7 +964,8 @@
             if (jsChangeThemeAll != null)
             {
                 String decorators = request.getParameter("decorators");                
-                Iterator fragmentsIter = requestPage.getRootFragment().getFragments().iterator();
+                String fragment_Id = request.getParameter("fragment");
+                Iterator fragmentsIter = requestPage.getFragmentById(fragment_Id).getFragments().iterator();
                 while(fragmentsIter.hasNext())
                 {
                     Fragment fragment = (Fragment) fragmentsIter.next();

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/xdocs/guides/guide-demo.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/xdocs/guides/guide-demo.xml?rev=703140&r1=703139&r2=703140&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/xdocs/guides/guide-demo.xml
(original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/xdocs/guides/guide-demo.xml
Thu Oct  9 04:41:05 2008
@@ -29,8 +29,8 @@
 			<p>To get a quick look at the Jetspeed decorators, themes,
 			<a href="../features.html">functionalities</a>,
 			and the admin interface point your browser to
-			<a href="http://portals.zones.apache.org:8080/jetspeed/portal/">the standard portal
demo</a> or
-			<a href="http://portals.zones.apache.org:8080/jetspeed/desktop/">the web 2.0 desktop
demo</a>.
+			<a href="http://portals.zones.apache.org/jetspeed/portal/">the standard portal demo</a>
or
+			<a href="http://portals.zones.apache.org/jetspeed/desktop/">the web 2.0 desktop
demo</a>.
 			Use the username <i>admin</i> connects using the password <i>j2</i>.
Note: It is probable that
 			someone changes the password therefore we will regenerate the site on a regular basis.
 			</p>



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message