Minor fixes.

git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@798 b35dd754-fafc-0310-a699-88a17e54d16e

src/web/setup-datasource-settings.jsp

@@ -60,7 +60,14 @@
 
     // Defaults
     if (mode == null) {
-        mode = STANDARD;
+        // If the "embedded-database" directory exists, select to the embedded db as the default.
+        if (new File(JiveGlobals.getMessengerHome(), "embedded-db").exists()) {
+            mode = EMBEDDED;
+        }
+        // Otherwise default to standard.
+        else {
+            mode = STANDARD;
+        }
     }
 %>
 

src/web/setup-header.jspf

@@ -17,16 +17,9 @@
 <span class="jive-setup-header">
 <table cellpadding="8" cellspacing="0" border="0" width="100%">
 <tr>
-    <td width="99%">
+    <td>
         <fmt:message key="title" /> Setup
     </td>
-    <td width="1%" nowrap>
-        <font size="-2" face="arial,helvetica,sans-serif" color="#ffffff">
-        <b>
-        Jive Software
-        </b>
-        </font>
-    </td>
 </tr>
 </table>
 </span>

src/web/setup-host-settings.jsp

@@ -154,13 +154,6 @@ LABEL { font-weight : normal; }
 <script language="JavaScript" type="text/javascript">
 // give focus to domain field
 document.f.domain.focus();
-// set default disabled state of ssl
-if (document.f.sslEnabled[0].checked) {
-    toggle(document.f,false);
-}
-else {
-    toggle(document.f,true);
-}
 </script>
 
 <%@ include file="setup-footer.jsp" %>
\ No newline at end of file

src/web/setup-index.jsp

@@ -57,14 +57,14 @@
 <%@ include file="setup-header.jspf" %>
 
 <p class="jive-setup-page-header">
-Installation Checklist
+Setup Checklist
 </p>
 
 <p>
 
 
-Welcome to <fmt:message key="title" />  Setup. This tool will lead you through the initial configuration process
-of the application. Before continuing, verify that your environment meets all the requirements
+Welcome to <fmt:message key="title" />  Setup. This tool will lead you through the initial setup or
+upgrade process. Before continuing, verify that your environment meets all the requirements
 below.
 </p>
 
@@ -96,18 +96,6 @@ below.
     <td align="center" class="jive-setup-checklist-box"><img src="images/check.gif" width="13" height="13" border="0"></td>
     <td align="center" class="jive-setup-checklist-box"><img src="images/blank.gif" width="13" height="13" border="0"></td>
 </tr>
-<tr>
-    <td class="jive-setup-category">
-        At least Servlet 2.2 API
-        <br>
-        <span class="jive-info">
-        Appserver: <%= application.getServerInfo() %>,
-        Supports Servlet 2.3 API and JSP 1.2.
-        </span>
-    </td>
-    <td align="center" class="jive-setup-checklist-box"><img src="images/check.gif" width="13" height="13" border="0"></td>
-    <td align="center" class="jive-setup-checklist-box"><img src="images/blank.gif" width="13" height="13" border="0"></td>
-</tr>
 <tr>
     <td colspan="3" class="jive-setup-category-header">
         <fmt:message key="title" /> Classes

src/web/setup-sidebar.jsp

@@ -26,7 +26,7 @@
 
     String[] items = {step1, step2, step3, step4};
     String[] names = {
-        "Install Checklist", "Server Settings", "Datasource Settings", "Admin Account"
+        "Setup Checklist", "Server Settings", "Datasource Settings", "Admin Account"
     };
     String[] links = {
         "setup-index.jsp",