droom 0.2.1 → 0.4.1

data/app/assets/stylesheets/{_definitions.css.sass → droom/_mixins.css.sass}

@@ -1,39 +1,3 @@
-$coolgrey0: #f2f0ed
-$coolgrey1: #e2e1dd
-$coolgrey2: #d6d6d4
-$coolgrey3: #cacac8
-$coolgrey4: #bdbdbd
-$coolgrey5: #b3b3b3
-$coolgrey6: #afafaf
-$coolgrey7: #9a9b9d
-$coolgrey8: #8c8d8e
-$coolgrey9: #747679
-$coolgrey10: #616265
-$coolgrey11: #4d4e53
-$black6: #52555f
-$rubine: #d1005d
-$blue: #00afdb
-$green: #74b87a
-$warmred: #ff625b
-$darkred: #b92a23
-$purple: #a27ec3
-$red: #ed1c24
-
-$dark: $coolgrey10
-$mid: $coolgrey7
-$pale: #d6d6d4
-$verypale: #ebeae8
-$palest: #f5f5f5
-
-$text: $dark
-$link: $rubine
-$hover: lighten($link, 8)
-$input: $mid
-$submit: $green
-$error: $rubine
-$active: #8c8d8e
-$visited: $link
-
 =hover
   &:hover
     color: $hover
@@ -59,13 +23,33 @@ $visited: $link
   overflow: hidden
   text-indent: $indent
 
-=button($color)
-  background-color: $color
+=button($color: $mid)
+  display: inline-block
+  position: relative
+  outline: none
+  cursor: pointer
+  text-align: center
+  text-decoration: none
+  font-size: 16px
+  padding: 12px 16px 9px
   +border-radius(3px)
+  +box-shadow(0 1px 2px rgba(0,0,0,0.6))
+  color: #fef4e9
+  border: solid 1px darken($color, 10)
+  +background-image(linear-gradient(lighten($color, 3), $color, darken($color, 10)))
   &:hover
-    background-color: lighten($color, 6)
+    text-decoration: none
+    +background-image(linear-gradient(lighten($color, 5), darken($color, 8)))
   &:active
-    background-color: darken($color, 12)
+    position: relative
+    top: 1px
+    +box-shadow(0 1px 2px rgba(0,0,0,0.6) inset)
+    +background-image(linear-gradient(darken($color, 10), lighten($color, 3), $color, darken($color, 15)))
+  &.unavailable
+    border: solid 1px darken($pale, 10)
+    color: lighten($pale, 15)
+    +background-image(linear-gradient(darken($pale, 10), lighten($pale, 3), $pale, darken($pale, 15)))
+    +opacity(0.75)
 
 =small
   font-size: 80%
@@ -94,6 +78,7 @@ $visited: $link
   margin-top: 0
   line-height: 14px
   min-height: 16px
+  font-size: 14px
   background:
     color: transparent
     position: 0 0
@@ -113,8 +98,8 @@ $visited: $link
 
 =big_icon_link($url)
   +icon_link($url)
-  text-indent: 30px
-  line-height: 30px
+  text-indent: 24px
+  line-height: 24px
   min-height: 24px
   &:hover
     background-position: 0 -48px
@@ -150,7 +135,7 @@ $visited: $link
   &:hover
     background-position: $x $y - 48px
   &.here
-    background-color: $verypale
+    background-color: $palest
     background-position: $x $y - 96px
 
 =blurred($color: $pale)

data/app/assets/stylesheets/{lib → droom}/_toolbar.css.sass

@@ -174,7 +174,7 @@
     border: 1px solid $pale
     border-bottom: none
     input[type="text"]
-      color: $blue
+      color: $input
       border: 1px solid $pale
       font-size: 14px
       padding: 9px 6px 6px 6px
@@ -189,10 +189,8 @@
     +border-radius(3px)
 
   [data-wysihtml5-dialog-action="save"]
-    background: $green
+    background: $submit
     color: #fff
 
   [data-wysihtml5-dialog-action="cancel"]
     color: $pale
-    &:hover
-      color: $hover

data/app/assets/stylesheets/droom/_variables.css.sass

@@ -0,0 +1,46 @@
+$coolgrey0: #f2f0ed
+$coolgrey1: #e2e1dd
+$coolgrey2: #d6d6d4
+$coolgrey3: #cacac8
+$coolgrey4: #bdbdbd
+$coolgrey5: #b3b3b3
+$coolgrey6: #afafaf
+$coolgrey7: #9a9b9d
+$coolgrey8: #8c8d8e
+$coolgrey9: #747679
+$coolgrey10: #616265
+$coolgrey11: #4d4e53
+$black6: #52555f
+$rubine: #d1005d
+$blue: #00afdb
+$green: #74b87a
+$warmred: #ff625b
+$darkred: #b92a23
+$purple: #a27ec3
+$red: #ed1c24
+$palered: lighten($red, 30)
+
+$dark: #4d4e53
+$mid: #9a9b9d
+$pale: #bdbdbd
+$palest: #f2f0ed !default
+
+$page: #ffffff
+$text: $dark
+$link: $red
+$hover: $palered
+$active: #8c8d8e
+$visited: $link
+$input: $dark
+$submit: $green
+$error: $darkred
+$help: #e59811
+
+$tag: #7489b8
+$match: $green
+$inst: $coolgrey10
+$person: $link
+
+$masthead: #64666f
+$menubg: $link
+$menuitem: $hover

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

@@ -62,7 +62,7 @@
     background-color: $verypale
   .k-btn-previous-month:active, .k-btn-next-month:active
     color: white
-    background-color: $rubine
+    background-color: $link
   .k-btn-previous-year:hover, .k-btn-next-year:hover
     color: #6FDF81
   .k-title, .k-header, .k-days
@@ -94,7 +94,7 @@
       &:hover
         background: $verypale
     &.k-selected
-      background-color: $rubine
+      background-color: $link
       font-weight: bold
       color: white
     &.k-range

data/app/controllers/droom/engine_controller.rb

@@ -12,8 +12,12 @@ module Droom
       raise Droom::PermissionDenied unless current_user && current_user.admin?
     end
     
+    def current_person
+      current_user.person if user_signed_in?
+    end
+    
     def no_layout_if_pjax
-      if request.headers['X-PJAX']
+      if request.headers['X-PJAX'] || request.format == 'js'
         false
       else
         Droom.layout

data/app/controllers/droom/events_controller.rb

@@ -75,7 +75,7 @@ module Droom
 
     def build_event
       params[:event] ||= {}
-      params[:event][:calendar_id] ||= @calendar.id
+      params[:event][:calendar_id] ||= @calendar.id if @calendar
       @event = Droom::Event.new({:start => Time.now.floor(30.minutes)}.merge(params[:event]))
     end
 
@@ -84,16 +84,19 @@ module Droom
     end
 
     def find_events
-      @events = @calendar.events
       if params[:direction] == 'past'
-        @events = @events.past.order('start DESC')
+        @events = @calendar.events.past.order('start DESC')
         @direction = "past"
       else
-        @events = @events.future_and_current.order('start ASC')
+        @events = @calendar.events.future_and_current.order('start ASC')
         @direction = "future"
       end
       unless current_user.admin?
-        @events = @events.visible_to(current_person)
+        if current_person
+          @events = @events.visible_to(current_person)
+        else
+          @events = @events.all_public
+        end
       end
       
       @show = params[:show] || 10
@@ -102,7 +105,7 @@ module Droom
     end
 
     def get_calendar
-      @calendar = Droom::Calendar.find_by_id(params[:calendar_id]) || Droom::Calendar.find_or_create_by_name("main")
+      @calendar = Droom::Calendar.find_by_id(params[:calendar_id]) || find_or_create_calendar
     end
 
     def find_or_create_calendar

data/app/controllers/droom/groups_controller.rb

@@ -60,7 +60,7 @@ module Droom
     end
 
     def get_groups
-      @groups = Droom::Group.all
+      @groups = current_user.admin? ? Droom::Group.all : Droom::Group.visible_to(current_user)
     end
 
   end

data/app/controllers/droom/organisations_controller.rb

@@ -1,6 +1,6 @@
 module Droom
   class OrganisationsController < Droom::EngineController
-    respond_to :html
+    respond_to :html, :js
     layout :no_layout_if_pjax
     helper Droom::DroomHelper
   

data/app/controllers/droom/people_controller.rb

@@ -4,7 +4,6 @@ module Droom
     layout :no_layout_if_pjax
     
     before_filter :authenticate_user! 
-    before_filter :scale_image_params, :only => [:create, :update]
     before_filter :find_people, :only => :index
     before_filter :get_groups
     before_filter :get_person, :only => [:show, :edit, :update, :destroy, :invite]
@@ -26,17 +25,27 @@ module Droom
         }
       end
     end
-    
+
     def create
-      @person.update_attributes(params[:person])
-      respond_with @person do |format|
-        format.js { render :partial => "droom/users/user_or_person" }
+      if @person.update_attributes(params[:person])
+        respond_with @person do |format|
+          format.js { render :partial => "droom/users/user_or_person" }
+          format.html { render :partial => "droom/people/person" }
+        end
+      else
+        respond_with @person
       end
     end
 
     def update
-      @person.update_attributes(params[:person])
-      respond_with @person
+      if @person.update_attributes(params[:person])
+        respond_with @person do |format|
+          format.js { render :partial => "droom/users/user_or_person" }
+          format.html { render :partial => "droom/people/person" }
+        end
+      else
+        respond_with @person
+      end
     end
     
     def destroy
@@ -60,7 +69,9 @@ module Droom
   protected
     
     def build_person
+      @organisation = Droom::Organisation.find(params[:organisation_id]) if params[:organisation_id]
       @person = Droom::Person.new(params[:person])
+      @person.organisation = @organisation if @organisation
     end
 
     def get_person
@@ -95,17 +106,6 @@ module Droom
     def confine_to_self
       @person = current_user.person unless current_user.admin?
     end
-
-    def scale_image_params
-      multiplier = params[:multiplier] || 4
-      Rails.logger.warn ">>> before scale_image_params (with multiplier #{multiplier}), params for person: #{params[:person].inspect}"
-      if params[:person]
-        [:image_scale_width, :image_scale_height, :image_offset_left, :image_offset_top].each do |p|
-          params[:person][p] = (params[:person][p].to_i * multiplier.to_i) unless params[:person][p].blank?
-        end
-      end
-      Rails.logger.warn ">>> after scale_image_params, params for person: #{params[:person].inspect}"
-    end
   
   end
 end

data/app/controllers/droom/suggestions_controller.rb

@@ -16,7 +16,6 @@ module Droom
           @title = span.width > 86400 ? "Events in #{fragment}" : "Events on #{fragment}"
         else
           @suggestions = @klasses.collect {|klass|
-            logger.warn ">>> getting #{klass}"
             klass.constantize.visible_to(current_user.person).matching(fragment).limit(max.to_i)
           }.flatten.sort_by(&:name).slice(0, max.to_i)
         end

data/app/controllers/droom/user_confirmations_controller.rb

@@ -0,0 +1,55 @@
+module Droom
+  class UserConfirmationsController < Devise::ConfirmationsController
+
+    # If user not yet confirmed, show password form (rather than just confirming, as is normal)
+    # If already confirmed, allow devise to do whatever a devise does.
+    #
+    def show
+      if self.resource = resource_class.find_by_id_and_confirmation_token(params[:id], params[:confirmation_token])
+        redirect_to after_sign_in_path_for(resource) if resource.confirmed?
+        # or we render user_confirmations/show
+      elsif user_signed_in?
+        redirect_to after_sign_in_path_for(current_user)
+      else
+        render :template => "devise/confirmations/failure" 
+      end
+    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
+      if self.resource = resource_class.where(id: params[:id], confirmation_token: params[resource_name][:confirmation_token]).first
+        result = resource.update_attributes(permitted_params)
+        if result && resource.password_match?
+          set_flash_message :notice, :confirmed
+          resource.confirm!
+          sign_in(resource_name, resource)
+          respond_with_navigational(resource){ redirect_to after_confirmation_path_for(resource_name, resource) }
+        else
+          # back to the password form
+          set_flash_message :error, :password_error
+          render :action => "show"
+        end
+      else
+        render :template => "devise/confirmations/failure"
+      end
+    end
+
+    def after_confirmation_path_for(resource_name, resource)
+      dashboard_url
+    end
+
+  protected
+  
+    def permitted_params
+      params[:user].slice(:forename, :name, :password, :password_confirmation)
+      # for rails 4
+      #params.require(:user).permit(:first_name, :last_name, :password, :password_confirmation)
+    end
+
+  end
+end

data/app/controllers/droom/users_controller.rb

@@ -5,10 +5,9 @@ module Droom
     layout :no_layout_if_pjax
     before_filter :authenticate_user!
     before_filter :require_admin!, :only => [:index, :new, :create, :destroy]
+    before_filter :get_user, :only => [:show, :edit, :update, :destroy, :welcome]
     before_filter :require_self_or_admin!, :only => [:edit, :update]
     before_filter :remember_token_auth
-    before_filter :get_user, :only => :edit
-    before_filter :get_user, :only => [:show, :edit, :update, :destroy, :welcome]
 
     def index
       @everyone = Droom::Person.all + Droom::User.unpersoned

data/app/controllers/droom/youtube_controller.rb

@@ -14,7 +14,10 @@ module Droom
       max = params[:limit] || 10
       @suggestions = []
       unless fragment.blank?
-        @suggestions = Droom.yt_client.videos_by(:query => fragment, :per_page => max).videos
+        videos = Droom.yt_client.videos_by(:query => fragment, :per_page => max).videos.to_a
+        @suggestions = videos.map { |vid|
+          vid.as_json.slice('unique_id', 'title', 'description', 'thumbnails').merge({"type" => "video"})
+        }
       end
       respond_with @suggestions
     end

data/app/helpers/droom/droom_helper.rb

@@ -35,11 +35,11 @@ module Droom
     end
 
     def current_person
-      current_user.person if current_user
+      current_user.person if user_signed_in?
     end
 
     def admin?
-      current_user and current_user.admin?
+      current_user && current_user.admin?
     end
 
     def pageclass
@@ -91,7 +91,7 @@ module Droom
 
     def nav_link_to(name, url, options={})
       options[:class] ||= ""
-      options[:class] << "here" if (request.path == url) || (request.path =~ /^#{url}/ && url != "/")
+      options[:class] << "here" if (request.path == url) || (request.path =~ /^#{url}/)
       link_to name, url, options
     end