Return-Path: 
 <commits-return-5820-apmail-roller-commits-archive=roller.apache.org@roller.apache.org>
Delivered-To: apmail-roller-commits-archive@www.apache.org
Received: (qmail 44453 invoked from network); 26 Jul 2009 15:35:05 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 26 Jul 2009 15:35:05 -0000
Received: (qmail 33996 invoked by uid 500); 26 Jul 2009 15:36:10 -0000
Delivered-To: apmail-roller-commits-archive@roller.apache.org
Received: (qmail 33969 invoked by uid 500); 26 Jul 2009 15:36:10 -0000
Mailing-List: contact commits-help@roller.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@roller.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@roller.apache.org>
List-Post: <mailto:commits@roller.apache.org>
List-Id: <commits.roller.apache.org>
Reply-To: dev@roller.apache.org
Delivered-To: mailing list commits@roller.apache.org
Received: (qmail 33960 invoked by uid 99); 26 Jul 2009 15:36:10 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 26 Jul 2009 15:36:10 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 26 Jul 2009 15:36:06 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 4FF4423888D7; Sun, 26 Jul 2009 15:35:45 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r797946 - in /roller/trunk/apps/weblogger/web:
 WEB-INF/jsps/admin/UserAdmin.jsp WEB-INF/jsps/core/Login.jsp
 WEB-INF/jsps/core/Register.jsp roller-ui/authoring/editors/editor-xinha.jsp
Date: Sun, 26 Jul 2009 15:35:45 -0000
To: commits@roller.apache.org
From: snoopdave@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090726153545.4FF4423888D7@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: snoopdave
Date: Sun Jul 26 15:35:44 2009
New Revision: 797946

URL: http://svn.apache.org/viewvc?rev=797946&view=rev
Log:
removing dependence on Prototype in these JSPs, there were only a couple of references; all to the $() selector

Modified:
    roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/UserAdmin.jsp
    roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/Login.jsp
    roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/Register.jsp
    roller/trunk/apps/weblogger/web/roller-ui/authoring/editors/editor-xinha.jsp

Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/UserAdmin.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/UserAdmin.jsp?rev=797946&r1=797945&r2=797946&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/UserAdmin.jsp (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/UserAdmin.jsp Sun Jul 26 15:35:44 2009
@@ -50,6 +50,6 @@
 <%-- this forces focus to the userName field --%>
 <script type="text/javascript">
 <!--
-    $('userName').focus();
+    document.getElementById('userName').focus();
 // -->
 </script>

Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/Login.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/Login.jsp?rev=797946&r1=797945&r2=797946&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/Login.jsp (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/Login.jsp Sun Jul 26 15:35:44 2009
@@ -106,7 +106,7 @@
                 <td width="80%">
                     <input type="submit" name="login" id="login" value="<s:text name="loginPage.login" />" />
                     <input type="reset" name="reset" id="reset" value="<s:text name="loginPage.reset" />" 
-                        onclick="$('j_username').focus()" />
+                        onclick="document.getElementById('j_username').focus()" />
                 </td>
             </tr>        
 
@@ -121,11 +121,11 @@
 if (document.getElementById) {
     if (getCookie("username") != null) {
         if (document.getElementById) {
-            $("j_username").value = getCookie("username");
-            $("j_password").focus();
+            document.getElementById("j_username").value = getCookie("username");
+            document.getElementById("j_password").focus();
         }
     } else {
-        $("j_username").focus();
+        document.getElementById("j_username").focus();
     }
 }
 

Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/Register.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/Register.jsp?rev=797946&r1=797945&r2=797946&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/Register.jsp (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/Register.jsp Sun Jul 26 15:35:44 2009
@@ -160,8 +160,11 @@
     var passwordText    = document.register['bean.passwordText'].value;
     var passwordConfirm = document.register['bean.passwordConfirm'].value;
     var userName        = document.register['bean.userName'].value;
-    var emailAddress     = document.register['bean.emailAddress'].value;
-    var openIdUrl       = document.register['bean.openIdUrl'].value;
+    var emailAddress    = document.register['bean.emailAddress'].value;
+    var openIdUrl       = "";
+    if (openIdConfig != 'disabled') {
+        openIdUrl = document.register['bean.openIdUrl'].value;
+    }
     
     if (ssoEnabled) {
         if (emailAddress) disabled = false;
@@ -175,17 +178,18 @@
     } else if (openIdConfig == 'hybrid') {
         if (emailAddress && ((passwordText && passwordConfirm) || (openIdUrl)) ) disabled = false;
     }
+
     if ((passwordText || passwordConfirm) && !(passwordText == passwordConfirm)) {
-        $('readytip').innerHTML = '<s:text name="userRegister.error.mismatchedPasswords" />';
+        document.getElementById('readytip').innerHTML = '<s:text name="userRegister.error.mismatchedPasswords" />';
         disabled = true;
     } else if (disabled) {
-        $('readytip').innerHTML = '<s:text name="userRegister.tip.ready" />'
+        document.getElementById('readytip').innerHTML = '<s:text name="userRegister.tip.ready" />'
     } else {
-        $('readytip').innerHTML = '<s:text name="userRegister.success.ready" />'
+        document.getElementById('readytip').innerHTML = '<s:text name="userRegister.success.ready" />'
     }
-    //$('submit').disabled = disabled;
+    document.getElementById('submit').disabled = disabled;
 }
-//$('submit').disabled = true;
+document.getElementById('submit').disabled = true;
 </script>
 
 

Modified: roller/trunk/apps/weblogger/web/roller-ui/authoring/editors/editor-xinha.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/roller-ui/authoring/editors/editor-xinha.jsp?rev=797946&r1=797945&r2=797946&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/web/roller-ui/authoring/editors/editor-xinha.jsp (original)
+++ roller/trunk/apps/weblogger/web/roller-ui/authoring/editors/editor-xinha.jsp Sun Jul 26 15:35:44 2009
@@ -16,11 +16,12 @@
   directory of this distribution.
 --%>
 <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
+<script type="text/javascript" src="<s:url value="/roller-ui/scripts/scriptaculous/prototype.js"/>" ></script>
 
 <script type="text/javascript">
 function editorCleanup() {
-    $('xe_content').value = xinha_editors.xe_content.getHTML().trim();
-    $('xe_summary').value = xinha_editors.xe_summary.getHTML().trim();
+    document.getElementById('xe_content').value = xinha_editors.xe_content.getHTML().trim();
+    document.getElementById('xe_summary').value = xinha_editors.xe_summary.getHTML().trim();
 }
 
 // (preferably absolute) URL (including trailing slash) where Xinha is installed