You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2015/02/03 23:57:15 UTC
[2/5] isis git commit: ISIS-1025: fixing merge issues,
also reworking todoapp logos.
ISIS-1025: fixing merge issues, also reworking todoapp logos.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/5474123a
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/5474123a
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/5474123a
Branch: refs/heads/master
Commit: 5474123a231d6bd02f230d39416d90f64980d3c4
Parents: 8fbebea
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Feb 3 22:08:45 2015 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Feb 3 22:34:18 2015 +0000
----------------------------------------------------------------------
.../ui/components/header/HeaderPanel.java | 34 +++++++++----------
.../main/webapp/images/todoapp-logo-160x40.pdn | Bin 13944 -> 0 bytes
.../main/webapp/images/todoapp-logo-160x40.png | Bin 4383 -> 5560 bytes
.../main/webapp/images/todoapp-logo-header.pdn | Bin 0 -> 17124 bytes
.../main/webapp/images/todoapp-logo-header.png | Bin 0 -> 5560 bytes
.../main/webapp/images/todoapp-logo-signin.pdn | Bin 0 -> 35612 bytes
.../main/webapp/images/todoapp-logo-signin.png | Bin 0 -> 15079 bytes
7 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/5474123a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanel.java
index f90f47a..de42b42 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanel.java
@@ -1,27 +1,26 @@
package org.apache.isis.viewer.wicket.ui.components.header;
import java.util.Locale;
+import com.google.inject.Inject;
+import com.google.inject.name.Named;
+import org.apache.wicket.Component;
+import org.apache.wicket.MarkupContainer;
+import org.apache.wicket.Page;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.isis.applib.annotation.DomainServiceLayout;
import org.apache.isis.applib.services.userprof.UserProfileService;
import org.apache.isis.viewer.wicket.model.common.PageParametersUtils;
import org.apache.isis.viewer.wicket.model.models.ServiceActionsModel;
import org.apache.isis.viewer.wicket.ui.ComponentType;
import org.apache.isis.viewer.wicket.ui.components.widgets.navbar.BrandLogo;
-import org.apache.isis.viewer.wicket.ui.pages.PageAbstract;
+import org.apache.isis.viewer.wicket.ui.components.widgets.navbar.BrandName;
import org.apache.isis.viewer.wicket.ui.pages.error.ErrorPage;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.isis.viewer.wicket.ui.util.Components;
-import org.apache.wicket.Component;
-import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.Page;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-import com.google.inject.Inject;
-import com.google.inject.name.Named;
/**
* A panel for the default page header
@@ -71,10 +70,11 @@ public class HeaderPanel extends PanelAbstract<Model<String>> {
protected void addApplicationName() {
Class<? extends Page> homePage = getApplication().getHomePage();
final BookmarkablePageLink<Void> applicationNameLink = new BookmarkablePageLink<>("applicationName", homePage);
- final Label brandLabel = new Label("brandText", applicationName);
- brandLabel.setVisible(brandLogo == null);
- final BrandLogo brandImage = new BrandLogo(brandLogo);
- applicationNameLink.add(brandLabel, brandImage);
+
+ final BrandLogo brandImage = new BrandLogo("brandLogo");
+ final BrandName brandName = new BrandName("brandText");
+ applicationNameLink.add(brandName, brandImage);
+
add(applicationNameLink);
}
@@ -107,7 +107,7 @@ public class HeaderPanel extends PanelAbstract<Model<String>> {
if (getPage() instanceof ErrorPage) {
Components.permanentlyHide(this, ID_PRIMARY_MENU_BAR);
Components.permanentlyHide(this, ID_SECONDARY_MENU_BAR);
- addMenuBar(this, ID_TERTIARY_MENU_BAR, null);
+ addMenuBar(this, ID_TERTIARY_MENU_BAR, DomainServiceLayout.MenuBar.TERTIARY);
} else {
addMenuBar(this, ID_PRIMARY_MENU_BAR, DomainServiceLayout.MenuBar.PRIMARY);
addMenuBar(this, ID_SECONDARY_MENU_BAR, DomainServiceLayout.MenuBar.SECONDARY);
http://git-wip-us.apache.org/repos/asf/isis/blob/5474123a/example/application/todoapp/webapp/src/main/webapp/images/todoapp-logo-160x40.pdn
----------------------------------------------------------------------
diff --git a/example/application/todoapp/webapp/src/main/webapp/images/todoapp-logo-160x40.pdn b/example/application/todoapp/webapp/src/main/webapp/images/todoapp-logo-160x40.pdn
deleted file mode 100644
index bb07783..0000000
Binary files a/example/application/todoapp/webapp/src/main/webapp/images/todoapp-logo-160x40.pdn and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/5474123a/example/application/todoapp/webapp/src/main/webapp/images/todoapp-logo-160x40.png
----------------------------------------------------------------------
diff --git a/example/application/todoapp/webapp/src/main/webapp/images/todoapp-logo-160x40.png b/example/application/todoapp/webapp/src/main/webapp/images/todoapp-logo-160x40.png
index 06ef909..2c417fb 100644
Binary files a/example/application/todoapp/webapp/src/main/webapp/images/todoapp-logo-160x40.png and b/example/application/todoapp/webapp/src/main/webapp/images/todoapp-logo-160x40.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/5474123a/example/application/todoapp/webapp/src/main/webapp/images/todoapp-logo-header.pdn
----------------------------------------------------------------------
diff --git a/example/application/todoapp/webapp/src/main/webapp/images/todoapp-logo-header.pdn b/example/application/todoapp/webapp/src/main/webapp/images/todoapp-logo-header.pdn
new file mode 100644
index 0000000..016c9b8
Binary files /dev/null and b/example/application/todoapp/webapp/src/main/webapp/images/todoapp-logo-header.pdn differ
http://git-wip-us.apache.org/repos/asf/isis/blob/5474123a/example/application/todoapp/webapp/src/main/webapp/images/todoapp-logo-header.png
----------------------------------------------------------------------
diff --git a/example/application/todoapp/webapp/src/main/webapp/images/todoapp-logo-header.png b/example/application/todoapp/webapp/src/main/webapp/images/todoapp-logo-header.png
new file mode 100644
index 0000000..2c417fb
Binary files /dev/null and b/example/application/todoapp/webapp/src/main/webapp/images/todoapp-logo-header.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/5474123a/example/application/todoapp/webapp/src/main/webapp/images/todoapp-logo-signin.pdn
----------------------------------------------------------------------
diff --git a/example/application/todoapp/webapp/src/main/webapp/images/todoapp-logo-signin.pdn b/example/application/todoapp/webapp/src/main/webapp/images/todoapp-logo-signin.pdn
new file mode 100644
index 0000000..7a164e1
Binary files /dev/null and b/example/application/todoapp/webapp/src/main/webapp/images/todoapp-logo-signin.pdn differ
http://git-wip-us.apache.org/repos/asf/isis/blob/5474123a/example/application/todoapp/webapp/src/main/webapp/images/todoapp-logo-signin.png
----------------------------------------------------------------------
diff --git a/example/application/todoapp/webapp/src/main/webapp/images/todoapp-logo-signin.png b/example/application/todoapp/webapp/src/main/webapp/images/todoapp-logo-signin.png
new file mode 100644
index 0000000..ee2feb4
Binary files /dev/null and b/example/application/todoapp/webapp/src/main/webapp/images/todoapp-logo-signin.png differ