javascript gets group param for temp testing... friend pictures on group nav displays all people and authors, also for testing

This commit is contained in:
danielvincent 2010-08-02 17:27:45 -07:00
parent 102b912878
commit 3d5f27fe5a
5 changed files with 45 additions and 19 deletions

View file

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

View file

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

View file

@ -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');
});

View file

@ -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; }

View file

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