From 19b633d3a3d33b99f0f59434473f46bbbdd2dc9b Mon Sep 17 00:00:00 2001 From: danielvincent Date: Sun, 1 Aug 2010 22:21:57 -0700 Subject: [PATCH 1/8] top nav for groups partially there. --- app/views/layouts/application.html.haml | 31 +++++++++++++++++++----- public/stylesheets/application.css | 24 +++++++++++++++--- public/stylesheets/sass/application.sass | 30 +++++++++++++++++++---- 3 files changed, 70 insertions(+), 15 deletions(-) diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 31388333b..4a96e6b2a 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -42,6 +42,28 @@ - else = link_to "login", new_user_session_path + #group + %ul + %li.selected ACM + %li FAMILY + %li WORK + %li HIGH SCHOOL + #user_pictures + = link_to(person_image_tag(current_user), root_path) + = link_to(person_image_tag(current_user), root_path) + = link_to(person_image_tag(current_user), root_path) + = link_to(person_image_tag(current_user), root_path) + = link_to(person_image_tag(current_user), root_path) + = link_to(person_image_tag(current_user), root_path) + = link_to(person_image_tag(current_user), root_path) + = link_to(person_image_tag(current_user), root_path) + = link_to(person_image_tag(current_user), root_path) + = link_to(person_image_tag(current_user), root_path) + = link_to(person_image_tag(current_user), root_path) + = link_to(person_image_tag(current_user), root_path) + - for friend in @friends + = person_image_link(friend) + .container - if user_signed_in? #user_name @@ -63,12 +85,9 @@ .container .span-24.last - .span-20.append-1.last - = yield + = yield - .span-3.last - = render 'people/sidebar' if user_signed_in? - .span-24.last - = render "posts/debug" + .span-24.last + = render "posts/debug" diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index c50e1e9ff..b11e56ba1 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -67,24 +67,24 @@ header { margin-bottom: 30px; color: #555555; background-color: #2b2726; + background-color: black; border-bottom: 3px solid #333333; padding: 6px 0; padding-top: 0; } header #diaspora_text { + margin-bottom: 1em; font-family: "BrandonGrotesqueLightRegular"; - font-size: 24px; - position: absolute; + font-size: 16px; border: none; color: white; text-shadow: 0 2px 0 black; } header #diaspora_text a { color: #666666; } header #diaspora_text span.sub_text { - color: black; text-shadow: none; } header #session_action { float: right; - margin-top: 9px; + top: 0; text-shadow: 0 1px 0 black; padding-right: 10px; } header #session_action a { @@ -412,3 +412,19 @@ h1.big_text { .image_cycle img { display: none; } + +#group { + color: #333333; } + #group ul { + font-size: 18px; + margin: 0; + padding: 0; } + #group ul > li { + display: inline; + margin-right: 10px; } + #group ul > li.selected { + color: white; + font-weight: bold; } + #group #user_pictures img { + display: inline-block; + height: 40px; } diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 3490e3b39..0c436867a 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -72,16 +72,18 @@ header :color #555 :background :color #2B2726 + :color #000 :border :bottom 3px solid #333 :padding 6px 0 :top 0 #diaspora_text + :margin + :bottom 1em :font :family 'BrandonGrotesqueLightRegular' - :size 24px - :position absolute + :size 16px :border none :color #fff :text @@ -90,14 +92,12 @@ header :color #666 span.sub_text - :color #000 :text :shadow none #session_action :float right - :margin - :top 9px + :top 0 :text-shadow 0 1px 0 #000 a :color #777 @@ -513,3 +513,23 @@ h1.big_text .image_cycle img :display none + +#group + :color #333 + ul + :font-size 18px + :margin 0 + :padding 0 + > li + :display inline + :margin + :right 10px + + &.selected + :color #fff + :font-weight bold + + #user_pictures + img + :display inline-block + :height 40px From 5974bf357121509ca1fe8854fd6e7f9c3c0cc0f9 Mon Sep 17 00:00:00 2001 From: danielvincent Date: Sun, 1 Aug 2010 22:27:39 -0700 Subject: [PATCH 2/8] group nav is now links to nothing --- app/views/layouts/application.html.haml | 18 ++++++++-------- public/stylesheets/application.css | 24 ++++++++++++++-------- public/stylesheets/sass/application.sass | 26 +++++++++++++++++------- 3 files changed, 43 insertions(+), 25 deletions(-) diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 4a96e6b2a..9cf9e25c9 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -18,8 +18,7 @@ = csrf_meta_tag = yield(:head) - = javascript_include_tag 'satisfaction' , 'satisfaction-display' - + = javascript_include_tag 'satisfaction', 'satisfaction-display' = javascript_include_tag 'jquery.html5_upload' %body @@ -44,11 +43,11 @@ #group %ul - %li.selected ACM - %li FAMILY - %li WORK - %li HIGH SCHOOL - #user_pictures + %li.selected= link_to "OTHER PRESIDENTS", root_path + %li= link_to "OSTATUS", ostatus_path + /%li= link_to "NEW YORK", "#" + /%li= link_to "NEW CIRCLE", "#" + #friend_pictures = link_to(person_image_tag(current_user), root_path) = link_to(person_image_tag(current_user), root_path) = link_to(person_image_tag(current_user), root_path) @@ -63,6 +62,8 @@ = link_to(person_image_tag(current_user), root_path) - for friend in @friends = person_image_link(friend) + .add_new + = link_to "+", requests_path .container - if user_signed_in? @@ -85,9 +86,6 @@ .container .span-24.last - = yield - - .span-24.last = render "posts/debug" diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index b11e56ba1..357f7bc99 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -84,7 +84,6 @@ header { text-shadow: none; } header #session_action { float: right; - top: 0; text-shadow: 0 1px 0 black; padding-right: 10px; } header #session_action a { @@ -155,9 +154,10 @@ h3 { font-weight: bold; } form { + position: relative; font-size: 120%; margin: 1em; - margin-left: 0em; } + margin-left: 0em; } #user_name { margin-bottom: 20px; } @@ -301,7 +301,8 @@ label { background-color: rgba(10, 81, 109, 0.05); border-bottom: 2px #999999 solid; color: #999999; - padding: 15px 1em; } + padding: 15px 1em; + padding-bottom: 30px; } #new_blog, #new_bookmark { @@ -416,15 +417,22 @@ h1.big_text { #group { color: #333333; } #group ul { - font-size: 18px; margin: 0; - padding: 0; } + padding: 0; + font-size: 14px; } #group ul > li { display: inline; margin-right: 10px; } - #group ul > li.selected { + #group ul > li.selected, #group ul > li.selected a { color: white; - font-weight: bold; } - #group #user_pictures img { + font-weight: bold; + font-size: 18px; } + #group a { + color: #333333; + font-weight: normal; } + #group #friend_pictures .add_new { + display: inline; + font-size: 40px; } + #group #friend_pictures img { display: inline-block; height: 40px; } diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 0c436867a..fe309e07f 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -97,7 +97,6 @@ header #session_action :float right - :top 0 :text-shadow 0 1px 0 #000 a :color #777 @@ -181,11 +180,11 @@ h3 :weight bold form + :position relative :font :size 120% :margin 1em - :margin-left 0em - + :left 0em #user_name :margin @@ -365,6 +364,7 @@ label :bottom 2px #999 solid :color #999 :padding 15px 1em + :bottom 30px #new_blog, #new_bookmark @@ -517,19 +517,31 @@ h1.big_text #group :color #333 ul - :font-size 18px :margin 0 :padding 0 + :font + :size 14px > li :display inline :margin :right 10px - &.selected + &.selected, &.selected a :color #fff - :font-weight bold + :font + :weight bold + :size 18px - #user_pictures + a + :color #333 + :font + :weight normal + + #friend_pictures + .add_new + :display inline + :font + :size 40px img :display inline-block :height 40px From 102b9128784e07136184c7357b283d40707b7cda Mon Sep 17 00:00:00 2001 From: danielvincent Date: Mon, 2 Aug 2010 16:20:30 -0700 Subject: [PATCH 3/8] moved group nav to its own partial --- app/views/layouts/application.html.haml | 28 +++---------------------- app/views/shared/_group_nav.haml | 21 +++++++++++++++++++ 2 files changed, 24 insertions(+), 25 deletions(-) create mode 100644 app/views/shared/_group_nav.haml diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 4f647d00e..f5400aef9 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -10,8 +10,7 @@ = stylesheet_link_tag "application", "ui", 'bubble' /= javascript_include_tag "http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js" = javascript_include_tag 'jquery142', 'rails', 'google' - = javascript_include_tag 'tiny_mce/tiny_mce', 'jquery.infieldlabel' - = javascript_include_tag 'jquery.cycle/jquery.cycle.min.js' + = javascript_include_tag 'tiny_mce/tiny_mce', 'jquery.infieldlabel', 'jquery.cycle/jquery.cycle.min.js' = javascript_include_tag 'view', 'publisher', 'image_picker' = render 'js/websocket_js' @@ -40,30 +39,9 @@ = link_to "logout", destroy_user_session_path - else = link_to "login", new_user_session_path + + = render "shared/group_nav" - #group - %ul - %li.selected= link_to "OTHER PRESIDENTS", root_path - %li= link_to "OSTATUS", ostatus_path - /%li= link_to "NEW YORK", "#" - /%li= link_to "NEW CIRCLE", "#" - #friend_pictures - = link_to(person_image_tag(current_user), root_path) - = link_to(person_image_tag(current_user), root_path) - = link_to(person_image_tag(current_user), root_path) - = link_to(person_image_tag(current_user), root_path) - = link_to(person_image_tag(current_user), root_path) - = link_to(person_image_tag(current_user), root_path) - = link_to(person_image_tag(current_user), root_path) - = link_to(person_image_tag(current_user), root_path) - = link_to(person_image_tag(current_user), root_path) - = link_to(person_image_tag(current_user), root_path) - = link_to(person_image_tag(current_user), root_path) - = link_to(person_image_tag(current_user), root_path) - - for friend in @friends - = person_image_link(friend) - .add_new - = link_to "+", requests_path .container - if user_signed_in? diff --git a/app/views/shared/_group_nav.haml b/app/views/shared/_group_nav.haml new file mode 100644 index 000000000..813473c60 --- /dev/null +++ b/app/views/shared/_group_nav.haml @@ -0,0 +1,21 @@ +#group + %ul + %li.selected= link_to "OTHER PRESIDENTS", root_path + %li= link_to "OSTATUS", ostatus_path + #friend_pictures + = link_to(person_image_tag(current_user), root_path) + = link_to(person_image_tag(current_user), root_path) + = link_to(person_image_tag(current_user), root_path) + = link_to(person_image_tag(current_user), root_path) + = link_to(person_image_tag(current_user), root_path) + = link_to(person_image_tag(current_user), root_path) + = link_to(person_image_tag(current_user), root_path) + = link_to(person_image_tag(current_user), root_path) + = link_to(person_image_tag(current_user), root_path) + = link_to(person_image_tag(current_user), root_path) + = link_to(person_image_tag(current_user), root_path) + = link_to(person_image_tag(current_user), root_path) + - for friend in @friends + = person_image_link(friend) + .add_new + = link_to "+", requests_path From 3d5f27fe5a49dad74f18bbab576bfe5ad4977a80 Mon Sep 17 00:00:00 2001 From: danielvincent Date: Mon, 2 Aug 2010 17:27:45 -0700 Subject: [PATCH 4/8] javascript gets group param for temp testing... friend pictures on group nav displays all people and authors, also for testing --- app/views/layouts/application.html.haml | 2 +- app/views/shared/_group_nav.haml | 21 +++++++-------------- public/javascripts/group_nav.js | 13 +++++++++++++ public/stylesheets/application.css | 12 +++++++++++- public/stylesheets/sass/application.sass | 16 +++++++++++++--- 5 files changed, 45 insertions(+), 19 deletions(-) create mode 100644 public/javascripts/group_nav.js diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index f5400aef9..44bce846b 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -11,7 +11,7 @@ /= javascript_include_tag "http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js" = javascript_include_tag 'jquery142', 'rails', 'google' = javascript_include_tag 'tiny_mce/tiny_mce', 'jquery.infieldlabel', 'jquery.cycle/jquery.cycle.min.js' - = javascript_include_tag 'view', 'publisher', 'image_picker' + = javascript_include_tag 'view', 'publisher', 'image_picker', 'group_nav' = render 'js/websocket_js' = csrf_meta_tag diff --git a/app/views/shared/_group_nav.haml b/app/views/shared/_group_nav.haml index 813473c60..9ba2f6d67 100644 --- a/app/views/shared/_group_nav.haml +++ b/app/views/shared/_group_nav.haml @@ -1,21 +1,14 @@ #group %ul - %li.selected= link_to "OTHER PRESIDENTS", root_path - %li= link_to "OSTATUS", ostatus_path + %li.other_presidents= link_to "OTHER PRESIDENTS", root_path(:g => "other_presidents") + %li.ostatus= link_to "OSTATUS", ostatus_path(:g => "ostatus") + %li.new_circle= link_to "NEW CIRCLE", "#" + #friend_pictures - = link_to(person_image_tag(current_user), root_path) - = link_to(person_image_tag(current_user), root_path) - = link_to(person_image_tag(current_user), root_path) - = link_to(person_image_tag(current_user), root_path) - = link_to(person_image_tag(current_user), root_path) - = link_to(person_image_tag(current_user), root_path) - = link_to(person_image_tag(current_user), root_path) - = link_to(person_image_tag(current_user), root_path) - = link_to(person_image_tag(current_user), root_path) - = link_to(person_image_tag(current_user), root_path) - = link_to(person_image_tag(current_user), root_path) - = link_to(person_image_tag(current_user), root_path) - for friend in @friends = person_image_link(friend) + + -for author in @subscribed_persons + = link_to (image_tag author.avatar_thumbnail, :class => "person_picture"), author_path(author) .add_new = link_to "+", requests_path diff --git a/public/javascripts/group_nav.js b/public/javascripts/group_nav.js new file mode 100644 index 000000000..62b99e18c --- /dev/null +++ b/public/javascripts/group_nav.js @@ -0,0 +1,13 @@ +$(document).ready( function() { + + var vars = [], hash; + var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&'); + for(var i = 0; i < hashes.length; i++) + { + hash = hashes[i].split('='); + vars.push(hash[0]); + vars[hash[0]] = hash[1]; + } + + $("."+vars['g']).addClass('selected'); +}); diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index dbb9964a0..1ba47cbca 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -431,8 +431,18 @@ h1.big_text { color: #333333; font-weight: normal; } #group #friend_pictures .add_new { - display: inline; + position: relative; + display: inline-block; + height: 40px; + width: 40px; + background-color: #222222; + text-align: center; font-size: 40px; } + #group #friend_pictures .add_new a { + display: block; + position: absolute; + top: -13px; + left: 7px; } #group #friend_pictures img { display: inline-block; height: 40px; } diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 13d2e6dca..bf3441940 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -539,9 +539,19 @@ h1.big_text #friend_pictures .add_new - :display inline - :font - :size 40px + :position relative + :display inline-block + :height 40px + :width 40px + :background + :color #222 + :text-align center + :font-size 40px + a + :display block + :position absolute + :top -13px + :left 7px img :display inline-block :height 40px From f3bc65135963003d686beb3c7f7ff6801c02c060 Mon Sep 17 00:00:00 2001 From: danielvincent Date: Mon, 2 Aug 2010 19:16:01 -0700 Subject: [PATCH 5/8] stuff fades --- public/javascripts/group_nav.js | 3 +++ public/stylesheets/application.css | 2 +- public/stylesheets/sass/application.sass | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/public/javascripts/group_nav.js b/public/javascripts/group_nav.js index 62b99e18c..f3d9600bb 100644 --- a/public/javascripts/group_nav.js +++ b/public/javascripts/group_nav.js @@ -10,4 +10,7 @@ $(document).ready( function() { } $("."+vars['g']).addClass('selected'); + + $("#group img").load(function(){$(this).fadeIn("slow");}); + }); diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 7cdcd5beb..929192e13 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -445,5 +445,5 @@ h1.big_text { top: -13px; left: 7px; } #group #friend_pictures img { - display: inline-block; + display: none; height: 40px; } diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index a170bb967..6b7bc1317 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -553,5 +553,5 @@ h1.big_text :top -13px :left 7px img - :display inline-block + :display none :height 40px From c54d47337b326b433019a1b014c8c812cbd58ba6 Mon Sep 17 00:00:00 2001 From: danielvincent Date: Fri, 6 Aug 2010 00:15:22 -0700 Subject: [PATCH 6/8] updated button style --- app/views/albums/index.html.haml | 4 +- app/views/albums/show.html.haml | 8 ++-- public/javascripts/view.js | 10 +---- public/stylesheets/application.css | 9 ++-- public/stylesheets/sass/application.sass | 6 ++- public/stylesheets/sass/ui.sass | 52 +++++++++++++----------- public/stylesheets/ui.css | 51 +++++++++++------------ 7 files changed, 70 insertions(+), 70 deletions(-) diff --git a/app/views/albums/index.html.haml b/app/views/albums/index.html.haml index 8f3816f3d..2e47295d6 100644 --- a/app/views/albums/index.html.haml +++ b/app/views/albums/index.html.haml @@ -2,8 +2,8 @@ .back = link_to "⇧ home", root_path Albums - .button.right#add_album_button - = link_to 'New Album', "#" + .right#add_album_button + = link_to 'New Album', "#", :class => "button" #add_album_box.contextual_pane = render "albums/new_album" diff --git a/app/views/albums/show.html.haml b/app/views/albums/show.html.haml index 253d94d19..208c3ae2b 100644 --- a/app/views/albums/show.html.haml +++ b/app/views/albums/show.html.haml @@ -5,8 +5,8 @@ = @album.name -if mine? @album - .button.right#add_photos_button - = link_to 'Add Photos', '#' + .right#add_photos_button + = link_to 'Add Photos', '#', :class => "button" #add_photo_box.contextual_pane = render "photos/new_photo", :photo => @photo, :album => @album @@ -26,5 +26,5 @@ .back = link_to "⇧ albums", albums_path -if mine? @album - .button.right - = link_to 'Edit Album', edit_album_path(@album) + .right + = link_to 'Edit Album', edit_album_path(@album), :class => "button" diff --git a/public/javascripts/view.js b/public/javascripts/view.js index 5da7a9f9e..5e0f2ef51 100644 --- a/public/javascripts/view.js +++ b/public/javascripts/view.js @@ -21,15 +21,7 @@ $(document).ready(function(){ var show_comments_toggle = $(this).parent().prev().children(".show_post_comments"); show_comments_toggle.html("hide comments ("+ ($(this).children().length - 1) + ")"); }; - }); - - $('a').hover(function(){ - if( $(this).children("img").length < 1 ) - $(this).fadeTo(60, 0.5); - }, function(){ - if( $(this).children("img").length < 1 ) - $(this).fadeTo(80, 1); - }); + }); $('#debug_info').click(function() { $('#debug_more').toggle('fast', function() { diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 929192e13..6710c853d 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -12,10 +12,10 @@ body { a { color: #018790; - text-decoration: none; - font-weight: bold; } + text-decoration: none; } a:hover { - color: #018790; } + color: white; + background-color: #018790; } #flash_notice, #flash_error, @@ -377,7 +377,8 @@ h1.big_text { .back { position: absolute; - font-size: 12px; } + font-size: 12px; + font-weight: normal; } #content_bottom { position: relative; diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 6b7bc1317..223080f2d 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -13,9 +13,10 @@ a :color #018790 :text :decoration none - :font-weight bold &:hover - :color #018790 + :color #fff + :background + :color #018790 #flash_notice, @@ -464,6 +465,7 @@ h1.big_text :position absolute :font :size 12px + :weight normal #content_bottom :position relative diff --git a/public/stylesheets/sass/ui.sass b/public/stylesheets/sass/ui.sass index 50000a8d3..7a64e4ce6 100644 --- a/public/stylesheets/sass/ui.sass +++ b/public/stylesheets/sass/ui.sass @@ -5,21 +5,22 @@ :display inline - :color #777 + :padding 4px + :font-size 12px :line-height 100% :text-shadow 0 1px 0 #fff - :min-height 14px + :min-height 10px - :background -webkit-gradient(linear, 0% 29%, 0% 85%, from(#FAFAFA), to(#E0E0E0)) - :background -moz-linear-gradient(top, #FAFAFA, #E0E0E0) + :background -webkit-gradient(linear, 0% 29%, 0% 85%, from(#FCFCFC), to(#F6F6F6)) + :background -moz-linear-gradient(top, #FCFCFC, #F6F6F6) - :border 1px solid #ccc - :bottom 1px solid #666 - :left 1px solid #999 - :right 1px solid #999 + :border 1px solid #EEE + :bottom 1px solid #999 + :left 1px solid #ccc + :right 1px solid #ccc :border-radius 3px :-moz-border-radius 3px @@ -27,28 +28,31 @@ :cursor pointer + :box-shadow 0 1px 1px #eee + :-webkit-box-shadow 0 1px 1px #eee + :-moz-box-shadow 0 1px 1px #eee - :box-shadow 0 1px 1px #ccc - :-webkit-box-shadow 0 1px 1px #ccc - :-moz-box-shadow 0 1px 1px #ccc + :font-weight normal - a - :font-weight normal - :color #777 + :color #666 - -.button - :padding 5px + &:hover + :color #666 + :background -webkit-gradient(linear, 0% 29%, 0% 85%, from(#FAFAFA), to(#F0F0F0)) + :background -moz-linear-gradient(top, #FAFAFA, #F0F0F0) &:active - :box-shadow 0 0px 2px #000 - :-webkit-box-shadow 0 0px 2px #000 - :-moz-box-shadow 0 0px 2px #000 - :color #555 + :color #666 + :background -webkit-gradient(linear, 0% 29%, 0% 85%, from(#F0F0F0), to(#FAFAFA)) + :background -moz-linear-gradient(top, #F0F0F0, #FAFAFA) + :border + :top 1px solid #ccc ul.button_set - :padding 5px 0 + :padding + :left 0 + :right 0 > li :padding 5px @@ -75,8 +79,8 @@ ul.button_set :right none .button .selected, .button_set .selected - :background -webkit-gradient(linear, 0% 29%, 0% 85%, from(#E0E0E0), to(#FAFAFA)) - :background -moz-linear-gradient(top, #e0e0e0, #fafafa) + :background -webkit-gradient(linear, 0% 29%, 0% 85%, from(#F0F0F0), to(#FAFAFA)) + :background -moz-linear-gradient(top, #F0F0F0, #fafafa) :border :top 1px solid #aaa diff --git a/public/stylesheets/ui.css b/public/stylesheets/ui.css index 63c8dc0cc..f83cc7957 100644 --- a/public/stylesheets/ui.css +++ b/public/stylesheets/ui.css @@ -2,38 +2,39 @@ font-family: "Lucida Grande", sans-serif; font-style: normal; display: inline; - color: #777777; + padding: 4px; font-size: 12px; line-height: 100%; text-shadow: 0 1px 0 white; - min-height: 14px; - background: -webkit-gradient(linear, 0% 29%, 0% 85%, from(#fafafa), to(#e0e0e0)); - background: -moz-linear-gradient(top, #fafafa, #e0e0e0); - border: 1px solid #cccccc; - border-bottom: 1px solid #666666; - border-left: 1px solid #999999; - border-right: 1px solid #999999; + min-height: 10px; + background: -webkit-gradient(linear, 0% 29%, 0% 85%, from(#fcfcfc), to(#f6f6f6)); + background: -moz-linear-gradient(top, #fcfcfc, #f6f6f6); + border: 1px solid #eeeeee; + border-bottom: 1px solid #999999; + border-left: 1px solid #cccccc; + border-right: 1px solid #cccccc; border-radius: 3px; -moz-border-radius: 3px; -webkit-border-radius: 3px; cursor: pointer; - box-shadow: 0 1px 1px #cccccc; - -webkit-box-shadow: 0 1px 1px #cccccc; - -moz-box-shadow: 0 1px 1px #cccccc; } - .button a, .button_set a { - font-weight: normal; - color: #777777; } - -.button { - padding: 5px; } - .button:active { - box-shadow: 0 0px 2px black; - -webkit-box-shadow: 0 0px 2px black; - -moz-box-shadow: 0 0px 2px black; - color: #555555; } + box-shadow: 0 1px 1px #eeeeee; + -webkit-box-shadow: 0 1px 1px #eeeeee; + -moz-box-shadow: 0 1px 1px #eeeeee; + font-weight: normal; + color: #666666; } + .button:hover, .button_set:hover { + color: #666666; + background: -webkit-gradient(linear, 0% 29%, 0% 85%, from(#fafafa), to(#f0f0f0)); + background: -moz-linear-gradient(top, #fafafa, #f0f0f0); } + .button:active, .button_set:active { + color: #666666; + background: -webkit-gradient(linear, 0% 29%, 0% 85%, from(#f0f0f0), to(#fafafa)); + background: -moz-linear-gradient(top, #f0f0f0, #fafafa); + border-top: 1px solid #cccccc; } ul.button_set { - padding: 5px 0; } + padding-left: 0; + padding-right: 0; } ul.button_set > li { padding: 5px; display: inline; @@ -50,8 +51,8 @@ ul.button_set { border-right: none; } .button .selected, .button_set .selected { - background: -webkit-gradient(linear, 0% 29%, 0% 85%, from(#e0e0e0), to(#fafafa)); - background: -moz-linear-gradient(top, #e0e0e0, #fafafa); + background: -webkit-gradient(linear, 0% 29%, 0% 85%, from(#f0f0f0), to(#fafafa)); + background: -moz-linear-gradient(top, #f0f0f0, #fafafa); border-top: 1px solid #aaaaaa; } .right { From 6f1a596dff79ab459a6985fb0324dca8b2ad5e7d Mon Sep 17 00:00:00 2001 From: danielvincent Date: Fri, 6 Aug 2010 00:40:44 -0700 Subject: [PATCH 7/8] small color changes --- app/views/authors/show.html.haml | 4 ++-- app/views/photos/show.html.haml | 8 ++++---- .../status_messages/_status_message.html.haml | 2 +- public/javascripts/view.js | 3 +++ public/stylesheets/application.css | 15 ++++++++------- public/stylesheets/sass/application.sass | 12 +++++++----- 6 files changed, 25 insertions(+), 19 deletions(-) diff --git a/app/views/authors/show.html.haml b/app/views/authors/show.html.haml index 89b6cd165..fbabf20ce 100644 --- a/app/views/authors/show.html.haml +++ b/app/views/authors/show.html.haml @@ -17,5 +17,5 @@ #content_bottom .back = link_to "⇧ ostatus", ostatus_path - .button.right - = link_to 'Unsubscribe', @author, :confirm => 'Are you sure?', :method => :delete + .right + = link_to 'Unsubscribe', @author, :confirm => 'Are you sure?', :method => :delete, :class => "button" diff --git a/app/views/photos/show.html.haml b/app/views/photos/show.html.haml index 0714ec692..4da35fd36 100644 --- a/app/views/photos/show.html.haml +++ b/app/views/photos/show.html.haml @@ -3,8 +3,8 @@ = link_to "⇧ #{@album.name}", album_path(@album) = @photo.image - .button.right - = link_to 'Edit Photo', edit_photo_path(@photo) + .right + = link_to 'Edit Photo', edit_photo_path(@photo), :class => "button" .sub_header = link_to "full size", @photo.image.url @@ -23,8 +23,8 @@ .back = link_to "⇧ #{@album.name}", album_path(@album) -if mine? @album - .button.right - = link_to 'Delete Photo', @photo, :confirm => 'Are you sure?', :method => :delete + .right + = link_to 'Delete Photo', @photo, :confirm => 'Are you sure?', :method => :delete, :class => "button" %h4{:class => "show_post_comments"} = "comments (#{@photo.comments.count})" diff --git a/app/views/status_messages/_status_message.html.haml b/app/views/status_messages/_status_message.html.haml index 5681e9753..954128431 100644 --- a/app/views/status_messages/_status_message.html.haml +++ b/app/views/status_messages/_status_message.html.haml @@ -14,4 +14,4 @@ - if mine?(post) .destroy_link - = link_to 'Delete', status_message_path(post), :confirm => 'Are you sure?', :method => :delete, :remote => true + = link_to 'Delete', status_message_path(post), :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "delete" diff --git a/public/javascripts/view.js b/public/javascripts/view.js index 5e0f2ef51..c181e3bcc 100644 --- a/public/javascripts/view.js +++ b/public/javascripts/view.js @@ -107,5 +107,8 @@ $(document).ready(function(){ $(this).fadeIn("slow"); }); + $(".delete").hover(function(){ + $(this).toggleClass("button"); + }); });//end document ready diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 6710c853d..437ba0fd7 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -12,10 +12,12 @@ body { a { color: #018790; + color: #556270; text-decoration: none; } a:hover { color: white; - background-color: #018790; } + background-color: #018790; + background-color: #556270; } #flash_notice, #flash_error, @@ -107,13 +109,12 @@ header { ul#stream, ul#friend_stream { margin: 0; - padding: 0; - color: #666666; } + padding: 0; } ul#stream > li, ul#friend_stream > li { list-style: none; padding: 15px 0; - border-bottom: 1px solid #f1f1f1; - margin-bottom: 5px; } + margin-bottom: 5px; + border-bottom: 1px solid #eeeeee; } ul#friend_stream > li { padding: 0.2em 0; } @@ -295,7 +296,8 @@ label { color: #999999; position: absolute; top: 3px; - left: 0.48em; } + left: 0.48em; + font-weight: normal; } #publisher { background-color: rgba(10, 81, 109, 0.05); @@ -367,7 +369,6 @@ ul#publisher_content_pickers li { h1.big_text { position: relative; line-height: auto; - border-top: 2px solid #666666; border-bottom: 1px solid #666666; text-align: center; } diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 223080f2d..f84d8b0c3 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -11,13 +11,14 @@ body :margin 0 a :color #018790 + :color #556270 :text :decoration none &:hover :color #fff :background :color #018790 - + :color #556270 #flash_notice, #flash_error, @@ -121,13 +122,12 @@ header ul#stream, ul#friend_stream :margin 0 :padding 0 - :color #666 > li :list-style none :padding 15px 0 - :border - :bottom 1px solid #f1f1f1 :margin-bottom 5px + :border + :bottom 1px solid #eee ul#friend_stream > li @@ -356,6 +356,8 @@ label :position absolute :top 3px :left 0.48em + :font + :weight normal #publisher :background @@ -451,7 +453,7 @@ h1.big_text :position relative :line-height auto :border - :top 2px solid #666 + //:top 2px solid #666 :bottom 1px solid #666 :text :align center From aebe7b97c0835fc19e39639f323e73564ce7fccd Mon Sep 17 00:00:00 2001 From: Raphael Date: Mon, 9 Aug 2010 15:58:53 -0700 Subject: [PATCH 8/8] DG RS; added groups. can't delete, but can make new ones --- app/controllers/application_controller.rb | 1 + app/controllers/groups_controller.rb | 44 +++++++++++++++++++++++ app/models/group.rb | 12 +++++++ app/models/user.rb | 9 ++++- app/views/groups/_new_group.haml | 6 ++++ app/views/groups/edit.html.haml | 25 +++++++++++++ app/views/groups/new.html.haml | 14 ++++++++ app/views/shared/_group_nav.haml | 9 +++-- config/routes.rb | 1 + public/stylesheets/application.css | 2 ++ public/stylesheets/sass/application.sass | 2 ++ spec/models/group_spec.rb | 32 +++++++++++++++++ 12 files changed, 151 insertions(+), 6 deletions(-) create mode 100644 app/controllers/groups_controller.rb create mode 100644 app/models/group.rb create mode 100644 app/views/groups/_new_group.haml create mode 100644 app/views/groups/edit.html.haml create mode 100644 app/views/groups/new.html.haml create mode 100644 spec/models/group_spec.rb diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index bb091706b..a36a8c873 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -16,6 +16,7 @@ class ApplicationController < ActionController::Base end def set_friends_and_status + @groups = current_user.groups @friends = current_user.friends if current_user @latest_status_message = StatusMessage.newest_for(current_user) if current_user end diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb new file mode 100644 index 000000000..e12809fb6 --- /dev/null +++ b/app/controllers/groups_controller.rb @@ -0,0 +1,44 @@ +class GroupsController < ApplicationController + before_filter :authenticate_user! + + def create + @group = current_user.group(params[:group]) + + if @group.created_at + flash[:notice] = "Successfully created group." + redirect_to root_url + else + render :action => 'new' + end + end + + def new + @group = Group.new + end + + def destroy + @group = Group.first(:id => params[:id]) + @group.destroy + flash[:notice] = "Successfully destroyed group." + redirect_to groups_url + end + + def show + @group = Group.first(:id => params[:id]) + end + + def edit + @group = Group.first(:id => params[:id]) + end + + def update + @group = Group.first(:id => params[:id]) + if @group.update_attributes(params[:group]) + flash[:notice] = "Successfully updated group." + redirect_to @group + else + render :action => 'edit' + end + end + +end diff --git a/app/models/group.rb b/app/models/group.rb new file mode 100644 index 000000000..885e471cc --- /dev/null +++ b/app/models/group.rb @@ -0,0 +1,12 @@ +class Group + include MongoMapper::Document + + key :name, String + + many :people, :class_name => 'Person' + belongs_to :user, :class_name => 'User' + + timestamps! + +end + diff --git a/app/models/user.rb b/app/models/user.rb index 7a73971ab..794c7970a 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -12,6 +12,8 @@ class User many :friends, :in => :friend_ids, :class_name => 'Person' many :pending_friends, :in => :pending_friend_ids, :class_name => 'Person' + many :groups, :class_name => 'Group' + before_validation_on_create :assign_key before_validation :do_bad_things @@ -28,9 +30,14 @@ class User "#{person.profile.first_name.to_s} #{person.profile.last_name.to_s}" end + ######### Groups ###################### + def group( opts = {} ) + opts[:user] = self + Group.create(opts) + end - ######### Friend Requesting + ######### Friend Requesting ########### def send_friend_request_to(friend_url) unless self.friends.find{ |x| x.url == friend_url} p = Request.instantiate(:to => friend_url, :from => self.person) diff --git a/app/views/groups/_new_group.haml b/app/views/groups/_new_group.haml new file mode 100644 index 000000000..755223fd8 --- /dev/null +++ b/app/views/groups/_new_group.haml @@ -0,0 +1,6 @@ += form_for Group.new do |f| + = f.error_messages + %p + = f.label :name + = f.text_field :name + = f.submit 'create', :class => 'button' diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml new file mode 100644 index 000000000..461bff1db --- /dev/null +++ b/app/views/groups/edit.html.haml @@ -0,0 +1,25 @@ +%h1.big_text + .back + = link_to "⇧ #{@group.name}", @group + + = "Editing #{@group.name}" + +.sub_header + ="updated #{how_long_ago(@group)}" + +- form_for @group do |a| + = a.error_messages + %p + = a.text_field :name + + #submit_block + = link_to "Cancel", root_path + or + = a.submit + +.button.delete + = link_to 'Delete Album', @group, :confirm => 'Are you sure?', :method => :delete + +#content_bottom + .back + = link_to "⇧ #{@group.name}", @group diff --git a/app/views/groups/new.html.haml b/app/views/groups/new.html.haml new file mode 100644 index 000000000..c899fd9ae --- /dev/null +++ b/app/views/groups/new.html.haml @@ -0,0 +1,14 @@ +%h1.big_text + =link_to 'groups', groups_path + >> + new group + += form_for @group do |f| + = f.error_messages + %p + = f.label :name + = f.text_field :name + %p + = f.submit + +%p= link_to "Back to List", groups_path diff --git a/app/views/shared/_group_nav.haml b/app/views/shared/_group_nav.haml index 9ba2f6d67..c61712038 100644 --- a/app/views/shared/_group_nav.haml +++ b/app/views/shared/_group_nav.haml @@ -1,14 +1,13 @@ #group %ul - %li.other_presidents= link_to "OTHER PRESIDENTS", root_path(:g => "other_presidents") - %li.ostatus= link_to "OSTATUS", ostatus_path(:g => "ostatus") - %li.new_circle= link_to "NEW CIRCLE", "#" + - for group in @groups + %li= link_to group.name, group_path(group) + + %li.new_group= link_to "NEW GROUP", new_group_path #friend_pictures - for friend in @friends = person_image_link(friend) - -for author in @subscribed_persons - = link_to (image_tag author.avatar_thumbnail, :class => "person_picture"), author_path(author) .add_new = link_to "+", requests_path diff --git a/config/routes.rb b/config/routes.rb index 3726f5bf4..8d0cd5c01 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -8,6 +8,7 @@ Diaspora::Application.routes.draw do |map| resources :requests resources :photos resources :albums + resources :groups match "/images/files/*path" => "gridfs#serve" diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 157423bba..ad207bf50 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -70,6 +70,7 @@ header { color: #555555; background-color: #2b2726; background-color: black; + background-color: white; border-bottom: 3px solid #333333; padding: 6px 0; padding-top: 0; } @@ -436,6 +437,7 @@ h1.big_text { margin-right: 10px; } #group ul > li.selected, #group ul > li.selected a { color: white; + color: black; font-weight: bold; font-size: 18px; } #group a { diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index df7530904..75b14624e 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -75,6 +75,7 @@ header :background :color #2B2726 :color #000 + :color #fff :border :bottom 3px solid #333 :padding 6px 0 @@ -546,6 +547,7 @@ h1.big_text &.selected, &.selected a :color #fff + :color #000 :font :weight bold :size 18px diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb new file mode 100644 index 000000000..a40a9be11 --- /dev/null +++ b/spec/models/group_spec.rb @@ -0,0 +1,32 @@ +require File.dirname(__FILE__) + '/../spec_helper' + +describe Group do + before do + @user = Factory.create(:user) + @friend = Factory.create(:person) + end + + describe 'creation' do + it 'should have a name' do + group = @user.group(:name => 'losers') + group.name.should == "losers" + end + end + + describe 'querying' do + before do + @group = @user.group(:name => 'losers', :people => [@friend]) + end + + it 'belong to a user' do + @group.user.id.should == @user.id + @user.groups.size.should == 1 + @user.groups.first.id.should == @group.id + end + + it 'should have people' do + @group.people.all.include?(@friend).should be true + @group.people.size.should == 1 + end + end +end