Author: ivaynberg
Date: Thu Oct 14 15:37:03 2010
New Revision: 1022584
URL: http://svn.apache.org/viewvc?rev=1022584&view=rev
Log:
Issue: WICKET-1779
Modified:
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.html
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/palette.css
Modified:
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.html
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.html?rev=1022584&r1=1022583&r2=1022584&view=diff
==============================================================================
---
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.html
(original)
+++
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.html
Thu Oct 14 15:37:03 2010
@@ -31,10 +31,10 @@
<select wicket:id="choices"
class="choicesSelect">[choices]</select>
</td>
<td class="buttons">
- <button type="button" wicket:id="addButton" class="button
add"><img wicket:id="image" src="add.gif"/></button><br/>
- <button type="button" wicket:id="removeButton" class="button
remove"><img wicket:id="image" src="remove.gif"/></button><br/>
- <button type="button" wicket:id="moveUpButton" class="button
up"><img wicket:id="image" src="up.gif"/></button><br/>
- <button type="button" wicket:id="moveDownButton" class="button
down"><img wicket:id="image" src="down.gif"/></button><br/>
+ <button type="button" wicket:id="addButton" class="button
add"><div/></button><br/>
+ <button type="button" wicket:id="removeButton" class="button
remove"><div/></button><br/>
+ <button type="button" wicket:id="moveUpButton" class="button
up"><div/></button><br/>
+ <button type="button" wicket:id="moveDownButton" class="button
down"><div/></button><br/>
</td>
<td class="pane selection">
<select class="selectionSelect"
wicket:id="selection">[selection]</select>
Modified:
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java?rev=1022584&r1=1022583&r2=1022584&view=diff
==============================================================================
---
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java
(original)
+++
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java
Thu Oct 14 15:37:03 2010
@@ -33,7 +33,6 @@ import org.apache.wicket.markup.html.Web
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.FormComponent;
import org.apache.wicket.markup.html.form.IChoiceRenderer;
-import org.apache.wicket.markup.html.image.Image;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.markup.html.resources.StyleSheetReference;
import org.apache.wicket.model.IModel;
@@ -119,22 +118,6 @@ public class Palette<T> extends Panel im
/** reference to the palette's css resource */
private static final ResourceReference CSS = new
ResourceReference(Palette.class, "palette.css");
-
- /** reference to default up button image */
- private static final ResourceReference UP_IMAGE = new
ResourceReference(Palette.class, "up.gif");
-
- /** reference to default down button image */
- private static final ResourceReference DOWN_IMAGE = new
ResourceReference(Palette.class,
- "down.gif");
-
- /** reference to default remove button image */
- private static final ResourceReference REMOVE_IMAGE = new
ResourceReference(Palette.class,
- "remove.gif");
-
- /** reference to default add button image */
- private static final ResourceReference ADD_IMAGE = new
ResourceReference(Palette.class,
- "add.gif");
-
/**
* @param id
* Component id
@@ -331,7 +314,7 @@ public class Palette<T> extends Panel im
super.onComponentTag(tag);
tag.getAttributes().put("onclick",
Palette.this.getDownOnClickJS());
}
- }.add(new Image("image", DOWN_IMAGE));
+ };
}
/**
@@ -351,7 +334,7 @@ public class Palette<T> extends Panel im
super.onComponentTag(tag);
tag.getAttributes().put("onclick",
Palette.this.getUpOnClickJS());
}
- }.add(new Image("image", UP_IMAGE));
+ };
}
/**
@@ -371,7 +354,7 @@ public class Palette<T> extends Panel im
super.onComponentTag(tag);
tag.getAttributes().put("onclick",
Palette.this.getRemoveOnClickJS());
}
- }.add(new Image("image", REMOVE_IMAGE));
+ };
}
/**
@@ -391,7 +374,7 @@ public class Palette<T> extends Panel im
super.onComponentTag(tag);
tag.getAttributes().put("onclick",
Palette.this.getAddOnClickJS());
}
- }.add(new Image("image", ADD_IMAGE));
+ };
}
/**
@@ -530,7 +513,7 @@ public class Palette<T> extends Panel im
modelChanged();
// call model.setObject()
- ((IModel<Object>) getDefaultModel()).setObject(model);
+ ((IModel<Object>)getDefaultModel()).setObject(model);
}
/**
Modified:
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/palette.css
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/palette.css?rev=1022584&r1=1022583&r2=1022584&view=diff
==============================================================================
---
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/palette.css
(original)
+++
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/palette.css
Thu Oct 14 15:37:03 2010
@@ -49,6 +49,30 @@ table.palette td.buttons button {
height: 40px;
}
+button.button.add div {
+ background: url("add.gif");
+ height: 15px;
+ width: 15px;
+}
+
+button.button.remove div {
+ background: url("remove.gif");
+ height: 15px;
+ width: 15px;
+}
+
+button.button.up div {
+ background: url("up.gif");
+ height: 15px;
+ width: 15px;
+}
+
+button.button.down div {
+ background: url("down.gif");
+ height: 15px;
+ width: 15px;
+}
+
/* Fix a firefox (2.0.0.4) bug :
https://bugzilla.mozilla.org/show_bug.cgi?id=382600 */
select::-moz-dummy-option {
visibility: hidden;
