From 9544b6194e80335d583a5a08d5b3b71033c9f487 Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Sat, 6 Apr 2013 19:04:51 +0200
Subject: [PATCH] styling

---
 .../commafeed/frontend/pages/HomePage.java    |   4 ++++
 src/main/webapp/images/google_reader_icon.png | Bin 0 -> 3120 bytes
 src/main/webapp/templates/_subscribe.html     |  18 ++++++++++--------
 3 files changed, 14 insertions(+), 8 deletions(-)
 create mode 100644 src/main/webapp/images/google_reader_icon.png

diff --git a/src/main/java/com/commafeed/frontend/pages/HomePage.java b/src/main/java/com/commafeed/frontend/pages/HomePage.java
index e7d21008..abfd5e81 100644
--- a/src/main/java/com/commafeed/frontend/pages/HomePage.java
+++ b/src/main/java/com/commafeed/frontend/pages/HomePage.java
@@ -28,6 +28,8 @@ import com.commafeed.frontend.references.ngupload.NGUploadReference;
 import com.commafeed.frontend.references.select2.Select2Reference;
 import com.commafeed.frontend.references.spinjs.SpinJSReference;
 
+import de.agilecoders.wicket.markup.html.bootstrap.extensions.icon.OpenWebIconsCssReference;
+
 @SuppressWarnings("serial")
 @SecurityCheck(Role.USER)
 public class HomePage extends BasePage {
@@ -53,6 +55,8 @@ public class HomePage extends BasePage {
 		CodeMirrorCssReference.renderHead(response);
 
 		CssTreeViewReference.renderHead(response);
+		response.render(CssHeaderItem.forReference(OpenWebIconsCssReference
+				.instance()));
 
 		response.render(JavaScriptHeaderItem.forUrl("js/main.js"));
 		response.render(JavaScriptHeaderItem.forUrl("js/controllers.js"));
diff --git a/src/main/webapp/images/google_reader_icon.png b/src/main/webapp/images/google_reader_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..086b89d13f1bc400b67dc475e3a12ddc3aca4dd6
GIT binary patch
literal 3120
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
KMNUMnLSTY4s^?k&

literal 0
HcmV?d00001

diff --git a/src/main/webapp/templates/_subscribe.html b/src/main/webapp/templates/_subscribe.html
index b8929434..7384a6db 100644
--- a/src/main/webapp/templates/_subscribe.html
+++ b/src/main/webapp/templates/_subscribe.html
@@ -1,15 +1,12 @@
 <div ng-controller="SubscribeCtrl">
 	<div class="btn-group">
-		<button class="btn" ng-click="open()">Subscribe</button>
+		<button class="btn" ng-click="open()"><span class="icon-feed-simple"></span> Subscribe</button>
 		<button class="btn dropdown-toggle" data-toggle="dropdown">
 			<span class="caret"></span>
 		</button>
 		<ul class="dropdown-menu">
-			<li>
-				<a ng-click="open()">Subscribe</a>
-			</li>
-			<li><a ng-click="openImport()">Import</a></li>
-			<li><a ng-click="openCategory()">New category</a></li>
+			<li><a ng-click="openImport()"><i class="icon-arrow-down"></i> Import</a></li>
+			<li><a ng-click="openCategory()"><i class="icon-plus"></i> Add a category</a></li>
 		</ul>
 	</div>
 	<div modal="isOpen" close="close()" options="opts">
@@ -57,8 +54,13 @@
 		<form ng-upload class="form-horizontal" action="rest/subscriptions/import">
 			<div class="modal-body">
 				<div class="control-group">
-					<div>Download subscriptions.xml from <a target="_blank" href="https://www.google.com/reader/subscriptions/export">here</a>.</div>
-					<div>Alternatively, let me import your feeds from your <a href="google/import/redirect">Google Reader account</a>.</div>
+					<div>Let me import your feeds from your 
+						<a href="google/import/redirect">						
+							<img src="images/google_reader_icon.png" width="16px" height="16px"/> 
+							Google Reader account
+						</a>.
+					</div>
+					<div>Alternatively, upload your subscriptions.xml file (download it from <a target="_blank" href="https://www.google.com/reader/subscriptions/export">here)</a>.</div>
 				</div>
 				<div class="control-group">
 					<label class="control-label">XML File</label>