[Carbon-commits] [Carbon] svn commit r114297 - branches/carbon/3.2.0/components/stratos/org.wso2.carbon.gapp.registration.ui/1.5.2/src/main/resources/web/gappregistration
dimuthul at wso2.com
dimuthul at wso2.com
Tue Oct 18 01:32:56 EDT 2011
Author: dimuthul
Date: Mon Oct 17 22:32:56 2011
New Revision: 114297
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=114297
Log:
Fixing the JS errors and JS functions.
Modified:
branches/carbon/3.2.0/components/stratos/org.wso2.carbon.gapp.registration.ui/1.5.2/src/main/resources/web/gappregistration/done_ajaxprocessor.jsp
branches/carbon/3.2.0/components/stratos/org.wso2.carbon.gapp.registration.ui/1.5.2/src/main/resources/web/gappregistration/setup_ajaxprocessor.jsp
Modified: branches/carbon/3.2.0/components/stratos/org.wso2.carbon.gapp.registration.ui/1.5.2/src/main/resources/web/gappregistration/done_ajaxprocessor.jsp
URL: http://wso2.org/svn/browse/wso2/branches/carbon/3.2.0/components/stratos/org.wso2.carbon.gapp.registration.ui/1.5.2/src/main/resources/web/gappregistration/done_ajaxprocessor.jsp?rev=114297&r1=114296&r2=114297&view=diff
==============================================================================
--- branches/carbon/3.2.0/components/stratos/org.wso2.carbon.gapp.registration.ui/1.5.2/src/main/resources/web/gappregistration/done_ajaxprocessor.jsp (original)
+++ branches/carbon/3.2.0/components/stratos/org.wso2.carbon.gapp.registration.ui/1.5.2/src/main/resources/web/gappregistration/done_ajaxprocessor.jsp Mon Oct 17 22:32:56 2011
@@ -29,12 +29,10 @@
<%@page import="org.wso2.carbon.ui.util.CharacterEncoder"%><script type="text/javascript" src="../userstore/extensions/js/vui.js"></script>
<script type="text/javascript" src="../admin/js/main.js"></script>
-<!-- jsp:include page="../dialog/display_messages.jsp"/ -->
-
<%
String domain = (String)session.getAttribute("domain");
String callback = (String)session.getAttribute("callback");
- String success = "successful";
+ boolean isSuccess = true;
try {
String subscription = (String)request.getParameter("usage-plan-name");
String firstName = (String)request.getParameter("admin-firstname");
@@ -48,12 +46,29 @@
GoolgeAppsRegistrationClient client = new GoolgeAppsRegistrationClient();
client.registerTenantForGAppDomain(backendServerURL, configContext, domain, email, firstName, lastName, subscription);
} catch (Exception e) {
- success = "unsuccessful. Please contacat administrator";
+ isSuccess = false;
}
%>
<link href="../admin/css/global.css" rel="stylesheet" type="text/css" media="all"/>
<link href="../admin/css/main.css" rel="stylesheet" type="text/css" media="all"/>
<link href="../tenant-register/css/tenant-register.css" rel="stylesheet" type="text/css" media="all"/>
+
+
+ <link href="../dialog/css/jqueryui/jqueryui-themeroller.css" rel="stylesheet" type="text/css" media="all"/>
+ <link href="../dialog/css/dialog.css" rel="stylesheet" type="text/css" media="all"/>
+ <link rel="icon" href="../admin/images/favicon.ico" type="image/x-icon"/>
+ <link rel="shortcut icon" href="../admin/images/favicon.ico" type="image/x-icon"/>
+
+ <script type="text/javascript" src="../admin/js/jquery.js"></script>
+ <script type="text/javascript" src="../admin/js/jquery.form.js"></script>
+ <script type="text/javascript" src="../dialog/js/jqueryui/jquery-ui.min.js"></script>
+ <script type="text/javascript" src="../dialog/js/dialog.js"></script>
+
+ <script type="text/javascript" src="../admin/js/main.js"></script>
+ <script type="text/javascript" src="../admin/js/WSRequest.js"></script>
+ <script type="text/javascript" src="../admin/js/cookies.js"></script>
+ <script src="../yui/build/yahoo-dom-event/yahoo-dom-event.js" type="text/javascript"></script>
+ <script src="../admin/js/widgets.js" type="text/javascript"></script>
<!--[if gte IE 8]>
<link href="../dialog/css/dialog-ie8.css" rel="stylesheet" type="text/css" media="all"/>
<![endif]-->
@@ -70,6 +85,21 @@
</style>
</head>
<body>
+<div id="dcontainer"></div>
+ <%if (isSuccess) {%>
+ <script type="text/javascript">
+ jQuery(document).ready(function() {
+ CARBON.showInfoDialog("Stratos setup was successful! You are being redirected back to Google");
+ });
+ </script>
+ <%} else {%>
+ <script type="text/javascript">
+ jQuery(document).ready(function() {
+ CARBON.showErrorDialog("Stratos setup was unsuccessful! You are being redirected back to Google");
+ });
+ </script>
+ <%}%>
+
<table id="main-table" border="0" cellspacing="0">
<tr>
<td id="header"><jsp:include page="../admin/layout/header.jsp" />
@@ -84,13 +114,18 @@
<tr>
<td id="body">
<fmt:bundle basename="org.wso2.carbon.gapp.registration.ui.i18n.Resources">
+
<script type="text/javascript">
</script>
<div id="middle">
<div id="workArea">
- <p>Setting up Stratos for Google App domain <%=domain%> was <%=success%>. You are being redirected back to <%=callback%></p>
+ <%if (isSuccess) {%>
+ <p>Setting up Stratos was successful. You are being redirected back to <%=callback%></p>
+ <% } else { %>
+ <p>Setting up Stratos was unsuccessful. You are being redirected back to <%=callback%></p>
+ <% } %>
</div>
</div>
</fmt:bundle>
Modified: branches/carbon/3.2.0/components/stratos/org.wso2.carbon.gapp.registration.ui/1.5.2/src/main/resources/web/gappregistration/setup_ajaxprocessor.jsp
URL: http://wso2.org/svn/browse/wso2/branches/carbon/3.2.0/components/stratos/org.wso2.carbon.gapp.registration.ui/1.5.2/src/main/resources/web/gappregistration/setup_ajaxprocessor.jsp?rev=114297&r1=114296&r2=114297&view=diff
==============================================================================
--- branches/carbon/3.2.0/components/stratos/org.wso2.carbon.gapp.registration.ui/1.5.2/src/main/resources/web/gappregistration/setup_ajaxprocessor.jsp (original)
+++ branches/carbon/3.2.0/components/stratos/org.wso2.carbon.gapp.registration.ui/1.5.2/src/main/resources/web/gappregistration/setup_ajaxprocessor.jsp Mon Oct 17 22:32:56 2011
@@ -34,11 +34,9 @@
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar" prefix="carbon" %>
-<script type="text/javascript" src="../userstore/extensions/js/vui.js"></script>
<script type="text/javascript" src="../admin/js/main.js"></script>
-<!-- jsp:include page="../dialog/display_messages.jsp"/ -->
-
<%
+//validateEmpty(fldname)
String domain = request.getParameter("domain");
String callback = request.getParameter("callback");
JSONArray packagesString = null;
@@ -79,6 +77,7 @@
return;
}
%>
+
<link href="../dialog/css/dialog.css" rel="stylesheet" type="text/css" media="all"/>
<link href="../admin/css/global.css" rel="stylesheet" type="text/css" media="all"/>
<link href="../admin/css/main.css" rel="stylesheet" type="text/css" media="all"/>
@@ -97,8 +96,62 @@
font-size:12px;
}
</style>
+
+ <link href="../dialog/css/jqueryui/jqueryui-themeroller.css" rel="stylesheet" type="text/css" media="all"/>
+ <link href="../dialog/css/dialog.css" rel="stylesheet" type="text/css" media="all"/>
+ <link rel="icon" href="../admin/images/favicon.ico" type="image/x-icon"/>
+ <link rel="shortcut icon" href="../admin/images/favicon.ico" type="image/x-icon"/>
+
+ <script type="text/javascript" src="../admin/js/jquery.js"></script>
+ <script type="text/javascript" src="../admin/js/jquery.form.js"></script>
+ <script type="text/javascript" src="../dialog/js/jqueryui/jquery-ui.min.js"></script>
+ <script type="text/javascript" src="../dialog/js/dialog.js"></script>
+
+ <script type="text/javascript" src="../admin/js/main.js"></script>
+ <script type="text/javascript" src="../admin/js/WSRequest.js"></script>
+ <script type="text/javascript" src="../admin/js/cookies.js"></script>
+ <script src="../yui/build/yahoo-dom-event/yahoo-dom-event.js" type="text/javascript"></script>
+ <script src="../admin/js/widgets.js" type="text/javascript"></script>
+
+<script type="text/javascript">
+function validateGAppSetupInfo() {
+ var error = validateEmpty('admin-email');
+ if (error) {
+ CARBON.showWarningDialog("Email address cannot be empty.");
+ return false;
+ }
+
+ var fld = document.getElementById('admin-email');
+ var value = fld.value;
+ if (value.indexOf("@") > -1 ) {
+ var emaildomain = value.substring(value.indexOf("@")+1, value.length);
+ if (emaildomain == "<%=domain%>") {
+ // do nothing
+ } else {
+ CARBON.showWarningDialog("Admin's email address must be in the same domain.");
+ return false;
+ }
+ } else {
+ CARBON.showWarningDialog("Invalid email address.");
+ return false;
+ }
+
+ var error = validateEmpty('admin-firstname');
+ if (error) {
+ CARBON.showWarningDialog("First name cannot be empty.");
+ return false;
+ }
+ var error = validateEmpty('admin-lastname');
+ if (error) {
+ CARBON.showWarningDialog("Last name cannot be empty.");
+ return false;
+ }
+ document.gappsetupForm.submit();
+};
+</script>
</head>
<body>
+<div id="dcontainer"></div>
<table id="main-table" border="0" cellspacing="0">
<tr>
<td id="header"><jsp:include page="../admin/layout/header.jsp" />
@@ -118,7 +171,7 @@
<div id="middle">
<h2>Setting up the Stratos Domain for your Google Apps Domain</h2>
<div id="workArea">
- <form method="post" action="done_ajaxprocessor.jsp">
+ <form method="post" name="gappsetupForm" action="done_ajaxprocessor.jsp">
<div class="toggle_container">
<table class="normal-nopadding" cellspacing="0" >
<tbody>
@@ -162,16 +215,11 @@
</td>
</tr>
<tr>
- <td></td>
+ <td class="buttonRow" colspan="2"><input type="button" class="button" value="OK" onclick="validateGAppSetupInfo();"/></td>
</tr>
</tbody>
</table>
</div>
- <!-- div id="select_users" style="display:none">
- <p>The usage plan you have selected allows only XXX number of users (except you). Please enter the email addresses of the allowed users. If you do not specify users, then allowed users will be filled on FCFS basis</p>
- <textarea rows="50" cols="200" wrap="hard"></textarea>
- </div -->
- <input type="submit" class="button" value="OK"/>
</form>
</div>
</div>
More information about the Carbon-commits
mailing list