Merge branch 'master' of github.com:diaspora/diaspora

app/helpers/photos_helper.rb

@@ -4,11 +4,11 @@ module PhotosHelper
     link_to (image_tag photo.url(:scaled_full)), photo_path(album.next_photo(photo)), :rel => "prefetch"
   end
 
-  def link_to_prev(photo, album)
-    link_to "<< prev", photo_path(album.prev_photo(photo)), :rel => "prefetch"
+  def url_to_prev(photo, album)
+    photo_path(album.prev_photo(photo))
   end
 
-  def link_to_next(photo, album)
-    link_to "next >>", photo_path(album.next_photo(photo)), :rel => "prefetch"
+  def url_to_next(photo, album)
+    photo_path(album.next_photo(photo))
   end
 end

app/views/layouts/application.html.haml

@@ -34,10 +34,15 @@
         #session_action
           - if user_signed_in?
             %ul#user_menu
+              %li#global_search
+                = form_tag(users_path, :method => 'get') do
+                  %label{:for => 'q'} Search
+                  = text_field_tag 'q'
               %li.name= link_to current_user.real_name, current_user.person
               %li= link_to "requests (#{@request_count})", requests_path, :class => new_request(@request_count)
               %li= link_to "settings", edit_user_path(current_user)
-              %li= link_to "search", users_path 
+
+
               %li= link_to "logout", destroy_user_session_path
           - else
             = link_to "login", new_user_session_path
@@ -46,12 +51,14 @@
           = link_to "DIASPORA*", root_path
           %span.sub_text
             PREVIEW
-        = render "shared/group_nav"
 
         = link_to "photos", albums_path
 
     .container
-      .span-24.last
+      .span-4.append-1.last
+        = render "shared/group_nav"
+
+      .span-19.last
         = yield
-      .span-24.last
+
         = render "posts/debug"

app/views/photos/show.html.haml

@@ -1,3 +1,16 @@
+:javascript
+  $(document).keydown(function(e){
+    switch(e.keyCode) {
+    case 37:
+      window.location.replace( "#{url_to_prev(@photo,@album)}" );
+      break;
+    case 39:
+      window.location.replace( "#{url_to_next(@photo,@album)}" );
+      break;
+    }
+  });
+
+
 .back= link_to "⇧ #{@album.name}", album_path(@album)
 %h1.big_text
   = @photo.image
@@ -6,11 +19,11 @@
     = link_to 'Edit Photo', edit_photo_path(@photo), :class => "button"
 
 .sub_header
-  = link_to_prev @photo, @album
+  = link_to "<< prev", url_to_prev(@photo, @album)
   |
   = link_to "full size", @photo.url
   |
-  = link_to_next @photo, @album
+  = link_to "next >>", url_to_next(@photo, @album)
 
 %div{:id => @photo.id}
   #show_photo

app/views/shared/_group_nav.haml

@@ -1,8 +1,11 @@
 #group
   %ul
+    .selected
+      = link_to @group.name, @group, :class => "selected"
     - for group in @groups
-      %li{:class => ("selected" if group.id.to_s == params[:id])}
-        = link_to group.name, group
+      - unless (group.id.to_s == params[:id])
+        %li
+          = link_to group.name, group
 
     %li.new_group= link_to("NEW GROUP", "#add_group_pane", :id => "add_group_button")
 
@@ -11,15 +14,12 @@
         = render "groups/new_group"
 
   - if @group
-    #friend_pictures
+    %ul#friend_pictures
       - for friend in @group.people
-        = person_image_link(friend)
-      = link_to (image_tag 'add_friend_button.png'), "#add_request_pane", :id => 'add_request_button'
-
-      - if @group.people.count == 0
-        %span.add_new_description
-          << click the plus to add friends to this group
-
+        %li
+          = person_image_link(friend)
+          = friend.real_name
+      %li= link_to (image_tag 'add_friend_button.png'), "#add_request_pane", :id => 'add_request_button'
 
       .yo{:style => 'display:none'}
         #add_request_pane

app/views/shared/_publisher.haml

@@ -1,18 +1,27 @@
 #publisher
-  #publisher_form
+  .span-19.last
     = form_for StatusMessage.new, :remote => true do |f|
       = f.error_messages
 
       -if group_id
         = f.hidden_field :group_id, :value => group_id
-        
 
-      %label{:for => "status_message_message"} Message
-      = f.text_area :message, :rows => 2
-      %ul
-        - for group in current_user.groups
-          %li
-            = group.name
-            = check_box_tag("groups_id[]", group.id, current_group?(group))
-      .right
+      .span-15.last
+        .span-2.last
+          .user_image
+            = owner_image_tag
+        .span-13.last
+          %p
+            %label{:for => "status_message_message"} Message
+            = f.text_area :message, :rows => 2
+      
+      .span-3.last
+
+        %ul.group_selector
+          going to...
+          - for group in current_user.groups
+            %li
+              = check_box_tag("groups_id[]", group.id, current_group?(group))
+              = group.name
+      .span-1.last
         = f.submit "Post"

public/images/glyphish-icons/Read me first - license.txt

@@ -0,0 +1,13 @@
+Created by Joseph Wain (see http://penandthink.com) at and probably downloaded from http://glyphish.com
+
+This work is licensed under the Creative Commons Attribution 3.0 United States License. To view a copy of this license, visit http://creativecommons.org/licenses/by/3.0/us/ or send a letter to Creative Commons, 171 Second Street, Suite 300, San Francisco, California, 94105, USA.
+
+You are free to share it and to remix it remix under the following conditions:
+
+* You must attribute the work in the manner specified by the author (SEE BELOW).
+* For any reuse or distribution, you must make clear to others the license terms of this work.
+* The above conditions can be waived if you get permission from the copyright holder (send me an email!).
+
+ATTRIBUTION -- a note reading "icons by Joseph Wain / glyphish.com" or similar, plus a link back to glyphish.com from your app's website, is the preferred form of attribution. Also acceptable would be, like, a link from within your iPhone application, or from the iTunes store page, but those aren't as useful to other people. If none of these work for you, please contact hello@glyphish.com and we can work something out.
+
+USE WITHOUT ATTRIBUTION -- If attribution is not possible, workable or desirable for your application, contact hello@glyphish.com for commercial non-attributed licensing terms.