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 2014/10/21 07:57:36 UTC
[01/13] git commit: ISIS-537 Add TODOs for updating the javadoc. It
links to a removed Java class
Repository: isis
Updated Branches:
refs/heads/master d11bcaa4e -> 0cc5bb635
ISIS-537 Add TODOs for updating the javadoc. It links to a removed Java class
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/fa9e9d7f
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/fa9e9d7f
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/fa9e9d7f
Branch: refs/heads/master
Commit: fa9e9d7f28120842adf811506fdde92656704714
Parents: d11bcaa
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Oct 20 11:04:52 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Oct 20 11:04:52 2014 +0300
----------------------------------------------------------------------
.../selector/links/CollectionContentsLinksSelectorPanelFactory.java | 1 +
.../entity/selector/links/EntityLinksSelectorPanelFactory.java | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/fa9e9d7f/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/links/CollectionContentsLinksSelectorPanelFactory.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/links/CollectionContentsLinksSelectorPanelFactory.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/links/CollectionContentsLinksSelectorPanelFactory.java
index de0a3bb..6dff6d9 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/links/CollectionContentsLinksSelectorPanelFactory.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/selector/links/CollectionContentsLinksSelectorPanelFactory.java
@@ -34,6 +34,7 @@ import org.apache.isis.viewer.wicket.ui.ComponentType;
* Either this class or {@link CollectionContentsDropDownSelectorPanelFactory} should be
* registered, but not both.
*/
+// TODO mgrigorov: there is no more CollectionContentsDropDownSelectorPanelFactory. Fix the javadoc
public class CollectionContentsLinksSelectorPanelFactory extends ComponentFactoryAbstract {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/isis/blob/fa9e9d7f/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanelFactory.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanelFactory.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanelFactory.java
index 7a9f6d0..32a4c23 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanelFactory.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanelFactory.java
@@ -34,6 +34,7 @@ import org.apache.isis.viewer.wicket.ui.components.entity.EntityComponentFactory
* Either this selector, or {@link EntityDropDownSelectorPanelFactory} should be registered;
* but not both.
*/
+// TODO mgrigorov: EntityDropDownSelectorPanelFactory doesn't seem to exist anymore. Update the javadoc
public class EntityLinksSelectorPanelFactory extends EntityComponentFactoryAbstract {
private static final long serialVersionUID = 1L;
[07/13] git commit: ISIS-537 Make the userName,
Logout and About links non-collapsible,
i.e. they are there in mobile phone view as well
Posted by da...@apache.org.
ISIS-537 Make the userName, Logout and About links non-collapsible, i.e. they are there in mobile phone view as well
This way the fixed top header looks better in desktops and tablets but worse in phones because the fixed top header hides the actual content. TODO improve that further
https://trello.com/c/0ucmwa6s/47-styling-fixes
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/0bf913a8
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/0bf913a8
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/0bf913a8
Branch: refs/heads/master
Commit: 0bf913a84df7a504f23049547d0c3e01a0354893
Parents: 615b43b
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Oct 20 14:34:40 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Oct 20 14:34:40 2014 +0300
----------------------------------------------------------------------
.../widgets/breadcrumbs/BreadcrumbPanel.css | 5 +++--
.../widgets/breadcrumbs/BreadcrumbPanel.html | 12 ++++++------
.../widgets/breadcrumbs/BreadcrumbPanel.java | 9 +++++++++
.../isis/viewer/wicket/ui/pages/PageAbstract.html | 18 ++++++++++--------
.../isis/viewer/wicket/ui/pages/PageAbstract.java | 1 -
.../wicket/ui/pages/bootstrap-overrides.css | 1 +
6 files changed, 29 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/0bf913a8/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.css
index 3fbc5c3..ca156d9 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.css
@@ -17,7 +17,8 @@
* under the License.
*/
-.zeroClipboardPanel .subscribingLink {
- display: none;
+.breadcrumbPanel {
+ display: inline-block;
+ width: 200px;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/0bf913a8/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.html
index bde2826..13d7bdd 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.html
@@ -18,12 +18,12 @@
under the License.
-->
<html xmlns:wicket="http://wicket.apache.org">
- <body>
- <wicket:panel>
- <div class="breadcrumbPanel">
+ <body>
+ <wicket:panel>
+ <span class="breadcrumbPanel">
<input wicket:id="breadcrumbs" type="hidden" class="autoComplete form-control select2-remote" style="width: 100%" />
- </div>
- </wicket:panel>
- </body>
+ </span>
+ </wicket:panel>
+ </body>
</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/0bf913a8/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
index 729c4b0..9efe491 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
@@ -25,6 +25,7 @@ import com.vaynberg.wicket.select2.TextChoiceProvider;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
+import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
@@ -37,6 +38,7 @@ import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistryAccessor;
import org.apache.isis.viewer.wicket.ui.pages.entity.EntityPage;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
+import org.apache.isis.viewer.wicket.ui.panels.PanelUtil;
public class BreadcrumbPanel extends PanelAbstract<IModel<Void>> {
@@ -116,6 +118,13 @@ public class BreadcrumbPanel extends PanelAbstract<IModel<Void>> {
addOrReplace(breadcrumbChoice);
}
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+
+ PanelUtil.renderHead(response, BreadcrumbPanel.class);
+ }
+
// //////////////////////////////////////
protected PageClassRegistry getPageClassRegistry() {
http://git-wip-us.apache.org/repos/asf/isis/blob/0bf913a8/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
index e4d2b0b..4bb9cd3 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
@@ -44,16 +44,18 @@
</button>
<a class="navbar-brand" wicket:id="applicationName"></a>
</div>
+ <div class="navbar-header navbar-right">
+ <form class="navbar-form navbar-left">
+ <span wicket:id="breadcrumbs"></span>
+ </form>
+ <p class="navbar-text"><i class="fa fa-user"></i> <span wicket:id="userName"></span></p>
+ <ul class="nav navbar-nav">
+ <li><a wicket:id="logoutLink" class="navbar-right"><i class="fa fa-sign-out"></i> <wicket:message key="logoutLabel"></wicket:message> </a></li>
+ <li><a wicket:id="aboutLink" class="navbar-right">About</a></li>
+ </ul>
+ </div>
<div class="navbar-collapse app-actions collapse">
<ul class="nav navbar-nav" wicket:id="applicationActions"></ul>
- <ul class="nav navbar-nav navbar-right">
- <p class="navbar-text" wicket:id="userName"></p>
- <li><a wicket:id="logoutLink">Logout</a></li>
- <li><a wicket:id="aboutLink">About</a></li>
- </ul>
- <form class="navbar-form navbar-right">
- <div wicket:id="breadcrumbs" style="width: 200px"></div>
- </form>
</div>
</div>
</header>
http://git-wip-us.apache.org/repos/asf/isis/blob/0bf913a8/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
index a1774f9..d8ea4e2 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
@@ -301,7 +301,6 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
setResponsePage(getSignInPage());
}
};
- logoutLink.setBody(new ResourceModel("logoutLabel"));
themeDiv.add(logoutLink);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/0bf913a8/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 886e498..32cdc0e 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
@@ -68,3 +68,4 @@
}
body { padding-top: 70px; }
+
[05/13] git commit: ISIS-537 Set default datePickerPattern to use
Moment.js formats. Update the javadoc of date picker classes
Posted by da...@apache.org.
ISIS-537 Set default datePickerPattern to use Moment.js formats. Update the javadoc of date picker classes
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/53c00365
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/53c00365
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/53c00365
Branch: refs/heads/master
Commit: 53c00365d770c441a0e548cdf09bb4b62846187f
Parents: e7d76da
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Oct 20 12:36:24 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Oct 20 12:36:24 2014 +0300
----------------------------------------------------------------------
.../wicket/viewer/settings/WicketViewerSettingsDefault.java | 7 ++++---
.../ui/components/scalars/datepicker/DateTimeConfig.java | 2 ++
.../scalars/datepicker/TextFieldWithDatePicker.java | 8 +++++++-
3 files changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/53c00365/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java
index 85200e8..5e01d0b 100644
--- a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java
+++ b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java
@@ -88,12 +88,13 @@ public class WicketViewerSettingsDefault implements WicketViewerSettings {
* The pattern used for rendering dates chosen by the {@link TextFieldWithDatePicker}.
*
* <p>
- * This pattern is different from {@link #getDatePattern()} because it is interpreted by a
- * <a href="http://jqueryui.com/datepicker/">JQuery UI DatePicker</a> component, rather
+ * This pattern is different from {@link #getDatePattern()} because it is interpreted by
+ * <a href="https://github.com/Eonasdan/bootstrap-datetimepicker">Bootstrap Datetime Picker</a> component
+ * that uses <a href="http://momentjs.com/docs/#/parsing/string-format/">Moment.js formats</a>, rather
* than by Java code.
*/
@Override
public String getDatePickerPattern() {
- return getConfiguration().getString("isis.viewer.wicket.datePickerPattern", "dd-MM-yyyy");
+ return getConfiguration().getString("isis.viewer.wicket.datePickerPattern", "DD-MM-YYYY");
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/53c00365/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/DateTimeConfig.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/DateTimeConfig.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/DateTimeConfig.java
index 5a1711b..8d6c18e 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/DateTimeConfig.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/DateTimeConfig.java
@@ -34,6 +34,8 @@ import org.joda.time.format.DateTimeFormatter;
/**
* Configuration holder for all {@link org.apache.isis.viewer.wicket.ui.components.scalars.datepicker.TextFieldWithDatePicker} configurations.
+ * Provides settings for <a href="https://github.com/Eonasdan/bootstrap-datetimepicker">Bootstrap Datetime picker</a>
+ * JavaScript widget
*/
public class DateTimeConfig extends AbstractConfig {
/**
http://git-wip-us.apache.org/repos/asf/isis/blob/53c00365/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDatePicker.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDatePicker.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDatePicker.java
index 7bc7f9a..549c506 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDatePicker.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDatePicker.java
@@ -35,7 +35,13 @@ import org.apache.isis.viewer.wicket.ui.components.scalars.DateConverter;
import static de.agilecoders.wicket.jquery.JQuery.$;
-
+/**
+ * A text input field that is used as a date picker.
+ * It uses <a href="https://github.com/Eonasdan/bootstrap-datetimepicker">Bootstrap Datetime picker</a>
+ * JavaScript widget
+ *
+ * @param <T> The type of the date/time
+ */
public class TextFieldWithDatePicker<T> extends TextField<T> implements IConverter<T> {
private static final long serialVersionUID = 1L;
[10/13] git commit: ISIS-537 Use application wide header contributor
to make sure that Bootstrap's CSS is always contributed first
Posted by da...@apache.org.
ISIS-537 Use application wide header contributor to make sure that Bootstrap's CSS is always contributed first
...so it is possible to override with bootstrap-override.css
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/373e4ed6
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/373e4ed6
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/373e4ed6
Branch: refs/heads/master
Commit: 373e4ed63667d377c9e6fca6cd5559b28434e390
Parents: a3c8f25
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Oct 20 15:45:02 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Oct 20 15:45:02 2014 +0300
----------------------------------------------------------------------
.../viewer/wicket/viewer/IsisWicketApplication.java | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/373e4ed6/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
index 0da6393..706acea 100644
--- a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
+++ b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
@@ -20,6 +20,7 @@
package org.apache.isis.viewer.wicket.viewer;
import de.agilecoders.wicket.core.Bootstrap;
+import de.agilecoders.wicket.core.markup.html.bootstrap.behavior.BootstrapBaseBehavior;
import de.agilecoders.wicket.core.settings.BootstrapSettings;
import de.agilecoders.wicket.core.settings.IBootstrapSettings;
import de.agilecoders.wicket.webjars.WicketWebjars;
@@ -46,6 +47,7 @@ import org.apache.wicket.core.request.mapper.MountedMapper;
import org.apache.wicket.guice.GuiceComponentInjector;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.filter.JavaScriptFilteredIntoFooterHeaderResponse;
+import org.apache.wicket.markup.html.IHeaderContributor;
import org.apache.wicket.markup.html.IHeaderResponseDecorator;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.request.cycle.IRequestCycleListener;
@@ -312,8 +314,16 @@ public class IsisWicketApplication extends AuthenticatedWebApplication implement
}
protected void configureWicketBootstrap() {
- IBootstrapSettings settings = new BootstrapSettings();
+ final IBootstrapSettings settings = new BootstrapSettings();
Bootstrap.install(this, settings);
+
+ getHeaderContributorListenerCollection().add(new IHeaderContributor() {
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ BootstrapBaseBehavior bootstrapBaseBehavior = new BootstrapBaseBehavior();
+ bootstrapBaseBehavior.renderHead(settings, response);
+ }
+ });
}
// //////////////////////////////////////
[06/13] git commit: ISIS-537 Use "panel panel-default" for
EntityPropertiesPanel's member groups
Posted by da...@apache.org.
ISIS-537 Use "panel panel-default" for EntityPropertiesPanel's member groups
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/615b43bc
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/615b43bc
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/615b43bc
Branch: refs/heads/master
Commit: 615b43bc09c1035d5c3b169cb9f74b8bfe85d9a6
Parents: 53c0036
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Oct 20 12:38:38 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Oct 20 12:38:38 2014 +0300
----------------------------------------------------------------------
.../ui/components/entity/properties/EntityPropertiesPanel.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/615b43bc/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 2b08c71..3fd23a6 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
@@ -46,7 +46,7 @@
<div wicket:id="middleColumn">
<div class="inputFormTable properties">
<fieldset wicket:id="memberGroup" class="memberGroup myBlockContainer panel panel-default">
- <div class="DANH-REMOVE-panel">
+ <div class="panel panel-default">
<div wicket:id="memberGroupName" class="panel-heading">[group name]</div>
<div wicket:id="properties" class="panel-body">
<div wicket:id="property" class="property">[property]</div>
[09/13] git commit: ISIS-537 Table headers should be bold
Posted by da...@apache.org.
ISIS-537 Table headers should be bold
https://trello.com/c/5d9CtTpb/54-spacing-alignment-headers-vs-body-font
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/a3c8f251
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/a3c8f251
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/a3c8f251
Branch: refs/heads/master
Commit: a3c8f25101357663e222bdc5c4f67245d2af3a81
Parents: 2e8aee8
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Oct 20 15:04:02 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Oct 20 15:04:02 2014 +0300
----------------------------------------------------------------------
.../collectioncontents/ajaxtable/IsisAjaxHeadersToolbar.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/a3c8f251/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxHeadersToolbar.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxHeadersToolbar.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxHeadersToolbar.html
index 0b6c27e..5f8ddf4 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxHeadersToolbar.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxHeadersToolbar.html
@@ -20,7 +20,7 @@
<wicket:container wicket:id="headers">
<th wicket:id="header">
<div>
- <span wicket:id="label">[header-label]</span> <span wicket:id="sortIcon" style="float: right"></span>
+ <strong wicket:id="label">[header-label]</strong> <span wicket:id="sortIcon" style="float: right"></span>
</div>
</th>
</wicket:container>
[11/13] git commit: ISIS-537 Introduce
BootstrapOverridesCssResourceReference - a CSS reference that contributes
Isis' overrides of Bootstrap CSS rules
Posted by da...@apache.org.
ISIS-537 Introduce BootstrapOverridesCssResourceReference - a CSS reference that contributes Isis' overrides of Bootstrap CSS rules
The reference could be used by application overrides as a dependency
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/cf1e505f
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/cf1e505f
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/cf1e505f
Branch: refs/heads/master
Commit: cf1e505f173746ac7970afd5c4c5f034c2664d27
Parents: 373e4ed
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Oct 20 15:49:34 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Oct 20 15:49:34 2014 +0300
----------------------------------------------------------------------
.../BootstrapOverridesCssResourceReference.java | 15 +++++++++++++++
.../isis/viewer/wicket/ui/pages/PageAbstract.java | 6 +-----
2 files changed, 16 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/cf1e505f/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/BootstrapOverridesCssResourceReference.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/BootstrapOverridesCssResourceReference.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/BootstrapOverridesCssResourceReference.java
new file mode 100644
index 0000000..1a464b0
--- /dev/null
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/BootstrapOverridesCssResourceReference.java
@@ -0,0 +1,15 @@
+package org.apache.isis.viewer.wicket.ui.pages;
+
+import org.apache.wicket.request.resource.CssResourceReference;
+
+/**
+ * A CSS resource reference that provides CSS rules which override the CSS rules
+ * provided by the currently active Bootstrap theme.
+ * Usually the overrides rules are about sizes and weights, but should not change any colors
+ */
+public class BootstrapOverridesCssResourceReference extends CssResourceReference {
+
+ public BootstrapOverridesCssResourceReference() {
+ super(BootstrapOverridesCssResourceReference.class, "bootstrap-overrides.css");
+ }
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/cf1e505f/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
index d8ea4e2..4bb7630 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
@@ -19,7 +19,6 @@
package org.apache.isis.viewer.wicket.ui.pages;
-import de.agilecoders.wicket.core.markup.html.bootstrap.behavior.BootstrapBaseBehavior;
import de.agilecoders.wicket.core.markup.html.references.BootlintJavaScriptReference;
import de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesomeCssReference;
@@ -51,7 +50,6 @@ import org.apache.wicket.protocol.http.ClientProperties;
import org.apache.wicket.protocol.http.WebSession;
import org.apache.wicket.protocol.http.request.WebClientInfo;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.wicket.request.resource.CssResourceReference;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -191,8 +189,6 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
// ensure that all collected JavaScript contributions are loaded at the page footer
add(new HeaderResponseContainer("footerJS", "footerJS"));
- BootstrapBaseBehavior.addTo(this);
-
} catch(RuntimeException ex) {
LOG.error("Failed to construct page, going back to sign in page", ex);
@@ -257,7 +253,7 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
response.render(new PriorityHeaderItem(JavaScriptHeaderItem.forReference(getApplication().getJavaScriptLibrarySettings().getJQueryReference())));
response.render(CssHeaderItem.forReference(FontAwesomeCssReference.instance()));
- response.render(CssHeaderItem.forReference(new CssResourceReference(PageAbstract.class, "bootstrap-overrides.css")));
+ response.render(CssHeaderItem.forReference(new BootstrapOverridesCssResourceReference()));
PanelUtil.renderHead(response, PageAbstract.class);
response.render(JavaScriptReferenceHeaderItem.forReference(JQUERY_LIVEQUERY_JS));
[03/13] git commit: ISIS-537 Fix the date pattern to match the format
used by Moment.js. JQueryUI is no more used
Posted by da...@apache.org.
ISIS-537 Fix the date pattern to match the format used by Moment.js. JQueryUI is no more used
https://trello.com/c/GuDB2Lmp/53-date-widget-broken
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/a1e8a159
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/a1e8a159
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/a1e8a159
Branch: refs/heads/master
Commit: a1e8a1593a79a8cfbd03360ecf0ecb74540204cb
Parents: 28f37f5
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Oct 20 12:01:33 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Oct 20 12:01:33 2014 +0300
----------------------------------------------------------------------
.../viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/a1e8a159/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java
index e577e54..85200e8 100644
--- a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java
+++ b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java
@@ -94,6 +94,6 @@ public class WicketViewerSettingsDefault implements WicketViewerSettings {
*/
@Override
public String getDatePickerPattern() {
- return getConfiguration().getString("isis.viewer.wicket.datePickerPattern", "dd-mm-yy");
+ return getConfiguration().getString("isis.viewer.wicket.datePickerPattern", "dd-MM-yyyy");
}
}
[04/13] git commit: ISIS-537 Optimize imports of
DateConverterForJavaSqlTimestamp
Posted by da...@apache.org.
ISIS-537 Optimize imports of DateConverterForJavaSqlTimestamp
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e7d76da5
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e7d76da5
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e7d76da5
Branch: refs/heads/master
Commit: e7d76da5a9f8822518682dff2e21b205fa34686b
Parents: a1e8a15
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Oct 20 12:02:50 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Oct 20 12:02:50 2014 +0300
----------------------------------------------------------------------
.../scalars/jdkdates/DateConverterForJavaSqlTimestamp.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/e7d76da5/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlTimestamp.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlTimestamp.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlTimestamp.java
index 43ec161..9e59c93 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlTimestamp.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlTimestamp.java
@@ -20,7 +20,6 @@ package org.apache.isis.viewer.wicket.ui.components.scalars.jdkdates;
import java.text.ParseException;
import java.util.Calendar;
-import java.util.Date;
import java.util.Locale;
import org.apache.wicket.util.convert.ConversionException;
@@ -71,4 +70,4 @@ public class DateConverterForJavaSqlTimestamp extends DateConverterForJavaAbstra
return adjusted;
}
-}
\ No newline at end of file
+}
[12/13] git commit: ISIS-537 Use bigger padding-top for the body
because otherwise the page content is hidden behind the static top header
Posted by da...@apache.org.
ISIS-537 Use bigger padding-top for the body because otherwise the page content is hidden behind the static top header
<label> should not be bold because it is used in table cells
https://trello.com/c/5d9CtTpb/54-spacing-alignment-headers-vs-body-font
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/00f8d5ce
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/00f8d5ce
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/00f8d5ce
Branch: refs/heads/master
Commit: 00f8d5ce456b84eeaad8f90f86890f514303561a
Parents: cf1e505
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Oct 20 15:51:22 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Oct 20 15:51:22 2014 +0300
----------------------------------------------------------------------
.../apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/00f8d5ce/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 32cdc0e..dfe480b 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
@@ -67,5 +67,8 @@
margin: 0;
}
-body { padding-top: 70px; }
+body { padding-top: 161px; }
+label {
+ font-weight: normal;
+}
[02/13] git commit: ISIS-537 Use Bootstrap Alert for feedback
messages. Show red asterisk for mandatory fields
Posted by da...@apache.org.
ISIS-537 Use Bootstrap Alert for feedback messages. Show red asterisk for mandatory fields
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/28f37f5f
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/28f37f5f
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/28f37f5f
Branch: refs/heads/master
Commit: 28f37f5ff3bfef0064ba7815d0e8e01c5b39065a
Parents: fa9e9d7
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Oct 20 11:08:03 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Oct 20 11:08:03 2014 +0300
----------------------------------------------------------------------
.../components/scalars/ScalarPanelAbstract.java | 5 +-
.../scalars/ScalarPanelTextFieldAbstract.java | 7 +-
.../viewer/wicket/ui/pages/PageAbstract-old.css | 962 +++++++++++++++++++
.../viewer/wicket/ui/pages/PageAbstract.css | 940 +-----------------
.../viewer/wicket/ui/pages/PageAbstract.java | 1 +
5 files changed, 974 insertions(+), 941 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/28f37f5f/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
index e77583b..d793759 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
@@ -19,6 +19,8 @@
package org.apache.isis.viewer.wicket.ui.components.scalars;
+import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+
import java.util.List;
import com.google.common.collect.Lists;
@@ -29,6 +31,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.behavior.Behavior;
+import org.apache.wicket.feedback.ComponentFeedbackMessageFilter;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.FormComponentLabel;
import org.apache.wicket.markup.html.form.LabeledWebMarkupContainer;
@@ -259,7 +262,7 @@ public abstract class ScalarPanelAbstract extends PanelAbstract<ScalarModel> imp
protected abstract Component addComponentForCompact();
protected void addFeedbackTo(MarkupContainer markupContainer, Component component) {
- markupContainer.addOrReplace(new ComponentFeedbackPanel(ID_FEEDBACK, component));
+ markupContainer.addOrReplace(new NotificationPanel(ID_FEEDBACK, component, new ComponentFeedbackMessageFilter(component)));
}
protected void addAdditionalLinksTo(final FormComponentLabel labelIfRegular) {
http://git-wip-us.apache.org/repos/asf/isis/blob/28f37f5f/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
index 902b1db..2f3d38c 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
@@ -86,12 +86,13 @@ public abstract class ScalarPanelTextFieldAbstract<T extends Serializable> exten
final FormComponentLabel labelIfRegular = createFormComponentLabel();
addOrReplace(labelIfRegular);
- if(getModel().isRequired()) {
- labelIfRegular.add(new CssClassAppender("mandatory"));
- }
final Label scalarName = new Label(ID_SCALAR_NAME, getRendering().getLabelCaption(textField));
+ if(getModel().isRequired()) {
+ scalarName.add(new CssClassAppender("mandatory"));
+ }
+
addOrReplace(scalarName);
final String describedAs = getModel().getDescribedAs();
http://git-wip-us.apache.org/repos/asf/isis/blob/28f37f5f/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract-old.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract-old.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract-old.css
new file mode 100644
index 0000000..b7e215e
--- /dev/null
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract-old.css
@@ -0,0 +1,962 @@
+/*
+ * 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.
+ */
+
+
+/*
+TODO mgrigorov: Remove this file once the new styling based on Bootstrap is finished
+
+
+colors
+------
+
+#E4E4DB - page background
+
+#00477F rich blue
+ h1,h2,h3 {color}
+ a {color}
+
+#20B5C2 - light blue
+ .ok {background-color}
+ .links{color}
+
+#40C0CB - highlight blue
+ .a:hover {background-color}
+
+#F0EFEA light (bookmark background)
+ .select2-choice {background-color}
+
+#407098 muted blue
+ th {color}
+
+
+#454545 dark brown/grey
+ body {color}
+
+#413D37 dark brown/banner
+ legend {color}
+
+#E4E4DB very pale beige
+.cancel {background-color}
+
+#46423C dark brown
+ .cancel {color}
+
+#888 medium grey
+ p.disabled {color}
+
+#F0EFEA very light grey
+ p.disabled {background-color}
+
+#E3E3D9 light grey
+ body {background-color}
+
+
+#BF0B0B - jgrowl error
+
+
+
+#46413B dark brown
+ .scalarName {color}
+
+#7F7F7F (medium grey)
+ .select2-choice {color}
+
+#46423C - dark (writing?)
+
+
+#CCCBC7 (medium)
+ input[disabled] {border-top}
+
+#EEEEEE light grey
+ th{background}
+
+#FFFFFF white
+ .ok {color}
+
+*/
+
+/********** ID's **********/
+
+#header {
+ width: 73%;
+ float: left;
+ height: 60px;
+ margin-left: 5px;
+ background: transparent url("images/logo.png") left center no-repeat;
+}
+
+#header .applicationName {
+ display:none;
+}
+.headerContainer {
+ background: url("images/bg_header_brown.png") left top repeat;
+ height: 100px;
+}
+
+.headerContainer .links>span:first-child {
+ background: url("/images/icon_appuser.png") no-repeat scroll left
+ center transparent;
+ line-height: 30px;
+ padding: 5px 0 5px 20px;
+ margin-left: 10px;
+}
+
+.headerContainer .links {
+ font-size: 0.9em;
+}
+
+.headerContainer .links a {
+ margin-left: 10px;
+}
+
+#secondaryMenu {
+ width: 25%;
+}
+
+#tertiaryMenu {
+ width: 3%;
+ float: right;
+ padding-right: 20px;
+}
+#breadcrumbsMenu {
+ width: 18%;
+ float: right;
+}
+#tertiaryMenu .imgLinks {
+ line-height: 30px;
+ font-size: 3em;
+ margin-right:20px;
+}
+
+#tertiaryMenu a.copyLink:hover,
+#tertiaryMenu a.copyLink.hover {
+ cursor: pointer;
+}
+
+#tertiaryMenu a.copyLink:active,
+#tertiaryMenu a.copyLink.active {
+ cursor: pointer;
+}
+
+
+#secondaryMenu,
+#tertiaryMenu {
+ display: inline-block;
+ float: right;
+ text-align: right;
+ margin-right: 5px;
+}
+
+#tertiaryMenu a {
+ font-size:3em;
+ line-height: 30px;
+}
+
+#header h1 {
+ margin: 10px 10px 10px 0px;
+ font-size: xx-large;
+}
+
+.clear {
+ clear: both;
+}
+
+.links {
+ clear: both;
+ height: 60px;
+ line-height:60px;
+ color:#20B5C2;
+ text-transform: uppercase;
+ font-size:1.0em;
+ font-weight:bold;
+ padding:0px 20px 0px 0px;
+}
+
+ .links a {
+ color:#FFFFFF;
+ font-weight:bold;
+ }
+
+
+#container {
+ /*width: 800px;*/
+}
+
+
+/* Buttons */
+
+.edit,
+.ok,
+.okButton {
+ display:inline-block;
+ background-color:#20B5C2;
+ color:#FFFFFF;
+ text-transform:uppercase;
+ font-size:0.9em;
+ border:0px;
+ padding:5px 10px;
+ border-radius:4px;
+ cursor:pointer;
+}
+
+.edit:focus,
+.ok:focus,
+.okButton:focus {
+ background-color: #40C0CB;
+ font-style: italic;
+}
+
+.cancel {
+ display:inline-block;
+ background-color:#E4E4DB;
+ color:#46423C;
+ text-transform:uppercase;
+ font-size:0.9em;
+ border:0px;
+ padding:5px 10px;
+ border-radius:4px;
+ cursor:pointer;
+}
+
+.cancel:focus {
+ font-style: italic;
+}
+
+
+/********** CLASSes **********/
+
+.feedbackPanel li {
+ list-style: none;
+}
+
+.leftSide {
+ float: left;
+ width: 220px;
+ height: 500px;
+}
+
+.rightSide {
+ float: right;
+ width: 520px;
+}
+
+/**************** APPLICATION MENU **************/
+
+#applicationActions {
+ padding-left: 10px;
+ height:40px;
+ margin-left: 10px;
+ width: 73%;
+ float: left;
+}
+
+#applicationActions .menuh {
+ background-color: transparent;
+ position:relative;
+ z-index:501;
+}
+
+#applicationActions .menuh ul.cssMenuItems {
+ line-height:30px;
+}
+
+#applicationActions .cssMenuPanel .menuh a:link,
+#applicationActions .cssMenuPanel .menuh a:visited,
+#applicationActions .cssMenuPanel .menuh a:active,
+#applicationActions .cssMenuPanel .menuh p {
+ background-color: transparent;
+ color: #FFFFFF;
+ text-decoration: none;
+ text-transform:uppercase;
+ font-size:0.9em;
+ font-weight:bold;
+}
+
+#applicationActions .cssMenuPanel .menuh a.prototype span {
+ color: #DBDB4D;
+ font-style: italic;
+}
+
+
+#applicationActions .cssMenuPanel .menuh li a:link,
+#applicationActions .cssMenuPanel .menuh li a:visited,
+#applicationActions .cssMenuPanel .menuh li a:active,
+#applicationActions .cssMenuPanel .menuh li p {
+ border-radius:4px 4px 0px 0px;
+ -moz-border-radius:4px 4px 0px 0px;
+ -webkit-border-radius:4px 4px 0px 0px;
+}
+
+#applicationActions .cssMenuPanel .menuh li li a:link,
+#applicationActions .cssMenuPanel .menuh li li a:visited,
+#applicationActions .cssMenuPanel .menuh li li a:active,
+#applicationActions .cssMenuPanel .menuh li li p {
+ border-radius:0px;
+ -moz-border-radius:0px;
+ -webkit-border-radius:0px;
+ background-color: #20B5C2;
+}
+
+#applicationActions .cssMenuPanel .menuh li li:last-child a:link,
+#applicationActions .cssMenuPanel .menuh li li:last-child a:visited,
+#applicationActions .cssMenuPanel .menuh li li:last-child a:active,
+#applicationActions .cssMenuPanel .menuh li li:last-child p {
+ border-radius:0px 0px 4px 4px;
+ -webkit-border-radius:0px 0px 4px 4px;
+ -moz-border-radius:0px 0px 4px 4px;
+ background-color: #20B5C2;
+}
+
+#applicationActions .cssMenuPanel .menuh li li:first-child a:link,
+#applicationActions .cssMenuPanel .menuh li li:first-child a:visited,
+#applicationActions .cssMenuPanel .menuh li li:first-child a:active,
+#applicationActions .cssMenuPanel .menuh li li:first-child p {
+ border-radius:0px 4px 0px 0px;
+ -webkit-border-radius:0px 4px 0px 0px;
+ -moz-border-radius:0px 4px 0px 0px;
+ background-color: #20B5C2;
+}
+
+#applicationActions .cssMenuPanel .menuh li li:first-child:last-child a:link,
+#applicationActions .cssMenuPanel .menuh li li:first-child:last-child a:visited,
+#applicationActions .cssMenuPanel .menuh li li:first-child:last-child a:active,
+#applicationActions .cssMenuPanel .menuh li li:first-child:last-child p {
+ border-radius:0px 4px 4px 4px;
+ -webkit-border-radius:0px 4px 4px 4px;
+ -moz-border-radius:0px 4px 4px 4px;
+ background-color: #20B5C2;
+}
+
+
+#applicationActions .menuh a,
+#applicationActions .menuh p {
+ border: 0px solid #00477F;
+ padding: 0px 1em 0px 1em;
+ background-image:none !important;
+}
+
+#applicationActions .cssMenuPanel .menuh li:hover a,
+#applicationActions .cssMenuPanel .menuh li:hover p {
+ color: #FFFFFF;
+ background-color: #20B5C2;
+}
+
+#applicationActions .cssMenuPanel .menuh a:hover,
+#applicationActions .cssMenuPanel .menuh p:hover {
+ color: #FFFFFF;
+ background-color: #20B5C2;
+}
+
+#applicationActions .cssMenuPanel .menuh li li a:hover,
+#applicationActions .cssMenuPanel .menuh li li p:hover {
+ color: #FFFFFF;
+ background-color: #40C0CB !important;
+}
+
+#applicationActions ul.cssSubMenuItemsPanel {
+ min-width:220px;
+}
+
+ #applicationActions ul.cssSubMenuItemsPanel li.cssSubMenuItem p.disabled {
+ color: lightgray;
+ /*background-color: #F0EFEA;*/
+
+ }
+
+
+/**************** ELEMENTS **************/
+
+body {
+ background-color: #E3E3D9;
+ color: #454545;
+ font-family: Arial,'Sans-serif', 'Helvetica', 'Sans-serif', 'sans';
+ font-size: 0.8em;
+ line-height: 1.4em;
+ padding: 0px;
+ margin:0px;
+}
+
+.panel, fieldset {
+ margin: 3px 0px;
+}
+
+.scalarNameAndValueComponentType .panel {
+ padding: 4px;
+}
+
+
+div {
+ margin: 0;
+ padding: 0;
+}
+
+#body {
+ min-height: 400px;
+ margin:20px;
+}
+
+#footer {
+}
+
+ #footer .links {
+ height:auto;
+ padding:0px 20px;
+ line-height:20px;
+ height:20px;
+ color:#46423C;
+ }
+
+ #footer .links a {
+ color:#20B5C2;
+ text-decoration:none;
+ }
+
+h3 {
+ margin-top: 9px;
+ margin-bottom: 0px;
+}
+
+p {
+ margin-top: 0px;
+ margin-bottom: 0px;
+}
+
+form fieldset .okButton {
+ margin-top: 2em;
+}
+
+.myBlockContainer {
+ background-color:#FFFFFF;
+ padding:10px;
+ border-radius:4px;
+ -moz-border-radius:4px;
+ -webkit-border-radius:4px;
+ margin-bottom:1%;
+ position:relative;
+ clear:both;
+}
+
+.myBlockContainer fieldset {
+ border:0px;
+ margin:0px;
+ padding:0px;
+}
+.myBlockContainer fieldset:not(:first-child) {
+ margin-top: 30px
+}
+
+
+.myBlockContainer legend {
+ color:#423D37;
+ font-size:1.6em;
+ margin-bottom:10px;
+ line-height:120%;
+ padding:0px;
+ float:left;
+ display:block;
+}
+
+
+/************************************************************ *********/
+
+
+
+h1,h2,h3,h4,h5,h6,h7,h8 {
+ color: #00477F;
+ font-weight: normal;
+}
+
+h1,h2 {
+ letter-spacing: -1px;
+}
+
+#extitle {
+ font-size: 12pt;
+ font-weight: bold;
+ color: #454545;
+ padding: 10px 10px 10px 10px;
+}
+
+.mark {
+ background-color: yellow;
+ margin: 5px;
+}
+
+.nospam {
+ display : none;
+}
+
+.block {
+ padding: 10px;
+}
+
+
+h2 {
+ font-size: 1.25em;
+}
+
+h3 {
+ font-size: 1em;
+}
+
+a {
+ color: #00477F;
+ font-weight: bold;
+ text-decoration: none;
+}
+
+a:hover {
+ text-decoration: underline;
+ cursor: pointer;
+}
+
+img {
+ border: none;
+}
+
+pre {
+ font-family: 'Lucida Sans', 'Helvetica', 'Sans serif', 'sans';
+}
+
+th {
+ background: #EEEEEE;
+ color: #407098;
+ font-weight: bold;
+}
+
+tr.b {
+ background: #EEEEEE;
+}
+
+tr.a {
+ background: #E6E6E5;
+}
+
+tr.none {
+ background: transparent;
+}
+
+a.none {
+ background: transparent;
+ padding-right: 0px;
+}
+
+.inputForm label.non {
+ display: inline !important;
+}
+
+.inputFormTable td {
+ padding: 2px;
+}
+
+div.tabRowContent {
+ border-style: solid;
+ border-width: 1px;
+ margin: 4px;
+ padding: 4px;
+}
+
+tr.section td {
+ padding-top: 0.75em;
+}
+
+table.contents td,
+table.contents th {
+ border-left: 1px solid #DDD;
+ border-right: 1px solid #DDD;
+}
+
+/*************** Styling Entity Forms and Parameters ********************/
+
+
+
+
+.property, .propertyOrCollection, .parameter {
+ clear: both;
+}
+
+.scalarNameAndValueComponentType {
+}
+
+.scalarName {
+ padding:6px 0px;
+ margin-bottom:5px;
+}
+
+
+
+.scalarValue {
+ margin-bottom:10px;
+}
+
+.collectionName,
+.collectionContents {
+
+}
+
+.scalarName, .collectionName {
+ float: left;
+ font-style: normal;
+ text-align: left;
+ text-transform:uppercase;
+ font-weight:bold !important;
+ font-size:0.9em;
+ color:#46413B;
+}
+
+.mandatory .scalarName:after,
+.mandatory .collectionName:after {
+ content: " *";
+ font-weight:bold;
+ color:#20B5C2;
+}
+
+.scalarValue,.collectionContents {
+ float: left;
+}
+
+.scalarValue {
+}
+
+.collectionContents {
+ width: 100%;
+}
+
+.scalarName {
+ width: 160px;
+}
+.scalarValue {
+}
+
+div.scalarPanel {
+ display: inline;
+}
+
+.buttons {
+ padding: 1em 0em 1em 0em;
+ clear: both;
+ display: block;
+}
+
+.mandatory {
+ font-weight: bold;
+}
+
+.number input {
+ text-align: right;
+}
+
+
+
+/********************* Select2 component styling *****************************/
+
+
+.actionPromptPage .select2-container .select2-choice,
+.entityPage .select2-container .select2-choice {
+ padding: 4px;
+}
+
+
+
+.actionPromptPage .select2-container .select2-choice,
+.entityPage .select2-container .select2-choice {
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+ border-radius: 4px;
+ height: 20px;
+ line-height: 20px;
+ color:#7F7F7F;
+ background:#FFFFFF none;
+ border:1px solid #F0EFEA;
+ border-top:1px solid #CCCBC7;
+}
+
+.actionPromptPage .select2-container .select2-choice span,
+.entityPage .select2-container .select2-choice span {
+ font-size:13px;
+}
+
+.actionPromptPage .select2-container.select2-drop-above .select2-choice,
+.entityPage .select2-container.select2-drop-above .select2-choice {
+ -webkit-border-radius:0px;
+ -moz-border-radius:0px;
+ border-radius:0px;
+}
+
+.actionPromptPage .select2-drop,
+.entityPage .select2-drop {
+ -webkit-border-radius:0px;
+ -moz-border-radius:0px;
+ border-radius:0px;
+}
+
+.actionPromptPage .select2-drop.select2-drop-above,
+.entityPage .select2-drop.select2-drop-above {
+ -webkit-border-radius:0px;
+ -moz-border-radius:0px;
+ border-radius:0px;
+}
+
+.actionPromptPage .select2-container .select2-choice div,
+.entityPage .select2-container .select2-choice div {
+ -webkit-border-radius:0px;
+ -moz-border-radius:0px;
+ border-radius:0px;
+ background: #EBEBE4;
+}
+
+.actionPromptPage .select2-container.select2-container-disabled .select2-choice,
+.entityPage .select2-container.select2-container-disabled .select2-choice {
+ background-color:#F0EFEA;
+ border:1px solid #F0EFEA;
+ border-top:1px solid #CCCBC7;
+}
+
+.actionPromptPage .select2-container a,
+.entityPage .select2-container a {
+ font-weight: normal;
+}
+
+/******** fix for select2 on ModalWindow ********/
+/* http://osdir.com/ml/users-wicket.apache.org/2013-09/msg00165.html */
+
+div.select2-drop {
+ z-index: 30001
+}
+
+.select2-drop-mask {
+ z-index: 30000
+}
+
+
+/******** action prompt modal dialog ********/
+
+
+.wicket-modal .w_content_container {
+ background-color: #E4E4DB;
+}
+
+.actionPanel {
+ width: 680px;
+}
+
+.actionPanel .myBlockContainer {
+ margin:19px;
+ padding: 20px;
+ width: 600px;
+ min-height: 200px;
+}
+
+.wicket-modal .w_caption {
+ display: none;
+}
+
+div.wicket-modal div.w_content_3 {
+ border: 0px;
+}
+
+div.wicket-modal div.w_content_3,
+div.wicket-modal div.w_content_2,
+div.wicket-modal div.w_content_1,
+div.wicket-modal div.w_content,
+.wicket-modal .w_content_container,
+.w_isis,
+.actionPanel {
+ border-radius:4px;
+ -moz-border-radius:4px;
+ -webkit-border-radius:4px;
+}
+
+/******** FORM STYLES ********/
+
+form input[type=text][disabled] {
+ border-radius:4px;
+ -moz-border-radius:4px;
+ -webkit-border-radius:4px;
+ padding:6px;
+ background-color:#F0EFEA;
+ border:1px solid #F0EFEA;
+ border-top:1px solid #CCCBC7;
+}
+
+form input[type=text] {
+ border-radius:4px;
+ -moz-border-radius:4px;
+ -webkit-border-radius:4px;
+ padding:6px;
+ background-color:#FFFFFF;
+ border:1px solid #F0EFEA;
+ border-top:1px solid #CCCBC7;
+}
+
+
+
+.inputForm {
+ clear:both;
+}
+
+.actionPanelHeaderNew {
+ clear:both;
+ display:block;
+}
+
+.actionPanelHeaderNew .entityIconAndTitlePanel {
+ padding-bottom:10px;
+ line-height:150%;
+ float:left;
+}
+
+div.actionPanelHeaderNew .iconAndTitle {
+ float: left;
+ padding:0em;
+}
+
+div.actionPanelHeaderNew .actions {
+ float: right;
+ padding:0em 0em;
+}
+
+.actionPanelHeaderNew .entityImage {
+ width: 32px;
+ height: 32px;
+ vertical-align:text-bottom;
+ padding-right:5px;
+}
+
+.actionPanelHeaderNew .entityTitle {
+ font-size: 1.8em;
+ font-weight:normal;
+ color:#413D37;
+ text-decoration:none;
+}
+
+/* Feedback Error Styling */
+
+.feedbackPanel {
+ clear:both;
+ display:block;
+ color:#990000;
+ font-weight:normal;
+ font-size:12px;
+ line-height:150%;
+}
+
+
+.feedbackPanelERROR {
+ color:#CC0000;
+ list-style: none;
+ font-weight: normal;
+}
+
+.feedbackPanelINFO {
+ color: green;
+ list-style: none;
+ font-weight: normal;
+}
+
+
+
+div#jGrowl {
+ margin-top: 55px;
+ margin-right: 25px;
+ color: white;
+ font-size: larger;
+ opacity: .90;
+ filter: alpha(opacity = 90);
+}
+
+div#jGrowl div.jgrowl-ERROR {
+ background-color: #BF0B0B;
+}
+div#jGrowl div.jgrowl-WARNING {
+ background-color: orange;
+}
+div#jGrowl div.jgrowl-INFO {
+ background-color: #20B5C2;
+}
+div#jGrowl div.jgrowl-WARNING {
+ background-color: orange;
+}
+div#jGrowl div.jGrowl-closer {
+ background-color: #F0EFEA;
+ color: #46423C;
+ font-size: small;
+}
+
+
+
+
+/* ModalWindow tweaks */
+
+div.wicket-mask-dark {
+ filter: alpha(opacity=40);
+ opacity: 0.4;
+}
+
+
+/* action buttons in properties */
+
+.properties .property .additionalLinkList {
+ float:none;
+ padding-top: 5px;
+ padding-bottom: 20px;
+}
+
+.properties .property .isisBlobPanel .additionalLinkList {
+ padding-top: 0px;
+}
+
+
+
+/** general **/
+
+.hidden {
+ display: none;
+}
+
+
+
+
+/**
+zero clipboard
+(for some reason - perhaps to do with Flash - this CSS doesn't seem to
+ do anything if within the ZeroClipboard.css)
+*/
+.zeroClipboardPanel a {
+ background-image: url("copy-26.png");
+ background-position: right;
+ background-repeat: no-repeat;
+ cursor: pointer;
+}
+
+
+/**
+for some reason the containedToggleboxPanel.css is not being picked up...
+*/
+.containedToggleboxPanel .containedToggleboxPanelForm {
+ display: inline;
+}
+
+
+
+
+.collectionContentsAsAjaxTablePanel table.contents tbody td div.FixtureResult-className label,
+.collectionContentsAsAjaxTablePanel table.contents tbody td div.FixtureResult-fixtureScriptClassName label {
+ text-transform: none;
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/28f37f5f/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css
index 58a6396..7ad5e1f 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css
@@ -16,944 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-
-
-/*
-colors
-------
-
-#E4E4DB - page background
-
-#00477F rich blue
- h1,h2,h3 {color}
- a {color}
-
-#20B5C2 - light blue
- .ok {background-color}
- .links{color}
-
-#40C0CB - highlight blue
- .a:hover {background-color}
-
-#F0EFEA light (bookmark background)
- .select2-choice {background-color}
-
-#407098 muted blue
- th {color}
-
-
-#454545 dark brown/grey
- body {color}
-
-#413D37 dark brown/banner
- legend {color}
-
-#E4E4DB very pale beige
-.cancel {background-color}
-
-#46423C dark brown
- .cancel {color}
-
-#888 medium grey
- p.disabled {color}
-
-#F0EFEA very light grey
- p.disabled {background-color}
-
-#E3E3D9 light grey
- body {background-color}
-
-
-#BF0B0B - jgrowl error
-
-
-
-#46413B dark brown
- .scalarName {color}
-
-#7F7F7F (medium grey)
- .select2-choice {color}
-
-#46423C - dark (writing?)
-
-
-#CCCBC7 (medium)
- input[disabled] {border-top}
-
-#EEEEEE light grey
- th{background}
-
-#FFFFFF white
- .ok {color}
-
-*/
-
-/********** ID's **********/
-
-#header {
- width: 73%;
- float: left;
- height: 60px;
- margin-left: 5px;
- background: transparent url("images/logo.png") left center no-repeat;
-}
-
-#header .applicationName {
- display:none;
-}
-.headerContainer {
- background: url("images/bg_header_brown.png") left top repeat;
- height: 100px;
-}
-
-.headerContainer .links>span:first-child {
- background: url("/images/icon_appuser.png") no-repeat scroll left
- center transparent;
- line-height: 30px;
- padding: 5px 0 5px 20px;
- margin-left: 10px;
-}
-
-.headerContainer .links {
- font-size: 0.9em;
-}
-
-.headerContainer .links a {
- margin-left: 10px;
-}
-
-#secondaryMenu {
- width: 25%;
-}
-
-#tertiaryMenu {
- width: 3%;
- float: right;
- padding-right: 20px;
-}
-#breadcrumbsMenu {
- width: 18%;
- float: right;
-}
-#tertiaryMenu .imgLinks {
- line-height: 30px;
- font-size: 3em;
- margin-right:20px;
-}
-
-#tertiaryMenu a.copyLink:hover,
-#tertiaryMenu a.copyLink.hover {
- cursor: pointer;
-}
-
-#tertiaryMenu a.copyLink:active,
-#tertiaryMenu a.copyLink.active {
- cursor: pointer;
-}
-
-
-#secondaryMenu,
-#tertiaryMenu {
- display: inline-block;
- float: right;
- text-align: right;
- margin-right: 5px;
-}
-
-#tertiaryMenu a {
- font-size:3em;
- line-height: 30px;
-}
-
-#header h1 {
- margin: 10px 10px 10px 0px;
- font-size: xx-large;
-}
-
-.clear {
- clear: both;
-}
-
-.links {
- clear: both;
- height: 60px;
- line-height:60px;
- color:#20B5C2;
- text-transform: uppercase;
- font-size:1.0em;
- font-weight:bold;
- padding:0px 20px 0px 0px;
-}
-
- .links a {
- color:#FFFFFF;
- font-weight:bold;
- }
-
-
-#container {
- /*width: 800px;*/
-}
-
-
-/* Buttons */
-
-.edit,
-.ok,
-.okButton {
- display:inline-block;
- background-color:#20B5C2;
- color:#FFFFFF;
- text-transform:uppercase;
- font-size:0.9em;
- border:0px;
- padding:5px 10px;
- border-radius:4px;
- cursor:pointer;
-}
-
-.edit:focus,
-.ok:focus,
-.okButton:focus {
- background-color: #40C0CB;
- font-style: italic;
-}
-
-.cancel {
- display:inline-block;
- background-color:#E4E4DB;
- color:#46423C;
- text-transform:uppercase;
- font-size:0.9em;
- border:0px;
- padding:5px 10px;
- border-radius:4px;
- cursor:pointer;
-}
-
-.cancel:focus {
- font-style: italic;
-}
-
-
-/********** CLASSes **********/
-
-.feedbackPanel li {
- list-style: none;
-}
-
-.leftSide {
- float: left;
- width: 220px;
- height: 500px;
-}
-
-.rightSide {
- float: right;
- width: 520px;
-}
-
-/**************** APPLICATION MENU **************/
-
-#applicationActions {
- padding-left: 10px;
- height:40px;
- margin-left: 10px;
- width: 73%;
- float: left;
-}
-
-#applicationActions .menuh {
- background-color: transparent;
- position:relative;
- z-index:501;
-}
-
-#applicationActions .menuh ul.cssMenuItems {
- line-height:30px;
-}
-
-#applicationActions .cssMenuPanel .menuh a:link,
-#applicationActions .cssMenuPanel .menuh a:visited,
-#applicationActions .cssMenuPanel .menuh a:active,
-#applicationActions .cssMenuPanel .menuh p {
- background-color: transparent;
- color: #FFFFFF;
- text-decoration: none;
- text-transform:uppercase;
- font-size:0.9em;
- font-weight:bold;
-}
-
-#applicationActions .cssMenuPanel .menuh a.prototype span {
- color: #DBDB4D;
- font-style: italic;
-}
-
-
-#applicationActions .cssMenuPanel .menuh li a:link,
-#applicationActions .cssMenuPanel .menuh li a:visited,
-#applicationActions .cssMenuPanel .menuh li a:active,
-#applicationActions .cssMenuPanel .menuh li p {
- border-radius:4px 4px 0px 0px;
- -moz-border-radius:4px 4px 0px 0px;
- -webkit-border-radius:4px 4px 0px 0px;
-}
-
-#applicationActions .cssMenuPanel .menuh li li a:link,
-#applicationActions .cssMenuPanel .menuh li li a:visited,
-#applicationActions .cssMenuPanel .menuh li li a:active,
-#applicationActions .cssMenuPanel .menuh li li p {
- border-radius:0px;
- -moz-border-radius:0px;
- -webkit-border-radius:0px;
- background-color: #20B5C2;
-}
-
-#applicationActions .cssMenuPanel .menuh li li:last-child a:link,
-#applicationActions .cssMenuPanel .menuh li li:last-child a:visited,
-#applicationActions .cssMenuPanel .menuh li li:last-child a:active,
-#applicationActions .cssMenuPanel .menuh li li:last-child p {
- border-radius:0px 0px 4px 4px;
- -webkit-border-radius:0px 0px 4px 4px;
- -moz-border-radius:0px 0px 4px 4px;
- background-color: #20B5C2;
-}
-
-#applicationActions .cssMenuPanel .menuh li li:first-child a:link,
-#applicationActions .cssMenuPanel .menuh li li:first-child a:visited,
-#applicationActions .cssMenuPanel .menuh li li:first-child a:active,
-#applicationActions .cssMenuPanel .menuh li li:first-child p {
- border-radius:0px 4px 0px 0px;
- -webkit-border-radius:0px 4px 0px 0px;
- -moz-border-radius:0px 4px 0px 0px;
- background-color: #20B5C2;
-}
-
-#applicationActions .cssMenuPanel .menuh li li:first-child:last-child a:link,
-#applicationActions .cssMenuPanel .menuh li li:first-child:last-child a:visited,
-#applicationActions .cssMenuPanel .menuh li li:first-child:last-child a:active,
-#applicationActions .cssMenuPanel .menuh li li:first-child:last-child p {
- border-radius:0px 4px 4px 4px;
- -webkit-border-radius:0px 4px 4px 4px;
- -moz-border-radius:0px 4px 4px 4px;
- background-color: #20B5C2;
-}
-
-
-#applicationActions .menuh a,
-#applicationActions .menuh p {
- border: 0px solid #00477F;
- padding: 0px 1em 0px 1em;
- background-image:none !important;
-}
-
-#applicationActions .cssMenuPanel .menuh li:hover a,
-#applicationActions .cssMenuPanel .menuh li:hover p {
- color: #FFFFFF;
- background-color: #20B5C2;
-}
-
-#applicationActions .cssMenuPanel .menuh a:hover,
-#applicationActions .cssMenuPanel .menuh p:hover {
- color: #FFFFFF;
- background-color: #20B5C2;
-}
-
-#applicationActions .cssMenuPanel .menuh li li a:hover,
-#applicationActions .cssMenuPanel .menuh li li p:hover {
- color: #FFFFFF;
- background-color: #40C0CB !important;
-}
-
-#applicationActions ul.cssSubMenuItemsPanel {
- min-width:220px;
-}
-
- #applicationActions ul.cssSubMenuItemsPanel li.cssSubMenuItem p.disabled {
- color: lightgray;
- /*background-color: #F0EFEA;*/
-
- }
-
-
-/**************** ELEMENTS **************/
-
-body {
- background-color: #E3E3D9;
- color: #454545;
- font-family: Arial,'Sans-serif', 'Helvetica', 'Sans-serif', 'sans';
- font-size: 0.8em;
- line-height: 1.4em;
- padding: 0px;
- margin:0px;
-}
-
-.panel, fieldset {
- margin: 3px 0px;
-}
-
-.scalarNameAndValueComponentType .panel {
- padding: 4px;
-}
-
-
-div {
- margin: 0;
- padding: 0;
-}
-
-#body {
- min-height: 400px;
- margin:20px;
-}
-
-#footer {
-}
-
- #footer .links {
- height:auto;
- padding:0px 20px;
- line-height:20px;
- height:20px;
- color:#46423C;
- }
-
- #footer .links a {
- color:#20B5C2;
- text-decoration:none;
- }
-
-h3 {
- margin-top: 9px;
- margin-bottom: 0px;
-}
-
-p {
- margin-top: 0px;
- margin-bottom: 0px;
-}
-
-form fieldset .okButton {
- margin-top: 2em;
-}
-
-.myBlockContainer {
- background-color:#FFFFFF;
- padding:10px;
- border-radius:4px;
- -moz-border-radius:4px;
- -webkit-border-radius:4px;
- margin-bottom:1%;
- position:relative;
- clear:both;
-}
-
-.myBlockContainer fieldset {
- border:0px;
- margin:0px;
- padding:0px;
-}
-.myBlockContainer fieldset:not(:first-child) {
- margin-top: 30px
-}
-
-
-.myBlockContainer legend {
- color:#423D37;
- font-size:1.6em;
- margin-bottom:10px;
- line-height:120%;
- padding:0px;
- float:left;
- display:block;
-}
-
-
-/************************************************************ *********/
-
-
-
-h1,h2,h3,h4,h5,h6,h7,h8 {
- color: #00477F;
- font-weight: normal;
-}
-
-h1,h2 {
- letter-spacing: -1px;
-}
-
-#extitle {
- font-size: 12pt;
- font-weight: bold;
- color: #454545;
- padding: 10px 10px 10px 10px;
-}
-
-.mark {
- background-color: yellow;
- margin: 5px;
-}
-
-.nospam {
- display : none;
-}
-
-.block {
- padding: 10px;
-}
-
-
-h2 {
- font-size: 1.25em;
-}
-
-h3 {
- font-size: 1em;
-}
-
-a {
- color: #00477F;
- font-weight: bold;
- text-decoration: none;
-}
-
-a:hover {
- text-decoration: underline;
- cursor: pointer;
-}
-
-img {
- border: none;
-}
-pre {
- font-family: 'Lucida Sans', 'Helvetica', 'Sans serif', 'sans';
-}
-
-th {
- background: #EEEEEE;
- color: #407098;
- font-weight: bold;
-}
-
-tr.b {
- background: #EEEEEE;
-}
-
-tr.a {
- background: #E6E6E5;
-}
-
-tr.none {
- background: transparent;
-}
-
-a.none {
- background: transparent;
- padding-right: 0px;
-}
-
-.inputForm label.non {
- display: inline !important;
-}
-
-.inputFormTable td {
- padding: 2px;
-}
-
-div.tabRowContent {
- border-style: solid;
- border-width: 1px;
- margin: 4px;
- padding: 4px;
-}
-
-tr.section td {
- padding-top: 0.75em;
-}
-
-table.contents td,
-table.contents th {
- border-left: 1px solid #DDD;
- border-right: 1px solid #DDD;
-}
-
-/*************** Styling Entity Forms and Parameters ********************/
-
-
-
-
-.property, .propertyOrCollection, .parameter {
- clear: both;
-}
-
-.scalarNameAndValueComponentType {
-}
-
-.scalarName {
- padding:6px 0px;
- margin-bottom:5px;
-}
-
-
-
-.scalarValue {
- margin-bottom:10px;
-}
-
-.collectionName,
-.collectionContents {
-
-}
-
-.scalarName, .collectionName {
- float: left;
- font-style: normal;
- text-align: left;
- text-transform:uppercase;
- font-weight:bold !important;
- font-size:0.9em;
- color:#46413B;
-}
-
-.mandatory .scalarName:after,
-.mandatory .collectionName:after {
+.mandatory.scalarName:after,
+.mandatory.collectionName:after {
content: " *";
font-weight:bold;
- color:#20B5C2;
-}
-
-.scalarValue,.collectionContents {
- float: left;
-}
-
-.scalarValue {
-}
-
-.collectionContents {
- width: 100%;
-}
-
-.scalarName {
- width: 160px;
-}
-.scalarValue {
-}
-
-div.scalarPanel {
- display: inline;
-}
-
-.buttons {
- padding: 1em 0em 1em 0em;
- clear: both;
- display: block;
-}
-
-.mandatory {
- font-weight: bold;
-}
-
-.number input {
- text-align: right;
-}
-
-
-
-/********************* Select2 component styling *****************************/
-
-
-.actionPromptPage .select2-container .select2-choice,
-.entityPage .select2-container .select2-choice {
- padding: 4px;
-}
-
-
-
-.actionPromptPage .select2-container .select2-choice,
-.entityPage .select2-container .select2-choice {
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
- border-radius: 4px;
- height: 20px;
- line-height: 20px;
- color:#7F7F7F;
- background:#FFFFFF none;
- border:1px solid #F0EFEA;
- border-top:1px solid #CCCBC7;
-}
-
-.actionPromptPage .select2-container .select2-choice span,
-.entityPage .select2-container .select2-choice span {
- font-size:13px;
-}
-
-.actionPromptPage .select2-container.select2-drop-above .select2-choice,
-.entityPage .select2-container.select2-drop-above .select2-choice {
- -webkit-border-radius:0px;
- -moz-border-radius:0px;
- border-radius:0px;
-}
-
-.actionPromptPage .select2-drop,
-.entityPage .select2-drop {
- -webkit-border-radius:0px;
- -moz-border-radius:0px;
- border-radius:0px;
-}
-
-.actionPromptPage .select2-drop.select2-drop-above,
-.entityPage .select2-drop.select2-drop-above {
- -webkit-border-radius:0px;
- -moz-border-radius:0px;
- border-radius:0px;
-}
-
-.actionPromptPage .select2-container .select2-choice div,
-.entityPage .select2-container .select2-choice div {
- -webkit-border-radius:0px;
- -moz-border-radius:0px;
- border-radius:0px;
- background: #EBEBE4;
-}
-
-.actionPromptPage .select2-container.select2-container-disabled .select2-choice,
-.entityPage .select2-container.select2-container-disabled .select2-choice {
- background-color:#F0EFEA;
- border:1px solid #F0EFEA;
- border-top:1px solid #CCCBC7;
-}
-
-.actionPromptPage .select2-container a,
-.entityPage .select2-container a {
- font-weight: normal;
-}
-
-/******** fix for select2 on ModalWindow ********/
-/* http://osdir.com/ml/users-wicket.apache.org/2013-09/msg00165.html */
-
-div.select2-drop {
- z-index: 30001
-}
-
-.select2-drop-mask {
- z-index: 30000
-}
-
-
-/******** action prompt modal dialog ********/
-
-
-.wicket-modal .w_content_container {
- background-color: #E4E4DB;
-}
-
-.actionPanel {
- width: 680px;
-}
-
-.actionPanel .myBlockContainer {
- margin:19px;
- padding: 20px;
- width: 600px;
- min-height: 200px;
-}
-
-.wicket-modal .w_caption {
- display: none;
-}
-
-div.wicket-modal div.w_content_3 {
- border: 0px;
-}
-
-div.wicket-modal div.w_content_3,
-div.wicket-modal div.w_content_2,
-div.wicket-modal div.w_content_1,
-div.wicket-modal div.w_content,
-.wicket-modal .w_content_container,
-.w_isis,
-.actionPanel {
- border-radius:4px;
- -moz-border-radius:4px;
- -webkit-border-radius:4px;
-}
-
-/******** FORM STYLES ********/
-
-form input[type=text][disabled] {
- border-radius:4px;
- -moz-border-radius:4px;
- -webkit-border-radius:4px;
- padding:6px;
- background-color:#F0EFEA;
- border:1px solid #F0EFEA;
- border-top:1px solid #CCCBC7;
-}
-
-form input[type=text] {
- border-radius:4px;
- -moz-border-radius:4px;
- -webkit-border-radius:4px;
- padding:6px;
- background-color:#FFFFFF;
- border:1px solid #F0EFEA;
- border-top:1px solid #CCCBC7;
-}
-
-
-
-.inputForm {
- clear:both;
-}
-
-.actionPanelHeaderNew {
- clear:both;
- display:block;
-}
-
-.actionPanelHeaderNew .entityIconAndTitlePanel {
- padding-bottom:10px;
- line-height:150%;
- float:left;
-}
-
-div.actionPanelHeaderNew .iconAndTitle {
- float: left;
- padding:0em;
-}
-
-div.actionPanelHeaderNew .actions {
- float: right;
- padding:0em 0em;
-}
-
-.actionPanelHeaderNew .entityImage {
- width: 32px;
- height: 32px;
- vertical-align:text-bottom;
- padding-right:5px;
-}
-
-.actionPanelHeaderNew .entityTitle {
- font-size: 1.8em;
- font-weight:normal;
- color:#413D37;
- text-decoration:none;
-}
-
-/* Feedback Error Styling */
-
-.feedbackPanel {
- clear:both;
- display:block;
- color:#990000;
- font-weight:normal;
- font-size:12px;
- line-height:150%;
-}
-
-
-.feedbackPanelERROR {
- color:#CC0000;
- list-style: none;
- font-weight: normal;
-}
-
-.feedbackPanelINFO {
- color: green;
- list-style: none;
- font-weight: normal;
-}
-
-
-
-div#jGrowl {
- margin-top: 55px;
- margin-right: 25px;
- color: white;
- font-size: larger;
- opacity: .90;
- filter: alpha(opacity = 90);
-}
-
-div#jGrowl div.jgrowl-ERROR {
- background-color: #BF0B0B;
-}
-div#jGrowl div.jgrowl-WARNING {
- background-color: orange;
-}
-div#jGrowl div.jgrowl-INFO {
- background-color: #20B5C2;
-}
-div#jGrowl div.jgrowl-WARNING {
- background-color: orange;
-}
-div#jGrowl div.jGrowl-closer {
- background-color: #F0EFEA;
- color: #46423C;
- font-size: small;
-}
-
-
-
-
-/* ModalWindow tweaks */
-
-div.wicket-mask-dark {
- filter: alpha(opacity=40);
- opacity: 0.4;
-}
-
-
-/* action buttons in properties */
-
-.properties .property .additionalLinkList {
- float:none;
- padding-top: 5px;
- padding-bottom: 20px;
-}
-
-.properties .property .isisBlobPanel .additionalLinkList {
- padding-top: 0px;
-}
-
-
-
-/** general **/
-
-.hidden {
- display: none;
-}
-
-
-
-
-/**
-zero clipboard
-(for some reason - perhaps to do with Flash - this CSS doesn't seem to
- do anything if within the ZeroClipboard.css)
-*/
-.zeroClipboardPanel a {
- background-image: url("copy-26.png");
- background-position: right;
- background-repeat: no-repeat;
- cursor: pointer;
-}
-
-
-/**
-for some reason the containedToggleboxPanel.css is not being picked up...
-*/
-.containedToggleboxPanel .containedToggleboxPanelForm {
- display: inline;
-}
-
-
-
-
-.collectionContentsAsAjaxTablePanel table.contents tbody td div.FixtureResult-className label,
-.collectionContentsAsAjaxTablePanel table.contents tbody td div.FixtureResult-fixtureScriptClassName label {
- text-transform: none;
+ color: #c2270d;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/28f37f5f/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
index 9fc0789..a1774f9 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
@@ -258,6 +258,7 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
response.render(new PriorityHeaderItem(JavaScriptHeaderItem.forReference(getApplication().getJavaScriptLibrarySettings().getJQueryReference())));
response.render(CssHeaderItem.forReference(FontAwesomeCssReference.instance()));
response.render(CssHeaderItem.forReference(new CssResourceReference(PageAbstract.class, "bootstrap-overrides.css")));
+ PanelUtil.renderHead(response, PageAbstract.class);
response.render(JavaScriptReferenceHeaderItem.forReference(JQUERY_LIVEQUERY_JS));
response.render(JavaScriptReferenceHeaderItem.forReference(JQUERY_ISIS_WICKET_VIEWER_JS));
[08/13] git commit: ISIS-537 Use FontAwesome sort icons instead of
chevrons. Use icon for the sort_none state as in pre-bootstrap version
Posted by da...@apache.org.
ISIS-537 Use FontAwesome sort icons instead of chevrons. Use icon for the sort_none state as in pre-bootstrap version
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/2e8aee8e
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/2e8aee8e
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/2e8aee8e
Branch: refs/heads/master
Commit: 2e8aee8e1ca535836d9f7b8464b624d89fd32fcd
Parents: 0bf913a
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Oct 20 14:45:10 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Oct 20 14:45:10 2014 +0300
----------------------------------------------------------------------
.../collectioncontents/ajaxtable/IsisAjaxHeadersToolbar.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/2e8aee8e/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxHeadersToolbar.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxHeadersToolbar.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxHeadersToolbar.java
index d66d99a..2f9b0cb 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxHeadersToolbar.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxHeadersToolbar.java
@@ -49,8 +49,9 @@ public class IsisAjaxHeadersToolbar<S> extends AbstractToolbar
{
private static final long serialVersionUID = 1L;
- private static final String CLASS_SORT_UP = "fa fa-chevron-up";
- private static final String CLASS_SORT_DOWN = "fa fa-chevron-down";
+ private static final String CLASS_SORT_NONE = "fa fa-sort";
+ private static final String CLASS_SORT_UP = "fa fa-sort-up";
+ private static final String CLASS_SORT_DOWN = "fa fa-sort-down";
static abstract class CssAttributeBehavior extends Behavior
{
@@ -171,6 +172,8 @@ public class IsisAjaxHeadersToolbar<S> extends AbstractToolbar
Attributes.addClass(tag, CLASS_SORT_UP);
} else if (sortOrder == SortOrder.DESCENDING) {
Attributes.addClass(tag, CLASS_SORT_DOWN);
+ } else {
+ Attributes.addClass(tag, CLASS_SORT_NONE);
}
}
};
[13/13] git commit: ISIS-872: updating STATUS
Posted by da...@apache.org.
ISIS-872: updating STATUS
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/0cc5bb63
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/0cc5bb63
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/0cc5bb63
Branch: refs/heads/master
Commit: 0cc5bb635ebf6d0c39d66638872cd7759274f44b
Parents: 00f8d5c
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Oct 21 06:56:33 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Oct 21 06:56:33 2014 +0100
----------------------------------------------------------------------
STATUS | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/0cc5bb63/STATUS
----------------------------------------------------------------------
diff --git a/STATUS b/STATUS
index 1adc756..42e5631 100644
--- a/STATUS
+++ b/STATUS
@@ -21,6 +21,11 @@ Description
TLP releases:
+ * isis-1.7.0 : 18 Oct 2014
+ * isis-viewer-wicket-1.7.0 : 18 Oct 2014
+ * todoapp-archetype-1.7.0 : 18 Oct 2014
+ * simpleapp-archetype-1.7.0 : 18 Oct 2014
+
* isis-1.6.0 : 28 Jul 2014
* isis-viewer-wicket-1.6.0 : 28 Jul 2014
* todoapp-archetype-1.6.0 : 28 Jul 2014