Repository: isis Updated Branches: refs/heads/master 8ae1792a8 -> 343c5a2c5
ISIS-537: more styling fixes. Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/343c5a2c Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/343c5a2c Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/343c5a2c Branch: refs/heads/master Commit: 343c5a2c5d1fbf29d7eb7b3ac29d1e4fc0e2eca0 Parents: 8ae1792 Author: Dan Haywood <[email protected]> Authored: Fri Nov 21 15:31:50 2014 +0100 Committer: Dan Haywood <[email protected]> Committed: Fri Nov 21 15:31:50 2014 +0100 ---------------------------------------------------------------------- .../ActionResultResponseType.java | 6 +--- .../additionallinks/AdditionalLinksPanel.css | 3 ++ .../CollectionContentsAsAjaxTablePanel.css | 2 +- .../collections/EntityCollectionsPanel.css | 1 + .../entity/properties/EntityPropertiesPanel.css | 4 --- .../properties/EntityPropertiesPanel.html | 18 ++++++---- .../properties/EntityPropertiesPanel.java | 3 +- .../components/voidreturn/VoidReturnPanel.html | 2 +- .../components/widgets/cssmenu/CssMenuPanel.css | 8 ++--- .../widgets/cssmenu/CssMenuPanel.java | 2 +- .../widgets/cssmenu/CssSubMenuItemsPanel.html | 2 +- .../wicket/ui/pages/bootstrap-overrides.css | 36 +++++++++++--------- .../ui/pages/voidreturn/VoidReturnPage.css | 1 - .../ui/pages/voidreturn/VoidReturnPage.html | 10 ++++-- .../ui/pages/voidreturn/VoidReturnPage.java | 5 --- 15 files changed, 53 insertions(+), 50 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/343c5a2c/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java ---------------------------------------------------------------------- diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java index 357792f..62291f8 100644 --- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java +++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java @@ -19,14 +19,9 @@ package org.apache.isis.viewer.wicket.ui.actionresponse; import java.net.URL; import java.util.Collection; import java.util.List; - import com.google.common.collect.Lists; - import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.request.IRequestHandler; -import org.apache.wicket.request.Url; -import org.apache.wicket.request.cycle.RequestCycle; - import org.apache.isis.applib.value.Blob; import org.apache.isis.applib.value.Clob; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; @@ -70,6 +65,7 @@ public enum ActionResultResponseType { @Override public ActionResultResponse interpretResult(final ActionModel model, final AjaxRequestTarget target, final ObjectAdapter resultAdapter) { ValueModel valueModel = new ValueModel(resultAdapter); + valueModel.setActionHint(model); final ValuePage valuePage = new ValuePage(valueModel); return ActionResultResponse.toPage(valuePage); } http://git-wip-us.apache.org/repos/asf/isis/blob/343c5a2c/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/additionallinks/AdditionalLinksPanel.css ---------------------------------------------------------------------- diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/additionallinks/AdditionalLinksPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/additionallinks/AdditionalLinksPanel.css index c6f721d..67ea0db 100644 --- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/additionallinks/AdditionalLinksPanel.css +++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/additionallinks/AdditionalLinksPanel.css @@ -32,3 +32,6 @@ ul.additionalLinkList { padding-bottom: 10px; } +.entityCollectionsPanel ul.additionalLinkList { + padding-bottom: 0px; +} http://git-wip-us.apache.org/repos/asf/isis/blob/343c5a2c/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.css ---------------------------------------------------------------------- diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.css index 66587b7..964a270 100644 --- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.css +++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.css @@ -86,7 +86,7 @@ } .collectionContentsAsAjaxTablePanel table.contents tbody td:first-child { - min-width: 20px; + width: 30px; } .collectionContentsAsAjaxTablePanel table.contents a:hover { http://git-wip-us.apache.org/repos/asf/isis/blob/343c5a2c/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.css ---------------------------------------------------------------------- diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.css index 4fd45a3..013a4f3 100644 --- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.css +++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.css @@ -34,3 +34,4 @@ height: 0px; } + http://git-wip-us.apache.org/repos/asf/isis/blob/343c5a2c/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.css ---------------------------------------------------------------------- diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.css index 66ea3e5..eaeea17 100644 --- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.css +++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.css @@ -16,7 +16,3 @@ * specific language governing permissions and limitations * under the License. */ -.entityPropertiesPanel .property { - padding-bottom: 0px; - margin-left: -3px; /* adjusting for leading pixels in front of label, to get 15px overall */ -} http://git-wip-us.apache.org/repos/asf/isis/blob/343c5a2c/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.html ---------------------------------------------------------------------- diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.html index e5ff967..ff9128a 100644 --- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.html +++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.html @@ -27,8 +27,10 @@ <div class="inputFormTable properties"> <fieldset wicket:id="memberGroup" class="memberGroup myBlockContainer"> <div class="panel panel-default"> - <div wicket:id="memberGroupName" class="panel-heading">[group name]</div> - <div class="panel-body"> + <div class="panel-heading"> + <div class="panel-title" wicket:id="memberGroupName" >[group name]</div> + </div> + <div class="properties panel-body"> <div wicket:id="properties"> <div wicket:id="property" class="property">[property]</div> </div> @@ -49,8 +51,10 @@ <div class="inputFormTable properties"> <fieldset wicket:id="memberGroup" class="memberGroup myBlockContainer"> <div class="panel panel-default"> - <div wicket:id="memberGroupName" class="panel-heading">[group name]</div> - <div class="panel-body"> + <div class="panel-heading"> + <div class="panel-title" wicket:id="memberGroupName" >[group name]</div> + </div> + <div class="properties panel-body"> <div wicket:id="properties"> <div wicket:id="property" class="property">[property]</div> </div> @@ -63,8 +67,10 @@ <div class="inputFormTable properties"> <fieldset wicket:id="memberGroup" class="memberGroup myBlockContainer"> <div class="panel panel-default"> - <div wicket:id="memberGroupName" class="panel-heading">[group name]</div> - <div class="panel-body"> + <div class="panel-heading"> + <div class="panel-title" wicket:id="memberGroupName" >[group name]</div> + </div> + <div class="properties panel-body"> <div wicket:id="properties"> <div wicket:id="property" class="property">[property]</div> </div> http://git-wip-us.apache.org/repos/asf/isis/blob/343c5a2c/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.java ---------------------------------------------------------------------- diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.java index ac89613..63ad60b 100644 --- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.java +++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.java @@ -23,7 +23,6 @@ import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.viewer.wicket.model.models.EntityModel; import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract; -import org.apache.isis.viewer.wicket.ui.panels.PanelUtil; /** * {@link PanelAbstract Panel} representing the properties of an entity, as per @@ -47,7 +46,7 @@ public class EntityPropertiesPanel extends PanelAbstract<EntityModel> { public void renderHead(IHeaderResponse response) { super.renderHead(response); - PanelUtil.renderHead(response, getClass()); + //PanelUtil.renderHead(response, getClass()); } private void buildGui() { http://git-wip-us.apache.org/repos/asf/isis/blob/343c5a2c/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/voidreturn/VoidReturnPanel.html ---------------------------------------------------------------------- diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/voidreturn/VoidReturnPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/voidreturn/VoidReturnPanel.html index 9aae7b7..bfe4192 100644 --- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/voidreturn/VoidReturnPanel.html +++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/voidreturn/VoidReturnPanel.html @@ -26,7 +26,7 @@ <body> <wicket:panel> <div class="voidReturnPanel voidReturnComponentType"> - <label>No results</label> + <span>No results</span> </div> </wicket:panel> </body> http://git-wip-us.apache.org/repos/asf/isis/blob/343c5a2c/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.css ---------------------------------------------------------------------- diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.css index a967c01..9fc82f4 100644 --- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.css +++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.css @@ -158,7 +158,7 @@ line-height: 30px; padding: 0 10px; font-weight: bold; - font-size: 0.85em; + /*font-size: 0.85em;*/ border-radius: 4px; -moz-border-radius: 4px; -webkit-border-radius: 4px; @@ -211,9 +211,9 @@ display: block; float: left; height: 30px; - line-height: 30px; - padding:0 10px; - font-size:0.85em; + /*line-height: 30px;*/ + padding: 4px 10px 0; + /*font-size:0.85em;*/ border-radius:4px; -moz-border-radius:4px; -webkit-border-radius:4px; http://git-wip-us.apache.org/repos/asf/isis/blob/343c5a2c/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.java ---------------------------------------------------------------------- diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.java index ad0c75a..7717c68 100644 --- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.java +++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.java @@ -81,7 +81,7 @@ public class CssMenuPanel extends PanelAbstract<CssMenuPanel.ListOfCssMenuItemsM super(id, new ListOfCssMenuItemsModel(topLevelMenuItems)); this.styleAppender = new StyleAppender(style); - add(styleAppender); + //add(styleAppender); final RepeatingView menuItemRv = new RepeatingView(CssMenuPanel.ID_MENU_ITEMS); add(menuItemRv); http://git-wip-us.apache.org/repos/asf/isis/blob/343c5a2c/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssSubMenuItemsPanel.html ---------------------------------------------------------------------- diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssSubMenuItemsPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssSubMenuItemsPanel.html index 1ef03c9..9c1e14f 100644 --- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssSubMenuItemsPanel.html +++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssSubMenuItemsPanel.html @@ -22,7 +22,7 @@ <wicket:panel> <ul class="cssSubMenuItemsPanel"> <li wicket:id="subMenuItems" class="cssSubMenuItem"> - <a wicket:id="menuLink" class="btn btn-primary"> + <a wicket:id="menuLink" class="btn btn-primary btn-sm"> <span class="fontAwesomeIcon" wicket:id="menuLinkFontAwesome"></span> <span class="menuLabel" wicket:id="menuLabel">[menu label]</span> </a> http://git-wip-us.apache.org/repos/asf/isis/blob/343c5a2c/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css ---------------------------------------------------------------------- diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css index 8105db2..c7143f3 100644 --- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css +++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css @@ -63,16 +63,16 @@ } -.entityPropertiesPanel .panel-body { - padding-bottom: 0px; +.entityPropertiesPanel .properties.panel-body { + padding-bottom: 5px; } - -.entityCollectionsPanel .viewLinks { - margin-top: -10px; +.entityPropertiesPanel .collection.panel-body { + padding-bottom: 10px; } + .entityCollectionsPanel .additionalLinksAndSelectorDropDown { - margin-top: -2px; + margin-top: -4px; } .collection.panel-body { @@ -117,7 +117,7 @@ div.label-left label.control-label { width: 30%; float: left; padding-top: 2px; - padding-left: 10px; + /*padding-left: 10px;*/ text-align: start; } @@ -178,7 +178,7 @@ div.label-left .choicesPlaceholder { } .form-horizontal.inputForm .form-group { - margin-left: -5px; + margin-left: 0px; margin-right: -25px; } @@ -204,15 +204,17 @@ div.label-left .choicesPlaceholder { font-style: italic; } -/* -not sure if this also needed, but it works... -a.prototype span.menuLabel::before, -a.prototype span.menuLinkLabel::before { - content: "["; +.actionParametersForm .buttons { + padding-top: 20px; } -a.prototype span.menuLabel::after, -a.prototype span.menuLinkLabel::after { - content: "]"; +.entityCollectionsPanel .panel-heading { + padding-bottom: 10px; +} + + + + +#body { + padding-top: 20px; } -*/ \ No newline at end of file http://git-wip-us.apache.org/repos/asf/isis/blob/343c5a2c/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.css ---------------------------------------------------------------------- diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.css index 19d821f..9e3094a 100644 --- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.css +++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.css @@ -22,4 +22,3 @@ clear:both; margin-bottom: 20px; } - \ No newline at end of file http://git-wip-us.apache.org/repos/asf/isis/blob/343c5a2c/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.html ---------------------------------------------------------------------- diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.html index 5f94423..e8fdf3e 100644 --- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.html +++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.html @@ -28,9 +28,15 @@ <div wicket:id="bookmarks"></div> <div class="myBlockContainer"> <div class="iconAndTitle panel panel-default actionPanelHeaderNew"> - <h3 wicket:id="actionName" class="actionName">[action name]</h3> + <div class="panel-heading"> + <div class="panel-title"> + <div wicket:id="actionName" class="actionName">[action name]</div> + </div> + </div> + <div class="panel-body"> + <div wicket:id="voidReturn"></div> + </div> </div> - <div wicket:id="voidReturn"></div> </div> </div> </wicket:extend> http://git-wip-us.apache.org/repos/asf/isis/blob/343c5a2c/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.java ---------------------------------------------------------------------- diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.java index 50b1ce3..313e933 100644 --- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.java +++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.java @@ -19,11 +19,9 @@ package org.apache.isis.viewer.wicket.ui.pages.voidreturn; -import org.apache.wicket.Component; import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.request.mapper.parameter.PageParameters; - import org.apache.isis.viewer.wicket.model.models.ActionModel; import org.apache.isis.viewer.wicket.model.models.VoidModel; import org.apache.isis.viewer.wicket.ui.ComponentType; @@ -39,9 +37,6 @@ public class VoidReturnPage extends PageAbstract { private static final String ID_ACTION_NAME = "actionName"; - /** - * For use with {@link Component#setResponsePage(org.apache.wicket.request.component.IRequestablePage)} - */ public VoidReturnPage(final VoidModel model) { this(model, actionNameFrom(model)); }
