minor style changes.

Matt Swanson · Matt Swanson · commit 98e5b371bfe5 · 2013-05-11T14:01:37.000-04:00
diff --git a/app/controllers/stories_controller.rb b/app/controllers/stories_controller.rb
@@ -9,7 +9,7 @@ class Stringer < Sinatra::Base
   end
 
   get "/archive" do
-    @read_stories = StoryRepository.read.page(params[:page]).per_page(15)
+    @read_stories = StoryRepository.read(params[:page])
 
     erb :archive
   end
diff --git a/app/public/css/styles.css b/app/public/css/styles.css
@@ -507,7 +507,14 @@ li.blank {
 }
 
 #zen a {
-  color: #F67100;
+  color: #F59745;
+  font-size: 14px;
+  border-bottom: 1px dotted #F59745;
+  text-decoration: none;
+}
+
+#zen .view-all {
+  line-height: 18px;
 }
 
 #pagination {
@@ -516,4 +523,7 @@ li.blank {
 
 #pagination a {
   color: #F67100;
+  border-bottom: 1px dotted #F59745;
+  text-decoration: none;
+  margin: 0 7px;
 }
diff --git a/app/repositories/story_repository.rb b/app/repositories/story_repository.rb
@@ -27,8 +27,8 @@ def self.unread
     Story.where(is_read: false).order("published desc") 
   end
 
-  def self.read
-    Story.where(is_read: true).order("published desc")
+  def self.read(page = 1)
+    Story.where(is_read: true).order("published desc").page(page).per_page(15)
   end
 
   def self.extract_content(entry)
diff --git a/app/views/archive.erb b/app/views/archive.erb
@@ -10,13 +10,18 @@
     <% end %>
   </ul>
 </div>
+
 <div id="pagination">
   <% if @read_stories.previous_page %>
-    <a href="?page=<%= @read_stories.previous_page %>"><i class="icon-double-angle-left"></i> <%= t('archive.previous') %></a>
+    <a href="?page=<%= @read_stories.previous_page %>"><%= t('archive.previous') %></a>
+  <% end %>
+
+  <% if @read_stories.total_pages > 1 %>
+    <%= @read_stories.current_page %> <%= t('archive.of') %> <%= @read_stories.total_pages %>
   <% end %>
-  Page <%= @read_stories.current_page %> of <%= @read_stories.total_pages %>
+
   <% if @read_stories.next_page %>
-    <a href="?page=<%= @read_stories.next_page %>"><%= t('archive.next') %> <i class="icon-double-angle-right"></i></a>
+    <a href="?page=<%= @read_stories.next_page %>"><%= t('archive.next') %></a>
   <% end %>
 </div>
 <% else %>
diff --git a/app/views/partials/_zen.erb b/app/views/partials/_zen.erb
@@ -5,8 +5,8 @@
     <small>
       <%= t('partials.zen.gtfo') %> <span id="gtfo"><%= t('partials.zen.go_make') %></span>.
     </small>
-    <small>
-      <p><%= t('partials.zen.procrastinate') %> <a href="/archive"><%= t('partials.zen.archive') %></a>.</p>
-    </small>
+  </p>
+  <p class="view-all">
+    <a href="/archive"><%= t('partials.zen.archive') %></a>
   </p>
 </div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -43,10 +43,9 @@ en:
         r: "Refresh"
     zen:
       zero: "You&#8217;ve reached RSS Zero&trade;"
-      gtfo: 'Now stop reading blogs and'
-      go_make: 'go make something'
-      procrastinate: "You can keep procrastinating by viewing your"
-      archive: "archive"
+      gtfo: "Now stop reading blogs and"
+      go_make: "go make something"
+      archive: "view all items"
   sessions:
     new:
       title: 'Stringer speaks'
@@ -87,4 +86,5 @@ en:
   archive:
     next: "Next"
     previous: "Previous"
+    of: "of"
     sorry: "Sorry, you haven't read any stories yet!"
diff --git a/config/locales/es.yml b/config/locales/es.yml
@@ -45,8 +45,7 @@ es:
       zero: "You&#8217;ve reached RSS Zero&trade;"
       gtfo: 'Ahora deja de leer blogs y'
       go_make: 've a hacer algo'
-      procrastinate: "You can keep procrastinating by checking out your"
-      archive: "archive"
+      archive: "view all items"
   sessions:
     new:
       title: 'Stringer que habla'
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
@@ -45,8 +45,7 @@ pt:
       zero: "Você alcançou RSS Zero&trade;"
       gtfo: 'Agora pare de ler blogs e'
       go_make: 'vá fazer algo'
-      procrastinate: "You can keep procrastinating by checking out your"
-      archive: "archive"
+      archive: "view all items"
   sessions:
     new:
       title: 'Stringer fala'
