You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2015/02/04 08:48:13 UTC
[1/4] isis git commit: ISIS-690 'Show all' button for tables.
Repository: isis
Updated Branches:
refs/heads/master e71f1fa5c -> eae15a260
ISIS-690 'Show all' button for tables.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e9c041db
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e9c041db
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e9c041db
Branch: refs/heads/master
Commit: e9c041dbdf0e0f9045cc3c8cf00d8753159fb56d
Parents: d099b31
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Nov 25 23:42:33 2014 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Nov 25 23:42:33 2014 +0100
----------------------------------------------------------------------
.../ajaxtable/IsisAjaxNavigationToolbar.html | 28 ++++++++++++++++++++
.../ajaxtable/IsisAjaxNavigationToolbar.java | 20 +++++++++++++-
2 files changed, 47 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/e9c041db/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.html
new file mode 100644
index 0000000..8854ea7
--- /dev/null
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.html
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<wicket:panel xmlns:wicket="http://wicket.apache.org">
+ <tr class="navigation">
+ <td wicket:id="span">
+ <div class="navigatorLabel">
+ <span wicket:id="navigatorLabel">[navigator-label]</span>
+ <button wicket:id="showAll" type="button" class="btn btn-xs btn-default">Show all</button>
+ </div>
+ <div class="navigator"><div wicket:id="navigator">[navigator]</div></div>
+ </td>
+ </tr>
+</wicket:panel>
http://git-wip-us.apache.org/repos/asf/isis/blob/e9c041db/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.java
index ddf893c..f28b5e0 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.java
@@ -16,6 +16,9 @@
*/
package org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable;
+import org.apache.wicket.MarkupContainer;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxNavigationToolbar;
import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;
@@ -25,8 +28,23 @@ public class IsisAjaxNavigationToolbar extends AjaxNavigationToolbar {
private static final long serialVersionUID = 1L;
- public IsisAjaxNavigationToolbar(DataTable<?, ?> table) {
+ public IsisAjaxNavigationToolbar(final DataTable<?, ?> table) {
super(table);
+
+ addShowAllButton(table);
+ }
+
+ private void addShowAllButton(final DataTable<?, ?> table) {
+ table.setOutputMarkupId(true);
+
+ ((MarkupContainer)get("span")).add(new AjaxLink("showAll") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ table.setItemsPerPage(Long.MAX_VALUE);
+ target.add(table);
+ }
+ });
}
@Override
[4/4] isis git commit: ISIS-690: tiny tweaks to the UI
Posted by da...@apache.org.
ISIS-690: tiny tweaks to the UI
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/eae15a26
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/eae15a26
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/eae15a26
Branch: refs/heads/master
Commit: eae15a260fd9f24ab33e9a862959fb77c3dc8de7
Parents: 69284c6
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Feb 4 07:47:54 2015 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Feb 4 07:47:54 2015 +0000
----------------------------------------------------------------------
.../collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.html | 2 +-
.../apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/eae15a26/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.html
index 8854ea7..604d8de 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.html
@@ -20,7 +20,7 @@
<td wicket:id="span">
<div class="navigatorLabel">
<span wicket:id="navigatorLabel">[navigator-label]</span>
- <button wicket:id="showAll" type="button" class="btn btn-xs btn-default">Show all</button>
+ <button wicket:id="showAll" type="button" class="btn btn-xs btn-link">Show all</button>
</div>
<div class="navigator"><div wicket:id="navigator">[navigator]</div></div>
</td>
http://git-wip-us.apache.org/repos/asf/isis/blob/eae15a26/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 0c096b3..87e6ad9 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
@@ -706,3 +706,8 @@ div.referencePanel.scalarNameAndValueComponentType {
.ui-draggable .modal-header {
cursor: move;
}
+
+.navigatorLabel .btn-link {
+ margin-top: -2px;
+ text-decoration: underline;
+}
\ No newline at end of file
[3/4] isis git commit: ISIS-987: adding some missing javadoc
Posted by da...@apache.org.
ISIS-987: adding some missing javadoc
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/69284c63
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/69284c63
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/69284c63
Branch: refs/heads/master
Commit: 69284c63d605c6e22959909dd12e29a475279521
Parents: 18056c5
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Feb 4 07:34:32 2015 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Feb 4 07:34:32 2015 +0000
----------------------------------------------------------------------
.../isis/applib/services/email/EmailService.java | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/69284c63/core/applib/src/main/java/org/apache/isis/applib/services/email/EmailService.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/email/EmailService.java b/core/applib/src/main/java/org/apache/isis/applib/services/email/EmailService.java
index 0f2f259..0781df3 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/email/EmailService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/email/EmailService.java
@@ -9,14 +9,25 @@ import javax.annotation.PostConstruct;
import org.apache.isis.applib.annotation.Programmatic;
/**
- * TODO ISIS-987 Javadoc
+ * Provides the ability to send emails to one or more recipients.
+ *
+ * <p>
+ * The core framework also provides a default implementation <tt>EmailServiceDefault</tt> that sends email as an
+ * HTML message, using an external SMTP provider. See the Isis website for further details.
+ * </p>
*/
public interface EmailService extends Serializable {
+ /**
+ * Always called by the framework, and allows the implementation to read configuration properties and initialize itself
+ */
@PostConstruct
@Programmatic
public void init() ;
+ /**
+ * Main API to send email and optional attachments.
+ */
@Programmatic
boolean send(List<String> to, List<String> cc, List<String> bcc, String subject, String body, DataSource... attachments);
[2/4] isis git commit: Merge remote-tracking branch
'martin-g/ISIS-690-add-showAll-button-for-tables'
Posted by da...@apache.org.
Merge remote-tracking branch 'martin-g/ISIS-690-add-showAll-button-for-tables'
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/18056c52
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/18056c52
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/18056c52
Branch: refs/heads/master
Commit: 18056c52b3840614bde408a5ee08ac31754c9622
Parents: e71f1fa e9c041d
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Feb 4 07:21:53 2015 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Feb 4 07:21:53 2015 +0000
----------------------------------------------------------------------
.../ajaxtable/IsisAjaxNavigationToolbar.html | 28 ++++++++++++++++++++
.../ajaxtable/IsisAjaxNavigationToolbar.java | 20 +++++++++++++-
2 files changed, 47 insertions(+), 1 deletion(-)
----------------------------------------------------------------------