From f9ed77d021c3a7c1a2c7b9b845d3fec4f4533316 Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Sun, 4 Apr 2010 16:15:54 -0400
Subject: [PATCH] Adding contact information to main page.

---
 media/css/reader.css         | 28 +++++++++++++
 templates/reader/feeds.xhtml | 76 ++++++++++++++++++++++--------------
 2 files changed, 75 insertions(+), 29 deletions(-)

diff --git a/media/css/reader.css b/media/css/reader.css
index 93226dee1..870fa323c 100644
--- a/media/css/reader.css
+++ b/media/css/reader.css
@@ -971,6 +971,33 @@ form.opml_import_form input {
     background: transparent url('../img/reader/newsblur_splash_image.png') no-repeat 0 0;
 }
 
+#NB-splash .NB-splash-links {
+    position: absolute;
+    right: 12px;
+    bottom: 0;
+    display: block;
+    font-size: 11px;
+    line-height: 16px;
+    margin: 0;
+    padding: 0;
+    text-shadow: 1px 1px 0 #F0F0F0;
+}
+
+#NB-splash .NB-splash-links a {
+    color: #405BA8;
+    font-size: 12px;
+    text-decoration: none;
+    font-weight: bold;
+}
+
+#NB-splash .NB-splash-links a:hover {
+    color: #A85B40;
+}
+
+#NB-splash .NB-splash-info {
+    margin-left: 244px;
+}
+
 /* ============== */
 /* = Classifier = */
 /* ============== */
@@ -1237,6 +1264,7 @@ form.opml_import_form input {
 
 .NB-manage .NB-manage-rename {
     margin: 0 0 12px 12px;
+    display: none; /* Sorry, but this is not v1.0. Maybe next tuesday. No, next, next tuesday. */
 }
 
 .NB-manage .NB-manage-rename label {
diff --git a/templates/reader/feeds.xhtml b/templates/reader/feeds.xhtml
index 82364c377..172e50a55 100644
--- a/templates/reader/feeds.xhtml
+++ b/templates/reader/feeds.xhtml
@@ -67,37 +67,55 @@
 </div>
 
 <div id="NB-splash">
-  {% if user.is_authenticated %}
-    <div class="NB-user">
-      Welcome, {{ user.username}}.
-      (<a href="{% url logout %}?next=/">Logout</a>)
-    </div>
-  {% endif %}
-  {% if not user.is_authenticated %}
-  <div class="NB-login">
-    {% if form.errors %}
-    <p>{{ form.errors }}</p>
-    {% endif %}
-    <div class="NB-login-label">Want an account?</div>
-    <div class="NB-login-text">Talk to <a href="http://twitter.com/samuelclay">@samuelclay</a>.</div>
-    
-    <form method="post" action="{% url login %}">
-      <div>
-        {{ form.username.label_tag }}
-        {{ form.username }}
-      </div>
-      <div>
-        {{ form.password.label_tag }}
-        {{ form.password }}
-      </div>
 
-      <input type="submit" value="login" />
-      <input type="hidden" name="next" value="/" />
-    </form>
+  <div class="NB-splash-info">
+    {% if user.is_authenticated %}
+      <div class="NB-user">
+        Welcome, {{ user.username}}.
+        (<a href="{% url logout %}?next=/">Logout</a>)
+      </div>
+    {% endif %}
+
+    {% if not user.is_authenticated %}
+      <div class="NB-login">
+        {% if form.errors %}
+        <p>{{ form.errors }}</p>
+        {% endif %}
+        <!--
+        <div class="NB-login-label">Want an account?</div>
+        <div class="NB-login-text">Talk to <a href="http://twitter.com/samuelclay">@samuelclay</a>.</div>
+        -->
+        
+        <form method="post" action="{% url login %}">
+          <div>
+            {{ form.username.label_tag }}
+            {{ form.username }}
+          </div>
+          <div>
+            {{ form.password.label_tag }}
+            {{ form.password }}
+          </div>
+
+          <input type="submit" value="login" />
+          <input type="hidden" name="next" value="/" />
+        </form>
+      </div>
+    {% endif %}
   </div>
-  {% endif %}
-    {# <div class="NB-splash-image"></div> #}
-    <div class="NB-splash-title"></div>
+  
+  <div class="NB-splash-info NB-splash-info-about">
+    
+  </div>
+
+  <div class="NB-splash-links">
+    By <a href="http://www.samuelclay.com">Samuel Clay</a>.
+    Contact: <a href="mailto:samuel@ofbrooklyn.com">samuel@ofbrooklyn.com</a>.
+    Twitter: <a href="http://twitter.com/samuelclay">@samuelclay</a>.
+  </div>
+      
+  {# <div class="NB-splash-image"></div> #}
+  <div class="NB-splash-title"></div>
+
 </div>