From 981d39d220b1479e20abcad0e9e9d7771c31c012 Mon Sep 17 00:00:00 2001
From: MrZYX <pr0fkill@gmail.com>
Date: Sat, 16 Apr 2011 14:03:24 +0200
Subject: [PATCH] Revert "touched up notifications page" because it completly
 breaks the page (in matter of style and localization [dates!])

This reverts commit a16e83df9ed6e9477e390f7ef08f9d4de476cd30.
---
 app/views/notifications/index.html.haml  | 32 ++++++++---------
 public/stylesheets/sass/application.sass | 45 ++----------------------
 2 files changed, 17 insertions(+), 60 deletions(-)

diff --git a/app/views/notifications/index.html.haml b/app/views/notifications/index.html.haml
index f867b9b7a..bc4de8fae 100644
--- a/app/views/notifications/index.html.haml
+++ b/app/views/notifications/index.html.haml
@@ -1,28 +1,24 @@
 - content_for :head do
   = include_javascripts :notifications
-.span-13
+.span-1
+  = image_tag 'icons/mail_big.png', :height => 30, :width => 30, :style=>"margin-top:3px;"
+.span-10
   %h2
-    %span.notification_count{:class => ('unread' if @notification_count > 0)}
-      = @notification_count
     = t('.notifications')
-.span-8.last.left
+.span-13.last.left
   = link_to t('.mark_all_as_read'), read_all_notifications_path, :class => 'button'
 
 .span-24.last
-  .stream.notifications
+  %ul.stream.notifications
     - @group_days.each do |day, notes|
-      .span-3
-        .date
-          .day= day.split(' ').last
-          .month= day.split(' ').first
+      %li
+        %h4= day
+        %ul.notifications_for_day
+          - notes.each do |note|
+            .stream_element{:data=>{:guid => note.id}, :class => "#{note.unread ? 'unread' : ''}"}
+              %span.from
+                = notification_people_link(note)
+                = object_link(note)
 
-      .span-8.notifications_for_day
-        - notes.each do |note|
-          .stream_element{:data=>{:guid => note.id}, :class => "#{note.unread ? 'unread' : ''}"}
-            %span.from
-              = notification_people_link(note)
-              = object_link(note)
-
-            %br
-            %time= timeago(note.created_at)
+              %span.time= timeago(note.created_at)
     = will_paginate @notifications
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index e5b061869..61a4dd9ba 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -236,10 +236,7 @@ header
       :display block
 
 .unread
-  :font-weight bold
-  :color #333 !important
-  time
-    :color #333 !important
+  :background-color #eee
 
 .diaspora_header_logo
   :position relative
@@ -270,6 +267,8 @@ header
       :font
         :weight normal
         :size smaller
+      :position absolute
+      :right 20px
 
 .from
   a
@@ -2822,41 +2821,3 @@ h1.tag
       :bottom 4px
   .see_all
     :text-align center
-
-.date
-  :background
-    :color #e6e6e6
-  :border-radius 8px
-  :padding 5px
-  :color #999
-
-  :text-align center
-  .day
-    :font-size 50px
-    :font-weight 200
-    :margin-bottom -15px
-    :margin-top -10px
-
-  .month
-    :font-size 14px
-
-.notification_count
-  :background
-    :color #f0f0f0
-  :color #999
-  :font
-    :weight normal
-
-  :padding 0 5px
-    :left 11px
-  :margin
-    :right 5px
-  :border
-    :radius 5px
-
-  &.unread
-    :background
-      :color lighten(#A40802, 5%)
-    :color #eee !important
-    :font
-      :weight bold