card-mod-format 0.14.2 → 0.15.1

data/set/all/html/menu.rb

@@ -1,11 +1,12 @@
 format :html do
   view :menu, denial: :blank, unknown: true do
-    return "" if card.unknown?
-
+    return "" unless card.known?
+    # would be preferable to do this with unknown: :blank, but that fails with view
+    # caching on, because voo always thinks it's the root.
     wrap_with :div, class: "card-menu #{menu_link_classes}" do
       [render_help_link,
        menu_link,
-       (voo.show?(:bridge_link) ? bridge_link(false) : nil)]
+       (voo.show?(:bridge_link) ? bridge_link(in_modal: false) : nil)]
     end
   end
 
@@ -35,6 +36,11 @@ format :html do
     edit_link edit_link_view
   end
 
+  view :edit_button do
+    view = voo.edit == :inline ? :edit_inline : :edit
+    link_to_view view, "Edit", class: "btn btn-sm btn-outline-primary me-2"
+  end
+
   def edit_link_view
     :edit
   end
@@ -47,13 +53,11 @@ format :html do
     bridge_link
   end
 
-  def bridge_link in_modal=true
+  def bridge_link text: "", in_modal: true, confirm: false
     opts = { class: "bridge-link" }
-    if in_modal
-      # add_class opts, "close"
-      opts["data-slotter-mode"] = "modal-replace"
-    end
-    link_to_view :bridge, material_icon(:more_horiz), opts
+    opts["data-slotter-mode"] = "modal-replace" if in_modal
+    confirm_edit_loss opts if confirm
+    link_to_view :bridge, "#{bridge_icon} #{text}", opts
   end
 
   # no caching because help_text view doesn't cache, and we can't have a
@@ -65,19 +69,15 @@ format :html do
   def help_link text=nil, title=nil
     opts = help_popover_opts text, title
     add_class opts, "_card-menu-popover"
-    link_to help_icon, opts
+    link_to icon_tag(:help), opts
   end
 
   def help_popover_opts text=nil, title=nil
     text ||= render_help_text
-    opts = { "data-placement": :left, class: "help-link" }
+    opts = { "data-bs-placement": :left, class: "help-link" }
     popover_opts text, title, opts
   end
 
-  def help_icon
-    material_icon("help")
-  end
-
   def help_title
     "#{name_parts_links} (#{render_type}) #{full_page_link unless card.simple?}"
   end
@@ -88,8 +88,18 @@ format :html do
     end.join Card::Name.joint
   end
 
-  def full_page_link
-    link_to_card full_page_card, full_page_icon, class: classy("full-page-link")
+  def full_page_link text: ""
+    link_to_card full_page_card, "#{full_page_icon} #{text}",
+                 class: classy("full-page-link")
+  end
+
+  def modal_page_link text: ""
+    modal_link "#{modal_icon} #{text}",
+               path: { mark: card }, size: modal_page_size, class: "_modal-page-link"
+  end
+
+  def modal_page_size
+    :xl
   end
 
   def full_page_card
@@ -97,12 +107,12 @@ format :html do
   end
 
   def edit_in_bridge_link opts={}
-    edit_link :bridge, opts
+    edit_link :bridge, *opts
   end
 
-  def edit_link view=:edit, opts={}
-    link_to_view view, opts.delete(:link_text) || menu_icon,
-                 edit_link_opts(modal: (opts[:modal] || :lg))
+  def edit_link view=:edit, link_text: nil, text: "", modal: nil
+    link_to_view view, link_text || "#{menu_icon} #{text}",
+                 edit_link_opts(modal: (modal || :lg))
   end
 
   # @param modal [Symbol] modal size
@@ -120,10 +130,23 @@ format :html do
   end
 
   def menu_icon
-    material_icon "edit"
+    icon_tag "edit"
   end
 
   def full_page_icon
     icon_tag :open_in_new
   end
+
+  def modal_icon
+    icon_tag :modal
+  end
+
+  def bridge_icon
+    icon_tag :board
+  end
+
+  def confirm_edit_loss opts
+    add_class opts, "_confirm"
+    opts["data-confirm-msg"] = t(:format_confirm_edit_loss)
+  end
 end

data/set/all/html/views.rb

@@ -1,25 +1,19 @@
+# require "truncato"
+
 format :html do
   def prepare_content_slot
     class_up "card-slot", "d0-card-content"
-    voo.hide :menu
   end
 
   before(:content) { prepare_content_slot }
 
   view :content do
-    voo.hide :edit_button
-    wrap do
-      [_render_menu, _render_core, _render_edit_button(edit: :inline)]
-    end
-  end
-
-  before :content_with_edit_button do
-    prepare_content_slot
-  end
-
-  view :content_with_edit_button, unknown: true do
     wrap do
-      [_render_menu, _render_core, _render_edit_button(edit: :inline)]
+      [
+        render_menu(optional: :hide),
+        render_core,
+        render_edit_button(optional: :hide, edit: :inline)
+      ]
     end
   end
 
@@ -41,7 +35,7 @@ format :html do
 
   view :content_with_title do
     wrap true, title: card.format(:text).render_core do
-      [_render_menu, _render_core]
+      [render_menu, render_core]
     end
   end
 
@@ -53,7 +47,7 @@ format :html do
   view :content_panel do
     wrap do
       wrap_with :div, class: "card-body" do
-        [_render_menu, _render_core]
+        [render_menu, render_core]
       end
     end
   end
@@ -69,7 +63,8 @@ format :html do
     end
   end
 
-  view :labeled, unknown: true do
+  # unlike unknown: true, unknown: (same view) can be overridden
+  view :labeled, unknown: :labeled do
     @content_body = true
     wrap(true, class: "row") do
       labeled(render_title, wrap_body { "#{render_menu}#{render_labeled_content}" })
@@ -114,18 +109,6 @@ format :html do
     Card.fetch(set_name)
   end
 
-  def raw_one_line_content
-    cleaned = Card::Content.clean! render_raw, {}
-    cut_with_ellipsis cleaned
-  end
-
-  def one_line_content
-    # TODO: use a version of Card::Content.smart_truncate
-    #       that counts characters instead of clean!
-    cleaned = Card::Content.clean! render_core, {}
-    cut_with_ellipsis cleaned
-  end
-
   # LOCALIZE
   def short_content
     short_content_items || short_content_fields || short_content_from_core

data/set/all/html/wrap.rb

@@ -9,7 +9,6 @@ format :html do
   end
 
   wrapper :slot do |opts|
-    class_up "card-slot", opts[:class] if opts[:class]
     attrib = slot_attributes true, opts
     method_wrap(:wrap_with, :div, attrib) { interior }
   end
@@ -25,7 +24,7 @@ format :html do
   end
 
   def slot_attributes slot, slot_attr
-    { id: slot_id, class: wrap_classes(slot), data: wrap_data }.tap do |hash|
+    { id: slot_id, class: wrap_classes(slot), data: wrap_data(true) }.tap do |hash|
       add_class hash, slot_attr.delete(:class)
       hash.deep_merge! slot_attr
     end
@@ -35,11 +34,12 @@ format :html do
     "#{card.name.safe_key}-#{@current_view}-view"
   end
 
-  def wrap_data slot=true
+  def wrap_data slot=false
     with_slot_data slot do
       {
         "card-id": card.id,
         "card-name": slot_cardname,
+        "card-type-id": card.type_id,
         "card-link-name": card.name.url_key,
         "slot-id": SecureRandom.hex(10)
       }
@@ -109,7 +109,8 @@ format :html do
 
   def body_css_classes
     css_classes = ["d0-card-body"]
-    css_classes += ["d0-card-content", card.safe_set_keys] if @content_body
+    css_classes << "d0-card-content" if @content_body
+    css_classes << card.safe_set_keys if @content_body || @set_keys
     classy(*css_classes)
   end
 

data/set/all/html.rb

@@ -9,14 +9,13 @@ format :html do
   view :type_info do
     return unless card.type_code != :basic
 
-    wrap_with :span, class: "type-info float-right" do
+    wrap_with :span, class: "type-info float-end" do
       link_to_card card.type_name, nil, class: "navbar-link"
     end
   end
 
   def default_nest_view
-    :titled
-    # card.rule(:default_html_view) || :titled
+    Cardio.config.default_html_view
   end
 
   def default_item_view

data/set/all/json.rb

@@ -40,10 +40,6 @@ format :json do
 
   private
 
-  def request_url
-    controller.request&.original_url || path
-  end
-
   def string_with_page_details
     raw = yield
     return raw if raw.is_a? String
@@ -54,7 +50,7 @@ format :json do
   def page_details obj
     return obj unless obj.is_a? Hash
 
-    obj.merge url: request_url, requested_at: Time.now.to_s
+    obj.merge url: request_url, requested_at: Time.now.utc.to_s
   end
 
   def stringify raw

data/set/right/head.rb

@@ -0,0 +1 @@
+assign_type :html

data/set/type/basic.rb

@@ -1,3 +1,3 @@
-def export_type
+def pod_type
   nil
 end

data/set/type/cardtype.rb

@@ -5,7 +5,7 @@ format :html do
 
   def type_formgroup args={}
     if card.cards_of_type_exist?
-      wrap_with :div, t(:format_cards_exist, scope: "core", cardname: safe_name)
+      wrap_with :div, t(:core_cards_exist, scope: "core", cardname: safe_name)
     else
       super
     end
@@ -50,7 +50,7 @@ format :html do
   end
 
   # don't cache because it depends on update permission for another card
-  view :configure_link, cache: :never, perms: ->(fmt) { fmt.can_configure? } do
+  view :configure_link, cache: :never, perms: :can_configure? do
     configure_link
   end
 
@@ -58,9 +58,7 @@ format :html do
     Card.fetch(card, :type, :structure, new: {}).ok? :update
   end
 
-  view :configure_button, cache: :never,
-                          denial: :blank,
-                          perms: ->(fmt) { fmt.can_configure? } do
+  view :configure_button, cache: :never, denial: :blank, perms: :can_configure? do
     configure_link "btn btn-secondary"
   end
 
@@ -73,7 +71,7 @@ format :html do
                  path: { view: :bridge,
                          bridge: { tab: :rules_tab },
                          set: Card::Name[safe_name, :type] },
-                 class: css_classes("configure-type-link ml-3", css_class)
+                 class: css_classes("configure-type-link ms-3", css_class)
   end
 
   private

data/set/type/json.rb

@@ -11,7 +11,7 @@ rescue JSON::ParserError => e
 end
 
 def parse_content
-  JSON.parse content
+  content.blank? ? "" : JSON.parse(content)
 end
 
 def item_names _args={}

data/set/type/number.rb

@@ -5,20 +5,5 @@ format :html do
 end
 
 event :validate_number, :validate, on: :save do
-  unless valid_number?(content)
-    errors.add :content,
-               t(:format_not_numeric, content: content)
-  end
-end
-
-def valid_number? string
-  return true if string.empty?
-
-  valid = true
-  begin
-    Kernel.Float(string)
-  rescue ArgumentError, TypeError
-    valid = false
-  end
-  valid
+  errors.add :content, t(:format_not_numeric, content: content) unless content.number?
 end

data/vendor/jquery_file_upload/LICENSE.txt

@@ -0,0 +1,20 @@
+MIT License
+
+Copyright © 2010 Sebastian Tschan, https://blueimp.net
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/vendor/jquery_file_upload/README.md

@@ -0,0 +1,224 @@
+# jQuery File Upload
+
+## Contents
+
+- [Description](#description)
+- [Demo](#demo)
+- [Features](#features)
+- [Security](#security)
+- [Setup](#setup)
+- [Requirements](#requirements)
+  - [Mandatory requirements](#mandatory-requirements)
+  - [Optional requirements](#optional-requirements)
+  - [Cross-domain requirements](#cross-domain-requirements)
+- [Browsers](#browsers)
+  - [Desktop browsers](#desktop-browsers)
+  - [Mobile browsers](#mobile-browsers)
+  - [Extended browser support information](#extended-browser-support-information)
+- [Testing](#testing)
+- [Support](#support)
+- [License](#license)
+
+## Description
+
+> File Upload widget with multiple file selection, drag&drop support, progress
+> bars, validation and preview images, audio and video for jQuery.  
+> Supports cross-domain, chunked and resumable file uploads and client-side
+> image resizing.  
+> Works with any server-side platform (PHP, Python, Ruby on Rails, Java,
+> Node.js, Go etc.) that supports standard HTML form file uploads.
+
+## Demo
+
+[Demo File Upload](https://blueimp.github.io/jQuery-File-Upload/)
+
+## Features
+
+- **Multiple file upload:**  
+  Allows to select multiple files at once and upload them simultaneously.
+- **Drag & Drop support:**  
+  Allows to upload files by dragging them from your desktop or file manager and
+  dropping them on your browser window.
+- **Upload progress bar:**  
+  Shows a progress bar indicating the upload progress for individual files and
+  for all uploads combined.
+- **Cancelable uploads:**  
+  Individual file uploads can be canceled to stop the upload progress.
+- **Resumable uploads:**  
+  Aborted uploads can be resumed with browsers supporting the Blob API.
+- **Chunked uploads:**  
+  Large files can be uploaded in smaller chunks with browsers supporting the
+  Blob API.
+- **Client-side image resizing:**  
+  Images can be automatically resized on client-side with browsers supporting
+  the required JS APIs.
+- **Preview images, audio and video:**  
+  A preview of image, audio and video files can be displayed before uploading
+  with browsers supporting the required APIs.
+- **No browser plugins (e.g. Adobe Flash) required:**  
+  The implementation is based on open standards like HTML5 and JavaScript and
+  requires no additional browser plugins.
+- **Graceful fallback for legacy browsers:**  
+  Uploads files via XMLHttpRequests if supported and uses iframes as fallback
+  for legacy browsers.
+- **HTML file upload form fallback:**  
+  Allows progressive enhancement by using a standard HTML file upload form as
+  widget element.
+- **Cross-site file uploads:**  
+  Supports uploading files to a different domain with cross-site XMLHttpRequests
+  or iframe redirects.
+- **Multiple plugin instances:**  
+  Allows to use multiple plugin instances on the same webpage.
+- **Customizable and extensible:**  
+  Provides an API to set individual options and define callback methods for
+  various upload events.
+- **Multipart and file contents stream uploads:**  
+  Files can be uploaded as standard "multipart/form-data" or file contents
+  stream (HTTP PUT file upload).
+- **Compatible with any server-side application platform:**  
+  Works with any server-side platform (PHP, Python, Ruby on Rails, Java,
+  Node.js, Go etc.) that supports standard HTML form file uploads.
+
+## Security
+
+⚠️ Please read the [VULNERABILITIES](VULNERABILITIES.md) document for a list of
+fixed vulnerabilities
+
+Please also read the [SECURITY](SECURITY.md) document for instructions on how to
+securely configure your Web server for file uploads.
+
+## Setup
+
+jQuery File Upload can be installed via [NPM](https://www.npmjs.com/):
+
+```sh
+npm install blueimp-file-upload
+```
+
+This allows you to include [jquery.fileupload.js](js/jquery.fileupload.js) and
+its extensions via `node_modules`, e.g:
+
+```html
+<script src="node_modules/blueimp-file-upload/js/jquery.fileupload.js"></script>
+```
+
+The widget can then be initialized on a file upload form the following way:
+
+```js
+$('#fileupload').fileupload();
+```
+
+For further information, please refer to the following guides:
+
+- [Main documentation page](https://github.com/blueimp/jQuery-File-Upload/wiki)
+- [List of all available Options](https://github.com/blueimp/jQuery-File-Upload/wiki/Options)
+- [The plugin API](https://github.com/blueimp/jQuery-File-Upload/wiki/API)
+- [How to setup the plugin on your website](https://github.com/blueimp/jQuery-File-Upload/wiki/Setup)
+- [How to use only the basic plugin.](https://github.com/blueimp/jQuery-File-Upload/wiki/Basic-plugin)
+
+## Requirements
+
+### Mandatory requirements
+
+- [jQuery](https://jquery.com/) v1.7+
+- [jQuery UI widget factory](https://api.jqueryui.com/jQuery.widget/) v1.9+
+  (included): Required for the basic File Upload plugin, but very lightweight
+  without any other dependencies from the jQuery UI suite.
+- [jQuery Iframe Transport plugin](https://github.com/blueimp/jQuery-File-Upload/blob/master/js/jquery.iframe-transport.js)
+  (included): Required for
+  [browsers without XHR file upload support](https://github.com/blueimp/jQuery-File-Upload/wiki/Browser-support).
+
+### Optional requirements
+
+- [JavaScript Templates engine](https://github.com/blueimp/JavaScript-Templates)
+  v3+: Used to render the selected and uploaded files.
+- [JavaScript Load Image library](https://github.com/blueimp/JavaScript-Load-Image)
+  v2+: Required for the image previews and resizing functionality.
+- [JavaScript Canvas to Blob polyfill](https://github.com/blueimp/JavaScript-Canvas-to-Blob)
+  v3+:Required for the resizing functionality.
+- [blueimp Gallery](https://github.com/blueimp/Gallery) v2+: Used to display the
+  uploaded images in a lightbox.
+- [Bootstrap](https://getbootstrap.com/) v3+: Used for the demo design.
+- [Glyphicons](https://glyphicons.com/) Icon set used by Bootstrap.
+
+### Cross-domain requirements
+
+[Cross-domain File Uploads](https://github.com/blueimp/jQuery-File-Upload/wiki/Cross-domain-uploads)
+using the
+[Iframe Transport plugin](https://github.com/blueimp/jQuery-File-Upload/blob/master/js/jquery.iframe-transport.js)
+require a redirect back to the origin server to retrieve the upload results. The
+[example implementation](https://github.com/blueimp/jQuery-File-Upload/blob/master/js/main.js)
+makes use of
+[result.html](https://github.com/blueimp/jQuery-File-Upload/blob/master/cors/result.html)
+as a static redirect page for the origin server.
+
+The repository also includes the
+[jQuery XDomainRequest Transport plugin](https://github.com/blueimp/jQuery-File-Upload/blob/master/js/cors/jquery.xdr-transport.js),
+which enables limited cross-domain AJAX requests in Microsoft Internet Explorer
+8 and 9 (IE 10 supports cross-domain XHR requests).  
+The XDomainRequest object allows GET and POST requests only and doesn't support
+file uploads. It is used on the
+[Demo](https://blueimp.github.io/jQuery-File-Upload/) to delete uploaded files
+from the cross-domain demo file upload service.
+
+## Browsers
+
+### Desktop browsers
+
+The File Upload plugin is regularly tested with the latest browser versions and
+supports the following minimal versions:
+
+- Google Chrome
+- Apple Safari 4.0+
+- Mozilla Firefox 3.0+
+- Opera 11.0+
+- Microsoft Internet Explorer 6.0+
+
+### Mobile browsers
+
+The File Upload plugin has been tested with and supports the following mobile
+browsers:
+
+- Apple Safari on iOS 6.0+
+- Google Chrome on iOS 6.0+
+- Google Chrome on Android 4.0+
+- Default Browser on Android 2.3+
+- Opera Mobile 12.0+
+
+### Extended browser support information
+
+For a detailed overview of the features supported by each browser version and
+known operating system / browser bugs, please have a look at the
+[Extended browser support information](https://github.com/blueimp/jQuery-File-Upload/wiki/Browser-support).
+
+## Testing
+
+The project comes with three sets of tests:
+
+1. Code linting using [ESLint](https://eslint.org/).
+2. Unit tests using [Mocha](https://mochajs.org/).
+3. End-to-end tests using [blueimp/wdio](https://github.com/blueimp/wdio).
+
+To run the tests, follow these steps:
+
+1. Start [Docker](https://docs.docker.com/).
+2. Install development dependencies:
+   ```sh
+   npm install
+   ```
+3. Run the tests:
+   ```sh
+   npm test
+   ```
+
+## Support
+
+This project is actively maintained, but there is no official support channel.  
+If you have a question that another developer might help you with, please post
+to
+[Stack Overflow](https://stackoverflow.com/questions/tagged/blueimp+jquery+file-upload)
+and tag your question with `blueimp jquery file upload`.
+
+## License
+
+Released under the [MIT license](https://opensource.org/licenses/MIT).