card 1.15.pre → 1.15.pre2

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

@@ -12,5 +12,5 @@ end
 
 def pristine?
   # has not been edited directly by human users.  bleep blorp.
-  new_card? or actions.joins(:act).where('card_acts.actor_id != ?', Card::WagnBotID).exists?
+  new_card? or !actions.joins(:act).where('card_acts.actor_id != ?', Card::WagnBotID).exists?
 end

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

@@ -2,11 +2,11 @@
 module ClassMethods
   
   def empty_trash
+    Card.delete_trashed_files
     Card.where(:trash=>true).delete_all
     Card::Action.delete_cardless
     Card::Reference.repair_missing_referees
     Card::Reference.delete_missing_referers
-    Card.delete_trashed_files
   end
   
   def delete_trashed_files #deletes any file not associated with a real card.
@@ -22,7 +22,7 @@ module ClassMethods
     end
   end
   
-  def merge_list attribs, opts
+  def merge_list attribs, opts={}
     unmerged = []
     attribs.each do |row|
       result = begin
@@ -46,6 +46,7 @@ module ClassMethods
         Rails.logger.info "failed to merge:\n\n#{ unmerged_json }"
       end
     end
+    unmerged
   end    
     
   

data/mod/01_core/set_pattern/02_all_plus.rb

@@ -9,5 +9,5 @@ def prototype_args anchor
 end
 
 def follow_label name
-  label name
+  'all "+" cards'
 end

data/mod/01_core/set_pattern/04_star.rb

@@ -11,5 +11,5 @@ def pattern_applies? card
 end
 
 def follow_label name
-  label name
-end
+  'all "*" cards'
+end

data/mod/01_core/set_pattern/05_rstar.rb

@@ -13,5 +13,5 @@ def pattern_applies? card
 end
 
 def follow_label name
-  label name
-end
+  'all "+*" cards'
+end

data/mod/01_core/set_pattern/07_type_plus_right.rb

@@ -19,5 +19,5 @@ def anchor_name card
 end
 
 def follow_label name
-  %{all  "+#{name.to_name.tag}" on "#{name.to_name.left_name}s}
+  %{all  "+#{name.to_name.tag}" on "#{name.to_name.left_name}s"}
 end

data/mod/01_core/spec/format/html_format_spec.rb

@@ -22,8 +22,8 @@ describe Card::HtmlFormat do
     it "titled" do
       result = render_card :titled, :name=>'A+B'
       assert_view_select result, 'div[class~="titled-view"]' do
-        assert_select 'h3' do
-          assert_select 'span'
+        assert_select 'div[class~="card-header"]' do
+          assert_select 'span[class~="card-title"]'
         end
         assert_select 'div[class~="card-body card-content"]', 'AlphaBeta'
       end
@@ -44,10 +44,9 @@ describe Card::HtmlFormat do
 
 
       it "renders top menu" do
-        
-        assert_view_select @simple_page, 'div#menu' do #'nav[class="navbar navbar-default navbar-static-top"]' do
+        assert_view_select @simple_page, 'header' do
           assert_select 'a[class="internal-link"][href="/"]', 'Home'
-          assert_select 'a[class="internal-link"][href="/recent"]', 'Recent'
+          assert_select 'a[class="internal-link"][href="/:recent"]', 'Recent'
           assert_select 'form.navbox-form[action="/:search"]' do
             assert_select 'input[name="_keyword"]'
           end
@@ -57,7 +56,7 @@ describe Card::HtmlFormat do
       it "renders card header" do
         # lots of duplication here...
         assert_view_select @simple_page, 'div[class="card-header panel-heading"]' do
-          assert_select 'h3[class="card-header-title panel-title"]'
+          assert_select 'div[class="card-header-title panel-title"]'
         end
       end
 
@@ -76,7 +75,7 @@ describe Card::HtmlFormat do
     context "layout" do
       before do
         Card::Auth.as_bot do
-          @layout_card = Card.create(:name=>'tmp layout', :type=>'Layout')
+          @layout_card = Card.create :name=>'tmp layout', :type=>'Layout'
           #warn "layout #{@layout_card.inspect}"
         end
         c = Card['*all+*layout'] and c.content = '[[tmp layout]]'
@@ -86,22 +85,22 @@ describe Card::HtmlFormat do
         #warn "lay #{@layout_card.inspect}, #{@main_card.inspect}"
       end
 
-      it "should default to core view when in layout mode" do
-        @layout_card.content = "Hi {{A}}"
-        Card::Auth.as_bot { @layout_card.save }
-
-        expect(@main_card.format.render(:layout)).to match('Hi Alpha')
-      end
-
-      it "should default to open view for main card" do
-        @layout_card.content='Open up {{_main}}'
-        Card::Auth.as_bot { @layout_card.save }
-
-        result = @main_card.format.render_layout
-        expect(result).to match(/Open up/)
-        expect(result).to match(/card-header/)
-        expect(result).to match(/Joe User/)
-      end
+#      it "should default to core view when in layout mode" do
+#        @layout_card.content = "Hi {{A}}"
+#        Card::Auth.as_bot { @layout_card.save }
+#
+#        expect(@main_card.format.render(:layout)).to match('Hi Alpha')
+#      end
+
+#      it "should default to open view for main card" do
+#        @layout_card.content='Open up {{_main}}'
+#        Card::Auth.as_bot { @layout_card.save }
+#
+#        result = @main_card.format.render_layout
+#        expect(result).to match(/Open up/)
+#        expect(result).to match(/card-header/)
+#        expect(result).to match(/Joe User/)
+#      end
 
       it "should render custom view of main" do
         @layout_card.content='Hey {{_main|name}}'
@@ -125,7 +124,7 @@ describe Card::HtmlFormat do
       
       it "should handle nested _main references" do
         Card::Auth.as_bot do
-          @layout_card.content="{{outer space}}"
+          @layout_card.content="{{outer space|core}}"
           @layout_card.save!
           Card.create :name=>"outer space", :content=>"{{_main|name}}"
         end

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

@@ -98,7 +98,7 @@ end
 
 format :html do
   view :history do |args|
-    frame args.merge(:body_class=>"history-slot", :content=>true, :subheader=>_render_revision_subheader ) do
+    frame args.merge(:body_class=>"history-slot list-group", :content=>true, :subheader=>_render_revision_subheader ) do
       _render_revisions
     end
   end
@@ -119,7 +119,7 @@ format :html do
 .history-header  
   %span.slotter
     = paginate intr, :remote=>true, :theme=>'twitter-bootstrap-3'
-  %span.history-legend{:style=>"text-align:right;"}
+  %div.history-legend
     %span.glyphicon.glyphicon-plus-sign.diff-green
     %span
       = Card::Diff.render_added_chunk("Added")
@@ -144,7 +144,7 @@ format :html do
     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") ) do
+    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 
@@ -164,8 +164,7 @@ format :html do
           %em.info
             Autosave
         - if current_rev_nr == rev_nr
-          |
-          %em.info
+          %em.label.label-info
             Current
         - elsif act_view == :expanded
           = rollback_link act.relevant_actions_for(card, act.actions.last.draft)
@@ -204,7 +203,7 @@ format :html do
       = wrap_diff :name do
         - name_changes(action, hide_diff)
     -else
-      =  link_to path(:view=>:related, :related=>{:view=>"history",:name=>action.card.name}), :class=>'slotter name-diff', 
+      =  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?
@@ -227,7 +226,7 @@ format :html do
     content = block.call
     if content.present?
       %{
-         <span class="#{field}-diff">
+         <span class="#{field}-diff#{ ' label label-default' if field == :name }">
          #{content}
          </span>
       }

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

@@ -1,7 +1,7 @@
     
 format :css do
 
-  def get_inclusion_defaults
+  def get_inclusion_defaults nested_card
     { :view => :content }
   end
 

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

@@ -1,7 +1,7 @@
 require 'csv'
 
 format :csv  do
-  def get_inclusion_defaults
+  def get_inclusion_defaults nested_card
     { :view => :core }
   end
   
@@ -26,7 +26,7 @@ format :csv  do
   view :csv_title_row do |args|
     #NOTE: assumes all cards have the same structure!
     begin
-      card1 = search_vars[:results].first  
+      card1 = search_results.first
     
       parsed_content = Card::Content.new card1.raw_content, self
       unless String === parsed_content.__getobj__

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

@@ -1,7 +1,7 @@
 
 format :json do
 
-  def get_inclusion_defaults
+  def get_inclusion_defaults nested_card
     { :view=>:atom }
   end
 

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

@@ -1,7 +1,7 @@
 format :html do
 
   view :editor do |args|
-    text_area :content, :rows=>5, :class=>'card-content'
+    text_area :content, :rows=>5, :class=>'card-content', "data-card-type-code"=>card.type_code
   end
   
   view :core do |args|

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

@@ -5,6 +5,11 @@ event :add_and_drop_items, :before=>:approve, :on=>:save do
 end
 
 format do
+  def item_links args={}
+    card.item_cards(args).map do |item_card|
+      subformat(item_card).render_link
+    end
+  end
 
   def wrap_item item, args={}
     item #no wrap in base    
@@ -36,19 +41,21 @@ format :html do
   end
 
   view :closed_content do |args|
-    args[:item] = (args[:item] || inclusion_defaults[:view])=='name' ? 'name' : 'link'
+    args[:item] = (args[:item] || inclusion_defaults(card)[:view])=='name' ? 'name' : 'link'
     args[:joint] ||= ', '
     _render_core args
   end
 
-  view :edit do |args|
-    super(args.merge(:pointer_item_class=>'form-control'))
-  end
+#  view :edit do |args|
+#    super(args.merge(:pointer_item_class=>'form-control'))
+#  end
 
   view :editor do |args|
     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')))
+    raw(_render part_view, args)
+    
+    #.merge(:pointer_item_class=>'form-control')))
   end
 
   view :list do |args|
@@ -99,15 +106,6 @@ format :html do
   end
 
 
-  view :old_list_item do |args|
-    %{
-      <li class="pointer-li">
-        #{ text_field_tag 'pointer_item', args[:pointer_item], :class=>'pointer-item-text' }
-        #{ link_to '', '#', :class=>'pointer-item-delete ui-icon ui-icon-circle-close'     }
-      </li>
-    }
-  end
-
   view :checkbox do |args|
     options = card.options.map do |option|
       checked = card.item_names.include?(option.name)
@@ -115,7 +113,7 @@ format :html do
       description = pointer_option_description option
       %{
         <div class="pointer-checkbox">
-          #{ check_box_tag "pointer_checkbox", option.name, checked, :id=>id, :class=>item_css_class('checkbox-button',args) }
+          #{ check_box_tag "pointer_checkbox", option.name, checked, :id=>id, :class=>'pointer-checkbox-button' }
           <label for="#{id}">#{option.name}</label>
           #{ %{<div class="checkbox-option-description">#{ description }</div>} if description }
         </div>
@@ -128,7 +126,7 @@ format :html do
   view :multiselect do |args|
     selected_options = card.item_names.map{|i_n| (c=Card.fetch(i_n) and c.name) or i_n}
     options = options_from_collection_for_select(card.options,:name,:name,selected_options)
-    select_tag("pointer_multiselect", options, :multiple=>true, :class=>item_css_class('multiselect',args))
+    select_tag("pointer_multiselect", options, :multiple=>true, :class=>'pointer-multiselect form-control')
   end
 
   view :radio do |args|
@@ -138,20 +136,20 @@ format :html do
       id = "pointer-radio-#{option.cardname.key}"
       description = pointer_option_description option
       %{ 
-        <div class="pointer-radio">
-        #{ radio_button_tag input_name, option.name, checked, :id=>id, :class=>item_css_class('radio-button',args) }
-        <label for="#{id}">#{ option.label }</label>
-        #{ %{<div class="radio-option-description">#{ description }</div>} if description }
-        </div>
+        <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>
+          #{ %{<div class="radio-option-description">#{ description }</div>} if description }
+        </li>
       }
     end.join("\n")
 
-    %{<div class="pointer-radio-list">#{options}</div>}
+    %{<ul class="pointer-radio-list">#{options}</ul>}
   end
 
   view :select do |args|
     options = [["-- Select --",""]] + card.options.map{|x| [x.name,x.name]}
-    select_tag("pointer_select", options_for_select(options, card.item_names.first), :class=>item_css_class('select',args) )
+    select_tag("pointer_select", options_for_select(options, card.item_names.first), :class=>'pointer-select form-control')
   end
 
 
@@ -171,12 +169,6 @@ format :html do
     %{<div class="pointer-item item-#{args[:view]}">#{item}</div>}
   end
   
-  def item_css_class option, args
-    css_classes = ["pointer-#{option}"]
-    css_classes << args[:pointer_item_class] if args[:pointer_item_class] 
-    css_classes.compact*' '
-  end
-  
   
 end
 
@@ -301,6 +293,10 @@ def drop_item name
   end
 end
 
+def insert_item index, name
+  new_names = item_names.insert(index,name)
+  self.content =  new_names.map { |name| "[[#{name}]]" }.join "\n"
+end
 
 
 def options_card

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

@@ -213,7 +213,7 @@ $(window).ready ->
     $(this).closest('form').find('#card_update_referencers').val 'true'
         
   $('body').on 'submit', '.edit_name-view .card-form', ->
-    confirmer = $(this).find '.confirm_rename-view'
+    confirmer = $(this).find '.alert'
     if confirmer.is ':hidden'
       if $(this).find('#referers').val() > 0
         $(this).find('.renamer-updater').show()
@@ -239,11 +239,12 @@ $(window).ready ->
     window.location = $(this).attr('href')
 
   unless wagn.noDoubleClick
-    $('body').on 'dblclick', '.card-slot', (event) ->
-      s = $(this)
-      return false if s.closest( '.nodblclick'  )[0]
-      return false if s.closest( '.card-header' )[0]
-      return false if s.find( '.card-editor' )[0]
+    $('body').on 'dblclick', 'div', (event) ->
+      t = $(this)
+      return false if t.closest( '.nodblclick'  )[0]
+      return false if t.closest( '.card-header' )[0]
+      return false if t.find( '.card-editor' )[0]
+      s = t.slot()
       return false unless s.data('cardId')
       s.addClass 'slotter'
       s.attr 'href', wagn.rootPath + '/card/edit/~' + s.data('cardId')

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

@@ -37,7 +37,7 @@ $.extend wagn,
     wagn.tinyMCEConfig = setter()
   
   initAce: (textarea) ->
-    type_code = textarea.slot().attr "data-card-type-code"
+    type_code = textarea.attr "data-card-type-code"
     hash = {}
     hash["java_script"] = "javascript"
     hash["coffee_script"] = "coffee"
@@ -45,6 +45,7 @@ $.extend wagn,
     hash["scss"] = "scss"
     hash["html"] = "html"
     hash["search_type"] = "json"
+    hash["layout_type"] = "html"
     mode = hash[type_code]
     unless mode
       textarea.autosize()

data/mod/03_machines/lib/stylesheets/style_bootstrap_compatible.css

@@ -0,0 +1,154 @@
+/* This backwards-compatibility spreadsheet is intended to keep the old "Classic" skins working even as the HTML has changed for the new bootstrap skins.  It is NOT intended to be used in new skins. */
+
+#menu {
+  height: 30px;
+  div.container-fluid{
+    display: block;
+  }
+  div.navbar-header {
+    display: none;
+  }
+  ul {
+    font-size: 14px;
+    margin-top: 5px;
+  }
+  li {
+    display: inline;
+  }
+  .navbar-left {
+    float: left;
+  }
+  .navbar-right {
+    float: right;
+    margin-right: 15px;
+  }
+  .navbar-form {
+    width: 30%;
+    margin-top: 5px;
+    margin-left: 10px;
+    input {
+      width: 100%;
+    }
+  }
+}
+
+#primary {
+  clear: both;
+}
+
+
+// removed from standard.scss
+input, select, textarea {
+  padding: 0 1%;
+}
+input, select {
+  max-width: 97.5%;
+}
+
+fieldset {
+  border: 0;
+  padding: 0;
+}
+.form-group {
+  padding: 10px;
+}
+
+.alert-info {
+  background: #ccc;
+  padding: 5px 10px;
+}
+
+
+.pagination {
+  display: inline-block;
+  padding-left: 0;
+  margin: 20px 0;
+  border-radius: 4px;
+}
+.pagination > li {
+  display: inline;
+}
+.pagination > li > a,
+.pagination > li > span {
+  position: relative;
+  float: left;
+  padding: 6px 12px;
+  margin-left: -1px;
+  line-height: 1.42857143;
+  color: #337ab7;
+  text-decoration: none;
+  background-color: #fff;
+  border: 1px solid #ddd;
+}
+.pagination > li:first-child > a,
+.pagination > li:first-child > span {
+  margin-left: 0;
+  border-top-left-radius: 4px;
+  border-bottom-left-radius: 4px;
+}
+.pagination > li:last-child > a,
+.pagination > li:last-child > span {
+  border-top-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+}
+.pagination > li > a:hover,
+.pagination > li > span:hover,
+.pagination > li > a:focus,
+.pagination > li > span:focus {
+  color: #666666;
+  background-color: #eee;
+  border-color: #ddd;
+}
+.pagination > .active > a,
+.pagination > .active > span,
+.pagination > .active > a:hover,
+.pagination > .active > span:hover,
+.pagination > .active > a:focus,
+.pagination > .active > span:focus {
+  z-index: 2;
+  color: #fff;
+  cursor: default;
+  background-color: #666666;
+  border-color: #666666;
+}
+.pagination > .disabled > span,
+.pagination > .disabled > span:hover,
+.pagination > .disabled > span:focus,
+.pagination > .disabled > a,
+.pagination > .disabled > a:hover,
+.pagination > .disabled > a:focus {
+  color: #777;
+  cursor: not-allowed;
+  background-color: #fff;
+  border-color: #ddd;
+}
+.pagination-lg > li > a,
+.pagination-lg > li > span {
+  padding: 10px 16px;
+  font-size: 18px;
+}
+.pagination-lg > li:first-child > a,
+.pagination-lg > li:first-child > span {
+  border-top-left-radius: 6px;
+  border-bottom-left-radius: 6px;
+}
+.pagination-lg > li:last-child > a,
+.pagination-lg > li:last-child > span {
+  border-top-right-radius: 6px;
+  border-bottom-right-radius: 6px;
+}
+.pagination-sm > li > a,
+.pagination-sm > li > span {
+  padding: 5px 10px;
+  font-size: 12px;
+}
+.pagination-sm > li:first-child > a,
+.pagination-sm > li:first-child > span {
+  border-top-left-radius: 3px;
+  border-bottom-left-radius: 3px;
+}
+.pagination-sm > li:last-child > a,
+.pagination-sm > li:last-child > span {
+  border-top-right-radius: 3px;
+  border-bottom-right-radius: 3px;
+}