card 1.15.7 → 1.16.0

data/mod/03_machines/lib/card/machine.rb

@@ -1,15 +1,15 @@
 # What is this?
-# The Machine module together with the MachineInput module implements a kind of observer pattern.  
-# It handles a collection of input cards to generate a output card (default is a file card). 
+# The Machine module together with the MachineInput module implements a kind of observer pattern.
+# It handles a collection of input cards to generate a output card (default is a file card).
 # If one of the input cards is changed the output card will be updated.
-# The classic example: 
+# The classic example:
 # A style card observes a collection of css and sccs card to generate a file card with a css file containg the assembled compressed css.
 
 # How to use it?
 # Include the Machine module in the card set that is supposed to produce the output card. If the output card should be autmatically updated when a input card is changed the input card has to be in a set that includes the MachineInput module.
 # The default machine
 #  -  uses its item cards as input cards or the card itself if there are no item cards;
-#     can be changed by passing a block to collect_input_cards 
+#     can be changed by passing a block to collect_input_cards
 #  -  takes the raw view of the input cards to generate the output;
 #     can be changed by passing a block to machine_input (in the input card set)
 #  -  stores the output as a .txt file in the "+machine output" card;
@@ -18,27 +18,27 @@
 
 # How does it work?
 # Machine cards have a +machine input and a +machine output card. The +machine input card is a pointer to all input cards.
-# Including the MachineInput module creates an ":on => save" event that runs the machines of all cards that are linked to that card via the +machine input pointer. 
+# Including the MachineInput module creates an ":on => save" event that runs the machines of all cards that are linked to that card via the +machine input pointer.
 
 
 
 class Card
-  module Machine    
+  module Machine
     module ClassMethods
-      attr_accessor :output_config 
-  
+      attr_accessor :output_config
+
       def collect_input_cards &block
         define_method :engine_input, &block
       end
-      
+
       def prepare_machine_input &block
         define_method :before_engine, &block
       end
-  
+
       def machine_engine &block
         define_method :engine, &block
       end
-  
+
       def store_machine_output args={}, &block
         output_config.merge!(args)
         if block_given?
@@ -50,16 +50,16 @@ class Card
     def self.included(host_class)
       host_class.extend( ClassMethods )
       host_class.output_config = { :filetype => "txt" }
-      
-            
+
+
       if Codename[:machine_output]  # for compatibility with old migrations
         host_class.card_accessor :machine_output, :type=>:file
         host_class.card_accessor :machine_input, :type => :pointer
-  
+
         # define default machine behaviour
-        host_class.collect_input_cards do 
+        host_class.collect_input_cards do
           # traverse through all levels of pointers and
-          # collect all item cards as input 
+          # collect all item cards as input
           items = [self]
           new_input = []
           already_extended = {} # avoid loops
@@ -82,9 +82,10 @@ class Card
 
         host_class.prepare_machine_input {}
         host_class.machine_engine { |input| input }
-        host_class.store_machine_output do |output| 
+        host_class.store_machine_output do |output|
           file = Tempfile.new [ id, ".#{host_class.output_config[:filetype]}" ]
           file.write output
+          file.rewind
           Card::Auth.as_bot do
             p = machine_output_card
             p.attach = file
@@ -93,14 +94,15 @@ class Card
           file.close
           file.unlink
         end
-  
+
+
         host_class.format do
           view :machine_output_url do |args|
             machine_output_url
           end
         end
-  
-        host_class.event "reset_machine_output_#{host_class.name.gsub(':','_')}".to_sym, :after => :store_subcards, :on => :save do  
+
+        host_class.event "reset_machine_output_#{host_class.name.gsub(':','_')}".to_sym, :after => :store_subcards, :on => :save do
           reset_machine_output!
         end
       end
@@ -111,7 +113,7 @@ class Card
       output = input_item_cards.map do |input|
         unless input.kind_of? Card::Set::Type::Pointer
           if input.respond_to? :machine_input
-            engine( input.machine_input ) 
+            engine( input.machine_input )
           else
             engine( input.format._render_raw )
           end
@@ -119,7 +121,7 @@ class Card
       end.select(&:present?).join( joint )
       after_engine output
     end
-    
+
     def reset_machine_output!
       Auth.as_bot do
         moc = machine_output_card and moc.real? and moc.delete!
@@ -127,8 +129,8 @@ class Card
         update_input_card
       end
     end
-    
- 
+
+
     def update_machine_output
       if ok? :read and not was_already_locked = locked?
         Auth.as_bot do
@@ -140,19 +142,19 @@ class Card
     ensure
        unlock! unless was_already_locked
     end
-    
+
     def lock_cache_key
       "UPDATE-LOCK:#{key}"
     end
-    
+
     def locked?
       Card.cache.read lock_cache_key
     end
-    
+
     def lock!
       Card.cache.write lock_cache_key, true
     end
-    
+
     def unlock!
       Card.cache.write lock_cache_key, false
     end
@@ -168,16 +170,16 @@ class Card
     def machine_output_url
       ensure_machine_output
       machine_output_card.attach.url #(:default, :timestamp => false)   # to get rid of additional number in url
-    end 
+    end
 
     def machine_output_path
       ensure_machine_output
       machine_output_card.attach.path
-    end 
+    end
 
     def ensure_machine_output
       if !output = fetch(:trait => :machine_output) or !output.selected_content_action_id
-        update_machine_output 
+        update_machine_output
       end
     end
   end

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

@@ -7,14 +7,6 @@ $(window).ready ->
   $('body').on 'click', '.toolbar .nav-pills > li', ->
     $(this).tab('show')
 
-  $(document).on 'tap', '.card-header', (event) ->
-    link = $(this).find('.card-menu > a')
-    unless !link[0] or                                             # no gear
-        event.pageX - $(this).offset().left < $(this).width() / 2  # left half of header
+  if wagn.isTouchDevice()
+    $('.show-on-hover').removeClass('show-on-hover')
 
-      link.click()
-      event.preventDefault()
-
-  $(document).on 'tap', 'body', (event) ->
-    unless $(event.target).closest('.card-header')[0] or $(event.target).closest('.card-menu-link')[0]
-      $('.card-menu .dropdown-toggle').dropdown('toggle')

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

@@ -52,10 +52,10 @@ jQuery.fn.extend {
   setSlotContent: (val) ->
     s = @slot()
     v = $(val)
-    if v[0]
-      if slotdata = s.attr 'data-slot'
-        v.attr 'data-slot', slotdata if slotdata?
-    else #simple text (not html)
+    unless v[0]
+    #   if slotdata = s.attr 'data-slot'
+    #     v.attr 'data-slot', slotdata if slotdata?
+    # else #simple text (not html)
       v = val
     s.replaceWith v
     v.trigger 'slotReady'
@@ -169,9 +169,9 @@ $(window).ready ->
   $('body').on 'loaded.bs.modal', null, (event) ->
     unless event.slotSuccessful
       wagn.initializeEditors $(event.target)
+      $(event.target).find(".card-slot").trigger("slotReady")
       event.slotSuccessful = true
 
-
   $('body').on 'ajax:error', '.slotter', (event, xhr) ->
     $(this).slotError xhr.status, xhr.responseText
 
@@ -327,11 +327,11 @@ $(window).ready ->
 
 
 # important: this prevents jquery-mobile from taking over everything
-$( document ).on "mobileinit", ->
-  $.extend $.mobile , {
-    autoInitializePage: false
-    ajaxEnabled: false
-  }
+# $( document ).on "mobileinit", ->
+#   $.extend $.mobile , {
+#     #autoInitializePage: false
+#     #ajaxEnabled: false
+#   }
 
 
 newCaptcha = (form)->

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

@@ -4,6 +4,7 @@ window.wagn ||= {} #needed to run w/o *head.  eg. jasmine
 
 $.extend wagn,
   editorContentFunctionMap: {
+    '.ace-editor-textarea'   : -> ace_editor_content this[0]
     '.tinymce-textarea'      : -> tinyMCE.get(@[0].id).getContent()
     '.pointer-select'        : -> pointerContent @val()
     '.pointer-multiselect'   : -> pointerContent @val()
@@ -54,7 +55,6 @@ $.extend wagn,
       position: "absolute"
       width: textarea.width()
       height: textarea.height()
-      class: textarea.attr("class")
     ).insertBefore(textarea)
     textarea.css "visibility", "hidden"
     textarea.css "height", "0px"
@@ -69,10 +69,6 @@ $.extend wagn,
     editor.getSession().setUseSoftTabs true
     editor.setOptions maxLines: 30
 
-    textarea.closest("form").submit ->
-      textarea.val editor.getSession().getValue()
-      return
-
     return
 
 
@@ -126,6 +122,19 @@ $.extend wagn,
     editor.append '<input type="hidden" value="CHOSEN" class="upload-card-content" name="' + contentFieldName + '">'
     # we add and remove the contentField to insure that nothing is added / updated when nothing is chosen.
 
+  isTouchDevice: ->
+    if 'ontouchstart' of window or window.DocumentTouch and document instanceof DocumentTouch
+      return true
+    else
+      return detectMobileBrowser()
+
+
+  # source for this method: detectmobilebrowsers.com
+  detectMobileBrowser = (userAgent) ->
+    userAgent = navigator.userAgent or navigator.vendor or window.opera
+    /(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(userAgent) or /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(userAgent.substr(0, 4))
+
+
 
 $(window).ready ->
 
@@ -186,7 +195,7 @@ $(window).ready ->
       type : 'PUT'
       data : 'card[content]=true'
 
-  $('body').on 'click', '.toolbar-pin.active > a', (e) ->
+  $('body').on 'click', '.toolbar-pin.active', (e) ->
     e.preventDefault()
     $(this).blur()
     $('.toolbar-pin').removeClass('active').addClass('inactive')
@@ -194,7 +203,7 @@ $(window).ready ->
       type : 'PUT'
       data : 'card[content]=false'
 
-  $('body').on 'click', '.toolbar-pin.inactive > a', (e) ->
+  $('body').on 'click', '.toolbar-pin.inactive', (e) ->
     e.preventDefault()
     $('.toolbar-pin').removeClass('inactive').addClass('active')
     $.ajax '/*toolbar_pinned',
@@ -202,6 +211,7 @@ $(window).ready ->
       data : 'card[content]=true'
 
 
+
   # following mod
   $('body').on 'click', '.btn-item-delete', ->
     $(this).find('.glyphicon').addClass("glyphicon-hourglass").removeClass("glyphicon-remove")
@@ -216,41 +226,73 @@ $(window).ready ->
     $(this).addClass("btn-primary").removeClass("btn-danger")
 
 
-  $('body').on 'click', '.update-follow-link', (event) ->
-    anchor = $(this)
-    url  = wagn.rootPath + '/' + anchor.data('card_key') + '.json?view=follow_status'
-    modal =  anchor.closest('.modal')
-    modal.removeData()
-    $.ajax url, {
-      type : 'GET'
-      dataType : 'json'
-      success : (data) ->
-        tags = $(modal).parent().find('.follow-link')
-        tags.find('.follow-verb').html data.verb
-        tags.attr 'href', data.path
-        tags.attr 'title', data.title
-        tags.data 'follow', data
-    }
+  # modal mod
+
+  $('body').on 'hide.bs.modal', (event) ->
+    $(event.target).find('.modal-dialog > .modal-content').empty()
+    if $(event.target).attr('id') != 'modal-main-slot'
+      slot = $( event.target ).slot()
+      menu_slot = slot.find '.menu-slot:first'
+      url  = wagn.rootPath + '/~' + slot.data('card-id')
+      params = { view: 'menu' }
+      params['is_main'] = true if slot.isMain()
 
-  $('body').on 'click', '.follow-toggle', (event) ->
-    anchor = $(this)
-    url  = wagn.rootPath + '/update/' + anchor.data('rule_name') + '.json'
-    $.ajax url, {
-      type : 'POST'
-      dataType : 'json'
-      data : {
-        'card[content]' : '[[' + anchor.data('follow').content + ']]'
-        'success[view]' : 'follow_status'
-        'success[id]'   : anchor.data('card_key')
+      $.ajax url, {
+        type : 'GET'
+        data: params
+        success : (data) ->
+          menu_slot.replaceWith data
       }
-      success : (data) ->
-        tags = anchor.closest('.modal').parent().find('.follow-toggle')
-        tags.find('.follow-verb').html data.verb
-        tags.attr 'title', data.title
-        tags.removeClass( 'follow-toggle-on follow-toggle-off').addClass data.class
-        tags.data 'follow', data
-    }
-    event.preventDefault() # Prevent link from following its href
+
+#     for slot in $('.card-slot')
+#       menu_slot = $(slot).find '.menu-slot:first'
+#       if menu_slot.size() > 0
+#         url  = wagn.rootPath + '/~' + $(slot).data('card-id')
+#         params = { view: 'menu' }
+#         params['is_main'] = true if $(slot).isMain()
+#
+#         $.ajax url, {
+#           type: 'GET'
+#           data: params
+#           success : (data) ->
+#             menu_slot.replaceWith data
+#         }
+
+#  $('body').on 'click', '.update-follow-link', (event) ->
+#    anchor = $(this)
+#    url  = wagn.rootPath + '/' + anchor.data('card_key') + '.json?view=follow_status'
+#    modal =  anchor.closest('.modal')
+#    modal.removeData()
+#    $.ajax url, {
+#      type : 'GET'
+#      dataType : 'json'
+#      success : (data) ->
+#        tags = $(modal).parent().find('.follow-link')
+#        tags.find('.follow-verb').html data.verb
+#        tags.attr 'href', data.path
+#        tags.attr 'title', data.title
+#        tags.data 'follow', data
+#    }
+
+#  $('body').on 'click', '.follow-toggle', (event) ->
+#    anchor = $(this)
+#    url  = wagn.rootPath + '/update/' + anchor.data('rule_name') + '.json'
+#    $.ajax url, {
+#      type : 'POST'
+#      dataType : 'json'
+#      data : {
+#        'card[content]' : '[[' + anchor.data('follow').content + ']]'
+#        'success[view]' : 'follow_status'
+#        'success[id]'   : anchor.data('card_key')
+#      }
+#      success : (data) ->
+#        tags = anchor.closest('.modal').parent().find('.follow-toggle')
+#        tags.find('.follow-verb').html data.verb
+#        tags.attr 'title', data.title
+#        tags.removeClass( 'follow-toggle-on follow-toggle-off').addClass data.class
+#        tags.data 'follow', data
+#    }
+#    event.preventDefault() # Prevent link from following its href
 
 
   # permissions mod
@@ -317,6 +359,11 @@ pointerContent = (vals) ->
   list = $.map $.makeArray(vals), (v)-> if v then '[[' + v + ']]'
   $.makeArray(list).join "\n"
 
+ace_editor_content = (element) ->
+  ace_div = $(element).siblings(".ace_editor")
+  editor = ace.edit(ace_div[0])
+  editor.getSession().getValue()
+
 #navbox mod
 reqIndex = 0 #prevents race conditions
 

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

@@ -54,11 +54,19 @@ Choosing (b) will mean your CSS will not be affected by automated updates.
     span.header-icon {
       margin: 0px 5px;
     }
+
   }
   .toggler {
     display: inline-block;
     position: relative;
   }
+  .type-info {
+    margin-right: 10px;
+  }
+}
+
+.card-subheader {
+  width: 100%;
 }
 
 .menu-slot {
@@ -99,7 +107,7 @@ Choosing (b) will mean your CSS will not be affected by automated updates.
   }
 
   .vertical-card-menu .dropdown-menu {
-    z-index: 2;
+    //z-index: 2;
   }
 
   .horizontal-card-menu {
@@ -124,14 +132,25 @@ Choosing (b) will mean your CSS will not be affected by automated updates.
 
 .navbar.toolbar {
   margin-bottom: 0;
+  .collapse > .navbar-form.navbar-left {
+    //padding-left: 0px;
+  }
 }
 
-.toolbar {
-  .navbar-text span.glyphicon, span.menu-item-label {
-    margin-left: 5px;
-  }
+.navbar-divide {
+  margin-left: 30px;
+  border-left: 1px solid;
 }
 
+.card-subheader {
+  height: 30px;
+  text-align: left;
+  font-size: 13px;
+  padding: 6px 15px 3px 15px;
+  > .card-title.panel-title {
+    font-size: 13px;
+  }
+}
 
 /*-- closed and labeled views --*/
 
@@ -265,29 +284,8 @@ in your skin.  Choosing (b) will mean your CSS will not be affected by automated
 
 /* related view (used by many menu items, such as "referred to by")  */
 
-.related-view {
-  > .card-frame, & {
-    > .card-body  {
-      background: #bbb;
-      padding: 35px 5px 5px 5px;
-      > .ALL  {
-        background: #fff;
-        > .card-header {
-          background: #ddd;
-          padding: 5px;
-          color: #000;
-        }
-        > .card-body {
-          padding: 8px 2%;
-        }
-      }
-    }
-    > a.close-related-view {
-      color: inherit;
-      margin-right: 5px;
-      margin-top: 5px;
-    }
-  }
+.ALL.related-view > .card-frame > .card-body {
+  padding: 0;
 }
 
 /* navboxes */