Author: taylor
Date: Sat Dec 12 20:29:48 2009
New Revision: 889974
URL: http://svn.apache.org/viewvc?rev=889974&view=rev
Log:
https://issues.apache.org/jira/browse/JS2-1084
disabling dragging of detached portlets in /portal mode until scheduled detach
work
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/jetui/layout.vm
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/decorator.vm
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/jetui/layout.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/jetui/layout.vm?rev=889974&r1=889973&r2=889974&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/jetui/layout.vm
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/jetui/layout.vm
Sat Dec 12 20:29:48 2009
@@ -72,7 +72,7 @@
$jetspeed.setCurrentFragment($f)
#if($f.type == "portlet")
## get the decorated Portlet content
- <div id='$f.id' name='$f.name' column='${col}'
row='${row}' class="portal-layout-cell
portal-layout-cell-${layoutType}-${row}-${col}" >
+ <div id='$f.id' locked='$f.isLocked()' name='$f.name'
column='${col}' row='${row}' class="portal-layout-cell
portal-layout-cell-${layoutType}-${row}-${col}" >
#parse($f.decoration.template)
</div>
#else
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/decorator.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/decorator.vm?rev=889974&r1=889973&r2=889974&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/decorator.vm
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/decorator.vm
Sat Dec 12 20:29:48 2009
@@ -37,6 +37,7 @@
$!jetspeed.getTitle($f)
</div>
+#if (!$f.isLocked())
#set($_actions = $decoration.actions)
<div class="PActionBar">
#foreach ($_action in $_actions)
@@ -46,6 +47,7 @@
<span style='cursor: pointer; z-index: 1000;'
id='jetspeed-close-${f.id}' title="close" class="portlet-action-close"><img
src="${request.contextPath}/decorations/portlet/jetspeed/images/close.gif"
alt="Close" border="0" /></span>
#end
</div>
+#end
</div>
#end
#if (!$jetspeed.isHidden($f) && !$hidePortlet &&
$jetspeed.WindowState.toString() != "minimized")
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js?rev=889974&r1=889973&r2=889974&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js
Sat Dec 12 20:29:48 2009
@@ -134,26 +134,36 @@
var draggablePortlets = Y.Node.all(config.portletStyle);
draggablePortlets.each(function(v, k) {
var portlet = new Y.JetUI.Portlet();
- Y.log("portlet = " + v.getAttribute("name") + v.getAttribute("id"));
+ Y.log("portlet = " + v.getAttribute("name") + v.getAttribute("id") +
"locked = " + v.getAttribute("locked"));
portlet.set("name", v.getAttribute("name"));
portlet.set("id", v.getAttribute("id"));
- portlet.set("toolbar", false);
+ portlet.set("toolbar", Boolean(v.getAttribute("locked").toLowerCase()
=== 'true'));
portlet.set("detached", false);
portlet.set("column", v.getAttribute("column"));
portlet.set("row", v.getAttribute("row"));
v.data = portlet;
- var ddNav = new Y.DD.Drag({
- node: v,
- groups: ['portlets'],
- dragMode: 'intersect'
- }).plug(Y.Plugin.DDProxy, {
- moveOnEnd: false
- });
- ddNav.addHandle(config.dragHandleStyle);
- var drop = new Y.DD.Drop({
- node: v,
- groups: ['portlets', 'toolbars']
- });
+ Y.log("toolbar = " + portlet.get("toolbar"));
+ var dragGroups = ['portlets'];
+ var dragMode = 'intersect';
+ var dropGroups = ['portlets', 'toolbars'];
+ if (portlet.get("toolbar") == false) {
+// FIXME: disabling Detachable toolbars until I have time to implement
scheduled
+// groups = ['toolbars'], dragMode = 'point';
+// dropGroups = [];
+// }
+ var ddNav = new Y.DD.Drag({
+ node: v,
+ groups: dragGroups,
+ dragMode: dragMode
+ }).plug(Y.Plugin.DDProxy, {
+ moveOnEnd: false
+ });
+ ddNav.addHandle(config.dragHandleStyle);
+ var drop = new Y.DD.Drop({
+ node: v,
+ groups: dropGroups
+ });
+ }
//portlet.info();
});
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
