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/12/02 08:21:03 UTC
[1/2] isis git commit: ISIS-819 Wicket viewer should show the
environment details so can distinguish if running in productnio vs
UAT/systest/dev etc
Repository: isis
Updated Branches:
refs/heads/master 67409b154 -> e78b950a0
ISIS-819 Wicket viewer should show the environment details so can distinguish if running in productnio vs UAT/systest/dev etc
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/0092b32a
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/0092b32a
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/0092b32a
Branch: refs/heads/master
Commit: 0092b32a7daff3aaec4b0a9143e32432279077fa
Parents: 67409b1
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Nov 25 22:51:25 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Dec 2 00:10:44 2014 +0000
----------------------------------------------------------------------
.../isis/viewer/wicket/ui/pages/PageAbstract.html | 2 +-
.../isis/viewer/wicket/ui/pages/PageAbstract.java | 12 ++++++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/0092b32a/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 fb1c372..54396dc 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
@@ -96,7 +96,7 @@
</ul>
<ul class="nav navbar-nav navbar-right">
<p class="navbar-text powered-by">Powered by:</p>
- <li><a href="http://isis.apache.org" target="_blank">Apache Isis ™</a></li>
+ <li><a href="http://isis.apache.org" target="_blank">Apache Isis ™ <i wicket:id="devModeWarning" class="fa fa-lg fa-warning text-danger" title="Running in Development mode!"></i></a></li>
<li><a wicket:id="aboutLink" class="navbar-right">About</a></li>
<li wicket:id="themePicker"></li>
</ul>
http://git-wip-us.apache.org/repos/asf/isis/blob/0092b32a/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 b12fa60..43886d2 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
@@ -42,6 +42,7 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.JavaScriptReferenceHeaderItem;
import org.apache.wicket.markup.head.PriorityHeaderItem;
import org.apache.wicket.markup.head.filter.HeaderResponseContainer;
+import org.apache.wicket.markup.html.WebComponent;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
@@ -180,6 +181,7 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
addUserName(themeDiv);
addLogoutLink(themeDiv);
addAboutLink(themeDiv);
+ addDevModeWarning(themeDiv);
addBreadcrumbs();
addThemePicker();
@@ -298,6 +300,16 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
themeDiv.add(aboutLink);
}
+ /**
+ * Adds a component that shows a warning sign next to "Powered by: Apache Isis" in development mode
+ * @param themeDiv The parent component
+ */
+ private void addDevModeWarning(MarkupContainer themeDiv) {
+ WebComponent devModeWarning = new WebComponent("devModeWarning");
+ devModeWarning.setVisible(getApplication().usesDevelopmentConfig());
+ themeDiv.add(devModeWarning);
+ }
+
private void addBreadcrumbs() {
BreadcrumbPanel breadcrumbPanel = new BreadcrumbPanel(ID_BREADCRUMBS);
themeDiv.addOrReplace(breadcrumbPanel);
[2/2] isis git commit: ISIS-819: move "development" warning to be
part of the after the about link, rather than the powered by link.
Posted by da...@apache.org.
ISIS-819: move "development" warning to be part of the after the about link, rather than the powered by link.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e78b950a
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e78b950a
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e78b950a
Branch: refs/heads/master
Commit: e78b950a086c8501c9d792e064377b122ccfc24f
Parents: 0092b32
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Dec 2 07:19:26 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Dec 2 07:19:26 2014 +0000
----------------------------------------------------------------------
.../isis/viewer/wicket/ui/pages/PageAbstract.html | 10 ++++++++--
.../isis/viewer/wicket/ui/pages/PageAbstract.java | 15 +++++++++------
2 files changed, 17 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/e78b950a/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 54396dc..5cd3c10 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
@@ -96,8 +96,14 @@
</ul>
<ul class="nav navbar-nav navbar-right">
<p class="navbar-text powered-by">Powered by:</p>
- <li><a href="http://isis.apache.org" target="_blank">Apache Isis ™ <i wicket:id="devModeWarning" class="fa fa-lg fa-warning text-danger" title="Running in Development mode!"></i></a></li>
- <li><a wicket:id="aboutLink" class="navbar-right">About</a></li>
+ <li><a href="http://isis.apache.org" target="_blank">Apache Isis ™</a></li>
+ <li>
+ <a wicket:id="aboutLink" class="navbar-right">
+ <span wicket:id="aboutMessage">About</span>
+ <i wicket:id="devModeWarning" class="fa fa-lg fa-warning text-danger" title="Running in Prototype (Development) mode!"/>
+ </a>
+
+ </li>
<li wicket:id="themePicker"></li>
</ul>
</div>
http://git-wip-us.apache.org/repos/asf/isis/blob/e78b950a/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 43886d2..0d7b129 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
@@ -181,7 +181,7 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
addUserName(themeDiv);
addLogoutLink(themeDiv);
addAboutLink(themeDiv);
- addDevModeWarning(themeDiv);
+
addBreadcrumbs();
addThemePicker();
@@ -296,18 +296,21 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
private void addAboutLink(MarkupContainer themeDiv) {
BookmarkablePageLink<Void> aboutLink = new BookmarkablePageLink<>("aboutLink", AboutPage.class);
- aboutLink.setBody(new ResourceModel("aboutLabel"));
themeDiv.add(aboutLink);
+
+ Label aboutLabel = new Label("aboutMessage", new ResourceModel("aboutLabel"));
+ aboutLink.add(aboutLabel);
+ addDevModeWarning(aboutLink);
}
/**
- * Adds a component that shows a warning sign next to "Powered by: Apache Isis" in development mode
- * @param themeDiv The parent component
+ * Adds a component that shows a warning sign next to "About" link in development mode
+ * @param container The parent component
*/
- private void addDevModeWarning(MarkupContainer themeDiv) {
+ private void addDevModeWarning(MarkupContainer container) {
WebComponent devModeWarning = new WebComponent("devModeWarning");
devModeWarning.setVisible(getApplication().usesDevelopmentConfig());
- themeDiv.add(devModeWarning);
+ container.add(devModeWarning);
}
private void addBreadcrumbs() {