card 1.93.5 → 1.93.6

data/mod/machines/file/all_script_machine_output/file.js

@@ -6,7 +6,7 @@ return!0}function Q(a,b,d,e){if(m.acceptData(a)){var f,g,h=m.expando,i=a.nodeTyp
 
 //script: slot
 (function() {
-  var addCaptcha, addCategoryOption, containerClass, detectMobileBrowser, doubleSidebar, filterAndSort, filterCategorySelected, hideFilterInputField, initCaptcha, navbox_results, navbox_select, navboxize, removeCategoryOption, reqIndex, setFilterInputWidth, showFilterInputField, sidebarToggle, singleSidebar, snakeCase, toggleButton, warn, wrapDeckoLayout, wrapSidebarToggle;
+  var addCaptcha, addCategoryOption, addSelectedButton, addSelectedButtonUrl, containerClass, deSelectAllLink, detectMobileBrowser, doubleSidebar, filterAndSort, filterBox, filterCategorySelected, hideFilterInputField, initCaptcha, navbox_results, navbox_select, navboxize, newFilteredListContent, removeCategoryOption, reqIndex, savedIds, selectFilteredItem, selectedBin, selectedData, selectedIds, selectedNames, setFilterInputWidth, showFilterInputField, sidebarToggle, singleSidebar, snakeCase, toggleButton, trackSelectedIds, updateFilterAfterSelection, warn, wrapDeckoLayout, wrapSidebarToggle;
 
   window.decko || (window.decko = {});
 
@@ -37,6 +37,9 @@ return!0}function Q(a,b,d,e){if(m.acceptData(a)){var f,g,h=m.expando,i=a.nodeTyp
         return item.find('input').val('');
       }
     });
+    $('body').on('click', '._filtered-list-item-delete', function() {
+      return $(this).closest('li').remove();
+    });
     $('body').on('show.bs.tab', 'a.load[data-toggle=tab][data-url]', function(e) {
       var tab_id, url;
       tab_id = $(e.target).attr('href');
@@ -514,17 +517,17 @@ return!0}function Q(a,b,d,e){if(m.acceptData(a)){var f,g,h=m.expando,i=a.nodeTyp
   });
 
   $(window).ready(function() {
-    $('body').on("change", "._filter-input input, ._filter-input select, ._filter-sort", function() {
+    $("body").on("change", "._filter-input input, ._filter-input select, ._filter-sort", function() {
       return filterAndSort(this);
     });
-    $('body').on("click", "._filter-category-select", function() {
+    $("body").on("click", "._filter-category-select", function() {
       var addFilterDropdown, category, label;
       addFilterDropdown = $(this).closest("._add-filter-dropdown");
       category = $(this).data("category");
       label = $(this).data("label");
       return filterCategorySelected(addFilterDropdown, category, label);
     });
-    return $('body').on("click", "._delete-filter-input", function() {
+    $("body").on("click", "._delete-filter-input", function() {
       var category, form, input;
       form = $(this).closest("._filter-form");
       input = $(this).closest("._filter-input");
@@ -533,8 +536,118 @@ return!0}function Q(a,b,d,e){if(m.acceptData(a)){var f,g,h=m.expando,i=a.nodeTyp
       hideFilterInputField(input);
       return form.submit();
     });
+    $("body").on("click", "._filter-items ._unselected ._search-checkbox-item input", function() {
+      selectFilteredItem($(this));
+      return updateFilterAfterSelection($(this));
+    });
+    $("body").on("click", "._filter-items ._selected ._search-checkbox-item input", function() {
+      var bin;
+      bin = selectedBin($(this));
+      $(this).slot().remove();
+      return updateFilterAfterSelection(bin);
+    });
+    $("body").on("click", "._filter-items ._add-selected", function() {
+      var btn, content;
+      btn = $(this);
+      content = newFilteredListContent(btn);
+      return btn.attr("href", addSelectedButtonUrl(btn, content));
+    });
+    $("body").on("click", "._select-all", function() {
+      filterBox($(this)).find("._unselected ._search-checkbox-item input").each(function() {
+        return selectFilteredItem($(this));
+      });
+      return updateFilterAfterSelection($(this));
+    });
+    return $("body").on("click", "._deselect-all", function() {
+      var bin;
+      bin = selectedBin($(this));
+      filterBox($(this)).find("._selected ._search-checkbox-item input").each(function() {
+        return $(this).slot().remove();
+      });
+      return updateFilterAfterSelection(bin);
+    });
   });
 
+  newFilteredListContent = function(el) {
+    var newContent, oldContent;
+    oldContent = el.slot().find(".d0-card-content").val();
+    newContent = decko.pointerContent(selectedNames(el));
+    if (!oldContent) {
+      return newContent;
+    }
+    return oldContent + "\n" + newContent;
+  };
+
+  addSelectedButtonUrl = function(btn, content) {
+    var query, url_base, view;
+    view = btn.slot().data("slot")["view"];
+    query = {
+      "card[content]": content,
+      "assign": true,
+      "view": view
+    };
+    url_base = btn.attr("href") + "?" + $.param(query);
+    return decko.prepUrl(url_base, btn.slot());
+  };
+
+  updateFilterAfterSelection = function(el) {
+    trackSelectedIds(el);
+    return filterAndSort(filterBox(el).find("._filter-form"));
+  };
+
+  selectFilteredItem = function(checkbox) {
+    checkbox.prop("checked", true);
+    return selectedBin(checkbox).append(checkbox.slot());
+  };
+
+  selectedBin = function(el) {
+    return filterBox(el).find("._selected-bin");
+  };
+
+  filterBox = function(el) {
+    return el.closest("._filter-items");
+  };
+
+  savedIds = function(el) {
+    var filteredList;
+    filteredList = addSelectedButton($(el)).slot().find("._pointer-filtered-list");
+    return filteredList.children().map(function() {
+      return $(this).data("cardId");
+    }).toArray();
+  };
+
+  addSelectedButton = function(el) {
+    return filterBox(el).find("._add-selected");
+  };
+
+  deSelectAllLink = function(el) {
+    return filterBox(el).find("._deselect-all");
+  };
+
+  selectedIds = function(el) {
+    return selectedData(el, "cardId");
+  };
+
+  selectedNames = function(el) {
+    return selectedData(el, "cardName");
+  };
+
+  selectedData = function(el, field) {
+    var slots;
+    slots = selectedBin(el).children();
+    return slots.map(function() {
+      return $(this).data(field);
+    }).toArray();
+  };
+
+  trackSelectedIds = function(el) {
+    var box, ids;
+    ids = savedIds(el).concat(selectedIds(el));
+    box = filterBox(el);
+    box.find("._not-ids").val(ids.toString());
+    return addSelectedButton(el).attr("disabled", ids.length === 0);
+  };
+
   filterCategorySelected = function(addFilterDropdown, selectedCategory, label) {
     var widget;
     widget = addFilterDropdown.closest("._filter-widget");
@@ -548,12 +661,12 @@ return!0}function Q(a,b,d,e){if(m.acceptData(a)){var f,g,h=m.expando,i=a.nodeTyp
     $inputField = $(widget.find(selector)[0]);
     $(widget.find("._add-filter-dropdown")).before($inputField);
     setFilterInputWidth($inputField);
-    decko.initAutoCardPlete($inputField.find('input'));
+    decko.initAutoCardPlete($inputField.find("input"));
     return $inputField.find("input, select").focus();
   };
 
   setFilterInputWidth = function($inputField) {
-    return $inputField.find('select:not([multiple])').select2({
+    return $inputField.find("select:not([multiple])").select2({
       dropdownAutoWidth: "true"
     });
   };
@@ -18457,11 +18570,9 @@ $.extend( proto, {
         return $(this).val();
       }));
     },
-    '.pointer-mixed': function() {
-      var element;
-      element = '.pointer-checkbox-sublist input:checked,.pointer-sublist-ul input';
-      return pointerContent(this.find(element).map(function() {
-        return $(this).val();
+    '._pointer-filtered-list': function() {
+      return pointerContent(this.find('._filtered-list-item').map(function() {
+        return $(this).data('cardname');
       }));
     },
     '.perm-editor': function() {
@@ -18491,17 +18602,20 @@ $.extend( proto, {
       return input.autocomplete({
         source: decko.prepUrl(url)
       });
+    },
+    pointerContent: function(vals) {
+      var list;
+      list = $.map($.makeArray(vals), function(v) {
+        if (v) {
+          return '[[' + v + ']]';
+        }
+      });
+      return $.makeArray(list).join("\n");
     }
   });
 
   pointerContent = function(vals) {
-    var list;
-    list = $.map($.makeArray(vals), function(v) {
-      if (v) {
-        return '[[' + v + ']]';
-      }
-    });
-    return $.makeArray(list).join("\n");
+    return decko.pointerContent(vals);
   };
 
   permissionsContent = function(ed) {

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

@@ -267,8 +267,6 @@ $(window).ready ->
       confirmer.show 'blind'
       false
 
-
-
   $('body').on 'click', '.follow-updater', ->
     $(this).closest('form').find('#card_update_all_users').val 'true'
 
@@ -412,3 +410,14 @@ decko.slotReady (slot) ->
         #new_slot.trigger('slotReady')
       2000
     )
+
+  # this finds ._modal-slots and moves them to the end of the body
+  # this allows us to render modal slots inside slots that call them and yet
+  # avoid associated problems (eg nested forms and unintentional styling)
+  # note: it deletes duplicate modal slots
+  slot.find('._modal-slot').each ->
+    mslot = $(this)
+    if $.find("body #" + mslot.attr("id")).length > 1
+      mslot.remove()
+    else
+      $("body").append mslot

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

@@ -1,14 +1,14 @@
 $(window).ready ->
-  $('body').on "change", "._filter-input input, ._filter-input select, ._filter-sort", ->
+  $("body").on "change", "._filter-input input, ._filter-input select, ._filter-sort", ->
     filterAndSort this
 
-  $('body').on "click", "._filter-category-select", ->
+  $("body").on "click", "._filter-category-select", ->
     addFilterDropdown = $(this).closest("._add-filter-dropdown")
     category = $(this).data("category")
     label = $(this).data("label")
     filterCategorySelected(addFilterDropdown, category, label)
 
-  $('body').on "click", "._delete-filter-input", ->
+  $("body").on "click", "._delete-filter-input", ->
     form = $(this).closest("._filter-form")
     input = $(this).closest("._filter-input")
     category = input.data("category")
@@ -17,9 +17,115 @@ $(window).ready ->
     hideFilterInputField(input)
     form.submit()
 
+  $("body").on "click", "._filter-items ._unselected ._search-checkbox-item input", ->
+    selectFilteredItem $(this)
+    updateAfterSelection $(this)
+
+  $("body").on "click", "._filter-items ._selected ._search-checkbox-item input", ->
+    bin = selectedBin $(this)
+    $(this).slot().remove()
+    updateAfterSelection bin
+
+  $("body").on "click", "._filter-items ._add-selected", ->
+    btn = $(this)
+    content = newFilteredListContent btn
+    btn.attr "href", addSelectedButtonUrl(btn, content)
+
+  $("body").on "click", "._select-all", ->
+    filterBox($(this)).find("._unselected ._search-checkbox-item input").each ->
+      selectFilteredItem $(this)
+    $(this).prop "checked", false
+    updateAfterSelection $(this)
+
+  $("body").on "click", "._deselect-all", ->
+    filterBox($(this)).find("._selected ._search-checkbox-item input").each ->
+      $(this).slot().remove()
+    $(this).prop "checked", true
+    updateAfterSelection $(this)
+
+  $('body').on 'click', '._filtered-list-item-delete', ->
+    $(this).closest('li').remove()
+
+newFilteredListContent = (el) ->
+  oldContent = el.slot().find(".d0-card-content").val()
+  newContent = decko.pointerContent selectedNames(el)
+  return newContent if !oldContent
+  oldContent + "\n" + newContent
+
+addSelectedButtonUrl = (btn, content) ->
+  view = btn.slot().data("slot")["view"]
+  card_args = { content: content, type: "Pointer" }
+  query = { assign: true, view: view, card: card_args }
+  url_base = decko.rootPath + btn.attr("href") + "&" + $.param(query)
+  decko.prepUrl url_base, btn.slot()
+
+updateAfterSelection = (el) ->
+  trackSelectedIds el
+  filterAndSort filterBox(el).find "._filter-form"
+  updateSelectedCount el
+  updateUnselectedCount el
+
+updateSelectedCount = (el) ->
+  count = selectedBin(el).children().length
+  filterBox(el).find("._selected-items").html count
+  deselectAllLink(el).attr "disabled", count == 0
+  addSelectedButton(el).attr "disabled", count == 0
+  updateSelectedSectionVisibility el, count > 0
+
+updateSelectedSectionVisibility = (el, items_present) ->
+  box = filterBox el
+  selected_items = box.find "._selected-item-list"
+  help_text = box.find "._filter-help"
+  if items_present
+    selected_items.show()
+    help_text.hide()
+  else
+    selected_items.hide()
+    help_text.show()
+
+updateUnselectedCount = (el) ->
+  box = filterBox(el)
+  count = box.find("._search-checkbox-list").children().length
+  box.find("._unselected-items").html count
+  box.find("._select-all").attr "disabled", count > 0
+
+selectFilteredItem = (checkbox) ->
+  checkbox.prop "checked", true
+  selectedBin(checkbox).append checkbox.slot()
+
+selectedBin = (el) ->
+  filterBox(el).find "._selected-bin"
+
+filterBox = (el) ->
+  el.closest "._filter-items"
+
+savedIds = (el) ->
+  filteredList = addSelectedButton($(el)).slot().find "._pointer-filtered-list"
+  filteredList.children().map( -> $(this).data "cardId" ).toArray()
+
+addSelectedButton = (el) ->
+  filterBox(el).find("._add-selected")
+
+deselectAllLink = (el) ->
+  filterBox(el).find("._deselect-all")
+
+selectedIds = (el) ->
+  selectedData el, "cardId"
+
+selectedNames = (el) ->
+  selectedData el, "cardName"
+
+selectedData = (el, field) ->
+  slots = selectedBin(el).children()
+  slots.map( -> $(this).data field ).toArray()
+
+trackSelectedIds = (el) ->
+  ids = savedIds(el).concat selectedIds(el)
+  box = filterBox el
+  box.find("._not-ids").val ids.toString()
+
 filterCategorySelected = (addFilterDropdown, selectedCategory, label) ->
   widget = addFilterDropdown.closest("._filter-widget")
-
   removeCategoryOption(addFilterDropdown, selectedCategory)
   showFilterInputField(selectedCategory, widget)
 
@@ -29,13 +135,13 @@ showFilterInputField = (category, widget) ->
 
   $(widget.find("._add-filter-dropdown")).before($inputField)
   setFilterInputWidth $inputField
-  decko.initAutoCardPlete($inputField.find('input')) # only has effect if there is a data-options-card value
+  decko.initAutoCardPlete($inputField.find("input")) # only has effect if there is a data-options-card value
   $inputField.find("input, select").focus()
 
 setFilterInputWidth = ($inputField) ->
   # multiple select fields are skipped because it the importance filter on wikirate
   # with preselected options got too much height because of this
-  $inputField.find('select:not([multiple])').select2(
+  $inputField.find("select:not([multiple])").select2(
     dropdownAutoWidth: "true"
   )
 
@@ -43,7 +149,7 @@ hideFilterInputField = (input) ->
   widget = input.closest("._filter-widget")
   category = input.data("category")
   $hiddenInputSlot = $(widget.find("._filter-input-field-prototypes > ._filter-input-field.#{category}")[0])
-  $hiddenInputSlot.append(input)
+  $hiddenInputSlot.append input
 
 addCategoryOption = (form, option) ->
   form.find("._filter-category-select[data-category='#{option}']").show()
@@ -52,5 +158,6 @@ removeCategoryOption = (el, option) ->
   el.find("._filter-category-select[data-category='#{option}']").hide()
 
 filterAndSort = (el)->
-    form = $(el).closest("._filter-form")
-    form.submit()
+  form = $(el).closest("._filter-form")
+  form.submit()
+

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

@@ -1,10 +1,10 @@
 /*!
- * Wagn: [[http://wagn.org]]
+ * Decko: [[http://wagn.org]]
  * Copyright 2015 Grass Commons and other contributors; Licensed GPL
  */
 
 /*
-This minimal CSS is needed for basic Wagn functionality.
+This minimal CSS is needed for basic Decko functionality.
 
 Without the following, menus will be barely usable, "closed" view will not appear on one line,
 and certain hidden information will show up.
@@ -292,7 +292,7 @@ pre,
 
 
 /*
-The below provides styles for aspects of wagn sites not usually prioritized by skin designers.
+The below provides styles for aspects of decks not usually prioritized by skin designers.
 
 It includes basic styling for:
 
@@ -464,6 +464,27 @@ textarea {
   }
 }
 
+._filter-widget {
+  .input-group.sort-input-group, ._filter-container > .input-group {
+    width: auto !important;
+  }
+  select {
+    min-width: 30%;
+    max-width: 100%;
+  }
+}
+
+.search-checkbox-item {
+  .checkbox-side {
+    width: 32px;
+    padding: 10px;
+  }
+
+  .item-view-side {
+    max-width: 550px;
+  }
+}
+
 .new-account-link {
   text-align: center;
 }