Updated info page. Added JSON link to all webpages.

bstewart · Jan 10, 2014 · 938e5cc · 938e5cc
1 parent d45628f
commit 938e5cc
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 2 deletions.
diff --git a/landing_src/views/default/index.html b/landing_src/views/default/index.html
@@ -26,7 +26,7 @@
 <div class="info">
 
 	<div class="heading">Server for Topic Model Visualization</div>
-	<div class="content">This server reads the output of <a href="http://scholar.harvard.edu/bstewart/-models-open-ended-survey-responses-applications-experiments/">Structural topic models</a> and distributes the content over the internet via a RESTful interface. For more information, please visit <a href="http://github.com/uwdata/termite-stm">Termite Web Server for STM</a> repository.</div>
+	<div class="content">This server reads the output of <a href="http://scholar.harvard.edu/bstewart/-models-open-ended-survey-responses-applications-experiments/">structural topic models</a> and distributes the content over the internet via a RESTful interface. For more information, please visit the <a href="http://github.com/uwdata/termite-stm">Termite Web Server for STM</a> repository.</div>
 
 	<div class="heading">API Format</div>
 	<div class="content">All API calls are in following format.</div>
@@ -36,5 +36,6 @@
 
 <div class="body">
 	<div class="heading">Server Response</div>
+	<div class="extras">[<a href="http://{{=request.env['HTTP_HOST']}}{{=request.env['PATH_INFO']}}?format=json">JSON format</a>]</div>
 	<div class="content">{{=content}}</div>
 </div>
diff --git a/server_src/controllers/lda.py b/server_src/controllers/lda.py
@@ -162,7 +162,7 @@ def TopicIndex():
 	}
 	dataStr = json.dumps( data, encoding = 'utf-8', indent = 2, sort_keys = True )
 	if IsJsonFormat():
-		return data
+		return dataStr
 	else:
 		response.view = 'lda/api.html'
 		data[ 'content' ] = dataStr

diff --git a/server_src/static/css/termite.css b/server_src/static/css/termite.css
@@ -56,6 +56,9 @@ div.body {
 div.body div.heading {
 	font-size: 12pt;
 }
+div.body div.extras {
+	font-size: 8pt;
+}
 div.body div.content {
 	display: inline-block;
 	padding: 15px;

diff --git a/server_src/views/default/index.html b/server_src/views/default/index.html
@@ -27,5 +27,6 @@
 
 <div class="body">
 	<div class="heading">Server Response</div>
+	<div class="extras">[<a href="http://{{=request.env['HTTP_HOST']}}{{=request.env['PATH_INFO']}}?format=json">JSON format</a>]</div>
 	<div class="content">{{=content}}</div>
 </div>
diff --git a/server_src/views/lda/api.html b/server_src/views/lda/api.html
@@ -32,5 +32,6 @@
 
 <div class="body">
 	<div class="heading">Server Response</div>
+	<div class="extras">[<a href="http://{{=request.env['HTTP_HOST']}}{{=request.env['PATH_INFO']}}?format=json">JSON format</a>]</div>
 	<div class="content">{{=content}}</div>
 </div>
diff --git a/server_src/views/lda/index.html b/server_src/views/lda/index.html
@@ -29,5 +29,6 @@
 
 <div class="body">
 	<div class="heading">Server Response</div>
+	<div class="extras">[<a href="http://{{=request.env['HTTP_HOST']}}{{=request.env['PATH_INFO']}}?format=json">JSON format</a>]</div>
 	<div class="content">{{=content}}</div>
 </div>