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 00:57:07 UTC
svn commit: r1656605 - in /isis/site/trunk/content:
components/viewers/wicket/brand-logo.md
components/viewers/wicket/images/brand-logo.png
components/viewers/wicket/user-registration.md documentation.md
reference/recognized-annotations/about.md
Author: danhaywood
Date: Mon Feb 2 23:57:06 2015
New Revision: 1656605
URL: http://svn.apache.org/r1656605
Log:
brand logo
Added:
isis/site/trunk/content/components/viewers/wicket/brand-logo.md
- copied, changed from r1650003, isis/site/trunk/content/components/viewers/wicket/suppressing-sign-up.md
isis/site/trunk/content/components/viewers/wicket/images/brand-logo.png (with props)
Modified:
isis/site/trunk/content/components/viewers/wicket/user-registration.md
isis/site/trunk/content/documentation.md
isis/site/trunk/content/reference/recognized-annotations/about.md
Copied: isis/site/trunk/content/components/viewers/wicket/brand-logo.md (from r1650003, isis/site/trunk/content/components/viewers/wicket/suppressing-sign-up.md)
URL: http://svn.apache.org/viewvc/isis/site/trunk/content/components/viewers/wicket/brand-logo.md?p2=isis/site/trunk/content/components/viewers/wicket/brand-logo.md&p1=isis/site/trunk/content/components/viewers/wicket/suppressing-sign-up.md&r1=1650003&r2=1656605&rev=1656605&view=diff
==============================================================================
--- isis/site/trunk/content/components/viewers/wicket/suppressing-sign-up.md (original)
+++ isis/site/trunk/content/components/viewers/wicket/brand-logo.md Mon Feb 2 23:57:06 2015
@@ -1,28 +1,47 @@
-Title: Suppressing Sign Up (1.8.0-SNAPSHOT)
+Title: Brand Logo (1.8.0-SNAPSHOT)
-If [user registration](./user-registration.html) has been configured, then the Wicket viewer allows the user to
-sign-up a new account and to reset their password from the login page.
-
-The 'sign up' link can be suppressed, if required, by setting a configuration flag.
+By default the Wicket viewer will display the application name top-left in the header menu. This can be changed to
+display a png logo instead.
##Screenshots
-With 'sign up' not suppressed (the default):
-
-
+The screenshot below shows the todo application with a 'brand logo' image in its header:
-and with the link suppressed:
+
-
##Configuration
-To suppress the 'sign up' link, add the following configuration flag:
+In the application-specific subclass of `IsisWicketApplication`, bind a string with name "brandLogo" to the URL of
+an image.
+
+For example:
+
+ @Override
+ protected Module newIsisWicketModule() {
+ final Module isisDefaults = super.newIsisWicketModule();
+
+ final Module overrides = new AbstractModule() {
+ @Override
+ protected void configure() {
+ ...
+ bind(String.class).annotatedWith(Names.named("brandLogo")).toInstance("/images/todoapp-logo-160x40.png");
+ ...
+ }
+ };
+
+ return Modules.override(isisDefaults).with(overrides);
+ }
+
+
+If the logo is hosted locally, add to the relevant directory (eg `src/main/webapp/images`). It is also valid for the
+URL to be absolute.
- isis.viewer.wicket.suppressSignUp=true
+You may also wish to tweak the `application.css`. For example, a logo with height 40px works well with the following:
-Typically this should be added to the `viewer_wicket.properties` file (in `WEB-INF`), though you can add to `isis.properties` if you wish.
+ .navbar-brand img {
+ margin-top: -5px;
+ margin-left: 5px;
+ }
-##See also
-The [password reset link](./suppressing-password-reset.html) can be suppressed in a similar manner.
Added: isis/site/trunk/content/components/viewers/wicket/images/brand-logo.png
URL: http://svn.apache.org/viewvc/isis/site/trunk/content/components/viewers/wicket/images/brand-logo.png?rev=1656605&view=auto
==============================================================================
Binary file - no diff available.
Propchange: isis/site/trunk/content/components/viewers/wicket/images/brand-logo.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: isis/site/trunk/content/components/viewers/wicket/user-registration.md
URL: http://svn.apache.org/viewvc/isis/site/trunk/content/components/viewers/wicket/user-registration.md?rev=1656605&r1=1656604&r2=1656605&view=diff
==============================================================================
--- isis/site/trunk/content/components/viewers/wicket/user-registration.md (original)
+++ isis/site/trunk/content/components/viewers/wicket/user-registration.md Mon Feb 2 23:57:06 2015
@@ -11,11 +11,11 @@ In a similar way, if the user has forgot
To support this the framework requires three services to be registered and configured:
-* the [user registration service](./../../../reference/services/user-registration-service.html) provides an API to create the user account
-* the [email notification service](./../../../reference/services/email-notification-service.html) provides an API for to send the verification emails
-* the [email service](./../../../reference/services/email-service.html) that is used by the email notification service to actually send the email.
+* the [user registration service](./../../../reference/services/user-registration-service.html), which provides an API to create the user account
+* the [email notification service](./../../../reference/services/email-notification-service.html), which provides an API for to send the verification emails
+* the [email service](./../../../reference/services/email-service.html), that is used by the email notification service to actually send the email.
-The Isis core framework provides a default implementation of both the email notification service and the email service, but there is *no* default implementation of the user registration service as it will depend on how security has been configured. However, if your application uses the [Isis addons security module](https://github.com/isisaddons/isis-module-security) then an implementation is provided by that module; just add to the classpath.
+The Isis core framework provides a default implementation of both the email notification service and the email service. If your application uses the [Isis addons security module](https://github.com/isisaddons/isis-module-security) then an implementation is provided by that module; just add to the classpath. Otherwise you will need to provide your own implementation (there is *no* default implementation of the user registration service in the core framework).
##Screenshots
Modified: isis/site/trunk/content/documentation.md
URL: http://svn.apache.org/viewvc/isis/site/trunk/content/documentation.md?rev=1656605&r1=1656604&r2=1656605&view=diff
==============================================================================
--- isis/site/trunk/content/documentation.md (original)
+++ isis/site/trunk/content/documentation.md Mon Feb 2 23:57:06 2015
@@ -464,6 +464,7 @@ Features, configuration and UI customisa
#### <a name="wicket-viewer-configuration">Configuration</a>
+* [Brand logo](components/viewers/wicket/brand-logo.html) (1.8.0-SNAPSHOT)
* [Suppressing 'sign up'](components/viewers/wicket/suppressing-sign-up.html) (1.8.0-SNAPSHOT)
* [Suppressing 'password reset'](components/viewers/wicket/suppressing-password-reset.html) (1.8.0-SNAPSHOT)
* [Suppressing 'remember me'](components/viewers/wicket/suppressing-remember-me.html)
Modified: isis/site/trunk/content/reference/recognized-annotations/about.md
URL: http://svn.apache.org/viewvc/isis/site/trunk/content/reference/recognized-annotations/about.md?rev=1656605&r1=1656604&r2=1656605&view=diff
==============================================================================
--- isis/site/trunk/content/reference/recognized-annotations/about.md (original)
+++ isis/site/trunk/content/reference/recognized-annotations/about.md Mon Feb 2 23:57:06 2015
@@ -572,7 +572,7 @@ go back to: [documentation](../../docume
</tr>
</table>
-### Annotations with incomplete/partial support
+n### Annotations with incomplete/partial support
<table class="table table-bordered table-condensed table-hover">
<tr>