app/views/categories/_list.html.haml @@ -1,6 +1,6 @@ class Categories < Application before :ensure_authenticated, :exclude => [:index, :show] - # provides :xml, :yaml, :js + provides :xml, :yaml, :js before :get_group def index @@ -11,7 +11,7 @@ class Categories < Application def show(id) @category = Category.get(id) raise NotFound unless @category - display @category + display @category, :layout => (request.xhr? ? false : nil) end def new app/controllers/categories.rb @@ -62,6 +62,14 @@ acronym :color black :line-height 1em + ul.cat_container + li.column + :width 400px + :list-style none + :float left + :padding 5px + :overflow auto + div.details :font-style italic :font-size 0.65em app/stylesheets/master.sass @@ -1,10 +1,6 @@ %h1== Categories for #{h @group.name} -%ul.categories - - for category in @categories - %li - = link_to h(category.name), resource(@group, category) - = link_to 'Edit', resource(@group, category, :edit) += partial :list, :categories => @categories %p = link_to 'New', resource(@group, :categories, :new) app/views/categories/index.html.haml @@ -1,5 +1,19 @@ %h1&= @group.name +%div + %ul.cat_container + %li.column= partial 'categories/list', :categories => @group.categories + +%p{:style => 'clear: both'} +- if session.authenticated? + - if @group.users.include? session.user + = form_for(@group, :action => resource(@group, :leave), :method => :put) do + = submit 'Leave this group :(' + - else + = form_for(@group, :action => resource(@group, :join), :method => :put) do + = submit 'Join this group :)' + + %p %b Members @@ -9,15 +23,6 @@ = link_to h(user.login), resource(user) = '*' if user == @group.leader -%p= link_to 'Categories', resource(@group, :categories) - -- if session.authenticated? - - if @group.users.include? session.user - = form_for(@group, :action => resource(@group, :leave), :method => :put) do - = submit 'Leave this group :(' - - else - = form_for(@group, :action => resource(@group, :join), :method => :put) do - = submit 'Join this group :)' = link_to 'Edit', resource(@group, :edit) | app/views/groups/show.html.haml @@ -1 +1,16 @@ -// Common JavaScript code across your application goes here. \ No newline at end of file +$(document).ready(function() { + $("ul.cat_container ul.categories a").click(function(e) { + if ($(this).parents("li.column").children("p").children("a.pin").hasClass("on")) { + e.preventDefault(); + indicator = '<li class="column"><a href="#" class="pin">pin</a></li>'; + link = this; + $.get(this.href, function(html) { + $(link).parents("ul.cat_container").after(html); + }); + } + }); + $("ul.cat_container a.pin").click(function(e) { + $(this).toggleClass("on"); + $(this).html($(this).hasClass("on") ? "unpin" : "pin"); + }); +}); \ No newline at end of file public/javascripts/groupthink.js 3d250988a0d993b99d1c8a0dc6c7dc74e400a2bf Liam Morley liam@carpeliam.com http://github.com/carpeliam/groupthink/commit/bef4d06404417db17dd47ecb4c059a78d6059831 bef4d06404417db17dd47ecb4c059a78d6059831 2008-12-26T00:31:44-08:00 2008-12-26T00:31:44-08:00 beginnings of jquery craziness cb78668a69739bd83734e06c84032df691b99b7d Liam Morley liam@carpeliam.com