nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

group edit button up top.

Browse source
This commit is contained in:
Daniel Vincent Grippi 2010-09-06 17:22:57 -07:00
parent 48415b4de8
commit 39c366e2e9
4 changed files with 17 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/views/shared/_group_friends.haml
View file

@ -4,7 +4,6 @@
- unless @group == :all - unless @group == :all
= link_to (image_tag('add_friend_button.png', :height => "50px", :width => "50px")), "#add_request_pane", :id => 'add_request_button' = link_to (image_tag('add_friend_button.png', :height => "50px", :width => "50px")), "#add_request_pane", :id => 'add_request_button'
= link_to "Edit", (edit_group_path(@group)), :class => "buttion"
.yo{:style => 'display:none'} .yo{:style => 'display:none'}
#add_request_pane #add_request_pane

6
app/views/shared/_group_nav.haml
View file

@ -6,11 +6,13 @@
%li{:id => group.id, :class => ("selected" if current_group?(group))} %li{:id => group.id, :class => ("selected" if current_group?(group))}
%span.group_name %span.group_name
= link_for_group group = link_for_group group
%span{:class => '⚙'}
= link_to "⚙", "#", :class => "edit_group_button"
%li.new_group= link_to("+", "#add_group_pane", :id => "add_group_button") %li.new_group= link_to("+", "#add_group_pane", :id => "add_group_button")
%li
%span{:class => '⚙'}
= link_to "⚙", edit_group_path(Group.first), :class => "edit_group_button", :title => "Manage your facets."
.yo{ :style => "display:none;"} .yo{ :style => "display:none;"}
#add_group_pane #add_group_pane
= render "groups/new_group" = render "groups/new_group"

15
public/stylesheets/application.css
View file

@ -462,21 +462,16 @@ h1.big_text {
margin-right: 0.5em; margin-right: 0.5em;
padding: 3px 8px; padding: 3px 8px;
border: 1px solid #555555; } border: 1px solid #555555; }
#group_nav ul > li:hover {
background-color: #444444; }
#group_nav ul > li:hover a {
color: #999999; }
#group_nav ul > li a { #group_nav ul > li a {
color: #999999; } color: #999999; }
#group_nav ul > li a:hover { #group_nav ul > li a:hover {
background: none; } background: none; }
#group_nav ul > li a.editable:hover { #group_nav ul > li a.editable:hover {
background: yellow; } background: yellow; }
#group_nav ul .⚙ { #group_nav ul > li:hover {
margin-left: 4px; background-color: #444444; }
margin-right: -4px; } #group_nav ul > li:hover a {
#group_nav ul .⚙ a { color: #999999; }
color: black; }
#group_nav ul .selected { #group_nav ul .selected {
font-weight: bold; font-weight: bold;
background-color: white; background-color: white;
@ -486,8 +481,6 @@ h1.big_text {
background-color: #eeeeee; } background-color: #eeeeee; }
#group_nav ul .selected a { #group_nav ul .selected a {
color: black; } color: black; }
#group_nav ul .selected .⚙ a {
color: #333333; }
#add_photo_loader { #add_photo_loader {
position: absolute; position: absolute;

26
public/stylesheets/sass/application.sass
View file

@ -577,6 +577,7 @@ h1.big_text
:style none :style none
:font :font
:size 14px :size 14px
> li > li
:background :background
:color #444 :color #444
@ -587,12 +588,6 @@ h1.big_text
:border 1px solid #555 :border 1px solid #555
&:hover
:background
:color #444
a
:color #999
a a
:color #999 :color #999
&:hover &:hover
@ -600,12 +595,12 @@ h1.big_text
&.editable:hover &.editable:hover
:background yellow :background yellow
.⚙ &:hover
:margin :background
:left 4px :color #444
:right -4px a
a :color #999
:color #000
.selected .selected
:font :font
@ -621,11 +616,6 @@ h1.big_text
a a
:color #000 :color #000
.⚙
a
:color #333
#add_photo_loader #add_photo_loader
:position absolute :position absolute
:display none :display none
@ -780,3 +770,5 @@ h1.big_text
:font :font
:style italic :style italic
:color #666 :color #666