card 1.15.pre2 → 1.15.0

data/db/migrate_core_cards/data/bootstrap_layout.json

@@ -29,7 +29,7 @@
       {
         "name": "style: classic cards",
         "type": "SCSS",
-        "content": "/* \r\nThis stylesheet defines the core rules of the \"classic\" Wagn look.\r\n*/\r\n\r\nbody {\r\n  font: 12px verdana, arial, helvetica, sans-serif;\r\n  background: #ccc;\r\n  color: #444;\r\n  margin: 0px;\r\n  min-width: 480px;\r\n}\r\n\r\n.card-frame {\r\n  margin: 1px 0;\r\n  -moz-border-radius: 8px;\r\n  border-radius: 8px;\r\n  border: 1px solid #aaa;\r\n  background: #fff;\r\n  margin: 0;\r\n  padding: 0 !important;\r\n  > .card-body {\r\n    min-height: 20px;\r\n  }\r\n  > .card-header {\r\n    margin: 0;\r\n    color: #333333;\r\n    background: #8AB;\r\n    text-align: left;\r\n    .toggler {\r\n      top: 2px;\r\n    }\r\n  }\r\n  > .instruction {\r\n    color: #440;\r\n    background: #ddc;\r\n  }  \r\n}\r\n\r\n#menu {\r\n  background: #8AB;\r\n  .navbar-default {\r\n    border: none;\r\n    background: #8AB;\r\n    a {\r\n      color: #000;\r\n    }\r\n  }\r\n}\r\n\r\n\r\n/*------------- closed view -------*/\r\n.closed-view {\r\n  border: 0;\r\n  border-bottom: 1px solid #ccc;\r\n  -moz-border-radius: 0 !important;\r\n  border-radius: 0 !important;\r\n  .card-header {\r\n    vertical-align: middle;\r\n    -moz-border-radius: 0 6px 6px 0;\r\n    border-radius: 0 6px 6px 0;\r\n    margin-right: 4px;\r\n  }\r\n}\r\n\r\n\r\n.errors-view > .card-body {\r\n  border: 2px solid #b44;\r\n  background: #ffb;\r\n}\r\n\r\n\r\n/*--------- links --------------*/\r\na {\r\n  color: #279;\r\n}\r\na.wanted-card {\r\n  color: #990000;\r\n}\r\na.email-link {\r\n  color: #997799;\r\n}\r\n\r\n\r\n\r\n/*-- misc --*/\r\n\r\np {\r\n  line-height: 1.5em;\r\n}\r\npre {\r\n  background-color: #e5f0f5;\r\n  padding: 10px;\r\n}\r\nli {\r\n  margin-bottom: 2px;\r\n}\r\nhr {\r\n  margin: 10px\r\n}\r\n\r\n\r\n.card-notice {\r\n  color: #009;\r\n}\r\n.joint {\r\n  color: #960;\r\n}\r\n\r\n"
+        "content": "/* \r\nThis stylesheet defines the core rules of the \"classic\" Wagn look.\r\n*/\r\n\r\nbody {\r\n  font: 12px verdana, arial, helvetica, sans-serif;\r\n  background: #ccc;\r\n  color: #444;\r\n  margin: 0px;\r\n  min-width: 480px;\r\n}\r\n\r\n.card-frame {\r\n  margin: 1px 0;\r\n  -moz-border-radius: 8px;\r\n  border-radius: 8px;\r\n  border: 1px solid #aaa;\r\n  background: #fff;\r\n  margin: 0;\r\n  padding: 0 !important;\r\n  > .card-body {\r\n    min-height: 20px;\r\n  }\r\n  > .card-header {\r\n    margin: 0;\r\n    color: #333333;\r\n    background: #8AB;\r\n    text-align: left;\r\n    .toggler {\r\n      top: 2px;\r\n    }\r\n  }\r\n  > .instruction {\r\n    color: #440;\r\n    background: #ddc;\r\n  }  \r\n}\r\nheader,\r\n#menu {\r\n  background: #8AB;\r\n  .navbar-default {\r\n    border: none;\r\n    background: #8AB;\r\n    .navbar-nav > li > a {\r\n      font-size: 1.3em;\r\n      color: #000;\r\n    }\r\n  }\r\n}\r\n\r\n\r\n/*------------- closed view -------*/\r\n.closed-view {\r\n  border: 0;\r\n  border-bottom: 1px solid #ccc;\r\n  -moz-border-radius: 0 !important;\r\n  border-radius: 0 !important;\r\n  .card-header {\r\n    vertical-align: middle;\r\n    -moz-border-radius: 0 6px 6px 0;\r\n    border-radius: 0 6px 6px 0;\r\n    margin-right: 4px;\r\n  }\r\n}\r\n\r\n\r\n.errors-view > .card-body {\r\n  border: 2px solid #b44;\r\n  background: #ffb;\r\n}\r\n\r\n\r\n/*--------- links --------------*/\r\na {\r\n  color: #279;\r\n}\r\na.wanted-card {\r\n  color: #990000;\r\n}\r\na.email-link {\r\n  color: #997799;\r\n}\r\n\r\n\r\n\r\n/*-- misc --*/\r\n\r\np {\r\n  line-height: 1.5em;\r\n}\r\npre {\r\n  background-color: #e5f0f5;\r\n  padding: 10px;\r\n}\r\nli {\r\n  margin-bottom: 2px;\r\n}\r\nhr {\r\n  margin: 10px\r\n}\r\n\r\n\r\n.card-notice {\r\n  color: #009;\r\n}\r\n.joint {\r\n  color: #960;\r\n}\r\n\r\n"
       },
       {
         "name": "style: common",

data/lib/card/reference.rb

@@ -53,7 +53,7 @@ class Card::Reference < ActiveRecord::Base
       delete_missing_referers
       
       Card.where(:trash=>false).find_each do |card|
-        Rails.logger.info "\n\n\nRepairing references for '#{card.name}' (id: #{card.id}) ... \n\n\n"
+        Rails.logger.info "\nRepairing references for '#{card.name}' (id: #{card.id}) ... "
         card.update_references 
       end
     end

data/mod/01_core/set/all/collection.rb

@@ -27,8 +27,7 @@ module ClassMethods
     if block_given?
       super(options) do |records|
         yield(records)
-        puts "resetting local cache"
-        Card.cache.reset_local
+        Card::Cache.reset_global
       end
     else
       super(options)

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

@@ -2,7 +2,7 @@ REVISIONS_PER_PAGE = Card.config.revisions_per_page
 
 # 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 
+  @current_act = if @supercard
     @supercard.current_act || @supercard.acts.build(:ip_address=>Env.ip)
   else
     acts.build(:ip_address=>Env.ip)
@@ -40,14 +40,13 @@ event :rollback_actions, :before=>:approve, :on=>:update, :when=>proc{ |c| Env a
   rollback_actions = Env.params['action_ids'].map do |a_id|
     Action.fetch(a_id) || nil
   end
-  rollback_actions.each do |action|  
+  rollback_actions.each do |action|
     if action.card_id == id
-      revision.merge!(revision(action)) 
+      revision.merge!(revision(action))
     else
-      revision[:subcards].merge!(revision(action))
+      revision[:subcards][action.card.name] = revision(action)
     end
   end
-  
   Env.params['action_ids'] = nil
   update_attributes! revision
   rollback_actions.each do |action|
@@ -59,8 +58,6 @@ end
 
 
 
-
-
 def intrusive_family_acts args={}   # all acts with actions on self and on cards that are descendants of self and included in self
   @intrusive_family_acts ||= begin
     Act.find_all_with_actions_on( (included_descendant_card_ids << id), args)
@@ -81,12 +78,12 @@ end
 
 def included_card_ids
   Card::Reference.select(:referee_id).where( :ref_type => 'I', :referer_id=>id ).pluck('referee_id').compact.uniq
-end 
-  
+end
+
 def descendant_card_ids parent_ids=[id]
   more_ids = Card.where('left_id IN (?)', parent_ids).pluck('id')
-  
-  if !more_ids.empty? 
+
+  if !more_ids.empty?
     more_ids += descendant_card_ids more_ids
   end
   more_ids
@@ -103,20 +100,20 @@ format :html do
     end
   end
 
-  view :revisions do |args| 
+  view :revisions do |args|
     page = params['page'] || 1
     count = card.intrusive_acts.size+1-(page.to_i-1)*REVISIONS_PER_PAGE
-    card.intrusive_acts.page(page).per(REVISIONS_PER_PAGE).map do |act|      
+    card.intrusive_acts.page(page).per(REVISIONS_PER_PAGE).map do |act|
       count -= 1
       render_act_summary args.merge(:act=>act,:rev_nr=>count)
     end.join
   end
-  
+
   view :revision_subheader do |args|
     intr = card.intrusive_acts.page(params['page']).per(REVISIONS_PER_PAGE)
-    render_haml :intr=>intr do 
+    render_haml :intr=>intr do
       %{
-.history-header  
+.history-header
   %span.slotter
     = paginate intr, :remote=>true, :theme=>'twitter-bootstrap-3'
   %div.history-legend
@@ -130,24 +127,24 @@ format :html do
       }
     end
   end
-  
+
   view :act_summary do |args|
     render_act :summary, args
   end
-  
+
   view :act_expanded do |args|
     render_act :expanded, args
   end
-  
+
   def render_act act_view, args
     act = (params['act_id'] and Card::Act.find(params['act_id'])) || args[:act]
-    rev_nr = params['rev_nr'] || args[:rev_nr] 
+    rev_nr = params['rev_nr'] || args[:rev_nr]
     current_rev_nr = params['current_rev_nr'] || args[:current_rev_nr] || card.current_rev_nr
     hide_diff = (params["hide_diff"]=="true") || args[:hide_diff]
     wrap( args.merge(:slot_class=>"revision-#{act.id} history-slot list-group-item") ) do
-      render_haml :card=>card, :act=>act, :act_view=>act_view, 
-                  :current_rev_nr=>current_rev_nr, :rev_nr=>rev_nr, 
-                  :hide_diff=> hide_diff do 
+      render_haml :card=>card, :act=>act, :act_view=>act_view,
+                  :current_rev_nr=>current_rev_nr, :rev_nr=>rev_nr,
+                  :hide_diff=> hide_diff do
         %{
 .act{:style=>"clear:both;"}
   .head
@@ -168,10 +165,10 @@ format :html do
             Current
         - elsif act_view == :expanded
           = rollback_link act.relevant_actions_for(card, act.actions.last.draft)
-          = show_or_hide_changes_link hide_diff, :act_id=>act.id, :act_view=>act_view, :rev_nr=>rev_nr, :current_rev_nr=>current_rev_nr 
+          = show_or_hide_changes_link hide_diff, :act_id=>act.id, :act_view=>act_view, :rev_nr=>rev_nr, :current_rev_nr=>current_rev_nr
   .toggle
     = fold_or_unfold_link :act_id=>act.id, :act_view=>act_view, :rev_nr=>rev_nr, :current_rev_nr=>current_rev_nr
-  
+
   .action-container{:style=>("clear: left;" if act_view == :expanded)}
     - act.relevant_actions_for(card).each do |action|
       = send("_render_action_#{ act_view }", :action=>action )
@@ -179,65 +176,79 @@ format :html do
       end
     end
   end
-  
+
   view :action_summary do |args|
     render_action :summary, args
   end
-  
+
   view :action_expanded do |args|
     render_action :expanded, args
   end
 
   def render_action action_view, args
     action = args[:action] || card.last_action
-    render_haml :action => action, 
-                :action_view=>action_view, 
-                :hide_diff=>Env.params["hide_diff"]=="true" || args[:hide_diff] do
+    hide_diff = Env.params["hide_diff"]=="true" || args[:hide_diff]
+    name_diff =
+      if action.card == card
+        name_changes(action, hide_diff)
+      else
+        link_to name_changes(action, hide_diff),
+                path(:view=>:related, :related=>{:view=>"history",:name=>action.card.name}),
+                :class=>'slotter label-label-default',
+                :slotSelector=>".card-slot.card-frame",
+                :remote=>true
+      end
+
+    type_diff =
+        action.new_type? &&
+        type_changes(action, hide_diff)
+
+    content_diff =
+        action.new_content? &&
+        action.card.format.render_content_changes(:action=>action, :diff_type=>action_view, :hide_diff=>hide_diff)
+
+    render_haml :action => action,
+                :action_view => action_view,
+                :name_diff => name_diff,
+                :type_diff => type_diff,
+                :content_diff => content_diff do
       %{
 .action
   .summary
-    %span.ampel   
-      %span.glyphicon.glyphicon-minus-sign{:class=>(action.red? ? 'diff-red' : 'diff-invisible')}
-      %span.glyphicon.glyphicon-plus-sign{:class=>(action.green? ? 'diff-green' : 'diff-invisible')}
-    -if action.card == card
-      = wrap_diff :name do
-        - name_changes(action, hide_diff)
-    -else
-      =  link_to path(:view=>:related, :related=>{:view=>"history",:name=>action.card.name}), :class=>'slotter label-label-default', 
-                   :slotSelector=>".card-slot.card-frame", :remote=>true do
-        - name_changes(action, hide_diff)    
-    -if action.new_type?
-      = wrap_diff :type do
-        - type_changes action, hide_diff
-    -if action.new_content?
-      %span.glyphicon.glyphicon-arrow-right.arrow
-      -if action_view == :summary 
-        = wrap_diff :content do
-          - action.card.format.render_content_changes :action=>action, :diff_type=>action_view, :hide_diff=>hide_diff
-  -if action.new_content? and action_view == :expanded
+    %span.ampel
+      = glyphicon 'minus-sign', (action.red? ? 'diff-red' : 'diff-invisible')
+      = glyphicon 'plus-sign', (action.green? ? 'diff-green' : 'diff-invisible')
+    = wrap_diff :name, name_diff
+    = wrap_diff :type, type_diff if type_diff
+    -if content_diff
+      = glyphicon 'arrow-right', 'arrow'
+      -if action_view == :summary
+        = wrap_diff :content, content_diff
+  -if content_diff and action_view == :expanded
     .expanded
-      = wrap_diff :content do
-        - action.card.format.render_content_changes :action=>action, :diff_type=>action_view, :hide_diff=>hide_diff
-        }
+      = wrap_diff :content, content_diff
+       }
     end
   end
 
-  def wrap_diff field, &block
-    content = block.call
+  def wrap_diff field, content
     if content.present?
       %{
          <span class="#{field}-diff#{ ' label label-default' if field == :name }">
          #{content}
          </span>
       }
+    else
+      ''
     end
   end
-  
+
+
   def name_changes action, hide_diff=false
     old_name = (name = action.old_values[:name] and showname(name).to_s)
     if action.new_name?
       new_name = showname(action.new_values[:name]).to_s
-      if hide_diff 
+      if hide_diff
         new_name
       else
         Card::Diff.complete(old_name,new_name)
@@ -246,26 +257,24 @@ format :html do
       old_name
     end
   end
-  
+
   def type_changes action, hide_diff=false
     change = hide_diff ? action.new_values[:cardtype] : action.cardtype_diff
     "(#{change})"
   end
-  
 
 
-  
   view :content_changes do |args|
     if args[:hide_diff]
       args[:action].new_values[:content]
-    else 
+    else
       args[:action].content_diff(args[:diff_type])
     end
   end
 
   def rollback_link action_ids
-    if card.ok?(:update) 
-      "| " + link_to('Save as current', path(:action=>:update, :view=>:open, :action_ids=>action_ids,),
+    if card.ok?(:update)
+      "| " + link_to('Save as current', path(:action=>:update, :view=>:open, :action_ids=>action_ids),
         :class=>'slotter',:slotSelector=>'.card-slot.card-frame', :remote=>true, :method=>:post, :rel=>'nofollow')
     end
   end
@@ -276,14 +285,14 @@ format :html do
     else
       toggled_view = :act_expanded
     end
-    link_to '', args.merge(:view=>toggled_view), 
-              :class=>"slotter revision-#{args[:act_id]} #{ args[:act_view]==:expanded ? "arrow-down" : "arrow-right"}", 
+    link_to '', args.merge(:view=>toggled_view),
+              :class=>"slotter revision-#{args[:act_id]} #{ args[:act_view]==:expanded ? "arrow-down" : "arrow-right"}",
               :remote=>true
   end
-  
+
   def show_or_hide_changes_link hide_diff, args
-    "| " +  view_link( (hide_diff ? "Show" : "Hide") + " changes", :act_expanded, 
-      :path_opts=>args.merge(:hide_diff=>!hide_diff), 
+    "| " +  view_link( (hide_diff ? "Show" : "Hide") + " changes", :act_expanded,
+      :path_opts=>args.merge(:hide_diff=>!hide_diff),
       :class=>'slotter', :remote=>true )
   end
 end

data/mod/02_basic_types/set/all/all_css.rb

@@ -2,7 +2,7 @@
 format :css do
 
   def get_inclusion_defaults nested_card
-    { :view => :content }
+    { :view => :raw }
   end
 
   def show view, args

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

@@ -101,7 +101,7 @@ jQuery.fn.extend {
   autosave: ->
     slot = @slot()
     return if @attr 'no-autosave'
-    multi = @closest 'fieldset'
+    multi = @closest '.form-group'
     if multi[0]
       return unless id = multi.data 'cardId'
       reportee = ': ' + multi.data 'cardName'
@@ -199,11 +199,8 @@ $(window).ready ->
         false
 
   $('body').on 'submit', '.card-form', ->
-#    warn "on submit called"
     $(this).setContentFieldsFromMap()
-#    warn "content fields set"    
     $(this).find('.card-content').attr('no-autosave','true')
-#    warn "autosave worked"
     true
 
   $('body').on 'click', '.submitter', ->

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

@@ -641,10 +641,6 @@ $act-gray:  #b7b7b7;
   li:nth-child(even) {
     background: #ddd;
   }
-  h1 {
-    font-size: 1.5em;
-    padding: .6em 0 .3em 0
-  }
   aside {
     float: right;
     border: 1px solid #999;  
@@ -658,6 +654,8 @@ $act-gray:  #b7b7b7;
     text-align: center;
     h2 {
       font-size: .9em;
+      padding: 0;
+      margin: 5px;
     }
     p {
       font-size: .8em;

data/mod/03_machines/set/self/script_ace.rb

@@ -1,8 +1,12 @@
 
 view :raw do |args|
-  File.read "#{Cardio.gem_root}/mod/03_machines/lib/javascript/ace.js"
+  
+  Rails.logger.info "reading file: #{Cardio.gem_root}/mod/03_machines/lib/javascript/#{card.codename}.js"
+  File.read "#{Cardio.gem_root}/mod/03_machines/lib/javascript/#{card.codename}.js"
 end
 
-view :editor do |args|
-  "Content is stored in file and can't be edited."
+format :html do
+  view :editor do |args|
+    "Content is stored in file and can't be edited."
+  end
 end

data/mod/03_machines/set/self/script_card_menu.rb

@@ -1,8 +1,3 @@
 
-view :raw do |args|
-  File.read "#{Cardio.gem_root}/mod/03_machines/lib/javascript/wagn_menu.js"
-end
-
-view :editor do |args|
-  "Content is stored in file and can't be edited."
-end
+format { include ScriptAce::Format }
+format(:html) { include ScriptAce::HtmlFormat }

data/mod/03_machines/set/self/script_html5shiv_printshiv.rb

@@ -1,7 +1,2 @@
-view :raw do |args|
-  File.read "#{Cardio.gem_root}/mod/03_machines/lib/javascript/html5shiv-printshiv.js"
-end
-
-view :editor do |args|
-  "Content is stored in file and can't be edited."
-end
+format { include ScriptAce::Format }
+format(:html) { include ScriptAce::HtmlFormat }

data/mod/03_machines/set/self/script_jquery.rb

@@ -1,8 +1,2 @@
-
-view :raw do |args|
-  File.read "#{Cardio.gem_root}/mod/03_machines/lib/javascript/jquery.js"
-end
-
-view :editor do |args|
-  "Content is stored in file and can't be edited."
-end
+format { include ScriptAce::Format }
+format(:html) { include ScriptAce::HtmlFormat }

data/mod/03_machines/set/self/script_jquery_helper.rb

@@ -9,6 +9,4 @@ view :raw do |args|
   end.join("\n")
 end
 
-view :editor do |args|
-  "Content is stored in file and can't be edited."
-end
+format(:html) { include ScriptAce::HtmlFormat }

data/mod/03_machines/set/self/script_slot.rb

@@ -4,6 +4,4 @@ view :raw do |args|
   end.join("\n")
 end
 
-view :editor do |args|
-  "Content is stored in file and can't be edited."
-end
+format(:html) { include ScriptAce::HtmlFormat }