xlawrence 2005/10/04 12:28:10 CEST
Modified files:
core/src/webapp/jsp/jahia/engines engine.jsp
core/src/webapp/jsp/jahia/engines/login login.jsp
Log:
moved login javascrupts from engine.jsp to login.jsp
Revision Changes Path
1.15 +42 -71 jahia/core/src/webapp/jsp/jahia/engines/engine.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/engine.jsp.diff?r1=1.14&r2=1.15&f=h
1.6 +26 -0 jahia/core/src/webapp/jsp/jahia/engines/login/login.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/login/login.jsp.diff?r1=1.5&r2=1.6&f=h
Index: engine.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/engine.jsp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- engine.jsp 2 Oct 2005 17:52:47 -0000 1.14
+++ engine.jsp 4 Oct 2005 10:28:09 -0000 1.15
@@ -30,78 +30,78 @@
final Properties includes = new Properties();
// shared jsp
- includes.setProperty("close", "/jsp/jahia/engines/shared/close.jsp");
- includes.setProperty("cancel", "/jsp/jahia/engines/shared/cancel.jsp");
- includes.setProperty("apply", "/jsp/jahia/engines/shared/apply.jsp");
- includes.setProperty("not_editable_field",
"/jsp/jahia/engines/shared/not_editable_field.jsp");
+ includes.setProperty("close",
"/jsp/jahia/engines/shared/close.jsp");
+ includes.setProperty("cancel",
"/jsp/jahia/engines/shared/cancel.jsp");
+ includes.setProperty("apply",
"/jsp/jahia/engines/shared/apply.jsp");
+ includes.setProperty("not_editable_field",
"/jsp/jahia/engines/shared/not_editable_field.jsp");
// login engine
- includes.setProperty("login", "/jsp/jahia/engines/login/login.jsp");
- includes.setProperty("bad_login",
"/jsp/jahia/engines/login/badlogin.jsp");
- includes.setProperty("login_close",
"/jsp/jahia/engines/login/close.jsp");
+ includes.setProperty("login",
"/jsp/jahia/engines/login/login.jsp");
+ includes.setProperty("bad_login",
"/jsp/jahia/engines/login/badlogin.jsp");
+ includes.setProperty("login_close",
"/jsp/jahia/engines/login/close.jsp");
// page properties engine
- includes.setProperty("page_properties",
"/jsp/jahia/engines/pages/pageproperties.jsp");
+ includes.setProperty("page_properties",
"/jsp/jahia/engines/pages/pageproperties.jsp");
// update field engine
- includes.setProperty("update_field",
"/jsp/jahia/engines/updatefield/updatefield.jsp");
+ includes.setProperty("update_field",
"/jsp/jahia/engines/updatefield/updatefield.jsp");
// add container engine
- includes.setProperty("add_container",
"/jsp/jahia/engines/addcontainer/addcontainer.jsp");
+ includes.setProperty("add_container",
"/jsp/jahia/engines/addcontainer/addcontainer.jsp");
// update container engine
- includes.setProperty("update_container",
"/jsp/jahia/engines/addcontainer/addcontainer.jsp");
+ includes.setProperty("update_container",
"/jsp/jahia/engines/addcontainer/addcontainer.jsp");
// delete container engine
- includes.setProperty("delete_container",
"/jsp/jahia/engines/deletecontainer/deletecontainer.jsp");
+ includes.setProperty("delete_container",
"/jsp/jahia/engines/deletecontainer/deletecontainer.jsp");
// container list properties
- includes.setProperty("container_list_properties",
"/jsp/jahia/engines/containerlistproperties/containerlistproperties.jsp");
+ includes.setProperty("container_list_properties",
"/jsp/jahia/engines/containerlistproperties/containerlistproperties.jsp");
// rights engine
- includes.setProperty("manage_rights",
"/jsp/jahia/engines/rights/managerights.jsp");
- includes.setProperty("manage_rights_close",
"/jsp/jahia/engines/rights/close.jsp");
+ includes.setProperty("manage_rights",
"/jsp/jahia/engines/rights/managerights.jsp");
+ includes.setProperty("manage_rights_close",
"/jsp/jahia/engines/rights/close.jsp");
// templates engine
- includes.setProperty("manage_template",
"/jsp/jahia/engines/template/template.jsp");
+ includes.setProperty("manage_template",
"/jsp/jahia/engines/template/template.jsp");
// select page engine
- includes.setProperty("select_page",
"/jsp/jahia/engines/selectpage/select_page.jsp");
- includes.setProperty("selectPage_close",
"/jsp/jahia/engines/selectpage/close.jsp");
+ includes.setProperty("select_page",
"/jsp/jahia/engines/selectpage/select_page.jsp");
+ includes.setProperty("selectPage_close",
"/jsp/jahia/engines/selectpage/close.jsp");
// filemanager engine
- includes.setProperty("filemanager",
"/jsp/jahia/engines/filemanager/filemanager.jsp");
- includes.setProperty("filemanager_fileupload",
"/jsp/jahia/engines/filemanager/fileupload.jsp");
- includes.setProperty("filemanager_fileuploadconfirm",
"/jsp/jahia/engines/filemanager/fileuploadconfirm.jsp");
- includes.setProperty("filemanager_filedelete",
"/jsp/jahia/engines/filemanager/filedelete.jsp");
- includes.setProperty("filemanager_fileusage",
"/jsp/jahia/engines/filemanager/fileusage.jsp");
- includes.setProperty("filemanager_filerename",
"/jsp/jahia/engines/filemanager/filerename.jsp");
- includes.setProperty("filemanager_error",
"/jsp/jahia/engines/filemanager/error.jsp");
- includes.setProperty("filemanager_close",
"/jsp/jahia/engines/filemanager/close.jsp");
- includes.setProperty("filemanager_reloadpage",
"/jsp/jahia/engines/filemanager/reloadpage.jsp");
- includes.setProperty("filemanager_view",
"/jsp/jahia/engines/filemanager/view.jsp");
- includes.setProperty("filemanager_fileedit",
"/jsp/jahia/engines/filemanager/fileedit.jsp");
- includes.setProperty("filemanager_createdir",
"/jsp/jahia/engines/filemanager/createdir.jsp");
- includes.setProperty("filemanager_migration",
"/jsp/jahia/engines/filemanager/migration.jsp");
-
- includes.setProperty("selectUG",
"/jsp/jahia/engines/users/selectUG.jsp");
- includes.setProperty("selectusers_close",
"/jsp/jahia/engines/users/close.jsp");
- includes.setProperty("edituserpreferences",
"/jsp/jahia/engines/users/editUserPreferences.jsp");
+ includes.setProperty("filemanager",
"/jsp/jahia/engines/filemanager/filemanager.jsp");
+ includes.setProperty("filemanager_fileupload",
"/jsp/jahia/engines/filemanager/fileupload.jsp");
+ includes.setProperty("filemanager_fileuploadconfirm",
"/jsp/jahia/engines/filemanager/fileuploadconfirm.jsp");
+ includes.setProperty("filemanager_filedelete",
"/jsp/jahia/engines/filemanager/filedelete.jsp");
+ includes.setProperty("filemanager_fileusage",
"/jsp/jahia/engines/filemanager/fileusage.jsp");
+ includes.setProperty("filemanager_filerename",
"/jsp/jahia/engines/filemanager/filerename.jsp");
+ includes.setProperty("filemanager_error",
"/jsp/jahia/engines/filemanager/error.jsp");
+ includes.setProperty("filemanager_close",
"/jsp/jahia/engines/filemanager/close.jsp");
+ includes.setProperty("filemanager_reloadpage",
"/jsp/jahia/engines/filemanager/reloadpage.jsp");
+ includes.setProperty("filemanager_view",
"/jsp/jahia/engines/filemanager/view.jsp");
+ includes.setProperty("filemanager_fileedit",
"/jsp/jahia/engines/filemanager/fileedit.jsp");
+ includes.setProperty("filemanager_createdir",
"/jsp/jahia/engines/filemanager/createdir.jsp");
+ includes.setProperty("filemanager_migration",
"/jsp/jahia/engines/filemanager/migration.jsp");
+
+ includes.setProperty("selectUG",
"/jsp/jahia/engines/users/selectUG.jsp");
+ includes.setProperty("selectusers_close",
"/jsp/jahia/engines/users/close.jsp");
+ includes.setProperty("edituserpreferences",
"/jsp/jahia/engines/users/editUserPreferences.jsp");
- includes.setProperty("versioning",
"/jsp/jahia/engines/versioning/versioning.jsp");
+ includes.setProperty("versioning",
"/jsp/jahia/engines/versioning/versioning.jsp");
- includes.setProperty("advworkflow",
"/jsp/jahia/engines/workflow/adv_workflow.jsp");
+ includes.setProperty("advworkflow",
"/jsp/jahia/engines/workflow/adv_workflow.jsp");
- includes.setProperty("lock", "/jsp/jahia/engines/lock/lock.jsp");
+ includes.setProperty("lock",
"/jsp/jahia/engines/lock/lock.jsp");
// metadata engine
- includes.setProperty("metadata_engine",
"/jsp/jahia/engines/addcontainer/addcontainer.jsp");
+ includes.setProperty("metadata_engine",
"/jsp/jahia/engines/addcontainer/addcontainer.jsp");
- includes.setProperty("mysettings",
"/jsp/jahia/engines/mysettings/mysettings.jsp");
+ includes.setProperty("mysettings",
"/jsp/jahia/engines/mysettings/mysettings.jsp");
- includes.setProperty("contentdefinition_forward",
"/views/engines/contentdefinition/index.jsp");
+ includes.setProperty("contentdefinition_forward",
"/views/engines/contentdefinition/index.jsp");
- includes.setProperty("timebasedpublishing_engine",
"/jsp/jahia/engines/timebasedpublishing/timebasedpublishing.jsp");
+ includes.setProperty("timebasedpublishing_engine",
"/jsp/jahia/engines/timebasedpublishing/timebasedpublishing.jsp");
request.setAttribute("includes", includes);
@@ -218,38 +218,9 @@
window.onunload = closeEngineWin;
</script>
-<!-- Script used by the login jsp -->
-<script type="text/javascript">
-
- function autoFocus(username) {
- if (username && username != "null" && username != "") {
- document.mainForm.password.focus();
- } else {
- document.mainForm.username.focus();
- }
- }
-
- document.onkeydown = keyDown;
-
- function keyDown(e) {
- if (!e) e = window.event;
- // e gives access to the event in all browsers
- var ieKey = e.keyCode;
- if (ieKey == 13) {
- sendFormSave();
- }
- if (ieKey == 87 && event.ctrlKey) {
- window.close();
- }
- }
-</script>
</head>
-<% if (jspSource.equals("login")) { %>
-<body onload="autoFocus('<%=request.getParameter("username")%>')">
-<% } else { %>
<body>
-<% } %>
<div id="wrapper">
<div id="header">
<h1>Jahia Engine</h1>
Index: login.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/login/login.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- login.jsp 29 Sep 2005 15:02:05 -0000 1.5
+++ login.jsp 4 Oct 2005 10:28:10 -0000 1.6
@@ -17,6 +17,32 @@
<h3 class="loginIcon"><jahia:engineResourceBundle
resourceName="org.jahia.engines.loginToJahia.label"/></h3>
+<!-- Script used by the login jsp -->
+<script type="text/javascript">
+
+ function autoFocus(username) {
+ if (username && username != "null" && username != "") {
+ document.mainForm.password.focus();
+ } else {
+ document.mainForm.username.focus();
+ }
+ }
+
+ document.onkeydown = keyDown;
+
+ function keyDown(e) {
+ if (!e) e = window.event;
+ // e gives access to the event in all browsers
+ var ieKey = e.keyCode;
+ if (ieKey == 13) {
+ sendFormSave();
+ }
+ if (ieKey == 87 && event.ctrlKey) {
+ window.close();
+ }
+ }
+</script>
+
<table>
<tr>
<td class="t3">
