From 819f3a3fb06943c206dc20da834100e6d2746294 Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Mon, 13 May 2013 13:27:46 +0200
Subject: [PATCH] about page refactoring

---
 src/main/webapp/templates/feeds.help.html | 129 +++++++++-------------
 1 file changed, 53 insertions(+), 76 deletions(-)

diff --git a/src/main/webapp/templates/feeds.help.html b/src/main/webapp/templates/feeds.help.html
index 7d25e391..ebc5e00a 100644
--- a/src/main/webapp/templates/feeds.help.html
+++ b/src/main/webapp/templates/feeds.help.html
@@ -1,80 +1,57 @@
 <div class="row-fluid">
-	<div class="span2">
-		<ul class="nav nav-pills nav-stacked">
-			<li class="active">
-				<a href="#about" data-toggle="pill">${toolbar.about}</a>
-			</li>
-			<li>
-				<a href="#api" data-toggle="pill">${about.rest_api}</a>
-			</li>
-			<li>
-				<a href="#shortcuts" data-toggle="pill">${about.keyboard_shortcuts}</a>
-			</li>
-		</ul>
+	<div class="span6">
+		<h3>${toolbar.about}</h3>
+		<p>
+			${about.line1_prefix} <a href="https://github.com/Athou/commafeed" target="_blank">GitHub</a> ${about.line1_suffix}
+		</p>
+		<p>
+			${about.line2_prefix} <a href="https://github.com/Athou/commafeed/issues" target="_blank">GitHub</a> ${about.line2_suffix}
+		</p>
+		
+		<h3>${toolbar.donate}</h3>
+		<p>
+			${about.line3}
+		</p>
+		<form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
+			<input type="hidden" name="cmd" value="_s-xclick">
+			<input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----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-----END PKCS7-----
+			">
+			<input type="image" src="https://www.paypalobjects.com/en_US/BE/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
+			<img alt="" border="0" src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif" width="1" height="1">
+		</form>
+		
+		<h3>${about.goodies}</h3>
+		<p>
+			<a href="https://chrome.google.com/webstore/detail/commafeed/bpbfpjiciblcfeganojjkfapnllbhdga" target="_blank">Chrome extension</a>
+		</p>
+		<p>
+			<a href="https://addons.mozilla.org/en-US/firefox/addon/commafeed/" target="_blank">Firefox extension</a>
+		</p>
+		
+		<h3>${about.translation}</h3>
+		<p>
+			${about.translation.message}
+		</p>
+		<p>
+			<a href="https://github.com/Athou/commafeed#translate-commafeed-into-your-language" target="_blank">
+				${about.translation.link}
+			</a>
+		</p>
+		
+		<h3>${about.rest_api}</h3>
+		<p>
+			${about.rest_api.line1}
+		</p>
+		<p>
+			<a href="api" target="_blank">${about.rest_api.link_to_documentation}</a>
+		</p>
+		
+		<h3>${about.keyboard_shortcuts}</h3>
+		<div ng-include="'templates/_shortcuts.html'"></div>
 	</div>
-	<div class="span10">
-		<div class="tab-content">
-			<div class="tab-pane active" id="about">
-				<div class="row-fluid">
-					<div class="span6">
-						<h3>${toolbar.about}</h3>
-						<p>
-							${about.line1_prefix} <a href="https://github.com/Athou/commafeed" target="_blank">GitHub</a> ${about.line1_suffix}
-						</p>
-						<p>
-							${about.line2_prefix} <a href="https://github.com/Athou/commafeed/issues" target="_blank">GitHub</a> ${about.line2_suffix}
-						</p>
-						
-						<h3>${toolbar.donate}</h3>
-						<p>
-							${about.line3}
-						</p>
-						<form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
-							<input type="hidden" name="cmd" value="_s-xclick">
-							<input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----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-----END PKCS7-----
-							">
-							<input type="image" src="https://www.paypalobjects.com/en_US/BE/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
-							<img alt="" border="0" src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif" width="1" height="1">
-						</form>
-						
-						<h3>${about.goodies}</h3>
-						<p>
-							<a href="https://chrome.google.com/webstore/detail/commafeed/bpbfpjiciblcfeganojjkfapnllbhdga" target="_blank">Chrome extension</a>
-						</p>
-						<p>
-							<a href="https://addons.mozilla.org/en-US/firefox/addon/commafeed/" target="_blank">Firefox extension</a>
-						</p>
-						
-						<h3>${about.translation}</h3>
-						<p>
-							${about.translation.message}
-						</p>
-						<p>
-							<a href="https://github.com/Athou/commafeed#translate-commafeed-into-your-language" target="_blank">
-								${about.translation.link}
-							</a>
-						</p>
-					</div>
-					<div class="span6">
-						<h3>${about.announcements}</h3>
-						<a class="twitter-timeline" href="https://twitter.com/CommaFeed" data-widget-id="333897786657480704">Tweets by @CommaFeed</a>
-						<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
-					</div>
-				</div>
-			</div>
-			<div class="tab-pane" id="api">
-				<h3>${about.rest_api}</h3>
-				<p>
-					${about.rest_api.line1}
-				</p>
-				<p>
-					<a href="api" target="_blank">${about.rest_api.link_to_documentation}</a>
-				</p>
-			</div>
-			<div class="tab-pane" id="shortcuts">
-				<h3>${about.keyboard_shortcuts}</h3>
-				<div ng-include="'templates/_shortcuts.html'"></div>
-			</div>
-		</div>
+	<div class="span6">
+		<h3>${about.announcements}</h3>
+		<a class="twitter-timeline" href="https://twitter.com/CommaFeed" data-widget-id="333897786657480704">Tweets by @CommaFeed</a>
+		<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
 	</div>
 </div>
\ No newline at end of file