You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2018/11/10 17:53:10 UTC
[isis] branch v2 updated: ISIS-2031: further simplify code,
also allow for less prominent css styling of 'took seconds' label
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/v2 by this push:
new e2d3163 ISIS-2031: further simplify code, also allow for less prominent css styling of 'took seconds' label
e2d3163 is described below
commit e2d31635f782f65920f1a5f3f98cb30fd6d78312
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat Nov 10 18:53:04 2018 +0100
ISIS-2031: further simplify code, also allow for less prominent css
styling of 'took seconds' label
Task-Url: https://issues.apache.org/jira/browse/ISIS-2031
---
.../ajaxtable/IsisAjaxNavigationToolbar.html | 2 +-
.../ajaxtable/IsisAjaxNavigationToolbar.java | 11 ++++----
.../ajaxtable/IsisTotalRecordsToolbar.html | 13 +++++-----
.../ajaxtable/IsisTotalRecordsToolbar.java | 21 ++++++++-------
.../ajaxtable/PrototypingMessageProvider.java | 30 ++++++++++++----------
.../viewer/wicket/ui/pages/bootstrap-overrides.css | 4 +++
6 files changed, 46 insertions(+), 35 deletions(-)
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.html b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.html
index 5390d3f..4aa6e44 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.html
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.html
@@ -21,7 +21,7 @@
<div class="navigatorLabel">
<span wicket:id="navigatorLabel">[navigator-label]</span>
<button wicket:id="showAll" type="button" class="btn btn-xs btn-link">Show all</button>
- <span wicket:id="prototyping">[prototyping-message]</span>
+ <span wicket:id="prototypingLabel" class="navigator-prototyping-label">[prototyping-label]</span>
</div>
<div class="navigator"><div wicket:id="navigator">[navigator]</div></div>
</td>
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.java
index ac7bca1..9f39923 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.java
@@ -33,6 +33,7 @@ public class IsisAjaxNavigationToolbar extends AjaxNavigationToolbar {
private static final long serialVersionUID = 1L;
+ private static final String navigatorContainerId = "span";
private static final String ID_SHOW_ALL = "showAll";
private static final String HINT_KEY_SHOW_ALL = "showAll";
private final ObjectAdapterToggleboxColumn toggleboxColumn;
@@ -53,9 +54,9 @@ public class IsisAjaxNavigationToolbar extends AjaxNavigationToolbar {
private void addShowAllButton(final DataTable<?, ?> table) {
table.setOutputMarkupId(true);
- final MarkupContainer span = spanThatContainsNavigatorLabel();
+ final MarkupContainer container = navigatorContainer();
- span.add(new AjaxLink<Void>(ID_SHOW_ALL) {
+ container.add(new AjaxLink<Void>(ID_SHOW_ALL) {
private static final long serialVersionUID = 1L;
@@ -80,12 +81,12 @@ public class IsisAjaxNavigationToolbar extends AjaxNavigationToolbar {
}
});
- span.add(new Label("prototyping", PrototypingMessageProvider.getTookTimingMessageModel()));
+ container.add(new Label("prototypingLabel", PrototypingMessageProvider.getTookTimingMessageModel()));
}
- private MarkupContainer spanThatContainsNavigatorLabel() {
- return ((MarkupContainer)get("span"));
+ private MarkupContainer navigatorContainer() {
+ return ((MarkupContainer)get(navigatorContainerId));
}
void honourHints() {
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisTotalRecordsToolbar.html b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisTotalRecordsToolbar.html
index fa094bc..13f7508 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisTotalRecordsToolbar.html
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisTotalRecordsToolbar.html
@@ -16,11 +16,12 @@
limitations under the License.
-->
<wicket:panel xmlns:wicket="http://wicket.apache.org">
- <tr class="totalrecords-tr">
- <td wicket:id="td" class="totalrecords-td">
- <div class="navigatorLabel">
- <span wicket:id="msg">[total records message]</span>
+ <tr class="navigation">
+ <td wicket:id="navigatorContainer">
+ <div class="navigatorLabel">
+ <span wicket:id="navigatorLabel">[navigator-label]</span>
+ <span wicket:id="prototypingLabel" class="navigator-prototyping-label">[prototyping-label]</span>
</div>
- </td>
- </tr>
+ </td>
+ </tr>
</wicket:panel>
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisTotalRecordsToolbar.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisTotalRecordsToolbar.java
index 103c15a..8532021 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisTotalRecordsToolbar.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisTotalRecordsToolbar.java
@@ -37,6 +37,7 @@ import org.apache.wicket.model.Model;
public class IsisTotalRecordsToolbar extends AbstractToolbar {
private static final long serialVersionUID = 1L;
+ private static final String navigatorContainerId = "navigatorContainer";
public IsisTotalRecordsToolbar(final DataTable<?, ?> table) {
@@ -46,9 +47,8 @@ public class IsisTotalRecordsToolbar extends AbstractToolbar {
@Override
public String getObject() {
- return String.format("Showing all of %d %s",
- table.getRowCount(),
- PrototypingMessageProvider.getTookTimingMessage());
+ return String.format("Showing all of %d",
+ table.getRowCount());
}
});
@@ -64,10 +64,10 @@ public class IsisTotalRecordsToolbar extends AbstractToolbar {
protected IsisTotalRecordsToolbar(final DataTable<?, ?> table, final IModel<String> messageModel) {
super(table);
- WebMarkupContainer td = new WebMarkupContainer("td");
- add(td);
+ WebMarkupContainer container = new WebMarkupContainer(navigatorContainerId);
+ add(container);
- td.add(AttributeModifier.replace("colspan", new IModel<String>()
+ container.add(AttributeModifier.replace("colspan", new IModel<String>()
{
private static final long serialVersionUID = 1L;
@@ -77,17 +77,20 @@ public class IsisTotalRecordsToolbar extends AbstractToolbar {
return String.valueOf(table.getColumns().size()).intern();
}
}));
- td.add(new Label("msg", messageModel));
+ container.add(new Label("navigatorLabel", messageModel));
+ container.add(new Label("prototypingLabel", PrototypingMessageProvider.getTookTimingMessageModel()));
}
/**
- * Only shows this toolbar when there is only one pages (when there is no page navigation)
+ * only shows this toolbar when there is only one page (when page navigation not available),
+ * and when there are at least 6 elements in the list
+ *
*/
@Override
protected void onConfigure() {
super.onConfigure();
- if(getTable().getRowCount() == 0) {
+ if(getTable().getRowCount() <= 5) {
setVisible(false);
return;
}
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/PrototypingMessageProvider.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/PrototypingMessageProvider.java
index 6b6c677..0ed6bc6 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/PrototypingMessageProvider.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/PrototypingMessageProvider.java
@@ -38,7 +38,22 @@ import org.apache.isis.core.runtime.system.context.IsisContext;
*/
class PrototypingMessageProvider {
- public static String getTookTimingMessage() {
+ public static IModel<String> getTookTimingMessageModel() {
+ return new Model<String>() {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public String getObject() {
+ return getTookTimingMessage();
+ }
+
+ };
+ }
+
+ // -- HELPER
+
+ private static String getTookTimingMessage() {
final boolean isPrototyping = IsisContext.getEnvironment()
.getDeploymentCategory().isPrototyping();
@@ -57,17 +72,4 @@ class PrototypingMessageProvider {
return tookTimingMessage.toString();
}
- public static IModel<String> getTookTimingMessageModel() {
- return new Model<String>() {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public String getObject() {
- return getTookTimingMessage();
- }
-
- };
- }
-
}
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
index da16f15..9c706a2 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
@@ -772,6 +772,10 @@ div.referencePanel.scalarNameAndValueComponentType {
text-decoration: underline;
}
+.navigatorLabel .navigator-prototyping-label {
+ color: silver;
+}
+
tr.headers th form input {
margin-left: -8px;
}