Salome HOME
projects / tools / siman.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f9d3105)
jQuery is included. Focus is set on username input field on login page by default.
authorrkv <rkv@opencascade.com>
Tue, 4 Dec 2012 09:02:40 +0000 (09:02 +0000)
committerrkv <rkv@opencascade.com>
Tue, 4 Dec 2012 09:02:40 +0000 (09:02 +0000)
Workspace/Siman/WebContent/layout/baseLayout.jsp patch | blob | history
Workspace/Siman/WebContent/layout/baseLayoutWithoutTitleBar.jsp patch | blob | history
Workspace/Siman/WebContent/layout/homeLayout.jsp patch | blob | history
Workspace/Siman/WebContent/layout/layoutLogin.jsp patch | blob | history
Workspace/Siman/WebContent/layout/welcomeLayout.jsp patch | blob | history
Workspace/Siman/WebContent/login.jsp patch | blob | history

diff --git a/Workspace/Siman/WebContent/layout/baseLayout.jsp b/Workspace/Siman/WebContent/layout/baseLayout.jsp
index d4d07262048ca0ec953ffd3b1e3c6ca30fa8c976..ffbc1e32dd05675b6bd3fc6908043b950649927f 100644 (file)
--- a/Workspace/Siman/WebContent/layout/baseLayout.jsp
+++ b/Workspace/Siman/WebContent/layout/baseLayout.jsp
@@ -11,7 +11,10 @@
        <title>
                <s:property value="%{getText(#request.title)}"/>
        </title>
-    <link href=<s:url value="/skin/default.css"/> rel="stylesheet" type="text/css">
+    <link href=<s:url value="/skin/default.css"/> rel="stylesheet" type="text/css"/>
+    <link href=<s:url value="/css/cupertino/jquery-ui-1.9.0.custom.css"/> rel="stylesheet"/>
+    <script src=<s:url value="/js/jquery-1.8.2.js"/>></script>
+    <script src=<s:url value="/js/jquery-ui-1.9.0.custom.js"/>></script>
 </head>
 
 <body>
diff --git a/Workspace/Siman/WebContent/layout/baseLayoutWithoutTitleBar.jsp b/Workspace/Siman/WebContent/layout/baseLayoutWithoutTitleBar.jsp
index 8db8fbf138dd83b3bac29b23372e81607b375c08..4401d4d883edcc7db578bcee69b4b7b99c56e328 100644 (file)
--- a/Workspace/Siman/WebContent/layout/baseLayoutWithoutTitleBar.jsp
+++ b/Workspace/Siman/WebContent/layout/baseLayoutWithoutTitleBar.jsp
@@ -11,7 +11,10 @@
        <title>
                <s:property value="%{getText(#request.title)}"/>
        </title>
-    <link href=<s:url value="/skin/default.css"/> rel="stylesheet" type="text/css">
+    <link href=<s:url value="/skin/default.css"/> rel="stylesheet" type="text/css"/>
+    <link href=<s:url value="/css/cupertino/jquery-ui-1.9.0.custom.css"/> rel="stylesheet"/>
+    <script src=<s:url value="/js/jquery-1.8.2.js"/>></script>
+    <script src=<s:url value="/js/jquery-ui-1.9.0.custom.js"/>></script>
 </head>
 
 <body>
diff --git a/Workspace/Siman/WebContent/layout/homeLayout.jsp b/Workspace/Siman/WebContent/layout/homeLayout.jsp
index fd331cbd5479fa5a06b90bc6e6cd6b74c11e20e5..b35caeeabf691d309e2b2ed09351559444fa4948 100644 (file)
--- a/Workspace/Siman/WebContent/layout/homeLayout.jsp
+++ b/Workspace/Siman/WebContent/layout/homeLayout.jsp
@@ -12,7 +12,10 @@
     <title>
                <s:property value="%{getText(#request.title)}"/>
        </title>
-    <link href=<s:url value="/skin/default.css"/> rel="stylesheet" type="text/css">
+    <link href=<s:url value="/skin/default.css"/> rel="stylesheet" type="text/css"/>
+    <link href=<s:url value="/css/cupertino/jquery-ui-1.9.0.custom.css"/> rel="stylesheet"/>
+    <script src=<s:url value="/js/jquery-1.8.2.js"/>></script>
+    <script src=<s:url value="/js/jquery-ui-1.9.0.custom.js"/>></script>
 </head>
 
 <body>
diff --git a/Workspace/Siman/WebContent/layout/layoutLogin.jsp b/Workspace/Siman/WebContent/layout/layoutLogin.jsp
index 384dece09062ed04c2e2697be282816c5f5f47e4..ca97ea47e2c3b421c8c666d3f9ae2fa09fdf8293 100644 (file)
--- a/Workspace/Siman/WebContent/layout/layoutLogin.jsp
+++ b/Workspace/Siman/WebContent/layout/layoutLogin.jsp
@@ -11,10 +11,13 @@
        <title>
                <tiles:insertAttribute name="title" ignore="true" />
        </title>
-       <link href=<s:url value="/skin/default.css"/> rel="stylesheet" type="text/css">
+       <link href=<s:url value="/skin/default.css"/> rel="stylesheet" type="text/css"/>
+       <link href=<s:url value="/css/cupertino/jquery-ui-1.9.0.custom.css"/> rel="stylesheet"/>
+    <script src=<s:url value="/js/jquery-1.8.2.js"/>></script>
+    <script src=<s:url value="/js/jquery-ui-1.9.0.custom.js"/>></script>
 </head>
 
-<body> <!--  onLoad="document.login.username.focus();" -->
+<body>
 
        <!-- Menu-bar -->
        <tiles:insertAttribute name="menu_bar" ignore="true" />
diff --git a/Workspace/Siman/WebContent/layout/welcomeLayout.jsp b/Workspace/Siman/WebContent/layout/welcomeLayout.jsp
index 02d9153466ea46ff6d59eca35c34b1af4188f70c..86dd973866a40bc822c2f9c37975367286bc7a03 100644 (file)
--- a/Workspace/Siman/WebContent/layout/welcomeLayout.jsp
+++ b/Workspace/Siman/WebContent/layout/welcomeLayout.jsp
@@ -13,7 +13,7 @@
        <title>
                <s:property value="%{getText(#request.title)}"/>
        </title>
-       <link href=<s:url value="/skin/default.css"/> rel="stylesheet"  type="text/css">
+       <link href=<s:url value="/skin/default.css"/> rel="stylesheet"  type="text/css"/>
 </head>
 
 <body>
diff --git a/Workspace/Siman/WebContent/login.jsp b/Workspace/Siman/WebContent/login.jsp
index 36fbc238f3d26a66df879d7836972cba85f45964..5c5f09f1ac1c9ff1372812aec7ee11a8100e00f7 100644 (file)
--- 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"%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
-<%  String menu = request.getParameter("backMenu");      // Last active menu
-%>
-<s:set var="menu"><%=menu%></s:set>
-
+<script>
+$(document).ready(function () {
+    $("#login #username").focus();
+});
+</script>
 <div id=article-box>
-       <div id=section>
-               <s:text name="title.login" />
-       </div>
-       <table width=100% border="0" cellpadding="0" cellspacing="0">
-               <tr height=10>
-                       <td></td>
-               </tr>
-               <tr>
-                       <td align=center><s:form action="login" namespace="/">
-                                       <tr class="error">
-                                               <td colspan=2><s:text name="%{errorCode}" /></td>
-                                       </tr>
-                                       <s:set var="valid">
-                                               <s:text name="menu.login" />
-                                       </s:set>
-                                       <s:textfield name="username" key="field.username" required="true" />
-                                       <s:password name="password" key="field.password" />
-                                       <s:hidden name="backMenu" value="%{menu}" />
-                                       <s:submit type="button" value="%{valid}" />
-                               </s:form></td>
-               </tr>
-               <tr height=10>
-                       <td></td>
-               </tr>
-       </table>
+<div id=section><s:text name="title.login" /></div>
+<table width=100% border="0" cellpadding="0" cellspacing="0">
+       <tr height=10>
+               <td></td>
+       </tr>
+       <tr>
+               <td align=center><s:form id="login" action="login" namespace="/">
+                       <tr class="error">
+                               <td colspan=2><s:text name="%{errorCode}" /></td>
+                       </tr>
+                       <s:set var="valid">
+                               <s:text name="menu.login" />
+                       </s:set>
+                       <s:textfield id="username" name="username" key="field.username" required="true" />
+                       <s:password name="password" key="field.password" />
+                       <s:hidden name="backMenu" value="%{#parameters.backMenu}" />
+                       <s:submit type="button" value="%{valid}" />
+               </s:form></td>
+       </tr>
+       <tr height=10>
+               <td></td>
+       </tr>
+</table>
 </div>
\ No newline at end of file
SALOME simulation manager [DEPRECATED]

Copyright © 2005–2024 Open CASCADE.
All rights reserved.
Legal Information