From fdd1a5d93bd19414de31b396498d4d991ffa540f Mon Sep 17 00:00:00 2001 From: danielvincent Date: Tue, 27 Jul 2010 16:04:51 -0700 Subject: [PATCH 1/3] more recovery --- app/views/albums/index.html.haml | 7 ++++--- app/views/photos/show.html.haml | 6 ++++-- app/views/requests/_new_request.haml | 3 ++- app/views/requests/index.html.haml | 3 +++ public/stylesheets/application.css | 9 ++++++++- public/stylesheets/sass/application.sass | 15 +++++++++++---- 6 files changed, 32 insertions(+), 11 deletions(-) diff --git a/app/views/albums/index.html.haml b/app/views/albums/index.html.haml index 5931461d7..56b0b6bb8 100644 --- a/app/views/albums/index.html.haml +++ b/app/views/albums/index.html.haml @@ -6,7 +6,7 @@ %li= your_albums_link .button.right#add_album_button - = link_to 'new album', "#" + = link_to 'New Album', "#" #add_album_box.contextual_pane = render "albums/new_album" @@ -17,5 +17,6 @@ #pagination = will_paginate @albums -%h3 - = link_to "make a new album", new_album_path unless params[:friends] +#content_bottom + .back + = link_to "⇧ home", root_path diff --git a/app/views/photos/show.html.haml b/app/views/photos/show.html.haml index d7ca04b6a..85affca6b 100644 --- a/app/views/photos/show.html.haml +++ b/app/views/photos/show.html.haml @@ -4,10 +4,12 @@ = @photo.image .button.right - = link_to 'edit', '#' + = link_to 'Edit', '#' + +.sub_header + = link_to "full size", @photo.image.url %div{:id => @photo.id} - = link_to "full size", @photo.image.url #show_photo = link_to_prev @photo, @album diff --git a/app/views/requests/_new_request.haml b/app/views/requests/_new_request.haml index da924b05e..714168fd2 100644 --- a/app/views/requests/_new_request.haml +++ b/app/views/requests/_new_request.haml @@ -1,7 +1,8 @@ = form_for @request do |f| = f.error_messages - enter a diaspora url, diaspora username, or random email address: + Enter a Diaspora URL, Diaspora username, or random email address: .field_with_submit = f.text_field :destination_url = f.submit + diff --git a/app/views/requests/index.html.haml b/app/views/requests/index.html.haml index 8347c76d8..c7943f49c 100644 --- a/app/views/requests/index.html.haml +++ b/app/views/requests/index.html.haml @@ -11,3 +11,6 @@ - for request in @remote_requests = render "request", :request => request +#content_bottom + .back + = link_to "⇧ home", root_path diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index c2ed05d18..c4c89497d 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -345,7 +345,7 @@ ul#publisher_content_pickers li { -moz-border-radius: 3px; } .field_with_submit input[type='text'] { - width: 85%; + width: 82%; display: inline; } h1.big_text { @@ -374,3 +374,10 @@ h1.big_text { .show_post_comments ul.comment_set { width: 100%; } + +.sub_header { + text-align: center; + font-style: italic; + margin-top: -5px; + margin-bottom: 15px; + color: #999999; } diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index e293bfdfc..8103fd7e0 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -423,7 +423,7 @@ ul#publisher_content_pickers li .field_with_submit input[type='text'] - :width 85% + :width 82% :display inline h1.big_text @@ -445,9 +445,6 @@ h1.big_text :font :size 12px - - - #content_bottom :position relative :line-height 36px @@ -464,3 +461,13 @@ h1.big_text .show_post_comments ul.comment_set :width 100% + +.sub_header + :text + :align center + :font + :style italic + :margin + :top -5px + :bottom 15px + :color #999 From e6d2f51675b2b120ad8623c53610f4ce53f9658e Mon Sep 17 00:00:00 2001 From: danielvincent Date: Tue, 27 Jul 2010 16:08:28 -0700 Subject: [PATCH 2/3] more visual recovery --- public/images/loader.gif | Bin 0 -> 1623 bytes public/stylesheets/sass/ui.sass | 122 ++++++++++++++++++++++++++++++++ 2 files changed, 122 insertions(+) create mode 100644 public/images/loader.gif create mode 100644 public/stylesheets/sass/ui.sass diff --git a/public/images/loader.gif b/public/images/loader.gif new file mode 100644 index 0000000000000000000000000000000000000000..570a3cb9e6f6f6df33ab90a0763ea63747a4dabf GIT binary patch literal 1623 zcmdVY`A?Gv7zgn8ecQg2OG=?oTd;lU!Aq&NCr6>>?LjX<%7AdlM$6G~ly>E41py1S z1q-xgL)YMcs9G;(_&&+9?DdcA=_AQ%ja#p2xD-2D7}lgZTC+1b_A<#M?~q0sd7G?&Yj zN~J25N~hD+*Vp&<_D)PpL?RImhhsDv9S(;;AgHXY+_PtoMx!Y!E32)o9UmVD{%?c) z6T7##s#2pe7mEc#9Ju92{@z_?ZE0mT^)pMltv&5s?cG-9-qw!hwpO>5iF!O9f!%3s zX?NJ10!M3a7J$6MgE3o+{MX@M_X-ePOlD{-IlY+&-^Q#|*@dQ;g%1e(2&4-M6UE{Y zBObov+`QS4;ny{j^3Y1yfL~}@+%cIwwaGH@NMJl>_+#zqV#h|x$bn~Gc{M4FKfuD* z!&y*lOt(FOq<|GrOmxs5*^$ukPNy3^ev*f5qkxAn@4FXX4T|ryh$UBRwez=u{I&gs zzVUUbX#q1n`V|i?m^rcV3@z^7d2>KhbM3p8CSt<<$O*F=mqs%U5eQW~Gq{Yv5RFJ5 znhb?$@C@Mdhj*Sb(%vtrszx&W!F1x{5EJp!XLb^afzvdkd+1Ui4gM^=qE>Au8rTvM z%^yN{e}2K7P6NP}$3#mNFK+hPm5il^%U}PtDgU%7rSA**t3EkptywmkETjkAb`6I?Yl1rSmZrx{8ZSW&;?r z`^Lwf8Q(3_n>lk2#|=MjxYyZZIxjLRX(L}}B_}^#Q=WD%zQ_DR{qPJ)DoB#;NKPew!O0cJXcesOtE5f>0z99OdJ< zRB96URDzz6dM-6aAh76g$>%6Iy*7#~94OwFb8xGy*BsENqUOQJXt2gNNXE(b&FFC2 zgAc8rpW}2m;y#+Ik6XT{Us&Bpa&&C|^r*Mf@zli_EORtiZC*oeikv;BEGlx+v#3gSeNl8>Pb~)8bI>^decG(z=Pqu%c{{KvVzj_0W zW;5tp!Aies3q%FiK9IrE2SnQsc~=cYU|>*B@B%Jz z5<%~2YTzak?UqRmC=iJfJx+e2ViuS?rifAqj0#1cAwj^8rBH_IrpCG4sM2D>CGB<> ziaP8CMtz6;hcG$_(CGmmQ>#TFnJfqfeVCR?P0fZd094KT=qFBQ`yiES{wyn1&R#w{ zHwv-HoV4o~gKBLmnik4NU|{9$YJiTcVj42@)+h)qV`}8gAqetEQz*<04RSr2Oi@GX e-y!75@{4FFEs?x>GX$&$2LH;v-?)GQ1^)thPqD-R literal 0 HcmV?d00001 diff --git a/public/stylesheets/sass/ui.sass b/public/stylesheets/sass/ui.sass new file mode 100644 index 000000000..eaa2f674c --- /dev/null +++ b/public/stylesheets/sass/ui.sass @@ -0,0 +1,122 @@ +.button, .button_set + :font + :family "Lucida Grande", sans-serif + + :display inline + + :color #777 + :font-size 12px + :line-height 100% + + :text-shadow 0 1px 0 #fff + + :min-height 14px + + :background -webkit-gradient(linear, 0% 29%, 0% 85%, from(#FAFAFA), to(#E0E0E0)) + + :border 1px solid #ccc + :bottom 1px solid #666 + :left 1px solid #999 + :right 1px solid #999 + + :border-radius 3px + :-moz-border-radius 3px + :-webkit-border-radius 3px + + :cursor pointer + + + :box-shadow 0 1px 1px #ccc + :-webkit-box-shadow 0 1px 1px #ccc + :-moz-box-shadow 0 1px 1px #ccc + + a + :font-weight normal + :color #777 + + +.button + :padding 5px + + &:active + :box-shadow 0 0px 2px #000 + :-webkit-box-shadow 0 0px 2px #000 + :-moz-box-shadow 0 0px 2px #000 + :color #555 + +ul.button_set + + :padding 5px 0 + + > li + :padding 5px + :display inline + :height 100% + :border + :left 1px solid #ccc + :right 1px solid #fff + + :margin + :left -3px + :right -3px + + &:first-child + :margin + :left 0 + :border + :left none + + &:last-child + :margin + :right 0 + :border + :right none + +.button .selected, .button_set .selected + :background -webkit-gradient(linear, 0% 29%, 0% 85%, from(#E0E0E0), to(#FAFAFA)) + :border + :top 1px solid #aaa + +.right + :position absolute + :right 0 + :margin + :top 5px + +.contextual_pane + :z-index 20 + + :position absolute + + :display none + + :right 0 + :background + :color rgba( 30,30,30,0.95 ) + + :border 2px solid #999 + + :border-radius 5px + :-moz-border-radius 5px + :-webkit-border-radius 5px + + :color #999 + + :font + :size 12px + :weight normal + + :line-height auto + + form + :margin 0 + :padding 10px + :color #999 + + input[type='text'] + :width 80% + :display block + + p + :padding 10px + :display inline From 7992b1b0e0e3c5214833d241f4696e207bbb2ef4 Mon Sep 17 00:00:00 2001 From: danielvincent Date: Tue, 27 Jul 2010 16:10:42 -0700 Subject: [PATCH 3/3] delete photo button on photo show page instead of delete album. --- app/views/photos/show.html.haml | 2 +- public/stylesheets/application.css | 2 +- public/stylesheets/sass/application.sass | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/photos/show.html.haml b/app/views/photos/show.html.haml index 85affca6b..534ed7c58 100644 --- a/app/views/photos/show.html.haml +++ b/app/views/photos/show.html.haml @@ -21,7 +21,7 @@ = link_to "⇧ #{@album.name}", album_path(@album) -if mine? @album .button.right - = link_to 'Delete Album', @album, :confirm => 'Are you sure?', :method => :delete + = link_to 'Delete Photo', @photo, :confirm => 'Are you sure?', :method => :delete %h4{:class => "show_post_comments"} = "comments (#{@photo.comments.count})" diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index c4c89497d..6ee9d2f62 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -379,5 +379,5 @@ h1.big_text { text-align: center; font-style: italic; margin-top: -5px; - margin-bottom: 15px; + margin-bottom: 20px; color: #999999; } diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 8103fd7e0..c149735ad 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -469,5 +469,5 @@ h1.big_text :style italic :margin :top -5px - :bottom 15px + :bottom 20px :color #999