droom 0.4.3 → 0.5.3

data/app/views/droom/scraps/_preload.html.haml

@@ -0,0 +1,4 @@
+- scrap ||= @scrap || preload
+
+.scrap.preload{:data => {:scrap => scrap.id}}
+  = render :partial => "droom/scraps/full/#{scrap.scraptype}", :locals => {:scrap => scrap}

data/app/views/droom/scraps/_stream.html.haml

@@ -1,4 +1,12 @@
 #scraps.paginated{:data => {:refreshable => true, :url => scraps_path(:format => :js)}}
-  = render :partial => "thumb", :collection => @scraps
-  .pagination
-    = paginate @scraps
+  - if @scraps.any?
+    = render :partial => "thumb", :collection => @scraps
+    .pagination.sliding
+      = paginate @scraps
+
+    .preload
+      = render :partial => "preload", :collection => @scraps
+      
+  - else
+    = t :no_stream
+  

data/app/views/droom/scraps/_thumb.html.haml

@@ -1,5 +1,37 @@
 - scrap ||= thumb
 - if Droom.scrap_types.include? scrap.scraptype
   %div{:class => "scrap #{scrap.scraptype}", :id => "scrap_#{scrap.id}"}
-    = render :partial => "droom/scraps/thumbs/#{scrap.scraptype}", :locals => {:scrap => scrap}
+
+    - if scrap.scraptype == 'document' && scrap.document
+      = link_to "document:", droom.scrap_url(scrap), :data => {:action => "stream", :scrap => scrap.id}, :class => "#{scrap.document.file_extension} icon"
+
+    - elsif scrap.scraptype == 'event' && scrap.event
+      .datemark
+        %span.mon= scrap.event.start.strftime('%b')
+        %span.dom= scrap.event.start.strftime('%d')
+        - if scrap.event.start.year != Date.today.year
+          %span.year= scrap.event.start.strftime('%Y')
+
+    - elsif scrap.scraptype == 'image' && scrap.image?
+      = link_to "image:", droom.scrap_url(scrap), :class => "thumb", :style =>"background-image: url('#{scrap.image.url(:icon)}')", :data => {:action => "stream", :scrap => scrap.id}
+
+    - elsif scrap.scraptype == 'link' && scrap.url?
+      = link_to "link:", scrap.url_with_protocol, :class => "icon link", :data => {:action => "stream", :scrap => scrap.id}
+      
+    - elsif scrap.scraptype == 'quote' && scrap.url?
+      = link_to "quote:", droom.scrap_url(scrap), :class => "icon quote", :data => {:action => "stream", :scrap => scrap.id}
+      
+    - elsif scrap.scraptype == 'video' && scrap.youtube_id?
+      = link_to "video:", droom.scrap_url(scrap), :class => "thumb playable", :style =>"background-image: url('#{scrap.image.url(:icon)}')", :data => {:action => "stream", :scrap => scrap.id}
+
+    - else
+      = link_to "text:", droom.scrap_url(scrap), :class => "icon text", :data => {:action => "stream", :scrap => scrap.id}
+
+    %p.sample
+      = link_to scrap.name, droom.scrap_url(scrap), :data => {:action => "stream", :scrap => scrap.id}
+      = action_menulink(scrap, :class => "small")
+      %span.caption
+        = shorten(scrap.note, 160)
+      = render :partial => "droom/scraps/credit", :locals => {:scrap => scrap}
+    = action_menu(scrap)
 

data/app/views/droom/scraps/edit.html.haml

@@ -1,2 +1,7 @@
-#edit_scrap
+#scrap
+  .header
+    = link_to "X", '#', :class => "closer", :data => {:action => "close"}
+    %h2.titlebar
+      = t :edit_scrap
+
   = render :partial => 'form'

data/app/views/droom/scraps/full/_document.html.haml

@@ -1,6 +1,7 @@
 - if document = scrap.document
-  .body.scrapdocument
-    %p.name
-      = link_to document.name, droom.folder_document_url(document.folder, document), :class => "dl #{document.file_extension}"
+  .body.document
+    .text
+      %p.name
+        = link_to document.name, droom.folder_document_url(document.folder, document), :class => "dl #{document.file_extension}"
 
   = render "droom/scraps/caption", :scrap => scrap

data/app/views/droom/scraps/full/_event.html.haml

@@ -1,20 +1,21 @@
 - if event = scrap.event
-  .body.scrapevent
-    .datemark
-      %span.mon= event.start.strftime('%b')
-      %span.dom= event.start.strftime('%d')
-      - if event.start.year != Date.today.year
-        %span.year= event.start.strftime('%Y')
+  .body.event
+    .text
+      .datemark
+        %span.mon= event.start.strftime('%b')
+        %span.dom= event.start.strftime('%d')
+        - if event.start.year != Date.today.year
+          %span.year= event.start.strftime('%Y')
 
-    .summary
-      %p.name
-        - if scrap.event.url
-          = link_to scrap.event.name, scrap.event.url_with_protocol, :class => "eventname"
-          %br
-          %span.note
-            = link_to shorten("→ #{scrap.event.url_with_protocol}".html_safe), scrap.event.url_with_protocol
-        - else
-          %span.eventname
-            = scrap.event.name
+      .summary
+        %p.name
+          - if scrap.event.url
+            = link_to scrap.event.name, scrap.event.url_with_protocol, :class => "eventname"
+            %br
+            %span.note
+              = link_to shorten("→ #{scrap.event.url_with_protocol}".html_safe), scrap.event.url_with_protocol
+          - else
+            %span.eventname
+              = scrap.event.name
 
   = render "droom/scraps/caption", :scrap => scrap

data/app/views/droom/scraps/full/_image.html.haml

@@ -1,4 +1,3 @@
-.body.image
-  = image_tag scrap.image.url(:cropped), :width => 580, :height => 326
+.body.image{:style => "background-image: url('#{scrap.image.url(:stream)}')"}
 
 = render "droom/scraps/caption", :scrap => scrap

data/app/views/droom/scraps/full/_link.html.haml

@@ -1,5 +1,6 @@
-.body.large
-  %p
-    = link_to scrap.url_without_protocol, scrap.url_with_protocol, :class => "icon link"
+.body.link
+  .text
+    %p
+      = link_to scrap.url_without_protocol, scrap.url_with_protocol, :class => "icon link"
 
 = render "droom/scraps/caption", :scrap => scrap

data/app/views/droom/scraps/full/_quote.html.haml

@@ -1,8 +1,5 @@
-.body{:style => "font-size: #{"%.2f" % scrap.text_size}em"}
-  = simple_format(scrap.body).html_safe
-  %p.attribution
-    = scrap.note
+.body.quote
+  .text
+    = simple_format(scrap.body).html_safe
 
-.caption
-  %p.attribution
-    = render "droom/scraps/credit", :scrap => scrap
+= render "droom/scraps/caption", :scrap => scrap

data/app/views/droom/scraps/full/_text.html.haml

@@ -1,4 +1,5 @@
-.body{:style => "font-size: #{"%.2f" % scrap.text_size}em"}
-  = simple_format(scrap.body).html_safe
+.body
+  .text
+    = simple_format(scrap.body).html_safe
 
 = render "droom/scraps/caption", :scrap => scrap

data/app/views/droom/scraps/full/_video.html.haml

@@ -1,4 +1,4 @@
-.body
-  %iframe.youtube{:width => "580", :height => "326", :src => "http://www.youtube.com/embed/#{@scrap.body}?fs=1&autohide=1&modestbranding=1&autoplay=1&wmode=opaque", :frameborder => 0, :allowfullscreen => true}
+.body.video
+  %iframe.youtube{:src => "http://www.youtube.com/embed/#{scrap.youtube_id}?fs=1&html5=1&autohide=1&modestbranding=1&autoplay=0&wmode=opaque", :frameborder => 0, :allowfullscreen => true}
 
 = render "droom/scraps/caption", :scrap => scrap

data/app/views/droom/scraps/new.html.haml

@@ -1,2 +1,7 @@
-#new_scrap
+#scrap
+  .header
+    = link_to "X", '#', :class => "closer", :data => {:action => "close"}
+    %h2.titlebar
+      = t :add_scrap
+
   = render :partial => 'form'

data/app/views/droom/scraps/show.html.haml

@@ -1,4 +1,5 @@
-.scrap{:id => "scrap_#{@scrap.id}"}
-  = render "droom/scraps/heading", :scrap => @scrap
-  = render :partial => "droom/scraps/full/#{@scrap.scraptype}", :locals => {:scrap => @scrap}
+- scrap ||= @scrap
+
+.scrap{:id => "scrap_#{scrap.id}"}
+  = render :partial => "droom/scraps/full/#{scrap.scraptype}", :locals => {:scrap => scrap}
 

data/app/views/droom/services/_action_menu.html.haml

@@ -0,0 +1,12 @@
+- service ||= @service
+
+- if can?(:edit, service)
+  .menu{:data => {:for => "service_#{service.id}"}}
+    %ul.actions
+      %li
+        = link_to t(:edit_service), droom.edit_service_url(service), :class => 'edit', :data => {:action => "popup", :affected => "#services"}
+      %li
+        = link_to t(:delete_service), droom.service_url(service), :method => 'delete', :class => 'delete', :data => {:action => "remove_all", :removed => ".s_#{service.id}", :confirm => t(:confirm_delete_service, :name => service.name)}
+      %li
+        = link_to t(:add_permission), droom.new_service_permission_url(service), :class => 'add', :data => {:action => "popup", :affected => "#services"}
+

data/app/views/droom/services/_created.html.haml

@@ -0,0 +1,3 @@
+%p.notification
+  = @permission.name
+  = t :created

data/app/views/droom/services/_form.html.haml

@@ -0,0 +1,18 @@
+= form_for [@service], :html => { :multipart => true, :class => 'edit service', :remote => true, :data => {:type => :html}} do |f|
+
+  %p.name
+    = f.label :name
+    = f.text_field :name, :class => 'name'
+
+  %p.slug
+    = f.label :slug
+    = f.text_field :slug, :class => 'slug'
+
+  %p.description
+    = f.label :description
+    = f.text_area :description, :class => 'description'
+
+  .buttons
+    = f.submit t(:save_service)
+    = t :or
+    = link_to t(:cancel), "/", :class => 'cancel'

data/app/views/droom/services/_services.html.haml

@@ -0,0 +1,44 @@
+%table.main.toggles#services{:data => {:refreshable => true, :hoverable => true, :url => "#{services_path}.js"}}
+  %thead
+    %tr
+      %th.action
+        - if can?(:create, Droom::Service)
+          = link_to t(:add_service), new_service_url, :class => 'add', :data => {:action => 'popup', :affected => '#services'}
+        - if can?(:create, Droom::Group)
+          = link_to t(:add_group), new_group_url, :class => 'add', :data => {:action => 'popup', :affected => '#services'}
+        
+      - @services.each do |service|
+        - width = service.permissions.count
+        %th.d{:colspan => width > 1 ? width : 1, :class => "s_#{service.id}"}
+          %h4
+            = service.name
+            = action_menulink(service, :class => "small")
+          = action_menu(service)
+          
+
+    %tr.rotated
+      %th.spacer
+      - @services.each do |service|
+        - width = service.permissions.count
+        - service.permissions.each_with_index do |perm, i|
+          %td{:class => "s_#{service.id} p_#{perm.id} #{'d' if i == width-1}".strip}
+            = action_menulink(perm, :class => "small")
+            %span.rotated
+              = perm.name
+            = action_menu(perm)
+
+    - @groups.each do |group|
+      %tbody
+        %tr
+          %td.name
+            = truncate(group.name, :length => 16)
+          - @services.each do |service|
+            - width = service.permissions.count
+            - service.permissions.each_with_index do |perm, i|
+              %td.toggle{:class => "s_#{service.id}  p_#{perm.id} #{'d' if i == width-1}".strip}
+                = render :partial => 'droom/group_permissions/toggle', :locals => {:group => group, :permission => perm}
+
+- if @services.empty?
+  .everyone
+    %p
+      No services are defined.

data/app/views/droom/services/edit.html.haml

@@ -0,0 +1,7 @@
+#service
+  .header
+    = link_to "X", '#', :class => "closer", :data => {:action => "close"}
+    %h2
+      = t :edit_service
+
+  = render :partial => 'form'

data/app/views/droom/services/index.html.haml

@@ -0,0 +1,5 @@
+#main.permissions
+  = render :partial => "services"
+
+- content_for :title do 
+  = t :access_control

data/app/views/droom/{people → services}/new.html.haml

@@ -1,6 +1,7 @@
-#person
+#service
   .header
     = link_to "X", '#', :class => "closer", :data => {:action => "close"}
-    %h2.titlebar
-      = t :new_person
+    %h2
+      = t :add_service
+      
   = render :partial => 'form'

data/app/views/droom/services/show.html.haml

@@ -0,0 +1,4 @@
+%p.title
+  = @service.name
+%p.description
+  = @service.description

data/app/views/droom/shared/_controls.html.haml

@@ -1,9 +1,9 @@
 - if user_signed_in?
   %p.controls
     = t(:signed_in_as, :name => current_user.full_name).html_safe
+    %br
     = link_to t(:preferences), droom.edit_user_url(current_user), :data => {:action => "popup"}
-    - if current_person
-      = link_to t(:profile), droom.edit_person_url(current_person), :data => {:action => "popup", :affected => ".people_list"}
+    = link_to t(:profile), droom.edit_user_url(current_user), :data => {:action => "popup", :affected => ".people_list"}
     = link_to t(:help_pages), "/help"
     = link_to t(:sign_out), Droom.sign_out_path, :method => :delete
     - if admin?

data/app/views/droom/shared/_navigation.html.haml

@@ -1,8 +1,8 @@
-- if current_user && current_user.activated?
+- if current_user && current_user.confirmed?
   %nav<
     = nav_link_to t(:your_page), droom.dashboard_path
     = nav_link_to t(:calendar), droom.events_path
     = nav_link_to t(:library), droom.documents_path
-    = nav_link_to t(:directory), droom.people_path
+    = nav_link_to t(:directory), droom.groups_path
     - if Droom.show_venue_map
       = nav_link_to t(:map), droom.venues_path

data/app/views/droom/shared/_toolbar.html.haml

@@ -5,8 +5,8 @@
     %li.command{:"data-wysihtml5-command" => "insertUnorderedList"}
     %li.command{:"data-wysihtml5-command" => "insertOrderedList"}
     %li.command{:"data-wysihtml5-command" => "createLink"}
+    %li.command{:"data-wysihtml5-command" => "formatBlock", :"data-wysihtml5-command-value" => "h1"}
     %li.command{:"data-wysihtml5-command" => "formatBlock", :"data-wysihtml5-command-value" => "h2"}
-    %li.command{:"data-wysihtml5-command" => "formatBlock", :"data-wysihtml5-command-value" => "h3"}
     %li.command{:"data-wysihtml5-action" => "change_view"}
 
 %div{:"data-wysihtml5-dialog" => "createLink", :style => "display: none"}

data/app/views/droom/suggestions/index.html.haml

@@ -0,0 +1 @@
+= render partial: "droom/shared/suggestions"

data/app/views/droom/users/_action_menu.html.haml

@@ -0,0 +1,21 @@
+- event ||= false
+- group ||= false
+
+- if can?(:edit, user)
+  .menu{:data => {:for => "user_#{user.id}"}}
+    %ul.actions
+      %li
+        = link_to t(:edit_profile), droom.edit_user_url(user), :class => 'edit', :data => {:action => "popup", :affected => "#user_#{user.id}"}
+      %li
+        = link_to t(:edit_account), droom.edit_user_url(user, view: 'preferences'), :class => 'edit', :data => {:action => "popup", :affected => "#user_#{user.id}"}
+      %li
+        = link_to t(:delete_user), droom.user_url(user), :method => 'delete', :class => 'delete', :data => {:action => "remove", :removed => "#user_#{user.id}", :confirm => t(:confirm_delete_user, :name => user.full_name)}
+
+      - if event && invitation = user.invitation_to(event)
+        %li
+          = link_to t(:uninvite), droom.event_invitation_url(event, invitation), :method => 'delete', :class => 'delete', :data => {:action => "remove", :removed => "#user_#{user.id}"}
+
+      - if group && membership = user.membership_of(group)
+        %li
+          = link_to t(:expel), droom.membership_url(membership), :method => 'delete', :class => 'delete', :data => {:action => "remove", :removed => "#user_#{user.id}"}
+        

data/app/views/droom/users/_suggested.html.haml

@@ -0,0 +1,14 @@
+- user ||= suggested
+
+%li.user
+  = link_to user.colloquial_name, user_url(user), :data => {:action => "popup"}
+  %span.note
+    - if user.phone? || user.email?
+      - if user.phone?
+        = user.phone
+      - if user.phone? && user.email?
+        %br
+      - if user.email?
+        = mail_to user.email
+    - else
+      = t :contact_information_unavailable

data/app/views/droom/users/_user.html.haml

@@ -1,2 +1,2 @@
-%li.user
-  = user.name
+- user ||= @user
+= render "droom/users/show/listed", user: user

data/app/views/droom/users/_users.html.haml

@@ -0,0 +1,7 @@
+- ineditable ||= false
+
+.paginated
+  %ul.people
+    = render :partial => 'droom/users/show/listed', :collection => @users
+  .pagination.sliding
+    = paginate @users

data/app/views/droom/users/_users_table.html.haml

@@ -1,33 +1,32 @@
 - groups = Droom::Group.all
 
-- if @everyone.any?
-  %table.main.users{:data => {:refreshable => true, :url => "#{users_path}.js"}}
+- if @users.any?
+  %table.main.toggles#users{:data => {:refreshable => true, :url => "#{admin_users_path}.js"}}
     %thead
-      %tr
-        - %w{name email invited confirmed directory admin}.each do |col|
-          %th{:class => col}
+      %tr.rotated
+        %th.action{:colspan => 2}
+          %p
+            - if can?(:create, Droom::User)
+              = link_to t(:add_user), new_user_url, :class => 'add', :data => {:action => 'popup', :affected => '#users'}
+            %br
+            - if can?(:create, Droom::Group)
+              = link_to t(:add_group), new_group_url, :class => 'add', :data => {:action => 'popup', :affected => '#users'}
+
+          %form.filter{:action => droom.admin_users_url(:format => :html), :autocomplete => 'off', :data => {:action => "table_filter", target: "#users"}}
+            %p
+              = search_field_tag :q, params[:q], :results => 5, :autosave => 'people_filter'
+              
+        - %w{confirmed admin}.each do |col|
+          %th{:class => "#{col} #{'d' if col=='admin'}"}
             - unless col == "name" || col == "email"
               %span.rotated
                 = col
-        %th.spacer
-        - groups.each do |group|
-          %th.group
+        - groups.each_with_index do |group, i|
+          %th.group{:class => "#{'d' if i == groups.length-1}"}
             %span.rotated
-              = group.name
-
-        = render :partial => 'extra_columns_header'
-
-      %tr
-        %td{:colspan => 2}
-        %th.note{:colspan => 4}
-          = t(:status)
-        %th.spacer.note
-        %th.note{:colspan => groups.count}
-          = t(:membership)
-
-        = render :partial => 'extra_columns_note'
+              = link_to truncate(group.name, :length => 16), edit_group_url(group), :data => {:action => 'popup'}
 
-    = render :partial => 'user_or_person', :collection => @everyone
+    = render :partial => 'droom/users/show/tabled', :collection => @users
 
 - else
   .everyone