cyberweb 0.7.9 → 0.8.17

data/lib/cyberweb/web_images/map_symbol_to_image_location.rb

@@ -116,7 +116,9 @@ module WebImages
          :ausrufung,
          :ausruf,
          :anmerkung,
-         :rufzeichen
+         :achtung,
+         :rufzeichen,
+         :information
       _ = "#{IMG_DIR}AUSRUFUNGSZEICHEN.png"
     # ======================================================================= #
     # === :ausrufungszeichen2
@@ -398,7 +400,9 @@ module WebImages
     # ======================================================================= #
     # === :dot6
     # ======================================================================= #
-    when :dot6, :dot_06, :dot106
+    when :dot6,
+         :dot_06,
+         :dot106
       _ = "#{IMG_DIR}DOT_06.png"
     # ======================================================================= #
     # === :dot7
@@ -410,27 +414,37 @@ module WebImages
     # ======================================================================= #
     # === :dot8
     # ======================================================================= #
-    when :dot8, :dot_08, :dot108
+    when :dot8,
+         :dot_08,
+         :dot108
       _ = "#{IMG_DIR}DOT_08.png"
     # ======================================================================= #
     # === :dot9
     # ======================================================================= #
-    when :dot9, :dot_09, :dot109
+    when :dot9,
+         :dot_09,
+         :dot109
       _ = "#{IMG_DIR}DOT_09.png"
     # ======================================================================= #
     # === :dot10
     # ======================================================================= #
-    when :dot10, :dot_10, :dot110
+    when :dot10,
+         :dot_10,
+         :dot110
       _ = "#{IMG_DIR}DOT_10.png"
     # ======================================================================= #
     # === :dot11
     # ======================================================================= #
-    when :dot11, :dot_11, :dot111
+    when :dot11,
+         :dot_11,
+         :dot111
       _ = "#{IMG_DIR}DOT_11.png"
     # ======================================================================= #
     # === :dot12
     # ======================================================================= #
-    when :dot12, :dot_12, :dot112
+    when :dot12,
+         :dot_12,
+         :dot112
       _ = "#{IMG_DIR}DOT_12.png"
     # when :dot13, :dot_13
     #   _ = "#{IMG_DIR}DOT13.png"
@@ -969,7 +983,8 @@ module WebImages
     # ======================================================================= #
     # === :notepad
     # ======================================================================= #
-    when :notepad, :notizblock
+    when :notepad,
+         :notizblock
       _ = "#{IMG_DIR}NOTEPAD.png"
     # ======================================================================= #
     # === :notiz
@@ -982,6 +997,11 @@ module WebImages
     when :obsolete
       _ = "#{IMG_DIR}OBSOLETE.png"
     # ======================================================================= #
+    # === :outdated
+    # ======================================================================= #
+    when :outdated
+      _ = "#{IMG_DIR}outdated.png"
+    # ======================================================================= #
     # === :pdf
     # ======================================================================= #
     when :pdf

data/lib/cyberweb/web_object/effects.rb

@@ -0,0 +1,19 @@
+#!/usr/bin/ruby -w
+# Encoding: UTF-8
+# frozen_string_literal: true
+# =========================================================================== #
+# This .rb file will include fancy effects, in particular CSS effects,
+# such as an animated glow around an element.
+# =========================================================================== #
+# require 'cyberweb/web_object/effects.rb'
+# =========================================================================== #
+require 'cyberweb/base/base.rb'
+
+module Cyberweb
+
+class WebObject < ::Cyberweb::Base # === Cyberweb::WebObject
+
+  def xyz
+  end
+
+end; end

data/lib/cyberweb/web_object/html_tags.rb

@@ -14,168 +14,6 @@ module Cyberweb
 
 class WebObject < ::Cyberweb::Base # === Cyberweb::WebObject
 
-  # ========================================================================= #
-  # === div                                                         (div tag)
-  #
-  # Input to this method can be in this format:
-  #
-  #   div(id: 'drag_div_sitemap_table', css_style: 'z-index: 1') {
-  #
-  # So the first argument can be a Hash.
-  # ========================================================================= #
-  def div(
-      optional_css_class  = '',
-      optional_the_id     = '',
-      optional_css_style  = '',
-      optional_javascript = '',
-      &block
-    )
-    # ======================================================================= #
-    # === Handle Hashes first
-    # ======================================================================= #
-    if optional_css_class.is_a? Hash
-      # ===================================================================== #
-      # === :css_style
-      # ===================================================================== #
-      if optional_css_class.has_key? :css_style
-        optional_css_style = optional_css_class.delete(:css_style)
-      end
-      # ===================================================================== #
-      # === :id
-      # ===================================================================== #
-      if optional_css_class.has_key? :id
-        optional_the_id = optional_css_class.delete(:id)
-      end
-      # ===================================================================== #
-      # === :css_class
-      # ===================================================================== #
-      if optional_css_class.has_key? :css_class
-        optional_css_class = optional_css_class.delete(:css_class)
-      # ===================================================================== #
-      # === :class
-      # ===================================================================== #
-      elsif optional_css_class.has_key? :class
-        optional_css_class = optional_css_class.delete(:class)
-      end
-      if optional_css_class.is_a? Hash
-        optional_css_class = ''
-      end
-    end
-    # ======================================================================= #
-    # We need to delegate to a toplevel method, in order to create
-    # the correct <div> tag.
-    # ======================================================================= #
-    add_this_div(
-      optional_css_class,
-      optional_the_id,
-      optional_css_style,
-      optional_javascript
-    )
-    # ======================================================================= #
-    # === Handle blocks given to <div> next
-    # ======================================================================= #
-    if block_given?
-      yield
-      cdiv
-    end
-  end
-
-  # ========================================================================= #
-  # === pre                                                         (pre tag)
-  #
-  # This method will ultimately generate a <pre> tag.
-  #
-  # The alias called "numbered_table" may be subject to change. One day
-  # it may be a new method that can then be used to number a list of
-  # entries passed as String or Array. For now, though, as of October
-  # 2022 it is just an alias.
-  # ========================================================================= #
-  def pre(
-      i                  = '',
-      optional_css_class = 'FS1_5em',
-      optional_the_id    = '',
-      optional_css_style = '',
-      optional_commands  = nil,
-      &block
-    )
-    if optional_commands
-      case optional_commands
-      # ===================================================================== #
-      # === :remove_html
-      # ===================================================================== #
-      when :remove_html
-        i = Cyberweb.remove_html(i)
-      end
-    end
-    # ======================================================================= #
-    # === Handle blocks next
-    # ======================================================================= #
-    if block_given?
-      yielded = yield.to_s
-      if yielded and !yielded.empty?
-        i = i.to_s.dup
-        i << yielded
-      end
-    end
-    addn(
-      '<pre'+
-      css_class_or_no_class(optional_css_class)+
-      id_or_no_id(optional_the_id)+
-      css_style_or_no_style(optional_css_style)+
-      '>'+
-      i.to_s+
-      '</pre>'
-    )
-  end; alias numbered_table pre # === numbered_table
-
-  # ========================================================================= #
-  # === button                                                   (button tag)
-  #
-  # This method will "generate" a HTML button. Since as of October 2022
-  # this uses its own HTML element; before that input(:button) was in
-  # use.
-  #
-  # The following example shows how this method could be used:
-  #
-  #   button {{
-  #     text: 'Hey there!'
-  #   }}
-  #
-  # A slightly more advanced example is the following variant:
-  #
-  #   button {{
-  #     text: 'Hey there - with more css and a Hello World alert-box in javascript when clicked by the user!',
-  #     css_class: 'bblack1 darkgreen pad8px BOLD',
-  #     javascript_function: 'msg("Hello world!!!")'
-  #   }}
-  #
-  # Here is another variant, by specifically responding to a click-event, to call a specific function:
-  #
-  #   button {{
-  #     text:           'Click here'
-  #     css_class:      'bblack1 pad8px'
-  #     on_click_event: :on_click_event_hello_world
-  #   }}
-  #
-  # And another variant, without a block:
-  #
-  #   button text: 'OK!',
-  #          css_class: 'glow_on_hover'
-  #
-  # ========================================================================= #
-  def button(
-      optional_text      = '',
-      optional_css_class = '',
-      &block
-    )
-    _ = ::HtmlTags.button(
-      optional_text,
-      optional_css_class,
-      &block
-    )
-    addnl(_)
-  end
-
   require 'cyberweb/html_tags/input.rb'
   # ========================================================================= #
   # === input                                                     (input tag)
@@ -514,7 +352,201 @@ class WebObject < ::Cyberweb::Base # === Cyberweb::WebObject
       _ << ' size="'+hash[:size].to_s+'"' if hash[:size]
       _ << ' maxlength="'+hash[:max_length].to_s+'"' if hash[:max_length]
     end
-    _ << ' />'+NL
+    _ << " />#{NL}"
+    addnl(_)
+  end
+
+  # ========================================================================= #
+  # === input_submit
+  #
+  # This is essentially a submit-button, in HTML.
+  #
+  # The first argument is the text that should be used for that button.
+  # ========================================================================= #
+  def input_submit(
+      default_value = '',
+      css_class     = Input.to_s,
+      name_to_use   = '',
+      css_style     = '',
+      accesskey     = '',
+      my_javascript = '',
+      id            = nil,
+      hash          = {},
+      &block
+    )
+    input(
+      :submit,
+      default_value,
+      css_class,
+      name_to_use,
+      css_style,
+      accesskey,
+      my_javascript,
+      id,
+      hash,
+      &block
+    )
+  end
+
+  # ========================================================================= #
+  # === div                                                         (div tag)
+  #
+  # Input to this method can be in this format:
+  #
+  #   div(id: 'drag_div_sitemap_table', css_style: 'z-index: 1') {
+  #
+  # So the first argument can be a Hash.
+  # ========================================================================= #
+  def div(
+      optional_css_class  = '',
+      optional_the_id     = '',
+      optional_css_style  = '',
+      optional_javascript = '',
+      &block
+    )
+    # ======================================================================= #
+    # === Handle Hashes first
+    # ======================================================================= #
+    if optional_css_class.is_a? Hash
+      # ===================================================================== #
+      # === :css_style
+      # ===================================================================== #
+      if optional_css_class.has_key? :css_style
+        optional_css_style = optional_css_class.delete(:css_style)
+      end
+      # ===================================================================== #
+      # === :id
+      # ===================================================================== #
+      if optional_css_class.has_key? :id
+        optional_the_id = optional_css_class.delete(:id)
+      end
+      # ===================================================================== #
+      # === :css_class
+      # ===================================================================== #
+      if optional_css_class.has_key? :css_class
+        optional_css_class = optional_css_class.delete(:css_class)
+      # ===================================================================== #
+      # === :class
+      # ===================================================================== #
+      elsif optional_css_class.has_key? :class
+        optional_css_class = optional_css_class.delete(:class)
+      end
+      if optional_css_class.is_a? Hash
+        optional_css_class = ''
+      end
+    end
+    # ======================================================================= #
+    # We need to delegate to a toplevel method, in order to create
+    # the correct <div> tag.
+    # ======================================================================= #
+    add_this_div(
+      optional_css_class,
+      optional_the_id,
+      optional_css_style,
+      optional_javascript
+    )
+    # ======================================================================= #
+    # === Handle blocks given to <div> next
+    # ======================================================================= #
+    if block_given?
+      yield
+      cdiv
+    end
+  end
+
+  # ========================================================================= #
+  # === pre                                                         (pre tag)
+  #
+  # This method will ultimately generate a <pre> tag.
+  #
+  # The alias called "numbered_table" may be subject to change. One day
+  # it may be a new method that can then be used to number a list of
+  # entries passed as String or Array. For now, though, as of October
+  # 2022 it is just an alias.
+  # ========================================================================= #
+  def pre(
+      i                  = '',
+      optional_css_class = 'FS1_5em',
+      optional_the_id    = '',
+      optional_css_style = '',
+      optional_commands  = nil,
+      &block
+    )
+    if optional_commands
+      case optional_commands
+      # ===================================================================== #
+      # === :remove_html
+      # ===================================================================== #
+      when :remove_html
+        i = Cyberweb.remove_html(i)
+      end
+    end
+    # ======================================================================= #
+    # === Handle blocks next
+    # ======================================================================= #
+    if block_given?
+      yielded = yield.to_s
+      if yielded and !yielded.empty?
+        i = i.to_s.dup
+        i << yielded
+      end
+    end
+    addn(
+      '<pre'+
+      css_class_or_no_class(optional_css_class)+
+      id_or_no_id(optional_the_id)+
+      css_style_or_no_style(optional_css_style)+
+      '>'+
+      i.to_s+
+      '</pre>'
+    )
+  end; alias numbered_table pre # === numbered_table
+
+  # ========================================================================= #
+  # === button                                                   (button tag)
+  #
+  # This method will "generate" a HTML button. Since as of October 2022
+  # this uses its own HTML element; before that input(:button) was in
+  # use.
+  #
+  # The following example shows how this method could be used:
+  #
+  #   button {{
+  #     text: 'Hey there!'
+  #   }}
+  #
+  # A slightly more advanced example is the following variant:
+  #
+  #   button {{
+  #     text: 'Hey there - with more css and a Hello World alert-box in javascript when clicked by the user!',
+  #     css_class: 'bblack1 darkgreen pad8px BOLD',
+  #     javascript_function: 'msg("Hello world!!!")'
+  #   }}
+  #
+  # Here is another variant, by specifically responding to a click-event, to call a specific function:
+  #
+  #   button {{
+  #     text:           'Click here'
+  #     css_class:      'bblack1 pad8px'
+  #     on_click_event: :on_click_event_hello_world
+  #   }}
+  #
+  # And another variant, without a block:
+  #
+  #   button text: 'OK!',
+  #          css_class: 'glow_on_hover'
+  #
+  # ========================================================================= #
+  def button(
+      optional_text      = '',
+      optional_css_class = '',
+      &block
+    )
+    _ = ::HtmlTags.button(
+      optional_text,
+      optional_css_class,
+      &block
+    )
     addnl(_)
   end
 
@@ -910,38 +942,6 @@ class WebObject < ::Cyberweb::Base # === Cyberweb::WebObject
     ee '<input type="text" id="'+work_on_this_id+'" name="'+work_on_this_id+'">'
   end
 
-  # ========================================================================= #
-  # === input_submit
-  #
-  # This is essentially a submit-button, in HTML.
-  #
-  # The first argument is the text that should be used for that button.
-  # ========================================================================= #
-  def input_submit(
-      default_value = '',
-      css_class     = Input.to_s,
-      name_to_use   = '',
-      css_style     = '',
-      accesskey     = '',
-      my_javascript = '',
-      id            = nil,
-      hash          = {},
-      &block
-    )
-    input(
-      :submit,
-      default_value,
-      css_class,
-      name_to_use,
-      css_style,
-      accesskey,
-      my_javascript,
-      id,
-      hash,
-      &block
-    )
-  end
-
   # ========================================================================= #
   # === input_radio
   # ========================================================================= #
@@ -1015,7 +1015,10 @@ class WebObject < ::Cyberweb::Base # === Cyberweb::WebObject
   end
 
   # ========================================================================= #
-  # === h1
+  # === h1                                                           (h1 tag)
+  #
+  # The first argument to this method is the content that will be shown
+  # via the generated <h1></h1> tag.
   # ========================================================================= #
   def h1(
       i                   = '',

data/lib/cyberweb/web_object/images.rb

@@ -14,11 +14,13 @@ class WebObject < ::Cyberweb::Base # === Cyberweb::WebObject
   # === simpler_string_image                                         (sg tag)
   #
   # This method has been added in September 2020 to specifically work
-  # around the problem that the older sg() has.
+  # around the problem that the older sg() method had.
   #
-  # The return-value of this method MUST always be a String; it may never
-  # use addnl() directly. The whole idea is to build up a <img> tag
-  # through it; sg is short for string_image().
+  # The return-value of this method MUST always be a String; it may
+  # never call addnl() directly. The whole idea is to build up a <img>
+  # tag through it.
+  #
+  # Note that sg stands short for string_image().
   # ========================================================================= #
   def simpler_string_image(
       i                  = :random, # This is the path - or a Symbol denoting that a path should be used.
@@ -152,9 +154,17 @@ class WebObject < ::Cyberweb::Base # === Cyberweb::WebObject
       # ===================================================================== #
       case yielded
       # ===================================================================== #
+      # === :drag
+      # ===================================================================== #
+      when :drag
+        optional_the_id = 'drag_'+File.basename(i).downcase.
+                           delete_suffix(
+                             File.extname(i)
+                           ).tr('.','_')
+      # ===================================================================== #
       # === :lazy_loading
       #
-      # This will allow for lazy loading of an image.
+      # This entry point allows for the lazy loading of an image.
       #
       # The use case for this may look like so:
       #
@@ -172,13 +182,6 @@ class WebObject < ::Cyberweb::Base # === Cyberweb::WebObject
         i.prepend(relative_path?.dup)
         may_we_prepend_the_path = false
       # ===================================================================== #
-      # === :draggable
-      # ===================================================================== #
-      when :drag
-        optional_the_id = 'drag_'+File.basename(i).downcase.delete_suffix(
-          File.extname(i)
-        ).tr('.','_')
-      # ===================================================================== #
       # === :draggable_attribute
       # ===================================================================== #
       when :draggable_attribute
@@ -196,8 +199,8 @@ class WebObject < ::Cyberweb::Base # === Cyberweb::WebObject
     # had, NOT the case if i begins with the substring 'http'.
     # ======================================================================= #
     if may_we_prepend_the_path and !i.start_with?('http')
-      i = return_path_to_the_images_directory+
-          i
+      i = "#{return_path_to_the_images_directory}"\
+          "#{i}"
     end
     # ======================================================================= #
     # Last but not least, we need to ensure that the ID is unique. If
@@ -221,20 +224,40 @@ class WebObject < ::Cyberweb::Base # === Cyberweb::WebObject
        alias sg         simpler_string_image # === sg
 
   # ========================================================================= #
-  # === images_css
+  # === sdimg
   #
-  # This method allows the user to set the same CSS rules for all
-  # images used on a given WebObject.
+  # This will return the string representation for a draggable
+  # image (as a string).
   # ========================================================================= #
-  def images_css(i)
-    @internal_hash[:global_CSS_rules_for_all_images] = i
-  end
-
-  # ========================================================================= #
-  # === images_css_rules?
-  # ========================================================================= #
-  def images_css_rules?
-    @internal_hash[:global_CSS_rules_for_all_images]
+  def sdimg(
+      url       = '',
+      css_class = :empty_string_or_global_css_rules_for_images, 
+      the_id    = '',
+      css_style = '',
+      alt_text  = '',
+      &block
+    )
+    if the_id and the_id.empty?
+      the_id = (
+                'drag_'+
+                 File.basename(url.to_s).
+                 downcase.
+                 delete_suffix(
+                   File.extname(url.to_s)
+                 )
+               ).tr('.','_')
+    end
+    if the_id and !the_id.empty? and !the_id.start_with?('drag_')
+      the_id = the_id.dup
+      the_id.prepend('drag_')
+    end
+    return simg(
+      url,
+      css_class,
+      the_id,
+      css_style,
+      alt_text
+    )
   end
 
   # ========================================================================= #
@@ -363,6 +386,40 @@ class WebObject < ::Cyberweb::Base # === Cyberweb::WebObject
        alias dimg          draggable_image # === dimg
        alias dimage        draggable_image # === dimage
 
+  # ========================================================================= #
+  # === dimgbr
+  #
+  # This method combines dimg() and br().
+  # ========================================================================= #
+  def dimgbr(
+      url       = '',
+      css_class = '', 
+      the_id    = '',
+      css_style = '',
+      alt_text  = '',
+      &block
+    )
+    dimg(url, css_class, the_id, css_style, alt_text, &block)
+    br
+  end
+
+  # ========================================================================= #
+  # === images_css
+  #
+  # This method allows the user to set the same CSS rules for all
+  # images used on a given WebObject.
+  # ========================================================================= #
+  def images_css(i)
+    @internal_hash[:global_CSS_rules_for_all_images] = i
+  end
+
+  # ========================================================================= #
+  # === images_css_rules?
+  # ========================================================================= #
+  def images_css_rules?
+    @internal_hash[:global_CSS_rules_for_all_images]
+  end
+
   # ========================================================================= #
   # === img_nbr
   #