Revision: 18477
Author: abogaart
Date: 2009-06-11 12:23:01 +0200 (Thu, 11 Jun 2009)
Log Message:
-----------
OPEN - issue HREPTWO-2658: UI: Paging in the linkpicker is messy
http://issues.onehippo.com/browse/HREPTWO-2658
- Added more space between end-of-list and paging widget
- Aligned paging widget to the right
- Added more height to pickers
Modified Paths:
--------------
hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/AbstractBrowserDialog.java
hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/dialog/AbstractDialog.java
hippo-ecm/trunk/package/config/src/main/resources/cms-pickers.xml
hippo-ecm/trunk/package/skin/src/main/webapp/screen.css
Modified:
hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/AbstractBrowserDialog.java
===================================================================
---
hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/AbstractBrowserDialog.java
2009-06-11 08:34:33 UTC (rev 18476)
+++
hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/AbstractBrowserDialog.java
2009-06-11 10:23:01 UTC (rev 18477)
@@ -106,7 +106,7 @@
@Override
public IValueMap getProperties() {
- return new ValueMap("width=850,height=445");
+ return new ValueMap("width=850,height=485");
}
@Override
Modified:
hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/dialog/AbstractDialog.java
===================================================================
---
hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/dialog/AbstractDialog.java
2009-06-11 08:34:33 UTC (rev 18476)
+++
hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/dialog/AbstractDialog.java
2009-06-11 10:23:01 UTC (rev 18477)
@@ -71,10 +71,10 @@
@SuppressWarnings("unused")
private final static String SVN_ID = "$Id$";
static final Logger log = LoggerFactory.getLogger(AbstractDialog.class);
-
+
protected final static IValueMap SMALL = new
ValueMap("width=380,height=250");
- protected final static IValueMap MEDIUM = new
ValueMap("width=475,height=250");
- protected final static IValueMap LARGE = new
ValueMap("width=855,height=445");
+ protected final static IValueMap MEDIUM = new
ValueMap("width=475,height=375");
+ protected final static IValueMap LARGE = new
ValueMap("width=855,height=450");
@SuppressWarnings("unchecked")
private class Container extends Panel implements IMarkupCacheKeyProvider,
IMarkupResourceStreamProvider {
@@ -117,7 +117,7 @@
+ AbstractDialog.this.getClass().getName()
+ "' not found."
+ " Enable debug messages for
org.apache.wicket.util.resource to get a list of all filenames tried"),
- ex);
+ ex);
}
}
}
@@ -179,7 +179,9 @@
Map<String, String> details = new HashMap<String, String>();
details.put("type", ex.getClass().getName());
details.put("message", ex.getMessage());
- ExceptionLabel label = new ExceptionLabel(id, new
StringResourceModel("exception,${type},${message}", AbstractDialog.this, new
Model((Serializable) details), ex.getLocalizedMessage()), ex,
ExceptionFeedbackPanel.this.getEscapeModelStrings());
+ ExceptionLabel label = new ExceptionLabel(id, new
StringResourceModel("exception,${type},${message}",
+ AbstractDialog.this, new Model((Serializable)
details), ex.getLocalizedMessage()), ex,
+ ExceptionFeedbackPanel.this.getEscapeModelStrings());
return label;
} else {
Label label = new Label(id);
@@ -193,11 +195,13 @@
protected FeedbackMessagesModel newFeedbackMessagesModel() {
return new FeedbackMessagesModel(this) {
private List messages;
+
@Override
protected List processMessages(final List messages) {
this.messages = messages;
return messages;
}
+
@Override
public void detach() {
if (messages == null || messages.size() == 0) {
@@ -218,7 +222,6 @@
private boolean visible;
private boolean enabled;
-
public ButtonWrapper(Button button) {
this.button = button;
visible = button.isVisible();
@@ -268,7 +271,7 @@
}
public Button getButton() {
- if(button == null) {
+ if (button == null) {
button = createButton();
}
return decorate(button);
@@ -325,7 +328,7 @@
}
private final static ResourceReference AJAX_LOADER_GIF = new
ResourceReference(AbstractDialog.class,
- "ajax-loader.gif");
+ "ajax-loader.gif");
protected FeedbackPanel feedback;
private Component focusComponent;
@@ -445,7 +448,7 @@
protected void setOkLabel(IModel label) {
ok.setLabel(label);
}
-
+
protected void setFocusOnOk() {
setFocus(ok.getButton());
}
@@ -470,7 +473,6 @@
setFocus(cancel.getButton());
}
-
public void setDialogService(IDialogService dialogService) {
this.dialogService = dialogService;
}
@@ -548,11 +550,11 @@
}
public Component setFocus(Component c) {
- if(focusComponent != null) {
+ if (focusComponent != null) {
return c;
}
- if(!c.getOutputMarkupId()) {
+ if (!c.getOutputMarkupId()) {
c.setOutputMarkupId(true);
}
return focusComponent = c;
Modified: hippo-ecm/trunk/package/config/src/main/resources/cms-pickers.xml
===================================================================
--- hippo-ecm/trunk/package/config/src/main/resources/cms-pickers.xml
2009-06-11 08:34:33 UTC (rev 18476)
+++ hippo-ecm/trunk/package/config/src/main/resources/cms-pickers.xml
2009-06-11 10:23:01 UTC (rev 18477)
@@ -77,7 +77,7 @@
</sv:property>
<sv:node sv:name="browser.options">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>frontend:plugin</sv:value>
+ <sv:value>frontend:pluginconfig</sv:value>
</sv:property>
<sv:property sv:name="list.page.size" sv:type="String">
<sv:value>4</sv:value>
@@ -214,7 +214,7 @@
</sv:property>
<sv:node sv:name="browser.options">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>frontend:plugin</sv:value>
+ <sv:value>frontend:pluginconfig</sv:value>
</sv:property>
<sv:property sv:name="list.page.size" sv:type="String">
<sv:value>10</sv:value>
@@ -412,7 +412,7 @@
</sv:property>
<sv:node sv:name="browser.options">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>frontend:plugin</sv:value>
+ <sv:value>frontend:pluginconfig</sv:value>
</sv:property>
<sv:property sv:name="list.page.size" sv:type="String">
<sv:value>10</sv:value>
Modified: hippo-ecm/trunk/package/skin/src/main/webapp/screen.css
===================================================================
--- hippo-ecm/trunk/package/skin/src/main/webapp/screen.css 2009-06-11
08:34:33 UTC (rev 18476)
+++ hippo-ecm/trunk/package/skin/src/main/webapp/screen.css 2009-06-11
10:23:01 UTC (rev 18477)
@@ -46,6 +46,7 @@
/* remove the background in dialog windows */
.hippo-window {background: none}
/* Global font setting */
+
.hippo-root,
.hippo-root table tr td,
.hippo-root table tr th {
@@ -311,18 +312,15 @@
/* Wicket Table Paging */
/* ================================================ */
.hippo-list-paging{position: absolute; bottom: 0px; left: 0px; background:
url("images/hippo-paging-back.png") repeat-x left bottom; width: 100%; color:
#afafaf}
-.hippo-list-details tr.hippo-list-paging td{width: 100%; padding: 0px;
border-bottom: 0px;}
-.hippo-list-paging td div{margin-top: 15px; text-align: right; color: #666666}
+.hippo-list-details tr.hippo-list-paging td{width: 630px; text-align: right;}
+.hippo-list-details .hippo-list-paging td{padding: 4px; text-align: center;
border-bottom: 0px; width: 190px;}
-.hippo-list-paging td em,
-.hippo-list-paging td a{text-align: center; color: #909090; border: 1px solid
#afafaf; border-right: 0px; float: left; display: block; width: 22px; height:
16px; padding-top: 6px; padding-bottom: 1px}
+.hippo-list-paging td div{margin-top: 10px; margin-bottom: 2px; width: 100%;}
+.hippo-list-paging td a{padding: 3px; color: #909090; border: 1px solid
#afafaf}
+.hippo-list-paging td span{padding: 3px;}
+.hippo-list-paging td a:hover{background: white; color: black; border: 1px
solid #666666}
+.hippo-list-paging td span em, .hippo-list-paging td a em{font-style: normal}
-.hippo-list-paging td span{display: block; float: left;}
-
-.hippo-list-paging td a:hover{color: black; background: #f2f2f2}
-.hippo-list-paging td span em,
-.hippo-list-paging td a em{font-style: normal}
-
/* Dashboard */
/* ================================================ */
.hippo-perspective-dashboard{padding-top: 23px;}
@@ -523,9 +521,9 @@
/* Picker General Styling */
.hippo-picker{background: url("images/picker-back.png") repeat-y; height:
331px; border-bottom: 1px solid #afafaf}
.hippo-picker-tree{width: 193px; float: left;}
-.hippo-picker-tree .hippo-tree{height: 255px; width: 193px}
-.hippo-picker-list-details{height: 306px; margin-left: 194px; background:
#ffffff url('images/silverBack3.png') repeat-x; width: auto; position:
relative; overflow: auto}
-.hippo-picker-properties{clear:both; height: 35px; padding: 10px;}
+.hippo-picker-tree .hippo-tree{height: 281px; width: 193px}
+.hippo-picker-list-details{height: 331px; margin-left: 194px; background:
#ffffff url('images/silverBack3.png') repeat-x; width: auto; position:
relative; overflow: auto}
+.hippo-picker-properties{clear:both; height: 35px; padding: 10px;
margin-top:25px;}
.hippo-picker .hippo-list-details .hippo-list-paging td{width: 630px;
text-align: right;}
.hippo-picker .hippo-window-form td input{width: 200px}
@@ -540,7 +538,7 @@
*/
.hippo-picker-navigation{background: url("images/silver4.png") repeat-x;
height: 20px; width: 635px; border-bottom: 1px solid #afafaf; margin-left:
194px; padding-top: 2px; padding-bottom: 2px; padding-left: 2px;}
-.hippo-picker-list-details tr.hippo-list-paging td div {margin-top: 10px}
+.hippo-picker-list-details tr.hippo-list-paging td div {margin-bottom: 2px;
margin-top: 10px; width: 100%;}
.hippo-picker-navigation-buttons{background:
url("images/hippo-picker-navigation-back.png") repeat-x;}
.hippo-window-form td div.hippo-picker-navigation-buttons input,
.hippo-picker-navigation-buttons input{float: left; padding: 0px; height: 22px;
width: 24px; font-size: 11px; background:
url("images/hippo-picker-navigation-buttons-back.png") no-repeat;
background-position: 0px -20px; border: none; margin: 0px; text-indent:
-9999px;}
_______________________________________________
Hippocms-svn mailing list
[email protected]
http://lists.hippo.nl/mailman/listinfo/hippocms-svn
