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

moving things around

Browse source
This commit is contained in:
danielvincent 2010-08-23 11:05:28 -07:00
parent 361adda6cd
commit 2d21ac0460
6 changed files with 77 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/views/layouts/application.html.haml
View file

@ -47,12 +47,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"

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

@ -1,8 +1,11 @@
#group
%ul
.selected
= @group.name
- 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")
@ -16,11 +19,6 @@
= 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
.yo{:style => 'display:none'}
#add_request_pane
= render "requests/new_request"

29
app/views/shared/_publisher.haml
View file

@ -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"

2
public/javascripts/view.js
View file

@ -33,7 +33,7 @@ $(document).ready(function(){
$("label").inFieldLabels();
$('#flash_notice, #flash_error, #flash_alert').delay(1500).slideUp(130);
$('#flash_notice, #flash_error, #flash_alert').delay(2500).slideUp(130);
$("#stream li").live('mouseover',function() {

60
public/stylesheets/application.css
View file

@ -73,7 +73,6 @@ header {
padding: 6px 0;
padding-top: 0; }
header #diaspora_text {
margin-bottom: 1em;
font-family: "BrandonGrotesqueLightRegular";
font-size: 16px;
border: none;
@ -303,31 +302,25 @@ label {
background-color: rgba(10, 81, 109, 0.05);
border-bottom: 2px #999999 solid;
color: #999999;
padding: 15px 1em;
padding-bottom: 30px;
position: relative; }
#new_blog,
#new_bookmark {
display: none; }
ul#publisher_content_pickers {
display: inline;
margin: 0 -10px;
padding: 0;
margin-left: 10px; }
ul#publisher_content_pickers li {
display: inline;
padding: 5px 10px;
margin-right: 5px; }
#publisher .selected {
border-bottom: 3px solid #999999;
background-color: rgba(10, 81, 109, 0.1); }
#publisher .right {
padding-right: 15px; }
position: relative;
height: 80px; }
#publisher textarea {
width: 95%; }
#publisher .user_image img {
height: 50px; }
#publisher ul.group_selector {
padding: 0;
margin: 0;
width: 150px;
list-style: none; }
#publisher ul.group_selector > li {
z-index: 10;
display: none;
background-color: white; }
#publisher ul.group_selector > li:active {
background-color: yellow; }
#publisher ul.group_selector:hover li {
display: block; }
#image_picker .small_photo {
height: 100px;
@ -428,23 +421,12 @@ h1.big_text {
display: inline;
margin-right: 10px; }
#group ul > li.selected, #group ul > li.selected a {
color: white;
color: black;
font-weight: bold;
font-size: 18px; }
font-size: 24px; }
#group a {
color: #aaaaaa;
font-weight: normal; }
#group #friend_pictures .add_new_description {
position: relative;
height: 40px;
display: inline-block;
background-color: #222222;
color: #999999;
top: -16px;
line-height: 40px;
padding: 0 1em;
margin-bottom: -20px;
font-style: italic; }
#group #friend_pictures img {
height: 40px; }

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

@ -80,8 +80,6 @@ header
:top 0
#diaspora_text
:margin
:bottom 1em
:font
:family 'BrandonGrotesqueLightRegular'
:size 16px
@ -371,36 +369,36 @@ label
:border
:bottom 2px #999 solid
:color #999
:padding 15px 1em
:bottom 30px
:position relative
:height 80px
#new_blog,
#new_bookmark
:display none
textarea
:width 95%
ul#publisher_content_pickers
:display inline
:margin 0 -10px
:padding 0
:margin
:left 10px
.user_image
img
:height 50px
ul#publisher_content_pickers li
:display inline
:padding 5px 10px
:margin
:right 5px
ul.group_selector
:padding 0
:margin 0
:width 150px
:list
:style none
#publisher .selected
:border
:bottom 3px solid #999
:background
:color rgba(10,81,109,0.1)
> li
:z-index 10
:display none
:background
:color #fff
&:active
:background
:color yellow
&:hover li
:display block
#publisher .right
:padding
:right 15px
#image_picker
.small_photo
@ -423,9 +421,7 @@ ul#publisher_content_pickers li
:border 1px solid #fff
/* cycle it! */
.album
:position relative
:height 300px
@ -535,10 +531,10 @@ h1.big_text
:right 10px
&.selected, &.selected a
:color #fff
:color #000
:font
:weight bold
:size 18px
:size 24px
a
:color #aaa
@ -546,23 +542,6 @@ h1.big_text
:weight normal
#friend_pictures
.add_new_description
:position relative
:height 40px
:display inline-block
:background
:color #222
:color #999
:top -16px
:line
:height 40px
:padding 0 1em
:margin
:bottom -20px
:font
:style italic
img
:height 40px