Commit 6c504ac7 authored by Matt Tucker's avatar Matt Tucker Committed by matt

First step of setup refector (currently broken).

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@4816 b35dd754-fafc-0310-a699-88a17e54d16e
parent b12cc6b7
...@@ -104,6 +104,7 @@ ...@@ -104,6 +104,7 @@
## Added section: 'server.db_stats.*' ## Added section: 'server.db_stats.*'
## Added key: 'group.summary.search' ## Added key: 'group.summary.search'
## Updated key: 'group.summary.no_groups' ## Updated key: 'group.summary.no_groups'
## Added key: 'setup.sidebar.profile'
# Wildfire # Wildfire
...@@ -1349,6 +1350,7 @@ setup.sidebar.title=Setup Progress ...@@ -1349,6 +1350,7 @@ setup.sidebar.title=Setup Progress
setup.sidebar.language=Language Selection setup.sidebar.language=Language Selection
setup.sidebar.settings=Server Settings setup.sidebar.settings=Server Settings
setup.sidebar.datasource=Database Settings setup.sidebar.datasource=Database Settings
setup.sidebar.profile=Profile Settings
setup.sidebar.admin=Admin Account setup.sidebar.admin=Admin Account
# SSL settings Page # SSL settings Page
......
...@@ -130,23 +130,27 @@ ...@@ -130,23 +130,27 @@
String step2 = (String)session.getAttribute("jive.setup.sidebar.2"); String step2 = (String)session.getAttribute("jive.setup.sidebar.2");
String step3 = (String)session.getAttribute("jive.setup.sidebar.3"); String step3 = (String)session.getAttribute("jive.setup.sidebar.3");
String step4 = (String)session.getAttribute("jive.setup.sidebar.4"); String step4 = (String)session.getAttribute("jive.setup.sidebar.4");
String step5 = (String)session.getAttribute("jive.setup.sidebar.4");
if (step1 == null) { step1 = IN_PROGRESS; } if (step1 == null) { step1 = IN_PROGRESS; }
if (step2 == null) { step2 = INCOMPLETE; } if (step2 == null) { step2 = INCOMPLETE; }
if (step3 == null) { step3 = INCOMPLETE; } if (step3 == null) { step3 = INCOMPLETE; }
if (step4 == null) { step4 = INCOMPLETE; } if (step4 == null) { step4 = INCOMPLETE; }
if (step5 == null) { step5 = INCOMPLETE; }
String[] items = {step1, step2, step3, step4}; String[] items = {step1, step2, step3, step4, step5};
String[] names = { String[] names = {
LocaleUtils.getLocalizedString("setup.sidebar.language"), LocaleUtils.getLocalizedString("setup.sidebar.language"),
LocaleUtils.getLocalizedString("setup.sidebar.settings"), LocaleUtils.getLocalizedString("setup.sidebar.settings"),
LocaleUtils.getLocalizedString("setup.sidebar.datasource"), LocaleUtils.getLocalizedString("setup.sidebar.datasource"),
LocaleUtils.getLocalizedString("setup.sidebar.profile"),
LocaleUtils.getLocalizedString("setup.sidebar.admin") LocaleUtils.getLocalizedString("setup.sidebar.admin")
}; };
String[] links = { String[] links = {
"index.jsp", "index.jsp",
"setup-host-settings.jsp", "setup-host-settings.jsp",
"setup-datasource-settings.jsp", "setup-datasource-settings.jsp",
"setup-profile-settings.jsp",
"setup-admin-settings.jsp" "setup-admin-settings.jsp"
}; };
%> %>
......
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
session.setAttribute("jive.setup.sidebar.3","done"); session.setAttribute("jive.setup.sidebar.3","done");
session.setAttribute("jive.setup.sidebar.4","in_progress"); session.setAttribute("jive.setup.sidebar.4","in_progress");
// Redirect // Redirect
response.sendRedirect("setup-admin-settings.jsp"); response.sendRedirect("setup-profile-settings.jsp");
return; return;
} }
} }
......
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
session.setAttribute("jive.setup.sidebar.3","done"); session.setAttribute("jive.setup.sidebar.3","done");
session.setAttribute("jive.setup.sidebar.4","in_progress"); session.setAttribute("jive.setup.sidebar.4","in_progress");
// Success, move on // Success, move on
response.sendRedirect("setup-admin-settings.jsp"); response.sendRedirect("setup-profile-settings.jsp");
return; return;
} }
} }
......
<%--
- $RCSfile$
- $Revision: 1410 $
- $Date: 2005-05-26 23:00:40 -0700 (Thu, 26 May 2005) $
--%>
<%@ page import="org.jivesoftware.util.*,
java.util.HashMap,
java.util.Map,
java.util.Date,
org.jivesoftware.wildfire.user.User,
org.jivesoftware.wildfire.user.UserManager,
org.jivesoftware.util.JiveGlobals" %>
<%@ page import="org.jivesoftware.wildfire.XMPPServer"%>
<%@ page import="org.jivesoftware.wildfire.auth.AuthFactory"%>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<%
// Redirect if we've already run setup:
if (!XMPPServer.getInstance().isSetupMode()) {
response.sendRedirect("setup-completed.jsp");
return;
}
%>
<%
// Get parameters
%>
<html>
<head>
<title>Profile Settings</title>
</head>
<body>
<p class="jive-setup-page-header">
Profile Settings
</p>
<p>
Blah blah.
</p>
<form action="setup-profile-settings.jsp" name="profileform" method="post">
</form>
</body>
</html>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment