card 1.15.2 → 1.15.3

data/mod/01_history/set/all/history.rb

@@ -1,5 +1,9 @@
 REVISIONS_PER_PAGE = Card.config.revisions_per_page
 
+def history?
+  true
+end
+
 # must be called on all actions and before :set_name, :process_subcards and :validate_delete_children
 def create_act_and_action
   @current_act = if @supercard
@@ -18,11 +22,11 @@ end
 
 
 
-event(:create_act_and_action_for_save,   :before=>:process_subcards, :on=>:save)   { create_act_and_action }
-event(:create_act_and_action_for_delete, :before =>:validate_delete_children, :on=>:delete) { create_act_and_action }
+event(:create_act_and_action_for_save,   :before=>:process_subcards, :on=>:save, :when=>proc {|c| c.history?} )   { create_act_and_action }
+event(:create_act_and_action_for_delete, :before =>:validate_delete_children, :on=>:delete, :when=>proc {|c| c.history? }) { create_act_and_action }
 
 
-event :remove_empty_act, :after=>:extend do
+event :remove_empty_act, :after=>:extend, :when=>proc {|c| c.history? } do
   # if not @supercard and not @current_act.actions.empty?
   #   @current_act.save
   # end
@@ -35,7 +39,7 @@ end
 
 
 
-event :rollback_actions, :before=>:approve, :on=>:update, :when=>proc{ |c| Env and Env.params['action_ids'] and Env.params['action_ids'].class == Array} do
+event :rollback_actions, :before=>:approve, :on=>:update, :when=>proc{ |c| c.history? && Env && Env.params['action_ids'] && Env.params['action_ids'].class == Array} do
   revision = { :subcards => {}}
   rollback_actions = Env.params['action_ids'].map do |a_id|
     Action.fetch(a_id) || nil

data/mod/02_basic_types/set/type/pointer.rb

@@ -4,6 +4,11 @@ event :add_and_drop_items, :before=>:approve, :on=>:save do
   self.drop_item Env.params['drop_item'] if Env.params['drop_item']
 end
 
+event :insert_item_event, :before=>:approve, :on=>:save, :when=> proc {|c| Env.params['insert_item']} do
+  index = Env.params['item_index'] || 0
+  self.insert_item index.to_i, Env.params['insert_item']
+end
+
 format do
   def item_links args={}
     card.item_cards(args).map do |item_card|
@@ -12,26 +17,20 @@ format do
   end
 
   def wrap_item item, args={}
-    item #no wrap in base    
+    item #no wrap in base
   end
-  
+
   view :core do |args|
     render_pointer_items args.merge(:joint=>', ')
   end
-  
+
   view :pointer_items, :tags=>:unknown_ok do |args|
-    item_args = { :view => ( args[:item] || (@inclusion_opts && @inclusion_opts[:view]) || default_item_view ) }
+    i_args = item_args(args)
     joint = args[:joint] || ' '
-    
-    if type = card.item_type
-      item_args[:type] = type
-    end
-
-    card.item_cards.map do |icard|
-      wrap_item nest(icard, item_args.clone), item_args 
+    card.item_cards.map do |i_card|
+      wrap_item nest(i_card, i_args.clone), i_args
     end.join joint
   end
-
 end
 
 format :html do
@@ -54,7 +53,7 @@ format :html do
     part_view = (c = card.rule(:input)) ? c.gsub(/[\[\]]/,'') : :list
     hidden_field( :content, :class=>'card-content') +
     raw(_render part_view, args)
-    
+
     #.merge(:pointer_item_class=>'form-control')))
   end
 
@@ -68,7 +67,7 @@ format :html do
 
     %{
       <ul class="pointer-list-editor #{extra_css_class}" options-card="#{options_card_name}">
-        #{ 
+        #{
           items.map do |item|
             _render_list_item args.merge( :pointer_item=>item )
           end * "\n"
@@ -77,7 +76,7 @@ format :html do
       #{ add_item_button }
     }
   end
-  
+
   def add_item_button
     content_tag :span, :class=>'input-group' do
       button_tag :class=>'pointer-item-add' do
@@ -85,7 +84,7 @@ format :html do
       end
     end
   end
-  
+
   view :list_item do |args|
     %{
       <li class="pointer-li">
@@ -135,7 +134,7 @@ format :html do
       checked = (option.name==card.item_names.first)
       id = "pointer-radio-#{option.cardname.key}"
       description = pointer_option_description option
-      %{ 
+      %{
         <li class="pointer-radio radio">
           #{ radio_button_tag input_name, option.name, checked, :id=>id, :class=>'pointer-radio-button' }
           <label for="#{id}">#{ option.label }</label>
@@ -162,14 +161,14 @@ format :html do
       end
     end
   end
-  
 
-  
+
+
   def wrap_item item, args
     %{<div class="pointer-item item-#{args[:view]}">#{item}</div>}
   end
-  
-  
+
+
 end
 
 
@@ -177,15 +176,15 @@ format :css do
   view :titled do |args|
     %(#{major_comment "STYLE GROUP: \"#{card.name}\"", '='}#{ _render_core })
   end
-  
+
   view :core do |args|
     card.item_cards.map do |item|
       nest item, :view=>(params[:item] || args[:item] || :content)
     end.join "\n\n"
   end
-  
+
   view :content, :core
-  
+
 end
 
 
@@ -213,7 +212,7 @@ event :standardize_items, :before=>:approve, :on=>:save do
   end
 end
 
-def diff_args 
+def diff_args
   {:format => :pointer}
 end
 
@@ -222,7 +221,7 @@ def item_cards args={}
     #warn "item_card[#{args.inspect}], :complete"
     Card::Query.new({:referred_to_by=>name}.merge(args)).run
   else
-    
+
     itype = args[:type] || item_type
     #warn "item_card[#{inspect}], :complete"
     item_names(args).map do |name|
@@ -294,7 +293,9 @@ def drop_item name
 end
 
 def insert_item index, name
-  new_names = item_names.insert(index,name)
+  new_names = item_names
+  new_names.delete(name)
+  new_names.insert(index,name)
   self.content =  new_names.map { |name| "[[#{name}]]" }.join "\n"
 end
 
@@ -303,7 +304,7 @@ def options_card
   self.rule_card :options
 end
 
-def options 
+def options
   result_cards = if oc = options_card
     oc.item_cards :default_limit=>50, :context=>name
   else

data/mod/03_machines/lib/javascript/wagn_mod.js.coffee

@@ -163,6 +163,45 @@ $(window).ready ->
     else
       item.find('input').val ''
 
+  $('body').on 'show.bs.tab', 'a.load[data-toggle=tab][data-url]', (e) ->
+    tab_id = $(e.target).attr('href')
+    url    = $(e.target).data('url')
+    $(e.target).removeClass('load')
+    $(tab_id).load(url)
+
+
+  # toolbar mod
+  $('body').on 'click', '.edit-toolbar-pin.active > a', (e) ->
+    e.preventDefault()
+    $(this).blur()
+    $('.edit-toolbar-pin').removeClass('active').addClass('inactive')
+    $.ajax '/*edit_toolbar_pinned',
+      type : 'PUT'
+      data : 'card[content]=false'
+
+  $('body').on 'click', '.edit-toolbar-pin.inactive > a', (e) ->
+    e.preventDefault()
+    $('.edit-toolbar-pin').removeClass('inactive').addClass('active')
+    $.ajax '/*edit_toolbar_pinned',
+      type : 'PUT'
+      data : 'card[content]=true'
+
+  $('body').on 'click', '.toolbar-pin.active > a', (e) ->
+    e.preventDefault()
+    $(this).blur()
+    $('.toolbar-pin').removeClass('active').addClass('inactive')
+    $.ajax '/*toolbar_pinned',
+      type : 'PUT'
+      data : 'card[content]=false'
+
+  $('body').on 'click', '.toolbar-pin.inactive > a', (e) ->
+    e.preventDefault()
+    $('.toolbar-pin').removeClass('inactive').addClass('active')
+    $.ajax '/*toolbar_pinned',
+      type : 'PUT'
+      data : 'card[content]=true'
+
+
   # following mod
   $('body').on 'click', '.btn-item-delete', ->
     $(this).find('.glyphicon').addClass("glyphicon-hourglass").removeClass("glyphicon-remove")

data/mod/03_machines/lib/stylesheets/style_cards.scss

@@ -269,7 +269,7 @@ in your skin.  Choosing (b) will mean your CSS will not be affected by automated
   > .card-frame, & {
     > .card-body  {
       background: #bbb;
-      padding: 5px;
+      padding: 35px 5px 5px 5px;
       > .ALL  {
         background: #fff;
         > .card-header {
@@ -282,6 +282,11 @@ in your skin.  Choosing (b) will mean your CSS will not be affected by automated
         }
       }
     }
+    > a.close-related-view {
+      color: inherit;
+      margin-right: 5px;
+      margin-top: 5px;
+    }
   }
 }
 

data/mod/05_email/set/all/notify.rb

@@ -1,11 +1,11 @@
 
-class FollowerStash  
+class FollowerStash
   def initialize card=nil
-    @followed_affected_cards = Hash.new { |h,v| h[v]=[] } 
+    @followed_affected_cards = Hash.new { |h,v| h[v]=[] }
     @visited = ::Set.new
     add_affected_card(card) if card
   end
-    
+
   def add_affected_card card
     Auth.as_bot do
       if !@visited.include? card.key
@@ -14,8 +14,8 @@ class FollowerStash
           notify Card.fetch(user_id), :of=>reason
         end
         if card.left and !@visited.include?(card.left.name) and follow_field_rule = card.left.rule_card(:follow_fields)
-          
-          follow_field_rule.item_names(:context=>card.left.cardname).each do |item|  
+
+          follow_field_rule.item_names(:context=>card.left.cardname).each do |item|
             if @visited.include? item.to_name.key
               add_affected_card card.left
               break
@@ -27,30 +27,30 @@ class FollowerStash
               end
             end
           end
-          
-        end 
-    
+
+        end
+
       end
 
     end
   end
-  
+
   def followers
     @followed_affected_cards.keys
   end
-  
+
   def each_follower_with_reason  # "follower" is a card object, "followed" a card name
     @followed_affected_cards.each do |user, reasons|
       yield(user,reasons.first)
     end
   end
-  
+
   private
-  
+
   def notify follower, because
     @followed_affected_cards[follower] << because[:of]
   end
-  
+
 end
 
 def act_card
@@ -63,9 +63,9 @@ event :stash_followers, :after=>:approve, :on=>:delete do
 end
 
 event :notify_followers, :after=>:extend, :when=>proc{ |c|
-    !c.supercard and c.current_act and Card::Auth.current_id != WagnBotID 
+    !c.supercard and c.current_act and Card::Auth.current_id != WagnBotID
   }  do
-    
+
   begin
     @current_act.reload
     @follower_stash ||= FollowerStash.new
@@ -83,47 +83,47 @@ event :notify_followers, :after=>:extend, :when=>proc{ |c|
     notable_exception_raised
   end
 end
-  
-format do  
+
+format do
   view :list_of_changes, :denial=>:blank do |args|
     action = get_action(args)
-    
+
     relevant_fields = case action.action_type
       when :create then [:cardtype, :content]
       when :update then [:name, :cardtype, :content]
       when :delete then [:content]
       end
-    
-    relevant_fields.map do |type| 
+
+    relevant_fields.map do |type|
       edit_info_for(type, action)
     end.compact.join
   end
-  
-  
+
+
   view :subedits, :perms=>:none do |args|
-    subedits = get_act(args).relevant_actions_for(card).map do |action| 
-        if action.card_id != card.id 
+    subedits = get_act(args).relevant_actions_for(card).map do |action|
+        if action.card_id != card.id
           action.card.format(:format=>@format).render_subedit_notice(:action=>action)
         end
       end.compact.join
-      
+
     if subedits.present?
       wrap_subedits subedits
     else
       ''
     end
   end
-    
+
   view :subedit_notice, :denial=>:blank do |args|
     action = get_action(args)
     name_before_action = (action.new_values[:name] && action.old_values[:name]) || card.name
-    
+
     wrap_subedit_item %{#{name_before_action} #{action.action_type}d
 #{ render_list_of_changes(args) }}
   end
-  
+
   view :followed, :perms=>:none, :closed=>true do |args|
-    if args[:followed_set] && (set_card = Card.fetch(args[:followed_set])) && 
+    if args[:followed_set] && (set_card = Card.fetch(args[:followed_set])) &&
          args[:follow_option] && (option_card = Card.fetch(args[:follow_option]))
        option_card.description set_card
     else
@@ -134,19 +134,19 @@ format do
   view :follower, :perms=>:none, :closed=>true do |args|
     args[:follower] || 'follower'
   end
-  
+
   view :unfollow_url, :perms=>:none, :closed=>true do |args|
     if args[:followed_set] && (set_card = Card.fetch(args[:followed_set])) && args[:follow_option] && args[:follower]
-     rule_name = set_card.follow_rule_name args[:follower]    
+     rule_name = set_card.follow_rule_name args[:follower]
      target_name = "#{args[:follower]}+#{Card[:follow].name}"
      update_path = page_path target_name, :action=>:update, :card=>{:subcards=>{rule_name=>Card[:never].name}}
      card_url update_path # absolutize path
     end
   end
-  
+
   def edit_info_for field, action
     return nil unless action.new_values[field]
-    
+
     item_title = case action.action_type
     when :update then 'new '
     when :delete then 'deleted '
@@ -159,52 +159,50 @@ format do
     else
       action.new_values[field]
     end
-    
+
      wrap_list_item "#{item_title}#{item_value}"
   end
-  
+
   def get_act args
     @notification_act ||= args[:act] || (args[:act_id] and Act.find(args[:act_id])) || card.acts.last
   end
-  
+
   def get_action args
     args[:action] || (args[:action_id] and Action.fetch(args[:action_id])) || card.last_action
   end
-  
-  
+
+
   def wrap_subedits subedits
     "\nThis update included the following changes:#{wrap_list subedits}"
   end
-     
+
   def wrap_list list
     "\n#{list}\n"
   end
-  
+
   def wrap_list_item item
     "   #{item}\n"
   end
-  
+
   def wrap_subedit_item text
     "\n#{text}\n"
   end
 end
 
 
-format :email_text do 
+format :email_text do
   view :last_action, :perms=>:none do |args|
     act = get_act(args)
-    action_on_card =  act.action_on(act.card_id) || act.actions.first
-    "#{action_on_card.action_type}d"
+    "#{act.main_action.action_type}d"
   end
 end
 
-format :email_html do  
+format :email_html do
   view :last_action, :perms=>:none do |args|
     act = get_act(args)
-    action_on_card =  act.action_on(act.card_id) || act.actions.first
-    "#{action_on_card.action_type}d"
+    "#{act.main_action.action_type}d"
   end
-  
+
   def wrap_list list
     "<ul>#{list}</ul>\n"
   end
@@ -212,7 +210,7 @@ format :email_html do
   def wrap_list_item item
     "<li>#{item}</li>\n"
   end
-  
+
   def wrap_subedit_item text
     "<li>#{text}</li>\n"
   end