public/images/icons/drag_handle_white.gif @@ -31,7 +31,7 @@ class PagesController < ApplicationController after_filter :user_track, :except => 'public' caches_page :public - cache_sweeper :page_sweeper, :only => [:update, :destroy, :reorder, :share, :transfer, :tags, :resize] + cache_sweeper :page_sweeper, :only => [:update, :destroy, :reorder, :reorder_sidebar, :share, :transfer, :tags, :resize] # GET /pages # GET /pages.xml @@ -207,6 +207,23 @@ class PagesController < ApplicationController end end + # POST /pages + # POST /pages.xml + def reorder_sidebar + index = 0 + params[:page_ids].each do |page_id| + p = Page.find(page_id) + p.sidebar_order = index + p.save! + index += 1 + end + + respond_to do |format| + format.html { head :ok } + format.xml { head :ok } + end + end + # PUT /pages/1/transfer def transfer page = Page.find(params[:id]) app/controllers/pages_controller.rb @@ -326,7 +326,9 @@ class Page < ActiveRecord::Base validates_uniqueness_of :address def sidebar_order - return self.get_setting("sidebar_order") + value = self.get_setting("sidebar_order") + return -1 if value == nil + return value end def sidebar_order=(value) app/models/page.rb @@ -39,7 +39,7 @@ class User < ActiveRecord::Base belongs_to :home_page, :class_name => 'Page', :foreign_key => 'home_page_id', :dependent => :destroy has_many :pages, :foreign_key => 'created_by_id', :order => 'pages.title ASC', :dependent => :destroy has_and_belongs_to_many :shared_pages, :class_name => 'Page', :join_table => 'shared_pages', :order => 'pages.title ASC' - has_and_belongs_to_many :favourite_pages, :class_name => 'Page', :join_table => 'favourite_pages', :order => 'pages.title ASC' + has_and_belongs_to_many :favourite_pages, :class_name => 'Page', :join_table => 'favourite_pages' has_one :status, :dependent => :destroy has_many :journals, :order => 'created_at DESC', :dependent => :destroy app/models/user.rb @@ -1,11 +1,15 @@ - cclass = @pages.nil? ? nil : 'current' -%ul#pageListItems - %li{:class => "#{(@logged_user.home_page == @page ? 'current' : nil)} std-page-link", :page_id => @logged_user.home_page_id} - %a{:href => page_path(@logged_user.home_page)}= h @logged_user.home_page.title - %li{:class => "#{cclass} std-page-link", :page_id => '0'} - %a{:href => pages_path}= :all_pages.l - %li{:class => "std-page-separator"} - - @logged_user.favourite_pages.each do |page| - %li{:class => (page == @page ? 'current' : nil), :page_id => page.id} - %a{:href => page_path(page)}= h page.title +%div#pageListItems + %ul#stdPageListItems + %li{:class => "#{(@logged_user.home_page == @page ? 'current' : nil)} std-page-link", :page_id => @logged_user.home_page_id} + %a{:href => page_path(@logged_user.home_page)}= h @logged_user.home_page.title + %li{:class => "#{cclass} std-page-link", :page_id => '0'} + %a{:href => pages_path}= :all_pages.l + %li{:class => "std-page-separator"} + %ul#usrPageListItems + - (@logged_user.favourite_pages.sort { |x,y| x.sidebar_order <=> y.sidebar_order }).each do |page| + %li{:id => "sidebar_page_#{page.id}", :class => "#{(page == @page ? 'current' : nil)} sidebar_page", :page_id => page.id} + %a.usrPageLink{:href => page_path(page)} + %span= h page.title + %span.usr_page_handle app/views/pages/_listed_pages.html.haml @@ -75,6 +75,7 @@ ActionController::Routing::Routes.draw do |map| end map.resources :pages, :member => {:reorder => :post, + :reorder_sidebar => :post, :transfer => :put, :favourite => :put, :duplicate => :post, config/routes.rb public/images/icons/drag_handle.gif @@ -1141,7 +1141,7 @@ var Page = { }, makeSortable: function() { - if (PAGE_READONLY) + if (PAGE_READONLY) return; var lists = $('.pageList .openItems .listItems'); @@ -1156,14 +1156,39 @@ var Page = { }); // Add droppables - $('#pageListItems li').each(function(i) { - var el = $(this); - if (!el.hasClass('current')) { - el.droppable('destroy'); - el.droppable({ hoverClass:'hover', accept:'.pageSlot', tolerance: 'pointer', drop:Page.dropSlotFunction}); - } - }); - + $('#stdPageListItems li').each(function(i) + { + var el = $(this); + if (!el.hasClass('current')) + { + el.droppable('destroy'); + el.droppable({ hoverClass:'hover', accept:'.pageSlot', tolerance: 'pointer', drop:Page.dropSlotFunction}); + } + }); + + $('#usrPageListItems li').each(function(i) + { + var el = $(this); + if (!el.hasClass('current')) + { + el.droppable('destroy'); + el.droppable({ hoverClass:'hover', accept:'.pageSlot', tolerance: 'pointer', drop:Page.dropSlotFunction}); + } + }); + + // Make sidebar sortable + $('#usrPageListItems').sortable('destroy'); + $('#usrPageListItems').sortable({ + axis: 'y', + handle: '.usr_page_handle', + items: '> .sidebar_page', + opacity: 0.75, + update: function(e, ui) + { + $.post('/pages/reorder_sidebar', $('#usrPageListItems').sortable('serialize', {key: 'page_ids'})); + } + }); + $('#slots').sortable('destroy'); $('#slots').sortable({ axis: 'y', public/javascripts/application.js @@ -208,6 +208,8 @@ form div { background-color: black; } +#stdPageListItems, +#usrPageListItems, #pageListItems { list-style-image: none; list-style-position: outside; @@ -230,6 +232,21 @@ form div { #pageListItems li.current { background: gray; } #pageListItems li.current a { color: white; text-decoration: none; } +#pageListItems li .usrPageLink { position: relative; } +#pageListItems li:hover .usr_page_handle { display: block; } +#pageListItems li .usr_page_handle { + cursor: move; + display: none; + width: 15px; + height: 15px; + background-image: url('/images/icons/drag_handle_white.gif'); + background-repeat: no-repeat; + background-position: 2px 2px; + position: absolute; + top: 6px; + right: 5px; +} + .std-page-link { font-weight: bold; font-size: 120%; @@ -345,7 +362,6 @@ li.albumPicture img { .pageSlotHandle .slot_handle { cursor: move; - } /* Page insert bar. Indicates current insertion point */ public/stylesheets/pages.css 0684e377e062fc11216448b4b3c25426145c37d0 Qiushi (Billy) He qiushihe@me.com http://github.com/jamesu/rucksack/commit/1e32a8a4a017477332a9de0d01c08a053a028485 1e32a8a4a017477332a9de0d01c08a053a028485 2009-05-27T03:25:26-07:00 2009-05-23T16:26:18-07:00 Made sidebar pages sortable Signed-off-by: James Urquhart <jamesu@gmail.com> 83b9170e1d7f4829fba20856ecb0710df12b8aad James Urquhart jamesu@gmail.com