droom 0.0.1 → 0.2.1

data/app/assets/stylesheets/lib/_kalendae.css.sass

@@ -4,7 +4,6 @@
   background: white
   padding: 0
   width: 210px
-  +light
   cursor: default
   &.k-floating
     position: absolute
@@ -23,7 +22,6 @@
     white-space: nowrap
     position: relative
     height: 32px
-    +heading
     font-size: 18px
     line-height: 32px
   .k-btn-previous-month, .k-btn-next-month
@@ -79,7 +77,6 @@
     width: 22px
     padding: 5px 5px 5px 3px
   .k-header span
-    +heading
     text-align: center
     color: $pale
   .k-days span
@@ -88,7 +85,7 @@
     line-height: 1em
     color: #999
   .k-today
-    +bold
+    font-weight: bold
   .k-days span
     &.k-active
       background-color: #fff
@@ -98,7 +95,7 @@
         background: $verypale
     &.k-selected
       background-color: $rubine
-      +bold
+      font-weight: bold
       color: white
     &.k-range
       background: none

data/app/assets/stylesheets/lib/_popups.css.sass

@@ -0,0 +1,86 @@
+div.popup
+  position: fixed
+  overflow: auto
+  top: 100px
+  left: 100px
+  width: 580px
+  padding: 0
+  z-index: 250
+  min-height: 200px
+  background-color: $palest
+  +box_shadow(1px 3px 8px #52555f)
+  .header
+    position: relative
+    height: 28px
+    width: 100%
+    overflow: hidden
+    background-color: $text
+    padding: 8px 10px 4px 20px
+  h2
+    position: relative
+    height: 24px
+    line-height: 27px
+    margin: 0
+    margin-right: 40px
+    font-weight: normal
+    font-size: 0.9em
+    color: white
+    white-space: nowrap
+  a.closer
+    display: block
+    float: right
+    width: 16px
+    height: 18px
+    margin-left: 10px
+    margin-right: 0
+    margin-top: 2px
+    +text-hidden
+    background: 
+      image: image-url('droom/crosses.png')
+      color: transparent
+      position: 0 0
+      repeat: no-repeat
+    &:hover
+      background-position: 0 -32px
+  .scrolled
+    overflow: hidden
+  .scroller
+    overflow: hidden
+    margin: 0
+    width: 1200px
+    .scrap
+      float: left
+      width: 580px
+  form
+    margin: 20px
+    
+  .header
+    position: relative
+    top: 0
+    left: 0
+    width: 550px
+    a.next, a.prev, span.next, span.prev
+      position: relative
+      display: inline-block
+      width: 18px
+      height: 18px
+      text-indent: 20px
+      margin: 0 4px
+      overflow: hidden
+      background:
+        repeat: no-repeat
+        image: image-url('droom/leftright.png')
+    a.next
+      background-position: 0 0
+      &:hover
+        background-position: 0 -32px
+    a.prev
+      background-position: 0 -96px
+      margin-left: 0
+      &:hover
+        background-position: 0 -128px
+    span.next
+      background-position: 0 -64px
+    span.prev
+      background-position: 0 -160px
+      margin-left: 0

data/app/assets/stylesheets/lib/_toolbar.css.sass

@@ -2,7 +2,7 @@
 
 .wysihtml
   position: relative
-  width: 600px
+  width: 100%
   textarea
     position: relative
     
@@ -30,6 +30,7 @@
 
   .commands
     border-left: 1px solid #ddd
+    border-top: 1px solid $pale
     display: inline-block
     -webkit-padding-start: 0
     padding: 0
@@ -154,31 +155,36 @@
       background-image: none !important
 
   [data-wysihtml5-dialog]
+    position: relative
+    display: block
+    overflow: hidden
+    width: 482px
+    background-color: $palest
+    clear: left
     color: #333
     font-size: 14px
+    line-height: 14px
     text-align: left
     -ms-box-sizing: border-box
     -webkit-box-sizing: border-box
     -moz-box-sizing: border-box
     box-sizing: border-box
-    padding: 5px 10px
-    background: white
-    position: relative
-    label
-      +bold
+    margin: 0
+    padding: 10px 6px 6px 6px
+    border: 1px solid $pale
+    border-bottom: none
     input[type="text"]
       color: $blue
       border: 1px solid $pale
-      padding: 3px
-      width: 50%
+      font-size: 14px
+      padding: 9px 6px 6px 6px
+      width: 310px
       min-width: 100px
       &:focus
         outline: 0
-        border: 1px solid #666
 
   [data-wysihtml5-dialog-action]
-    +book
-    padding: 4px
+    padding: 8px
     cursor: pointer
     +border-radius(3px)
 

data/app/controllers/droom/agenda_categories_controller.rb

@@ -0,0 +1,24 @@
+module Droom
+  class AgendaCategoriesController < Droom::EngineController
+    respond_to :html, :js
+    layout :no_layout_if_pjax
+    before_filter :get_event
+    before_filter :get_agenda_category, :only => [:destroy, :edit, :update]
+    before_filter :build_agenda_category, :only => [:new, :create]
+
+  protected
+
+    def get_event
+      @event = Droom::Event.find(params[:event_id])
+    end
+
+    def get_agenda_category
+      @agenda_category = @event.agenda_categories.find(params[:id])
+    end
+    
+    def build_agenda_category
+      @agenda_category = @event.agenda_categories.build(params[:agenda_category])
+    end
+
+  end
+end

data/app/controllers/droom/calendars_controller.rb

@@ -0,0 +1,29 @@
+module Droom
+  class CalendarsController < Droom::EngineController
+    respond_to :html, :json, :rss, :ics
+    layout :no_layout_if_pjax
+
+    before_filter :authenticate_user!
+    before_filter :get_calendar, :only => :show
+    before_filter :get_calendars, :only => :index
+    before_filter :require_admin!, :except => :show
+
+    def show
+      respond_with @calendar
+    end
+
+    def index
+      respond_with @calendars
+    end
+
+  protected
+
+    def get_calendars
+      @calendars = Droom::Calendar.all
+    end
+
+    def get_calendar
+      @calendar = Droom::Calendar.find(params[:id])
+    end
+  end
+end

data/app/controllers/droom/confirmations_controller.rb

@@ -0,0 +1,38 @@
+module Droom
+  class ConfirmationsController < Devise::ConfirmationsController
+
+    # If user not yet confirmed, show password form (rather than just confirming, as it normal)
+    # If already confirmed, allow devise to do whatever devise does.
+    #
+    def show
+      self.resource = resource_class.find_by_confirmation_token(params[:confirmation_token])
+      super if resource.confirmed?
+    end
+
+    # the purpose of this is to add another step between user creation and user confirmation, such that
+    # we perform the confirmation only if a password is supplied and validates.
+    #
+    # NB. in the tortured RESTfulness of devise, that means turning confirmation#show into a password form
+    # and using confirmations#update to update the user object accordingly.
+    #
+    def update
+      self.resource = resource_class.find_by_confirmation_token(params[resource_name][:confirmation_token])
+      
+      result = resource.update_attributes(params[resource_name].except(:confirmation_token))
+      
+      Rails.logger.warn ">>> update_attributes gave us #{result.inspect} and password #{resource.password} / #{resource.password_confirmation}"
+      Rails.logger.warn ">>> errors: #{resource.errors.full_messages}"
+      
+      if result && resource.password_match?
+        self.resource = resource_class.confirm_by_token(params[resource_name][:confirmation_token])
+        set_flash_message :notice, :confirmed
+        sign_in_and_redirect(resource_name, resource)
+      else
+        # back to the password form
+        set_flash_message :error, :password_error
+        render :action => "show"
+      end
+    end
+    
+  end
+end

data/app/controllers/droom/dashboard_controller.rb

@@ -6,6 +6,8 @@ module Droom
     before_filter :authenticate_user!  
     
     def index
+      @panel = session[:panel] || "search"
+      session[:panel] = nil
       render
     end
     

data/app/controllers/droom/documents_controller.rb

@@ -4,56 +4,54 @@ module Droom
     layout :no_layout_if_pjax
   
     before_filter :authenticate_user!
-    before_filter :require_admin!, :except => [:index, :show]
-    before_filter :get_current_person
+    # before_filter :require_admin!, :except => [:index, :show]
+    before_filter :get_folder
     before_filter :find_documents, :only => [:index]
     before_filter :get_document, :only => [:show, :edit, :update, :destroy]
     before_filter :build_document, :only => [:new, :create]
     
     def index
       respond_with @documents do |format|
-        format.js { 
-          if @event
-            render :partial => 'documents_list'
-          else
-            render :partial => 'documents_table'
-          end
-        }
+        format.js { render :partial => 'droom/documents/documents' }
       end
     end
   
     def show
-      if current_user.person && @document.file
-        if personal_document = current_user.person.personal_version_of(@document)
-          # personal documents are stored outside the web root so this is an internal-only redirect in nginx.
-          redirect_to personal_document.url
-        else
-          # master documents are stored in private S3 buckets accessible only through signed urls with a lifespan of only two minutes.
-          redirect_to @document.file.expiring_url(Time.now + 120)
-        end
+      if @document.file
+        # master documents are stored in private S3 buckets
+        # To keep the documents secure, we: 
+        # * publish them only through this controller (so no S3 links appear on the page)
+        # * deliver them only to authenticated users
+        # * delivery by redirecting to a URL that expires in ten minutes
+        #
+        # We could channel all file delivery through this controller and may do so in future but it
+        # creates a nasty performance bottleneck. For now the redirect approach seems more robust 
+        # and the expiring URLs sufficiently obscure.
+        #
+        redirect_to @document.file.expiring_url(Time.now + 600)
+      else
+        raise ActiveRecord::RecordNotFound
       end
     end
     
     def new
-      render :partial => "form"
+      render 
     end
 
     def create
-      if @event
-        @event.save!
-      end
+      @document.update_attributes(params[:document])
       @document.save!
       render :partial => 'created'
     end
     
     def edit
-      render :partial => "form"
+      render 
     end
     
     def update
       @document.update_attributes(params[:document])
       @document.save!
-      render :partial => 'table_document', :object => @document.with_event
+      render :partial => 'listing', :object => @document.with_event
     end
 
     def destroy
@@ -63,54 +61,47 @@ module Droom
     
     
   protected
+    def get_folder
+      @folder = Droom::Folder.find_by_id(params[:folder_id])
+    end
     
     def build_document
-      params[:document] ||= {}
-      if params[:event_id] || params[:document][:event_id]
-        @event = Droom::Event.find(params[:event_id] || params[:document][:event_id])
-        @document = @event.documents.new(params[:document])
-        @category = @event.categories.find(params[:category_name]) if params[:category_name]
-      else
-        @document = Droom::Document.new(params[:document])
-      end
+      @document = @folder.documents.build(params[:document])
     end
 
     def get_document
-      @document = Droom::Document.find(params[:id])
+      @document = @folder.documents.find(params[:id])
     end
 
     def find_documents
-      @event = Droom::Event.find(params[:event_id]) if params[:event_id]
       sort_orders = {
-        'ASC' => "ASC",
-        'DESC' => "DESC"
+        'asc' => "ASC",
+        'desc' => "DESC"
       }
-      params[:order] = 'DESC' unless sort_orders[params[:order]]
+      @order = sort_orders[params[:order]] || "DESC"
 
       sort_parameters = {
-        'name' => 'droom_documents.name',
-        'filename' => 'droom_documents.file_file_name',
-        'filesize' => 'droom_documents.file_file_size',
-        'created' => 'droom_documents.created_at',
-        'event' => 'event_name',
-        'category' => 'case when category_name is null then 1 else 0 end, category_name'
+        'name' => "droom_documents.name #{@order}",
+        'filename' => "droom_documents.file_file_name #{@order}",
+        'filesize' => "droom_documents.file_file_size #{@order}",
+        'created' => "droom_documents.created_at #{@order}",
+        'event' => "event_name #{@order}",
+        'category' => "case when category_name is null then 1 else 0 end #{@order}, category_name #{@order}"
       }
       params[:sort] = 'created' unless sort_parameters[params[:sort]]
-
-      @by = sort_parameters[params[:sort]]
-      @order = sort_orders[params[:order]]
-      @show = params[:show] || 20
+      @sort = params[:sort]
+      @show = params[:show] || 10
       @page = params[:page] || 1
       
       if current_user.admin?
-        @documents = Droom::Document.with_latest_event
+        @documents = Droom::Document.scoped({})
       else
-        @documents = Droom::Document.visible_to(@current_person).with_latest_event
+        @documents = Droom::Document.visible_to(@current_person)
       end
 
-      @documents = @documents.name_matching(params[:q]) unless params[:q].blank?
-      @documents = @documents.order("#{@by} #{@order}").page(@page).per(@show)
+      @documents = @documents.matching(params[:q]) unless params[:q].blank?
+      @documents = @documents.order(sort_parameters[@sort]).page(@page).per(@show)
     end
-    
+
   end
 end