Skip to content

Implemented Twitter Bootstrap version #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
prusso-sse wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Implemented Twitter Bootstrap version #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db4da6c
Implemented Twitter Bootstrap UI
Feb 11, 2014
5dca05a
Forgot to take out local settings
Feb 11, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,6 @@
</webResources>
</configuration>
</plugin>

</plugins>
</build>

Expand Down
5 changes: 5 additions & 0 deletions src/main/java/gov/usgs/cida/glri/sb/ui/ScienceBaseService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;

import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import org.apache.http.HttpEntity;
import org.apache.http.NameValuePair;
import org.apache.http.client.entity.UrlEncodedFormEntity;
Expand Down Expand Up @@ -55,6 +57,9 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re

String strResponse = query.getQueryResponse(reqMap);
response.setContentType(query.getRequestedFormat().getFullName() + "; charset=UTF-8");

System.out.println("Sending back: \n[" + strResponse + "]\n");

out.write(strResponse);

} catch (Exception ex) {
Expand Down
Loading