From c7d04d2948b107cd01380a257194af71fc63018e Mon Sep 17 00:00:00 2001 From: rkv Date: Tue, 4 Dec 2012 09:02:40 +0000 Subject: [PATCH] jQuery is included. Focus is set on username input field on login page by default. --- .../Siman/WebContent/layout/baseLayout.jsp | 5 +- .../layout/baseLayoutWithoutTitleBar.jsp | 5 +- .../Siman/WebContent/layout/homeLayout.jsp | 5 +- .../Siman/WebContent/layout/layoutLogin.jsp | 7 ++- .../Siman/WebContent/layout/welcomeLayout.jsp | 2 +- Workspace/Siman/WebContent/login.jsp | 60 +++++++++---------- 6 files changed, 48 insertions(+), 36 deletions(-) diff --git a/Workspace/Siman/WebContent/layout/baseLayout.jsp b/Workspace/Siman/WebContent/layout/baseLayout.jsp index d4d0726..ffbc1e3 100644 --- a/Workspace/Siman/WebContent/layout/baseLayout.jsp +++ b/Workspace/Siman/WebContent/layout/baseLayout.jsp @@ -11,7 +11,10 @@ <s:property value="%{getText(#request.title)}"/> - rel="stylesheet" type="text/css"> + rel="stylesheet" type="text/css"/> + rel="stylesheet"/> + + diff --git a/Workspace/Siman/WebContent/layout/baseLayoutWithoutTitleBar.jsp b/Workspace/Siman/WebContent/layout/baseLayoutWithoutTitleBar.jsp index 8db8fbf..4401d4d 100644 --- a/Workspace/Siman/WebContent/layout/baseLayoutWithoutTitleBar.jsp +++ b/Workspace/Siman/WebContent/layout/baseLayoutWithoutTitleBar.jsp @@ -11,7 +11,10 @@ <s:property value="%{getText(#request.title)}"/> - rel="stylesheet" type="text/css"> + rel="stylesheet" type="text/css"/> + rel="stylesheet"/> + + diff --git a/Workspace/Siman/WebContent/layout/homeLayout.jsp b/Workspace/Siman/WebContent/layout/homeLayout.jsp index fd331cb..b35caee 100644 --- a/Workspace/Siman/WebContent/layout/homeLayout.jsp +++ b/Workspace/Siman/WebContent/layout/homeLayout.jsp @@ -12,7 +12,10 @@ <s:property value="%{getText(#request.title)}"/> - rel="stylesheet" type="text/css"> + rel="stylesheet" type="text/css"/> + rel="stylesheet"/> + + diff --git a/Workspace/Siman/WebContent/layout/layoutLogin.jsp b/Workspace/Siman/WebContent/layout/layoutLogin.jsp index 384dece..ca97ea4 100644 --- a/Workspace/Siman/WebContent/layout/layoutLogin.jsp +++ b/Workspace/Siman/WebContent/layout/layoutLogin.jsp @@ -11,10 +11,13 @@ <tiles:insertAttribute name="title" ignore="true" /> - rel="stylesheet" type="text/css"> + rel="stylesheet" type="text/css"/> + rel="stylesheet"/> + + - + diff --git a/Workspace/Siman/WebContent/layout/welcomeLayout.jsp b/Workspace/Siman/WebContent/layout/welcomeLayout.jsp index 02d9153..86dd973 100644 --- a/Workspace/Siman/WebContent/layout/welcomeLayout.jsp +++ b/Workspace/Siman/WebContent/layout/welcomeLayout.jsp @@ -13,7 +13,7 @@ <s:property value="%{getText(#request.title)}"/> - rel="stylesheet" type="text/css"> + rel="stylesheet" type="text/css"/> diff --git a/Workspace/Siman/WebContent/login.jsp b/Workspace/Siman/WebContent/login.jsp index 36fbc23..5c5f09f 100644 --- a/Workspace/Siman/WebContent/login.jsp +++ b/Workspace/Siman/WebContent/login.jsp @@ -1,35 +1,35 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%> +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" + pageEncoding="ISO-8859-1"%> <%@ taglib prefix="s" uri="/struts-tags"%> -<% String menu = request.getParameter("backMenu"); // Last active menu -%> -<%=menu%> - +
-
- -
- - - - - - - - - - - - - - - - - - - - -
-
+
+ + + + + + + + + + + + + + + + + + + + +
+
\ No newline at end of file -- 2.39.2