Author: ktlili
Date: Thu Jan 3 17:47:47 2008
New Revision: 19455
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19455&repname=
=3Djahia
Log:
- fix some layoutmanager bugs
Modified:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/org/jahia/ajax/gwt=
/layoutManager/public/layoutmanager.css
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/layo=
utManager/client/component/dragdrop/DraggableWidget.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/layo=
utManager/client/component/dragdrop/RegisterRowPositionDragHandler.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/layo=
utManager/client/component/dragdrop/TargetVerticalPanel.java
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/org/jahia/aj=
ax/gwt/layoutManager/public/layoutmanager.css
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/conf/java/org/jahia/ajax/gwt/layoutManager/public/lay=
outmanager.css&rev=3D19455&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/org/jahia/ajax/gwt=
/layoutManager/public/layoutmanager.css (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/org/jahia/ajax/gwt=
/layoutManager/public/layoutmanager.css Thu Jan 3 17:47:47 2008
@@ -19,7 +19,7 @@
padding: 3px;
margin: 2px;
font-weight: bold;
- cursor: hand;
+ cursor: move;
width: 120px;
}
=
@@ -31,8 +31,12 @@
=
.layout-manager-box-header {
background: transparent url( top-bottom.gif ) repeat-x scroll 0%;
+ height: 19px;
width: 100%;
- cursor:move;
+}
+
+.layout-manager-box-header-dnd {
+ cursor: move;
}
=
.layout-manager-button {
@@ -102,7 +106,6 @@
color: #15428B;
font-family: tahoma, arial, verdana, sans-serif;
font-weight: bold;
- cursor: default;
font-family: tahoma, arial, verdana, sans-serif;
}
=
@@ -226,7 +229,6 @@
background-position: -15px -45px;
}
=
-
.my-tool-gear {
background-position: 0 -90px;
}
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/gw=
t/layoutManager/client/component/dragdrop/DraggableWidget.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/layoutManager/client/componen=
t/dragdrop/DraggableWidget.java&rev=3D19455&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/layo=
utManager/client/component/dragdrop/DraggableWidget.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/layo=
utManager/client/component/dragdrop/DraggableWidget.java Thu Jan 3 17:47:4=
7 2008
@@ -28,7 +28,7 @@
private final Label removeWidget =3D new Label("");
=
// parent column =
- private VerticalPanel column;
+ private TargetVerticalPanel column;
private int columnIndex;
private int rowIndex;
=
@@ -87,6 +87,7 @@
// set headerLabel
final Label headerLabel =3D new Label(getHeader());
headerLabel.addStyleName("my-cpanel-small-hdr-text");
+ headerLabel.addStyleName("layout-manager-box-header-dnd");
=
// hide header buttons
hideHeaderButtons();
@@ -125,7 +126,7 @@
removeWidget.addStyleName("my-tool");
removeWidget.addStyleName("my-tool-close");
=
- // full screnn
+ // full screen
fullScreenStateLabelWidget.addClickListener(new SetFullScreenState=
DraggableWidgetClickListener(this));
fullScreenStateLabelWidget.addStyleName("my-icon-btn");
fullScreenStateLabelWidget.addStyleName("my-nodrag");
@@ -146,13 +147,13 @@
// east panel
HorizontalPanel eastPanel =3D new HorizontalPanel();
eastPanel.setSpacing(2);
+ eastPanel.add(new Label(""));
eastPanel.add(normalStateLabelWidget);
eastPanel.add(maximizeLabelWidget);
eastPanel.add(fullScreenStateLabelWidget);
eastPanel.add(removeWidget);
headerPanel.add(eastPanel, DockPanel.EAST);
headerPanel.setCellHorizontalAlignment(eastPanel, DockPanel.ALIGN_=
RIGHT);
-
// make draggable
if (isDraggable()) {
if (dragController !=3D null) {
@@ -170,11 +171,11 @@
this.jahiaDndArea =3D jahiaDndArea;
}
=
- public VerticalPanel getColumn() {
+ public TargetVerticalPanel getColumn() {
return column;
}
=
- public void setColumn(VerticalPanel column) {
+ public void setColumn(TargetVerticalPanel column) {
this.column =3D column;
}
=
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/gw=
t/layoutManager/client/component/dragdrop/RegisterRowPositionDragHandler.ja=
va
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/layoutManager/client/componen=
t/dragdrop/RegisterRowPositionDragHandler.java&rev=3D19455&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/layo=
utManager/client/component/dragdrop/RegisterRowPositionDragHandler.java (or=
iginal)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/layo=
utManager/client/component/dragdrop/RegisterRowPositionDragHandler.java Thu=
Jan 3 17:47:47 2008
@@ -37,18 +37,29 @@
// get source
final DraggableWidget sourceDraggableWidget =3D (DraggableWidget) =
event.getSource();
=
-
//get old column
- final VerticalPanel oldColumn =3D sourceDraggableWidget.getColumn(=
);
+ final TargetVerticalPanel oldColumn =3D sourceDraggableWidget.getC=
olumn();
=
// get new column
- final VerticalPanel newColumn =3D (VerticalPanel) event.getDropTar=
get();
+ final TargetVerticalPanel newColumn =3D (TargetVerticalPanel) even=
t.getDropTarget();
+
+ // draggable wiget still in the quickbar
+ if(oldColumn =3D=3D null && newColumn =3D=3D null){
+ return;
+ }
+
+ // same column
+ if(oldColumn !=3D null && newColumn!=3D null){
+ if(oldColumn.getIndex() =3D=3D newColumn.getIndex()){
+ return;
+ }
+ }
=
// create properties list
final List properties =3D new ArrayList();
=
// properties for widget of old column
- if (!JahiaPageUserPropertyHelper.isStatusClosed(sourceDraggableWid=
get.getStatus())) {
+ if (oldColumn !=3D null) {
for (int rowIndex =3D 0; rowIndex < oldColumn.getWidgetCount()=
; rowIndex++) {
Widget w =3D oldColumn.getWidget(rowIndex);
if (w instanceof DraggableWidget) {
@@ -59,18 +70,18 @@
}
}
} else {
- // case of quickbar
- if (!(isQuickbarColumn(newColumn))) {
- sourceDraggableWidget.setStatus(JahiaPageUserPropertyHelpe=
r.getStatusNormaleValue());
- GWTPageUserProperty statusProperty =3D new GWTLayoutManage=
rPageUserProperty(page.getPid(), null, null, JahiaPageUserPropertyHelper.ge=
tBoxStatusPropName(sourceDraggableWidget.getId()), sourceDraggableWidget.ge=
tStatus());
- properties.add(statusProperty);
+ // draggble widgte was in the quickbar
+ if (newColumn !=3D null) {
+ if (newColumn instanceof TargetVerticalPanel) {
+ sourceDraggableWidget.setStatus(JahiaPageUserPropertyH=
elper.getStatusNormaleValue());
+ GWTPageUserProperty statusProperty =3D new GWTLayoutMa=
nagerPageUserProperty(page.getPid(), null, null, JahiaPageUserPropertyHelpe=
r.getBoxStatusPropName(sourceDraggableWidget.getId()), sourceDraggableWidge=
t.getStatus());
+ properties.add(statusProperty);
+ }
}
}
=
sourceDraggableWidget.refreshHeaderVisibility();
=
-
-
// properties for widget of new column
for (int rowIndex =3D 0; rowIndex < newColumn.getWidgetCount(); ro=
wIndex++) {
Widget w =3D newColumn.getWidget(rowIndex);
@@ -98,18 +109,6 @@
log("onDragEnd: " + event);
}
=
- private boolean isQuickbarColumn(VerticalPanel column) {
- if (column !=3D null) {
- String styleName =3D column.getStyleName();
- if (styleName !=3D null) {
- return column.getStyleName().equalsIgnoreCase(QuickBarWidg=
et.QUICKBAR_CONTENT_WIDGET);
- } else {
- return false;
- }
- } else {
- return false;
- }
- }
=
public void onDragStart(DragStartEvent event) {
log("onDragStart: " + event);
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/gw=
t/layoutManager/client/component/dragdrop/TargetVerticalPanel.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/layoutManager/client/componen=
t/dragdrop/TargetVerticalPanel.java&rev=3D19455&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/layo=
utManager/client/component/dragdrop/TargetVerticalPanel.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/layo=
utManager/client/component/dragdrop/TargetVerticalPanel.java Thu Jan 3 17:=
47:47 2008
@@ -41,5 +41,7 @@
dragController.registerDropController(dropController);
}
=
-
+ public int getIndex() {
+ return index;
+ }
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
