Author: ludovic
Date: 2007-11-07 19:02:21 +0100 (Wed, 07 Nov 2007)
New Revision: 5705
Modified:
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/AssetDocument.java
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/pages/HistoryPage.java
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/widgets/currikiitem/CurrikiItemHeader.java
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/widgets/currikiitem/CurrikiItemImpl.java
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/widgets/currikiitem/DirectionItem.java
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/style.css
Log:
CURRIKI-891 add a warning to "Remove" function in Currikulum Builder
CURRIKI-1076 Editing CBOE makes expand/collapse triangle disappears.
CURRIKI-1074 Metadata is not displayed while copying CBOE asset
CURRIKI-1081 JS error while copying CBOE
CURRIKI-1072 After Rollback, screen has to be refreshed to see the new version
CURRIKI-929 Admin tool bar overwrite, not pushes down, header of app
Modified:
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/AssetDocument.java
===================================================================
---
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/AssetDocument.java
2007-11-07 17:37:03 UTC (rev 5704)
+++
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/AssetDocument.java
2007-11-07 18:02:21 UTC (rev 5705)
@@ -42,7 +42,7 @@
}
public boolean isDuplicatable() {
- return duplicatable;
+ return duplicatable && !isDirectionBlock();
}
public void setDuplicatable(boolean duplicatable) {
Modified:
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/pages/HistoryPage.java
===================================================================
---
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/pages/HistoryPage.java
2007-11-07 17:37:03 UTC (rev 5704)
+++
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/pages/HistoryPage.java
2007-11-07 18:02:21 UTC (rev 5705)
@@ -233,6 +233,7 @@
editor.setCurrentAssetInvalid(true);
// Tree is invalid when it is a
composite asset that is rolledback
editor.setTreeContentInvalid(true);
+ editor.resetCache();
editor.refreshState();
}
}
Modified:
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/widgets/currikiitem/CurrikiItemHeader.java
===================================================================
---
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/widgets/currikiitem/CurrikiItemHeader.java
2007-11-07 17:37:03 UTC (rev 5704)
+++
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/widgets/currikiitem/CurrikiItemHeader.java
2007-11-07 18:02:21 UTC (rev 5705)
@@ -22,6 +22,7 @@
package org.curriki.gwt.client.widgets.currikiitem;
import com.google.gwt.user.client.ui.*;
+import com.google.gwt.user.client.Window;
import org.curriki.gwt.client.Main;
import org.curriki.gwt.client.Constants;
Modified:
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/widgets/currikiitem/CurrikiItemImpl.java
===================================================================
---
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/widgets/currikiitem/CurrikiItemImpl.java
2007-11-07 17:37:03 UTC (rev 5704)
+++
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/widgets/currikiitem/CurrikiItemImpl.java
2007-11-07 18:02:21 UTC (rev 5705)
@@ -60,7 +60,9 @@
private NextCancelDialog proposeTemplateDuplicationDialog;
private ChoiceDialog proposeEditDuplicationDialog;
+ private NextCancelDialog confirmRemoveDialog;
+
public CurrikiItemImpl(){
init();
}
@@ -394,7 +396,15 @@
}
public void onRemoveClick() {
- Main.getSingleton().getEditor().removeAsset(getIndex());
+ confirmRemoveDialog = new
NextCancelDialog(Main.getTranslation("curriki.editor.confirmremovetitle"),
Main.getTranslation("curriki.editor.confirmremovetext"), "editorconfirmremove",
new AsyncCallback() {
+ public void onFailure(Throwable throwable) {
+ confirmRemoveDialog.hide();
+ }
+ public void onSuccess(Object object) {
+ confirmRemoveDialog.hide();
+ Main.getSingleton().getEditor().removeAsset(getIndex());
+ }
+ });
}
public void onCommentClick() {
Modified:
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/widgets/currikiitem/DirectionItem.java
===================================================================
---
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/widgets/currikiitem/DirectionItem.java
2007-11-07 17:37:03 UTC (rev 5704)
+++
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/widgets/currikiitem/DirectionItem.java
2007-11-07 18:02:21 UTC (rev 5705)
@@ -9,12 +9,14 @@
import com.google.gwt.user.client.ui.TextArea;
import com.google.gwt.user.client.Event;
import com.google.gwt.user.client.DOM;
+import com.google.gwt.user.client.rpc.AsyncCallback;
import com.xpn.xwiki.gwt.api.client.Document;
import com.xpn.xwiki.gwt.api.client.XObject;
import org.curriki.gwt.client.Constants;
import org.curriki.gwt.client.Main;
import org.curriki.gwt.client.pages.EditPage;
import org.curriki.gwt.client.widgets.currikiitem.display.AbstractItemDisplay;
+import org.curriki.gwt.client.widgets.modaldialogbox.NextCancelDialog;
/*
* See the NOTICE file distributed with this work for additional
* information regarding copyright ownership.
@@ -47,6 +49,7 @@
private DockPanel panel = new DockPanel();
private long index = -1;
private boolean selected = false;
+ private NextCancelDialog confirmRemoveDialog;
public DirectionItem(Document doc, String key){
int obj_id =
Integer.valueOf(key.substring(Constants.DIRECTION.length())).intValue();
@@ -176,7 +179,15 @@
}
public void onRemoveClick() {
- Main.getSingleton().getEditor().removeAsset(getIndex());
+ confirmRemoveDialog = new
NextCancelDialog(Main.getTranslation("curriki.editor.confirmremovetitle"),
Main.getTranslation("curriki.editor.confirmremovetext"), "editorconfirmremove",
new AsyncCallback() {
+ public void onFailure(Throwable throwable) {
+ confirmRemoveDialog.hide();
+ }
+ public void onSuccess(Object object) {
+ confirmRemoveDialog.hide();
+ Main.getSingleton().getEditor().removeAsset(getIndex());
+ }
+ });
}
public void onHideClick() {
Modified:
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/style.css
===================================================================
--- xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/style.css
2007-11-07 17:37:03 UTC (rev 5704)
+++ xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/style.css
2007-11-07 18:02:21 UTC (rev 5705)
@@ -3026,9 +3026,6 @@
border: 1px solid #ccc;
border-top: 0;
}
-.item-panel-selected .item-header-collapse {
- display: none;
-}
.item-description {
margin: 10px 0;
}
@@ -4336,4 +4333,7 @@
}
.dialog-help-caption-button {
float: right;
+}
+body.admin {
+ margin-top: 25px;
}
\ No newline at end of file
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
