diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml index f1e3eb9d0..b5e7e0137 100644 --- a/app/views/layouts/_header.html.haml +++ b/app/views/layouts/_header.html.haml @@ -3,85 +3,10 @@ -# the COPYRIGHT file. .container{:style => "position:relative;"} + = link_to image_tag('logo_small.png', :height => "16px", :width => "161px", :style => 'position:relative;top:5px;'), root_path - - if current_user - = link_to image_tag('logo_small.png', :height => "16px", :width => "161px", :class => "diaspora_header_logo"), multi_path - - else - = link_to image_tag('logo_large.png', :height => "32px", :width => "321px", :class => "diaspora_header_logo"), root_path - - - if !current_user - .right - %ul#landing_nav - %li= link_to '@joindiaspora', "http://twitter.com/joindiaspora" - %li= link_to 'github', "https://github.com/diaspora/diaspora" - %li= link_to t('.blog'), 'http://blog.joindiaspora.com/' - %li= link_to t('.login'), new_user_session_path, :class => 'login' - - - elsif (current_user || !@landing_page) - #global_search - = form_tag(people_path, :method => 'get', :class => "search_form") do - = text_field_tag 'q', params[:q], :placeholder => t('find_people'), :type => 'search', :results => 5 - - #nav_badges - #home_badge.badge - = link_to multi_path, :title => t('_home') do - = image_tag 'icons/home_grey.png', :alt => t('_home') - - #notification_badge.badge - = link_to notifications_path, :title => new_notification_text(@notification_count) do - = image_tag 'icons/notifications_grey.png', :id => "notification-flag", :alt => new_notification_text(@notification_count) - .badge_count{:class => ("hidden" if @notification_count == 0)} - = @notification_count - - #message_inbox_badge.badge - = link_to conversations_path, :title => new_message_text(@unread_message_count) do - = image_tag 'icons/mail_grey.png', :alt => new_message_text(@unread_message_count) - .badge_count{:class => ("hidden" if @unread_message_count == 0)} - = @unread_message_count - - #notification_dropdown - .header - .right - = link_to t('notifications.index.mark_all_as_read'), read_all_notifications_path - \| - = link_to t('.view_all'), notifications_path, :id => "view_all_notifications" - %h4 - = t('.recent_notifications') - .notifications - .ajax_loader - = image_tag("ajax-loader.gif") - - #hovercard_container - #hovercard - %img.avatar - %h4 - %a.person - %p.handle - #hovercard_dropdown_container - - .hovercard_footer - .footer_container - .hashtags - - %ul#user_menu.dropdown - %li - .right - ▼ - .avatar - = owner_image_tag(:thumb_small) - = link_to current_user.name, '#', :title => current_user.diaspora_handle - %li= link_to t('.profile'), local_or_remote_person_path(current_user.person) - %li= link_to t('_contacts'), contacts_link - %li= link_to t('.settings'), edit_user_path - -if current_user.admin? - %li= link_to t('.admin'), user_search_path - %li= link_to t('.logout'), destroy_user_session_path - - #lightbox - #lightbox-content - = link_to "[x] close", '#', :id => 'lightbox-close-link' - %img#lightbox-image - #lightbox-imageset - - #lightbox-backdrop - + %ul#landing_nav + %li= link_to '@joindiaspora', "http://twitter.com/joindiaspora" + %li= link_to 'github', "https://github.com/diaspora/diaspora" + %li= link_to t('.blog'), 'http://blog.joindiaspora.com/' + %li= link_to t('.login'), new_user_session_path, :class => 'login' diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 93a71c967..7ac8679b1 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -97,7 +97,7 @@ #notifications - unless current_user - %header{:class=>('landing')} + %header = render 'layouts/header' = render 'templates/templates' diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 55d7ddbb5..cea7576eb 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -174,10 +174,6 @@ header :border :bottom 1px solid #444 - &.fixit - :position fixed - :top -30px - a :color #CCC :color rgb(147,147,147) @@ -239,7 +235,7 @@ header :right 15px &:hover :background - :color #222 + :color transparent :text :decoration none &:focus @@ -1931,13 +1927,19 @@ ul#landing_nav :margin 0 :padding 0 - :font - :size 14px + :position absolute + :top 4px + :right 0 > li :display inline :margin :right 0.5em + + &:last-child + :margin + :right 0 + a :color $blue diff --git a/public/u/ilya.html b/public/u/ilya.html deleted file mode 100644 index b145e9562..000000000 --- a/public/u/ilya.html +++ /dev/null @@ -1,2156 +0,0 @@ - - - - - -Ilya Zhitomirskiy - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -⇧ - -
-
-
- -
- -
-
- -
-
-
-
-
-
-Ilya Zhitomirskiy -
-
- -
-
-
-
-
-
-

-Ilya Zhitomirskiy -

- -ilya@joindiaspora.com - -
-
-
-
- - -
-
-
- -Deletelabel - -
- -
- -
-
- - Ilya Zhitomirskiy - -
-
- -Ilya Zhitomirskiy - - - -– - -2011-11-07 00:01:10 UTC - - -
-
- - dark vador ** - -
-
- -dark vador ** - -– - -2011-11-06 23:54:17 UTC - -– -13 reshares - - -
-
-
-Scaled_full_363d931ccf65338fee73 -
-
-
-

#Butterfly #gif

- -
- -
-
- -
- - - -Public -– - - -[commenting currently unavailable] - -
- -
- -
    -
  • - - Luke Gosling - -
    - -Luke Gosling - - -

    Rest in peace Ilya. Thanks for everything you gave us.

    - -     -
    - - -
    -
    -
    • -
  • - - Johan Westlund - -
    - -Johan Westlund - - -

    RIP

    - -     -
    - - -
    -
    -
    • -
  • - - Jeff - -
    - -Jeff - - -

    Obviously left the planet too early and way before his time. Must have been summoned for a greater cause.

    - -     -
    - - -
    -
    -
    • - Comments are currently disabled. We miss Ilya too. -
-
- -
-
-
-
-
- -Deletelabel - -
- -
- -
-
- - Ilya Zhitomirskiy - -
-
- -Ilya Zhitomirskiy - - - -– - -2011-11-02 06:19:28 UTC - - -
-
- - Zulu** - -
-
- -Zulu** - -– - -2011-10-29 00:26:26 UTC - -– -92 reshares - - -
-F3cd4ae0-40db-4f50-8117-e6fb594938da -
-
- -
- - - -Public -– - - -[commenting currently unavailable] - -
- -
- -
    -
  • - - Vintage - -
    - -Vintage - - -

    This one...lol

    - -     -
    - - -
    -
    -
    • -
  • - - Chibi Carlos Barrero - -
    - -Chibi Carlos Barrero - - -

    excelent and true

    - -     -
    - - -
    -
    -
    • -
  • - - Diego Vilas - -
    - -Diego Vilas - - -

    Waaa nice
    -Reshout!

    - -     -
    - - -
    -
    -
    • - Comments are currently disabled. We miss Ilya too. -
-
- -
-
-
-
-
- -Deletelabel - -
- -
- -
-
- - Ilya Zhitomirskiy - -
-
- -Ilya Zhitomirskiy - - - -– - -2011-11-02 05:46:55 UTC - - -
-
- - BirgitF - -
-
- -BirgitF - -– - -2011-11-01 05:23:20 UTC - -– -12 reshares - - -
-
-
-Scaled_full_56e56efad428e8a5e877 -
-
-
-

#gif #cats

- -
- -
-
- -
- - - -Public -– - - -[commenting currently unavailable] - -
- -
- -
    -
  • - - Erwin Dela Cruz - -
    - -Erwin Dela Cruz - - -

    Nice!

    - -     -
    - - -
    -
    -
    • -
  • - - Dennis Evans - -
    - -Dennis Evans - - -

    So THAT'S what took so long! You're forgiven team #diaspora =)

    - -     -
    - - -
    -
    -
    • -
  • - - empregadita - -
    - -empregadita - - -

    very nice!

    - -     -
    - - -
    -
    -
    • - Comments are currently disabled. We miss Ilya too. -
-
- -
-
-
-
-
- -Deletelabel - -
- -
- -
-
- - Ilya Zhitomirskiy - -
-
- -Ilya Zhitomirskiy - - - -– - -2011-11-02 03:58:51 UTC - - -
-
- - davux - -
-
- -davux - -– - -2011-11-01 17:01:12 UTC - -– -29 reshares - - -
-
-
-Scaled_full_1feeb9aaf020171311cb -
-
-
-

#Diaspora♥

- -

I'm troubled to announce that Diaspora has become a dating service too. Yeah, don't laugh. Some time ago I started to follow somebody's posts (I won't disclose any name), then they started to follow mine as well, and we slowly got to know and appreciate each other's ideas and interests. Since Diaspora doesn't have a chat (yet), we began to chat via Jabber/GTalk and progressively became closer and like each other more. We finally met in real life recently... and are now in a relationship. I didn't think that using Diaspora could lead to that. Same thing happened to you? Please tell about it, without forgetting the #Diaspora♥ #hashtag!

- -
- -

Me da cosa admitirlo, pero debo anunciar que Diaspora tiene ahora función de servicio de encuentros también. No se rian. Hace tiempo empecé a seguir las publicaciones de alguien (no voy a dar ningún nombre), luego esa persona hizo lo mismo y poquito a poco nos fuimos conociendo y agradando. Diaspora no cuenta (todavía) con un sistema de chat, así que a través de Jabber/Gtalk empezamos a conversar y a acercarnos más. Por fin nos conocimos en la vida real hace poco, fue algo muy bonito... y pues ahora tenemos una relación. :) Sinceramente no pensaba que este tipo de encuentro podía suceder en Diaspora... Me encantaría saber si te pasó algo parecido! Por favor cuéntanos, no olvides poner la #etiqueta #Diaspora♥.

- -
- -

C'est un peu troublant, mais je me dois d'annoncer que Diaspora fait également office de site de rencontres. On ne rigole pas. Il y a quelque temps, j'ai commencé à suivre les posts de quelqu'un dont je tairai le nom, et cette personne en a fait autant. On a commencé à se connaître, à s'apprécier... se plaire quand les discussions ont continué sur Jabber/Gtalk puisque Diaspora ne fournit pas encore de système de chat. On a fini par se rencontrer dans la vie réelle il y a peu, et maintenant on sort ensemble! C'est un peu inattendu, je ne pensais pas qu'utiliser Diaspora pourrait avoir ce genre de conséquences. Est-ce qu'il vous est arrivé le même genre d'histoire ? Racontez... sans oublier le #tag #Diaspora♥ bien sûr !

- -
- -
-
- -
- - - -Public -– - - -[commenting currently unavailable] - -
- -
- -
    -
  • - - Alex** - -
    - -Alex** - - -

    =O

    - -     -
    - - -
    -
    -
    • -
  • - - Alex** - -
    - -Alex** - - -

    Illyia, we demand details !!! x-D

    - -     -
    - - -
    -
    -
    • -
  • - - Alex** - -
    - -Alex** - - -

    Hahahahahahahahaha ♥

    - -     -
    - - -
    -
    -
    • - Comments are currently disabled. We miss Ilya too. -
-
- -
-
-
-
-
- -Deletelabel - -
- -
- -
-
- - Ilya Zhitomirskiy - -
-
- -Ilya Zhitomirskiy - - - -– - -2011-11-01 04:33:23 UTC - - -
-
- - Tyler Zika - -
-
- -Tyler Zika - -– - -2011-09-08 08:17:10 UTC - -– -17 reshares - - -
-Home-surfing -
-
- -
- - - -Public -– - - -[commenting currently unavailable] - -
- -
- -
    - Comments are currently disabled. We miss Ilya too. -
-
- -
-
-
-
-
- -Deletelabel - -
- -
- -
-
- - Ilya Zhitomirskiy - -
-
- -Ilya Zhitomirskiy - - - -– - -2011-10-31 07:44:43 UTC - - -
-
- - David Kettler - -
-
- -David Kettler - -– - -2011-10-31 07:40:08 UTC - -– -6 reshares - - -
-
-

just finished up some epic user testing of diaspora with messageTH in San Francisco and Ilya Zhitomirskiy. look forward to a redesigned on-boarding process, browsable hashtags, publishing vs. consuming clarity, and redesigned/fuller profile pages

- -
- -
-
- -
- - - -Public -– - - -[commenting currently unavailable] - -
- -
- -
    -
  • - - Loon WL - -
    - -Loon WL - - -

    how much storage for the photos upload ?

    - -     -
    - - -
    -
    -
    • -
  • - - Michaela Reiki Master-Teacher - -
    - -Michaela Reiki Master-Teacher - - -

    Sounds like it was a busy night!

    - -     -
    - - -
    -
    -
    • -
  • - - Kcard - -
    - -Kcard - - -

    Sounds so great...Can't wait so see it.

    - -     -
    - - -
    -
    -
    • - Comments are currently disabled. We miss Ilya too. -
-
- -
-
-
-
-
- -Deletelabel - -
- -
- -
-
- - Ilya Zhitomirskiy - -
-
- -Ilya Zhitomirskiy - - - -– - -2011-10-31 07:31:05 UTC - - -
-
- - Vittorio Cuculo** - -
-
- -Vittorio Cuculo** - -– - -2011-10-30 16:04:34 UTC - -– -45 reshares - - -
-9e97d776-14d6-4567-ac95-144a031bc8a1 -
-
- -
- - - -Public -– - - -[commenting currently unavailable] - -
- -
- -
    - Comments are currently disabled. We miss Ilya too. -
-
- -
-
-
-
-
- -Deletelabel - -
- -
- -
-
- - Ilya Zhitomirskiy - -
-
- -Ilya Zhitomirskiy - - - -– - -2011-10-30 03:02:14 UTC - - -
-
- - Diaspora HQ - -
-
- -Diaspora HQ - -– - -2011-10-29 17:07:52 UTC - -– -10 reshares - - -
-
-

Hi All,

- -

Due to personal reasons, I've had to leave Diaspora*. Please contact daniel@joindiaspora.com going forward.

- -

Best,

- -

Yosem

- -
- -
-
- -
- - - -Public -– - - -[commenting currently unavailable] - -
- -
- -
    -
  • - - LilBambi ** - -
    - -LilBambi ** - - -

    You will be missed Yosem. Thanks for all you have done to further D* and do well. Good luck in all you do.

    - -     -
    - - -
    -
    -
    • -
  • - - Pawan** - -
    - -Pawan** - - -

    You'll be missed Yosem. Hope you'll be back in #Diaspora soon. Wish you all the best.

    - -     -
    - - -
    -
    -
    • -
  • - - Mrpaulsy - -
    - -Mrpaulsy - - -

    Hope you're okay...

    - -     -
    - - -
    -
    -
    • - Comments are currently disabled. We miss Ilya too. -
-
- -
-
-
-
-
- -Deletelabel - -
- -
- -
-
- - Ilya Zhitomirskiy - -
-
- -Ilya Zhitomirskiy - - - -– - -2011-10-24 00:53:48 UTC - - -
-
- - Daniel Grippi - -
-
- -Daniel Grippi - -– - -2011-10-24 00:47:01 UTC - -– -22 reshares - - -
-
-
-Scaled_full_3a8b944ba99d42e6c82e -
-
-
-

we're back in business. ya'll have been quite patient! #diaspora #wereback #heyguys

- -
- -
-
- -
- - - -Public -– - - -[commenting currently unavailable] - -
- -
- -
    -
  • - - Birch Wind ** - -
    - -Birch Wind ** - - -

    god. you guys are young enough to be my sons. Amazes me how I pull out hair trying to figure out how to do simple code, yet there's peeps like the D Team changing the SN world, LOL! You guys rock!

    - -     -
    - - -
    -
    -
    • - Comments are currently disabled. We miss Ilya too. -
-
- -
-
-
-
-
- -Deletelabel - -
- -
- -
-
- - Ilya Zhitomirskiy - -
-
- -Ilya Zhitomirskiy - - - -– - -2011-10-23 06:23:18 UTC - - -
-
- - manojkmohan** - -
-
- -manojkmohan** - -– - -2011-10-23 02:54:40 UTC - -– -12 reshares - - -
-8c67a1b1-09e7-4883-9a2b-55bcc7ca21e3 -
-
- -
- - - -Public -– - - -[commenting currently unavailable] - -
- -
- -
    - Comments are currently disabled. We miss Ilya too. -
-
- -
-
-
-
-
- -Deletelabel - -
- -
- -
-
- - Ilya Zhitomirskiy - -
-
- -Ilya Zhitomirskiy - - - -– - -2011-10-16 16:22:52 UTC - - -
-
- - Dusky Savage - -
-
- -Dusky Savage - -– - -2011-10-16 03:02:54 UTC - -– -15 reshares - - -
-F7b5b27b-7608-4e5f-a53f-639cd8cc8299 -
-
- -
- - - -Public -– - - -[commenting currently unavailable] - -
- -
- -
    - Comments are currently disabled. We miss Ilya too. -
-
- -
-
-
-
-
- -Deletelabel - -
- -
- -
-
- - Ilya Zhitomirskiy - -
-
- -Ilya Zhitomirskiy - - - -– - -2011-10-14 21:56:44 UTC - - -
-
- - Jan-Christoph Borchardt - -
-
- -Jan-Christoph Borchardt - -– - -2011-10-14 14:00:03 UTC - -– -30 reshares - - -
-
-

99% of people are locked in to 1% of web platforms #OccupyTheWeb

- -
- -
-
- -
- - - -Public -– - - -[commenting currently unavailable] - -
- -
- -
    - Comments are currently disabled. We miss Ilya too. -
-
- -
-
-
-
-
- -Deletelabel - -
- -
- -
-
- - Ilya Zhitomirskiy - -
-
- -Ilya Zhitomirskiy - - - -– - -2011-10-14 21:52:33 UTC - - -
-
- - dave p - -
-
- -dave p - -– - -2011-10-14 21:41:44 UTC - -– -5 reshares - - -
-
-

5 Reasons Mozilla Should Fund Diaspora - ReadWriteCloud - http://www.readwriteweb.com/cloud/2011/10/5-reasons-mozilla-should-fund.php
-#diaspora #mozilla

- -
- -
-
- -
- - - -Public -– - - -[commenting currently unavailable] - -
- -
- -
    -
  • - - Paul Morris - -
    - -Paul Morris - - -

    Makes sense to me! Or if not that, there's the Mozilla WebFWD fellows program: https://webfwd.org

    - -     -
    - - -
    -
    -
    • -
  • - - Wiley Quixote - -
    - -Wiley Quixote - - -

    ooooh, great press, great idea! Some of the writers over at ReadWriteWeb are really on the ball. :) I've found very few reasons to be cynical about them -- and that's saying a lot in my book.

    - -     -
    - - -
    -
    -
    • -
  • - - David Kettler - -
    - -David Kettler - - -

    sadly, this will not be happening any time soon :(

    - -     -
    - - -
    -
    -
    • - Comments are currently disabled. We miss Ilya too. -
-
- -
-
-
-
-
- -Deletelabel - -
- -
- -
-
- - Ilya Zhitomirskiy - -
-
- -Ilya Zhitomirskiy - - - -– - -2011-10-14 05:57:38 UTC - - -
-9ce9d388-6d3e-45f3-a7b7-4654e4ffdd92 -
- -via Cubbi.es -– - - -Public -– - - -[commenting currently unavailable] - -
- -
- -
    -
  • - - Taton Chorizo - -
    - -Taton Chorizo - - -

    this bears appears in Age of Mythology with a cheat... right?

    - -     -
    - - -
    -
    -
    • -
  • - - Justin Olsen - -
    - -Justin Olsen - - -

    Wow I really like that.

    - -     -
    - - -
    -
    -
    • -
  • - - just john - -
    - -just john - - -

    @Brent Bartlett * Did somebody say #synnibar? The desktop RPG with the mandatory after-quest audits?

    - -

    As for the pic itself, somebody should send it on to Steven #Colbert.

    - -     -
    - - -
    -
    -
    • - Comments are currently disabled. We miss Ilya too. -
-
- -
-
-
-
-
- -Deletelabel - -
- -
- -
-
- - Ilya Zhitomirskiy - -
-
- -Ilya Zhitomirskiy - - - -– - -2011-10-13 17:50:12 UTC - - -
-
- - Mr. Minus - -
-
- -Mr. Minus - -– - -2011-10-13 14:00:12 UTC - -– -35 reshares - - -
-3e3147f3-353b-4561-84cc-6094b730a19f -
-
- -
- - - -Public -– - - -[commenting currently unavailable] - -
- -
- -
    - Comments are currently disabled. We miss Ilya too. -
-
- -
-
-
- - - -
-
-
- -
-
- - - - -