litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use login widget on login page (committing files that got skipped in r6451). Add help() method to WidgetDirective.

Browse source
This commit is contained in:
rjy7 2010-11-16 15:10:12 +00:00
parent 6c43c7dada
commit 7d28e601ea
5 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
productMods/WEB-INF/web.xml
View file

@ -389,7 +389,16 @@
<servlet-name>SiteAdminController</servlet-name> <servlet-name>SiteAdminController</servlet-name>
<url-pattern>/siteAdmin.jsp</url-pattern> <url-pattern>/siteAdmin.jsp</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet>
<servlet-name>EmptyController</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.EmptyController</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>EmptyController</servlet-name>
<url-pattern>/login</url-pattern>
</servlet-mapping>
<servlet> <servlet>
<servlet-name>RevisionInfoController</servlet-name> <servlet-name>RevisionInfoController</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.RevisionInfoController</servlet-class> <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.RevisionInfoController</servlet-class>
@ -1292,10 +1301,12 @@
<servlet-name>authenticate</servlet-name> <servlet-name>authenticate</servlet-name>
<url-pattern>/authenticate</url-pattern> <url-pattern>/authenticate</url-pattern>
</servlet-mapping> </servlet-mapping>
<!--
<servlet-mapping> <servlet-mapping>
<servlet-name>login</servlet-name> <servlet-name>login</servlet-name>
<url-pattern>/login</url-pattern> <url-pattern>/login</url-pattern>
</servlet-mapping> </servlet-mapping>
-->
<servlet-mapping> <servlet-mapping>
<servlet-name>loginShibbolethSetup</servlet-name> <servlet-name>loginShibbolethSetup</servlet-name>
<url-pattern>/loginShibboleth</url-pattern> <url-pattern>/loginShibboleth</url-pattern>

5
themes/wilma/css/wilma.css
View file

@ -222,7 +222,6 @@ ul#main-nav {
} }
/* LOG IN------> */ /* LOG IN------> */
#log-in { #log-in {
float:right;
width:314px; width:314px;
height:390px; height:390px;
border:1px solid #e8ece9; border:1px solid #e8ece9;
@ -231,6 +230,10 @@ ul#main-nav {
padding-bottom:30px; padding-bottom:30px;
margin-bottom:30px; margin-bottom:30px;
} }
/* Login container on home page */
#login-container {
float: right;
}
#log-in h2 { #log-in h2 {
font-size: 22px; font-size: 22px;
color: #2485ae; color: #2485ae;

BIN
themes/wilma/site_icons/iconAlert.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
themes/wilma/site_icons/iconAlertBig.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

10
themes/wilma/templates/page-home.ftl
View file

@ -1,8 +1,6 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#import "lib-list.ftl" as l> <@widget name="login" include="assets" />
<#import "widget-login.ftl" as login>
<@login.assets />
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
@ -112,9 +110,11 @@
</fieldset> </fieldset>
</section> <!-- #search-home --> </section> <!-- #search-home -->
</section> <!-- #intro --> </section> <!-- #intro -->
<section id="login-container">
<@widget name="login" />
</section>
<@login.markup />
<section id="browse"> <section id="browse">
<h4>Browse</h4> <h4>Browse</h4>