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

login improvements included label change (email or password) and cancel link on password change NIHVIVO-227

Browse source
This commit is contained in:
nac26 2010-07-16 12:44:10 +00:00
parent 07d018591b
commit 8c4238b05f
4 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/SiteAdminController.java
View file

@ -80,7 +80,7 @@ public class SiteAdminController extends BaseEditController {
RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP); RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP);
request.setAttribute("bodyJsp","/siteAdmin/siteAdminMain.jsp"); request.setAttribute("bodyJsp","/siteAdmin/siteAdminMain.jsp");
request.setAttribute("scripts","/siteAdmin/siteAdminScripts.jsp"); request.setAttribute("scripts","/siteAdmin/siteAdminHeadContent.jsp");
request.setAttribute("title",((Portal)request.getAttribute("portalBean")).getAppName() + " Site Administration"); request.setAttribute("title",((Portal)request.getAttribute("portalBean")).getAppName() + " Site Administration");
request.setAttribute("epoKey",epo.getKey()); request.setAttribute("epoKey",epo.getKey());
try { try {

3
webapp/web/siteAdmin/loginForm.jsp
View file

@ -9,7 +9,4 @@
String themeDir = new VitroRequest(request).getPortal().getThemeDir().replaceAll("/$", ""); String themeDir = new VitroRequest(request).getPortal().getThemeDir().replaceAll("/$", "");
%> %>
<link rel="stylesheet" type="text/css" href="<%=themeDir%>/css/login.css"/>
<%= new LoginTemplateHelper(request).showLoginPage(request) %> <%= new LoginTemplateHelper(request).showLoginPage(request) %>

15
webapp/web/siteAdmin/siteAdminHeadContent.jsp Normal file
View file

@ -0,0 +1,15 @@
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.User" %>
<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest" %>
<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
<c:set var="portal" value="${requestScope.portalBean}"/>
<c:set var="contextPath"><c:out value="${pageContext.request.contextPath}" /></c:set>
<c:set var="themeDir" value="${contextPath}/${portal.themeDir}"/>
<link rel="stylesheet" type="text/css" href="${themeDir}css/login.css"/>
<link rel="stylesheet" type="text/css" href="${themeDir}css/formedit.css"/>
<script type="text/javascript" src="js/jquery.js"></script>
<script type="text/javascript" src="js/login/loginUtils.js"></script>

2
webapp/web/templates/freemarker/body/login/login-forcedPasswordChange.ftl
View file

@ -2,8 +2,6 @@
<#-- Log in template for accessing site admin --> <#-- Log in template for accessing site admin -->
${stylesheets.addFromTheme("/login.css")}
${stylesheets.addFromTheme("/formedit.css")}
<div id="formLogin" class="pageBodyGroup"> <div id="formLogin" class="pageBodyGroup">
<h2>Create Your New Password</h2> <h2>Create Your New Password</h2>