card 1.96.2 → 1.96.3

data/mod/item/spec/set/all/bar_spec.rb

@@ -1,15 +1,15 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::All::Bar do
-  specify "view thin_bar" do
-    expect_view(:thin_bar).to have_tag("div.card-slot.bar-view")
+  specify "view mini_bar" do
+    expect_view(:mini_bar).to have_tag("div.card-slot.bar-view")
   end
 
   specify "view bar_left" do
     expect_view(:bar_left).to have_tag("span.card-title")
   end
 
-  specify "view bar_middle" do
+  xspecify "view bar_middle" do
     expect_view(:bar_middle).to have_tag("span.labeled-badge")
   end
 

data/mod/machines/lib/javascript/decko_filter.js.coffee

@@ -8,9 +8,9 @@ $.extend decko,
 
 $(window).ready ->
   $("body").on "change", "._filter-input input, ._filter-input select, ._filter-sort", ->
+    return if weirdoSelect2FilterBreaker this
     filterAndSort this
 
-
   $("body").on "click", "._filter-category-select", ->
     decko.filterCategorySelected($(this))
 
@@ -52,6 +52,10 @@ $(window).ready ->
   $('body').on 'click', '._filtered-list-item-delete', ->
     $(this).closest('li').remove()
 
+# sometimes this element shows up as changed and breaks the filter.
+weirdoSelect2FilterBreaker = (el) ->
+  $(el).hasClass "select2-search__field"
+
 newFilteredListContent = (el) ->
   $.map(prefilteredIds(el).concat(selectedIds el), (id) -> "~" + id).join "\n"
 

data/mod/machines/lib/stylesheets/style_cards.scss

@@ -1,5 +1,5 @@
 /*!
- * Decko: [[http://wagn.org]]
+ * Decko: [[https://decko.org]]
  * Copyright 2015 Grass Commons and other contributors; Licensed GPL
  */
 
@@ -375,25 +375,19 @@ in your skin.  Choosing (b) will mean your CSS will not be affected by automated
 
 .labeled-view {
   padding: 5px 0;
-  label h1,
-  .pointer-list,
-  .pointer-item,
-  .search-result-list,
-  .search-result-item {
-    font-size: 1em;
-  }
-  > .d0-card-content {
-    padding-left: 10px;
+  .labeled-content {
+    font-weight: bold;
+    .pointer-list,
+    .pointer-item,
+    .search-result-list,
+    .search-result-item {
+      font-size: 1em;
+      padding: 0;
+      text-indent: 0;
+    }
   }
 }
 
-.labeled-view label,
-a.missing-labeled {
-  display: inline-block;
-  min-width: 30%;
-  text-align: right;
-}
-
 /*-------------------- */
 /*- EDIT INTERFACE   - */
 /*-------------------- */
@@ -491,14 +485,12 @@ textarea {
 
 /* links to create missing cards */
 
-.missing-view a {
-  color: $gray-600;
+a.missing-link {
+  color: $text-muted;
   font-variant: small-caps;
-}
-
-.missing-view a:hover {
-  color: $blue;
-  background: #ffc;
+  &:hover {
+    color: $primary;
+  }
 }
 
 /*-------------------- */

data/mod/pointer/set/abstract/01_paging.rb

@@ -9,12 +9,12 @@ format do
     offset_param
   end
 
-  def search_with_params args={}
-    card.item_names(args)
+  def search_with_params
+    card.item_names
   end
 
-  def count_with_params args={}
-    card.item_names(args).count
+  def count_with_params
+    card.item_names.count
   end
 
   def total_pages

data/mod/pointer/set/abstract/02_pointer/options_api.rb

@@ -33,23 +33,21 @@ def options_rule_card
 end
 
 def standard_option_names
-  option_names_from_rules || option_names_from_search
-end
-
-def option_names_from_rules
-  return unless (rule_card = options_rule_card)
-  rule_card.item_names context: name, limit: rule_card.try(:default_limit).to_i
+  if json_options?
+    options_hash.values.map(&:to_name)
+  else
+    option_names_from_items
+  end
 end
 
-# TODO: let's either (a) document why it's useful to hard-code a search for the
-# first 50 names as options, or (b) remove this.  EFM votes for B
-def option_names_from_search
-  Card.search({ sort: "name", limit: 50, return: :name },
-              "option names for pointer: #{name}")
+def option_names_from_items
+  o_card = options_card
+  limit = o_card.try(:default_limit).to_i
+  o_card.item_names context: name, limit: limit
 end
 
 def options_card
-  Card.fetch options_card_name
+  options_rule_card || Card[:all]
 end
 
 def options_card_name

data/mod/prosemirror_editor/db/migrate_core_cards/20160804112548_add_prosemirror_cards.rb

@@ -25,6 +25,6 @@ class AddProsemirrorCards < Card::Migration
     "Configure [[http://prosemirror.net|ProseMirror]], "\
     "Decko's default "\
     "[[http://en.wikipedia.org/wiki/Wysiwyg|wysiwyg]] editor. "\
-    "[[http://wagn.org/ProseMirror|more]]"
+    "[[https://decko.org/ProseMirror|more]]"
   end
 end

data/mod/search/set/abstract/search.rb

@@ -52,17 +52,20 @@ def each_item_name_with_options _content=nil
 end
 
 format do
-  def search_with_params args={}
-    query_args = search_params.merge args
+  def search_with_params
+    search_with_rescue search_params
+  end
+
+  def count_with_params
+    search_with_rescue search_params.merge(return: :count)
+  end
+
+  def search_with_rescue query_args
     card.cached_search query_args
   rescue Error::BadQuery => e
     e
   end
 
-  def count_with_params args={}
-    search_with_params args.merge return: :count
-  end
-
   def implicit_item_view view_from_query_params=nil
     view = voo_items_view || view_from_query_params || default_item_view
     Card::View.canonicalize view

data/mod/search/set/abstract/wql_search.rb

@@ -1,11 +1,26 @@
 include_set Abstract::Search
 
 def search args={}
-  query = fetch_query(args)
-  # forces explicit limiting
-  # can be 0 or less to force no limit
-  raise "OH NO.. no limit" unless query.mods[:limit]
-  query.run
+  with_skipping args do
+    query = fetch_query(args)
+    # forces explicit limiting
+    # can be 0 or less to force no limit
+    raise "OH NO.. no limit" unless query.mods[:limit]
+    query.run
+  end
+end
+
+# for override, eg when required subqueries are known to be missing
+def skip_search?
+  false
+end
+
+def with_skipping args
+  skip_search? ? skipped_search_result(args) : yield
+end
+
+def skipped_search_result args={}
+  args[:return] == :count ? 0 : []
 end
 
 def cache_query?

data/mod/search/set/self/search.rb

@@ -28,7 +28,7 @@ format :html do
   end
 
   def keyword_search_title keyword
-    %(Search results for: <span class="search-keyword">#{keyword}</span>)
+    %(Search results for: <span class="search-keyword">#{h keyword}</span>)
   end
 
   def search_keyword

data/mod/standard/set/all/error.rb

@@ -31,6 +31,21 @@ format do
     tr(:bad_address)
   end
 
+  view :errors do
+    ["Problem:", "", standard_errors].flatten.join "\n"
+  end
+
+  def standard_errors
+    card.errors.map do |attrib, msg|
+      attrib == :abort ? msg : standard_error_message(attrib, msg)
+    end
+  end
+
+  # for override
+  def standard_error_message attribute, message
+    "#{attribute.to_s.upcase}: #{message}"
+  end
+
   def unsupported_view_error_message view
     tr(:unsupported_view, view: view, cardname: card.name)
   end

data/mod/standard/set/all/rich_html/content.rb

@@ -36,15 +36,31 @@ format :html do
     output [layout, modal_slot]
   end
 
-  view :content do
+  def prepare_content_slot
     class_up "card-slot", "d0-card-content"
     voo.hide :menu
+  end
+
+  before(:content) { prepare_content_slot }
+
+  view :content do
     wrap { [_render_menu, _render_core] }
   end
 
+  before(:content_with_title) { prepare_content_slot }
+
+  view :content_with_title do
+    wrap true, title: card.format(:text).render_core do
+      [_render_menu, _render_core]
+    end
+  end
+
+  before :content_panel do
+    prepare_content_slot
+    class_up "card-slot", "card", true
+  end
+
   view :content_panel do
-    class_up "card-slot", "d0-card-content card"
-    voo.hide :menu
     wrap do
       wrap_with :div, class: "card-body" do
         [_render_menu, _render_core]
@@ -64,28 +80,21 @@ format :html do
     end
   end
 
-  view :labeled do
-    class_up "d0-card-body", "labeled-content"
+  # view :property do
+  #   voo.title ||= card.name.right
+  #   render_labeled
+  # end
+
+  view :labeled, tags: :unknown_ok do
     @content_body = true
-    wrap do
-      [
-        _render_menu,
-        labeled_row
-      ]
+    wrap(true, class: "row") do
+      [_render_menu,
+       labeled(render_title, wrap_body { render_labeled_content })]
     end
   end
 
-  def labeled_row
-    haml do
-      <<-HAML.strip_heredoc
-        .row
-          .col-4.text-right
-            .label
-              = _render_title
-          .col
-            = wrap_body { _render_labeled_content }
-      HAML
-    end
+  def labeled label, content
+    haml :labeled, label: label, content: content
   end
 
   view :type_info do

data/mod/standard/set/all/rich_html/content/labeled.haml

@@ -0,0 +1,4 @@
+.label.col-4.text-right
+  = label
+.labeled-content.col-8
+  = content

data/mod/standard/set/all/rich_html/error.rb

@@ -6,11 +6,18 @@ format :html do
   end
 
   view :missing do
-    return "" unless card.ok? :create  # should this be moved into ok_view?
+    createable do
+      wrap { missing_link("#{fa_icon 'plus-square'} #{_render_title}") }
+    end
+  end
+
+  def createable
+    card.ok?(:create) ? yield : ""
+  end
+
+  def missing_link text
     path_opts = voo.type ? { card: { type: voo.type } } : {}
-    link_text = "Add #{_render_title}"
-    klass = "slotter missing-#{@denied_view || voo.home_view}"
-    wrap { link_to_view :new, link_text, path: path_opts, class: klass }
+    link_to_view :new, text, path: path_opts, class: "slotter missing-link"
   end
 
   view :closed_missing, perms: :none do
@@ -99,14 +106,6 @@ format :html do
     wrap_with(:span, title: error_message(exception)) { cardname }
   end
 
-  def standard_errors
-    card.errors.map do |attrib, msg|
-      alert "warning", true do
-        attrib == :abort ? h(msg) : standard_error_message(attrib, msg)
-      end
-    end
-  end
-
   def standard_error_message attribute, message
     "<strong>#{h attribute.to_s.upcase}:</strong> #{h message}"
   end

data/mod/standard/set/all/rich_html/title.rb

@@ -25,7 +25,7 @@ format :html do
   end
 
   def wrapped_title title
-    wrap_with :span, class: classy("card-title") do
+    wrap_with :span, class: classy("card-title"), title: title do
       title.to_name.parts.join wrapped_joint
     end
   end

data/mod/standard/spec/content/chunk/include_spec.rb

@@ -154,7 +154,7 @@ describe Card::Content::Chunk::Nest, "Inclusion" do
       create! "Quentin", "{{Admin}}"
       adm = Card["Quentin"]
       adm.update_attributes content: "{{Oak}}"
-      expect(adm.format.render_core).to match(/too deep/)
+      expect { adm.format.render_core }.to raise_error(Card::Error::UserError, /too deep/)
     end
 
     it "handles missing cards" do

data/mod/standard/spec/set/all/error_spec.rb

@@ -3,7 +3,7 @@
 describe Card::Set::All::Error do
   describe "missing view" do
     it "prompts to add" do
-      expect(render_content("{{+cardipoo|open}}").match(/Add \<span/)).not_to be_nil
+      expect(render_content("{{+cardipoo|open}}")).to match(/fa-plus-square.*cardipoo/)
     end
   end
 end

data/mod/standard/spec/set/type/email_template/email_config_spec.rb

@@ -1,6 +1,7 @@
 # -*- encoding : utf-8 -*-
 
 require "card/mailer"
+require "card/seed_consts"
 
 describe Card::Set::Type::EmailTemplate::EmailConfig do
   let(:email_name) { "a mail template" }
@@ -20,7 +21,7 @@ describe Card::Set::Type::EmailTemplate::EmailConfig do
 
   before do
     Card::Auth.current_id = Card::WagnBotID
-    chunk_test = "Url(wagn.org) Link([[http://wagn.org|Wagn]])"\
+    chunk_test = "Url(decko.org) Link([[https://decko.org|Decko]])"\
                  " Inclusion({{B|name}}) Card link([[A]])"
     Card.create! name: email_name, type: :email_template, subcards: {
       "+*to" => "joe@user.com",
@@ -81,10 +82,10 @@ describe Card::Set::Type::EmailTemplate::EmailConfig do
       is_expected.to include "*subject"
     end
     it "does not render url" do
-      is_expected.to include "Url(wagn.org)"
+      is_expected.to include "Url(decko.org)"
     end
     it "does not render link" do
-      is_expected.to include "Link(Wagn[http://wagn.org])"
+      is_expected.to include "Link(Decko[https://decko.org])"
     end
     it "renders nest" do
       is_expected.to include "Inclusion(B)"
@@ -98,10 +99,10 @@ describe Card::Set::Type::EmailTemplate::EmailConfig do
       is_expected.to include "*text message"
     end
     it "does not render url" do
-      is_expected.to include "Url(wagn.org)"
+      is_expected.to include "Url(decko.org)"
     end
     it "renders link" do
-      is_expected.to include "Link(Wagn[http://wagn.org])"
+      is_expected.to include "Link(Decko[https://decko.org])"
     end
     it "renders nest" do
       is_expected.to include "Inclusion(B)"
@@ -118,11 +119,11 @@ describe Card::Set::Type::EmailTemplate::EmailConfig do
     end
     it "renders url" do
       is_expected.to include 'Url(<a target="_blank" class="external-link" '\
-                               'href="http://wagn.org">wagn.org</a>)'
+                               'href="http://decko.org">decko.org</a>)'
     end
     it "renders link" do
       is_expected.to include 'Link(<a target="_blank" class="external-link" '\
-                               'href="http://wagn.org">Wagn</a>)'
+                               'href="https://decko.org">Decko</a>)'
     end
     it "renders nest" do
       is_expected.to include "Inclusion(B)"
@@ -131,8 +132,8 @@ describe Card::Set::Type::EmailTemplate::EmailConfig do
       Card::Env[:protocol] = "http://"
       Card::Env[:host] = "www.fake.com"
       is_expected.to include 'Card link(<a class="known-card" '\
-                               'href="http://www.fake.com/A">' \
-                               '<span class="card-title">A</span></a>)'
+                             'href="http://www.fake.com/A">' \
+                             '<span class="card-title" title="A">A</span></a>)'
     end
   end