breeze_cms 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f646a90e3dbdb8190f71e362c939f2f03b994a762e0299b7114d34145895b6ee
-  data.tar.gz: 983233a8a60d560dafd3cc04ada3dfda851d52d4cd1b55a58e3e2941185cc9be
+  metadata.gz: 67734e6d1c8022a40abd64558f959d817527f34c67580899c85c40aa113c22ba
+  data.tar.gz: e4eaea667b42541e13e80dba9042579eec0def4ff796ba7cd27e60903b65d570
 SHA512:
-  metadata.gz: 769fe59c952a682a0706611024b440160ab0381cc5e172991f89fd38c049ae139485ef35d0f4885f42f002fbaec05519cce8fff5db253b6f1449c040f6329e1d
-  data.tar.gz: 3f1e414a8c90510ad4cf8447414a03d6f7eff1d261224ae73387ba24626e7b868ebaa9a870885b5a295ebca77165f8d4b99fa2e766de5c5077d2a9d56e330193
+  metadata.gz: 1049c6a06a1813e2473144b8ef1c400ab7f23ecb5a0e9f15b0ab0f2e9fc9ce6152ce4288f0e73b6c57214e236739aba4f905da900157026b86d8da35622ef660
+  data.tar.gz: d892c28e6a490cc8e0e21352bd41510a57a04b411a9a1d12a1dc459a3eca408878582c8b64351c76eb9953aaeac9c481163328e80fdb0e475f1f70d902e3757a

data/README.md

@@ -1,24 +1,19 @@
-# Breeze
+# Breeze CMS
 
-A CMS that integrates into the rails workflow. Ie it is file based
-not db based.
+Breeze, the tailwind based, developers CMS
 
-Changes propagate in the normal development cycle, with git, possible
-branches, possible staging, possible reviews and controlled deploys.
+Breeze renders pages, that are made up of sections, that may include cards.
+Breeze also manages images, even lets you edit them, and manages translations when you go international. 
+
+All data is stored in yaml files, images as assets. Breeze makes commits for changes which developers upstream in a very rails sort of way.
 
 ## Usage
 
 Breeze is designed for developers to give limited editing facilities
 to users. As with rails, there is great flexibility how this can be
-achieved, see wiki for more details.
-
-## Installation
-
-And more info see the wiki
-
-## Contributing
+achieved, see homepage for more details.
 
-Ask first.
+[breeze.codeberg.page](https://breeze.codeberg.page/)
 
 ## License
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/app/assets/stylesheets/breeze/breeze.css

@@ -1360,6 +1360,10 @@ select {
   border-width: 0;
 }
 
+.visible {
+  visibility: visible;
+}
+
 .fixed {
   position: fixed;
 }
@@ -1712,6 +1716,10 @@ select {
   height: 0.75rem;
 }
 
+.h-32 {
+  height: 8rem;
+}
+
 .h-4 {
   height: 1rem;
 }
@@ -1720,6 +1728,10 @@ select {
   height: 10rem;
 }
 
+.h-48 {
+  height: 12rem;
+}
+
 .h-56 {
   height: 14rem;
 }
@@ -1732,6 +1744,10 @@ select {
   height: 15rem;
 }
 
+.h-64 {
+  height: 16rem;
+}
+
 .h-72 {
   height: 18rem;
 }
@@ -2399,6 +2415,10 @@ select {
      object-fit: cover;
 }
 
+.p-1 {
+  padding: 0.25rem;
+}
+
 .p-2 {
   padding: 0.5rem;
 }
@@ -2510,10 +2530,6 @@ select {
   padding-bottom: 1rem;
 }
 
-.pb-6 {
-  padding-bottom: 1.5rem;
-}
-
 .pr-12 {
   padding-right: 3rem;
 }
@@ -2744,6 +2760,11 @@ select {
   box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
 }
 
+.invert {
+  --tw-invert: invert(100%);
+  filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow);
+}
+
 .filter {
   filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow);
 }
@@ -3379,11 +3400,6 @@ select {
     text-align: center;
   }
 
-  .sm\:text-2xl {
-    font-size: 1.5rem;
-    line-height: 2rem;
-  }
-
   .sm\:text-4xl {
     font-size: 2.25rem;
     line-height: 2.5rem;
@@ -3468,11 +3484,6 @@ select {
     padding-bottom: 2.5rem;
   }
 
-  .md\:text-2xl {
-    font-size: 1.5rem;
-    line-height: 2rem;
-  }
-
   .md\:text-4xl {
     font-size: 2.25rem;
     line-height: 2.5rem;
@@ -3515,10 +3526,6 @@ select {
     margin-top: 0px;
   }
 
-  .lg\:mt-8 {
-    margin-top: 2rem;
-  }
-
   .lg\:h-96 {
     height: 24rem;
   }

data/app/assets/stylesheets/breeze/breeze.email.css

@@ -350,10 +350,6 @@
   height: 5rem;
 }
 
-.h-24 {
-  height: 6rem;
-}
-
 .h-40 {
   height: 10rem;
 }
@@ -758,10 +754,6 @@
   padding-bottom: 1rem;
 }
 
-.pb-6 {
-  padding-bottom: 1.5rem;
-}
-
 .pr-16 {
   padding-right: 4rem;
 }
@@ -1104,11 +1096,6 @@
     text-align: center;
   }
 
-  .sm\:text-2xl {
-    font-size: 1.5rem;
-    line-height: 2rem;
-  }
-
   .sm\:text-4xl {
     font-size: 2.25rem;
     line-height: 2.5rem;
@@ -1188,11 +1175,6 @@
     padding-bottom: 2.5rem;
   }
 
-  .md\:text-2xl {
-    font-size: 1.5rem;
-    line-height: 2rem;
-  }
-
   .md\:text-4xl {
     font-size: 2.25rem;
     line-height: 2.5rem;
@@ -1235,10 +1217,6 @@
     margin-top: 0px;
   }
 
-  .lg\:mt-8 {
-    margin-top: 2rem;
-  }
-
   .lg\:h-96 {
     height: 24rem;
   }

data/app/controllers/breeze/translations_controller.rb

@@ -30,8 +30,11 @@ module Breeze
     # PATCH/PUT /translations/1
     def update
       respond_to do |format|
-         @translation.update(params[:translation] , "user")
-         format.html { redirect_to(@translation, :notice => 'User was successfully updated.') }
+         @translation.update(translation_params , current_member_email )
+         format.html {
+           redirect_to(translation_path(@translation.object.page.id),
+                        :notice => 'Translation was successfully updated.')
+         }
          format.json { render status: 200, json: {} }
        end
     end
@@ -45,7 +48,7 @@ module Breeze
     private
       # Use callbacks to share common setup or constraints between actions.
       def set_translation
-        @translation = Translation.find(params[:id])
+        @translation = Translation.find(params[:id] || params[:translation_id])
       end
 
       # Only allow a list of trusted parameters through.

data/app/controllers/breeze/view_controller.rb

@@ -2,6 +2,8 @@ module Breeze
   class ViewController < ::ApplicationController
 
     def page
+      locale = params[:lang] || I18n.default_locale
+      I18n.locale = locale
       @page = Page.find_by_name(params[:id])
       redirect_to "/" , alert: "No page #{params[:id]}" unless @page
     end

data/app/helpers/breeze/breeze_helper.rb

@@ -26,7 +26,7 @@ module Breeze
       last = ChangeSet.current.last
       return 10 unless last
       last = (Time.now - last).to_i
-      return 10 if ( last >= 600 )
+      return 9 if ( last >= 600 )
       digit =  last / 60
       digit
     end

data/app/helpers/breeze/options_helper.rb

@@ -115,6 +115,13 @@ module Breeze
       {class: clazz }
     end
 
+    def height_option( section , clazz = "" )
+      if section.has_option?("height")
+        clazz += " " + (section.option("height") || "")
+      end
+      {class: clazz }
+    end
+
 
   end
 end

data/app/helpers/breeze/view_helper.rb

@@ -38,6 +38,12 @@ module Breeze
       "inline-block rounded-lg px-3 py-2 text-base font-medium border border-gray-500 hover:border-black"
     end
 
+    def get_button_text(element)
+      text = element.option("button_text")
+      return text unless text.include?("_")
+      I18n.t( text )
+    end
+
     def view_button(element , extra_classes = "")
       return "" unless element.has_option?("button_link")
       ["<button class='#{button_classes} ",
@@ -46,7 +52,7 @@ module Breeze
         "<a href='" ,
         element.option("button_link") ,
         "'>" ,
-        element.option("button_text") ,
+        get_button_text(element) ,
         "</a>",
       " </button>"].join.html_safe
     end
@@ -57,8 +63,9 @@ module Breeze
       return  nil unless blog
       blog.sections.last
     end
+
     def last_blog
-      PagesHelper.last_blog
+      ViewHelper.last_blog
     end
 
     def header_list

data/app/models/breeze/card.rb

@@ -20,6 +20,10 @@ module Breeze
       sum
     end
 
+    def page
+      section.page
+    end
+
     def move_up
       swap_index_with(previous_card)
     end
@@ -65,7 +69,6 @@ module Breeze
     end
 
     def delete(editor)
-      delete_translations(editor)
       delete_save!(editor)
     end
 
@@ -81,10 +84,5 @@ module Breeze
       card
     end
 
-    def self.reload
-      res = super()
-      self.fix_translations
-    end
-
   end
 end

data/app/models/breeze/section.rb

@@ -93,7 +93,6 @@ module Breeze
 
     def delete(editor)
       cards.each {|card| card.delete(editor) }
-      delete_translations(editor)
       delete_save!(editor)
     end
 
@@ -128,10 +127,5 @@ module Breeze
       nil
     end
 
-    def self.reload
-      res = super()
-      self.fix_translations
-    end
-
   end
 end

data/app/models/breeze/translation.rb

@@ -1,83 +1,99 @@
 module Breeze
-  class Translation < ActiveBase
+  # gives a handle on the translations
+  #
+  # actual translations are stored in the object (section/card)
+  # but dealing with hashes of hashes quickly gets unwieldy, hence this class
+  #
+  # Strings are written lasily into the object, ie no translation, no text
 
-    set_root_path Rails.root.join(Breeze.data_dir)
+  class Translation
 
-    fields :id
-    fields :objectid , :object_type # poly: card or section (id without _, no association)
-    fields :language # the language for which the is a translation
-    fields :text , :header, :sub_header #actual text fields
+#    fields :objectid , :object_type # poly: card or section (id without _, no association)
+#    fields :language # the language for which the is a translation
+#    fields :text , :header, :sub_header #actual text fields
 
-    def initialize(data)
-      super(data)
-      raise "no object type" unless self.object_type
-      raise "no object id" unless lang = self.objectid
-      raise "no language" unless lang = self.language
-      raise "not configured language #{lang}" unless Breeze.has_language(lang)
+    attr :object , :language
+
+    def initialize(object , language)
+      @object = object
+      @language = language
+      raise "no object type" unless object.object_type
+      raise "not configured language #{language}" unless Breeze.has_language(language)
     end
 
-    def object
-      clazz = "Breeze::#{object_type}".constantize
-      clazz.find( objectid )
+    def id
+      "#{object.object_type}-#{language}-#{object.id}"
     end
 
-    def is_old?
-      return true unless self.updated_at
-      object.updated_at > self.updated_at
+    def text
+      t = get_text
+      return t unless t.blank?
+      return object.text
     end
 
-    def change_name
-      "Translation: #{object.change_name}"
+    def header
+      t = get_header
+      return t unless t.blank?
+      return object.header
     end
 
-    def update(hash , user)
-      return unless hash
-      [:text , :header ].each do |key|
-        data[key] = hash[key] if hash.has_key?(key)
-      end
-      add_save(user)
+    def get_text
+      return "" unless data = object.data[language]
+      data[:text] || ""
     end
 
-    class << self
+    def set_text(text)
+      object.data[language] = {} unless object.data[language]
+      object.data[language][:updated_at] = Time.now
+      object.data[language][:text] = text
+    end
 
-      def fill_data(object, data = {})
-        data[:text] = object.text
-        data[:header] = object.header
-        data[:objectid] = object.id
-        data[:object_type] = object.object_type
-        data
-      end
+    def get_header
+      return "" unless data = object.data[language]
+      data[:header] || ""
+    end
 
-      def find_translation(objectid , object_type, language)
-        find_all(:objectid, objectid).each do |o|
-          return o if (objectid == o.objectid    ) &&
-                    (object_type == o.object_type) &&
-                    (language == o.language)
-        end
-        nil
-      end
+    def set_header(header)
+      object.data[language] = {} unless object.data[language]
+      object.data[language][:updated_at] = Time.now
+      object.data[language][:header] = header
+    end
 
-      def ensure_translation(object , language)
-        found = self.find_translation(object.id , object.object_type , language)
-        return nil if found
-        data = fill_data(object)
-        data[:updated_at] = object.updated_at - 1.day
-        data[:language] = language
-        data[:id] = "#{object.object_type}_#{object.id}"
-        data
-      end
+    def is_old?
+      return false if(text.blank? and header.blank?)
+      return true unless self.updated_at
+      object.updated_at > self.updated_at
+    end
 
-      def new_object_translation(object, data)
-        self.fill_data(object,data)
-        self.new_translation(data)
-      end
+    def updated_at
+      return nil unless object.data[language]
+      object.data[language][:updated_at]
+    end
 
-      # append data and create new object.
-      def new_translation( data )
-        new_id = Translation.append(data)
-        Translation.new(data)
-      end
+    def update(hash , editor)
+      return unless hash
+      set_text(hash[:text]) if hash.has_key?(:text)
+      set_header(hash[:header]) if hash.has_key?(:header)
+      object.data[language][:updated_by] = editor
+      object.data[language][:updated_at] = Time.now
 
+      ChangeSet.current.add(self.class.name , "#{language}:#{object.change_name}", editor)
+      object.class.save_all
+    end
+
+    # find according to id, ie class_num
+    def self.find(id)
+      clazz , lang , num = id.split("-")
+      num = num.to_i
+      case clazz
+      when "Section"
+        object = Section.find(num)
+      when "Card"
+        object = Card.find( num )
+      else
+        raise "clazz not recognized #{clazz}"
+      end
+      object.get_translation(lang)
     end
   end
 end

data/app/models/breeze/view_base.rb

@@ -107,27 +107,7 @@ module Breeze
     end
 
     def get_translation(lang)
-      Translation.find_translation(self.id , self.object_type , lang)
-    end
-
-    def delete_translations(editor)
-      Breeze.language_strings.each do |lang|
-        trans = Translation.find_translation(self.id, self.object_type , lang)
-        trans.delete_save!(editor) if trans
-      end
-    end
-
-    def self.fix_translations
-      create = []
-      Breeze.language_strings.each do |lang|
-        self.all.each do |object|
-          data = Translation.ensure_translation(object , lang)
-          (create << data) unless data.nil?
-        end
-      end
-      #puts "#{self.name} create #{create.length} Translations"
-      create.each{ |data| Translation.new_translation(data) }
-      Translation.save_all
+      Translation.new( self , lang)
     end
 
   end

data/app/views/breeze/changes/index.haml

@@ -18,7 +18,7 @@
         %th.whitespace-nowrap.px-4.py-2.text-left.font-medium.text-gray-900
           .flex.items-center.gap-2
             Change
-        -[:Page , :Section , :Card , :Image].each do |element|
+        -[:Page , :Section , :Card , :Image , :Translation].each do |element|
           %th.whitespace-nowrap.px-4.py-2.text-left.font-medium.text-gray-900
             .flex.items-center.gap-2
               =element
@@ -27,7 +27,7 @@
         %tr
           %td.whitespace-nowrap.px-4.py-2.text-gray-700
             = type.to_s.capitalize
-          -[:Page , :Section , :Card , :Image].each do |element|
+          -[:Page , :Section , :Card , :Image, :Translation].each do |element|
             %td.px-4.py-2.text-gray-700
               - changeset(type , element).each do |name|
                 =name.last

data/app/views/breeze/styles/index.haml

@@ -1,10 +1,6 @@
 .mx-6.md:mx-12.mx-20.flex.h-16.items-center.gap-16
-  .text-xl.font-bold
-    Page styles
-  .text-xl.font-bold
-    =link_to "Section styles" , "#section_styles"
-  .text-xl.font-bold
-    =link_to "Card styles" , "#cards_styles"
+  .text-4xl.font-bold
+    This is a list of all available styles
 
 .flex.bg-cyan-100
   .px-4.py-8.mx-auto.text-center

data/app/views/breeze/translations/_row.haml

@@ -1,29 +1,22 @@
 .flex.gap-10.mt-2.pt-4.bg-neutral-50.mx-10.border-b-2{class: language_bg(trans.language)}
-  .basis-10.ml-3
+  .basis-10.ml-3.p-1.rounded{ class: ("bg-orange-200" if trans.is_old?) ,
+            id: "#{trans.id}_idfield" }
     %h3.text-lg.font-bold.text-center
-      = trans.object.index_name
-      = trans.language
+      %button{onclick: "button_ok(event)" , id: "#{trans.id}_idbutton"}
+        = trans.object.index_name
+        = trans.language
   .grow
-    .text{id: "#{trans.id}_header_text" ,
-          onclick: "text_to_form(event)" ,
-          class: ("bg-orange-200" if trans.is_old?) }
+    .text{id: "#{trans.id}_headerfield" , onclick: "text_to_form(event)"}
       = trans.header
-    .hidden.form{id: "#{trans.id}_header_form"}
-      %input.mt-1.w-full.rounded-md.border-gray-200.bg-white.text-sm.text-gray-800.shadow-sm{ id: "#{trans.id}_header", type: "text" , value: trans.header}
-      %button.button.change.mt-4{type: :submit ,
-              id: "#{trans.id}_header_button" ,
-               onclick: "submit_switch(event)"  }
-        Update Texts
   .grow
-    .text{id: "#{trans.id}_text_text" ,
-          onclick: "text_to_form(event)" ,
-          class: ("bg-orange-200" if trans.is_old?) }
+    .text{id: "#{trans.id}_textfield" , onclick: "text_to_form(event)" }
       = trans.text
-    .hidden.form{id: "#{trans.id}_text_form"}
+    .hidden.form{id: "#{trans.id}_form"}
+      %input.mt-1.w-full.rounded-md.border-gray-200.bg-white.text-sm.text-gray-800.shadow-sm{ id: "#{trans.id}_header", type: "text" , value: trans.header}
       %textarea.mt-2.w-full.rounded-lg.border-gray-200.align-top.shadow-sm.sm:text-sm{ cols: 100 ,
               id: "#{trans.id}_text" , rows: rows(trans.text) }
-        =trans.text
+        = trans.text
       %button.button.change.mt-4{type: :submit ,
-              id: "#{trans.id}_text_button" ,
+              id: "#{trans.id}_button" ,
               onclick: "submit_switch(event)"}
         Update Texts

data/app/views/breeze/translations/show.haml

@@ -28,7 +28,7 @@
 
   // change visibility id_text /id_form according to param 2/3
   function toggle_vis(id , text_visability , form_visability){
-    var text_id = id + "_text";
+    var text_id = id + "_textfield";
     var text = document.getElementById(text_id);
     text.style.display = text_visability;
     var form_id = id + "_form";
@@ -38,14 +38,17 @@
   }
 
 
-  function form_submit(trans_id , field ){
-    var input_id = trans_id + "_" + field
-    var input = document.getElementById(input_id);
+  function form_submit(trans_id ){
+    var text_id = trans_id + "_text"
+    var text = document.getElementById(text_id);
+    var header_id = trans_id + "_header"
+    var header = document.getElementById(header_id);
 
     var postObj = {
-        authenticity_token: "#{form_authenticity_token}"
+        authenticity_token: "#{form_authenticity_token}" ,
+        header: header.value ,
+        text: text.value ,
     }
-    postObj[field] = input.value ;
     const url = "/breeze/translations/" + trans_id
     fetch(url, {
         method: 'put', body: JSON.stringify(postObj),
@@ -53,27 +56,44 @@
       }).then((response) => {
           return response.json()
       }).then((res) => {
-          console.log(input_id + " updated")
+          console.log(trans_id + " updated")
       }).catch((error) => {
           console.log(error)
       })
-    var text = toggle_vis( input_id , "block", "none")
-    text.innerHTML = input.value ;
-    text.classList.remove("bg-orange-200");
+    toggle_vis( trans_id , "block", "none")
+    document.getElementById(trans_id + "_headerfield").innerHTML = header.value ;
+    document.getElementById(trans_id + "_textfield").innerHTML = text.value ;
+    document.getElementById(trans_id + "_idfield").classList.remove("bg-orange-200");
   }
 
-
   function submit_switch(event){
     var input_id = event.target.id; // eg 123_header
     console.log("switch " + input_id)
     var parts = input_id.split("_")
-    form_submit( parts[0] , parts[1] );
+    form_submit( parts[0]  );
   }
 
-
   function text_to_form(event) {
     var text_id = event.target.id; // eg 123_header_text
     console.log("text2form " + text_id)
     var parts = text_id.split("_");
-    toggle_vis( parts[0] + "_" + parts[1] , "none" , "block")
+    toggle_vis( parts[0] , "none" , "block")
+  }
+
+  function button_ok(event) {
+    var idbutton = event.target;
+    var parts = idbutton.id.split("_");
+    document.getElementById(parts[0] + "_idfield").classList.remove("bg-orange-200");
+    var postObj = { authenticity_token: "#{form_authenticity_token}"  }
+    const url = "/breeze/translations/" + parts[0]
+    fetch(url, {
+        method: 'put', body: JSON.stringify(postObj),
+        headers: { 'Accept': 'application/json', 'Content-Type': 'application/json'}
+      }).then((response) => {
+          return response.json()
+      }).then((res) => {
+          console.log(parts[0] + " updated")
+      }).catch((error) => {
+          console.log(error)
+      })
   }

data/app/views/breeze/view/_form_section.haml

@@ -17,5 +17,9 @@
         .grid.gap-6.md:grid-cols-2
           .relative.z-0.mt-10
             %input.peer.block.w-full.appearance-none.border-0.border-b.border-gray-500.bg-transparent.px-0.text-sm.text-gray-900.focus:border-blue-600.focus:outline-none.focus:ring-0{:class => "py-2.5", :name => "challenge", :placeholder => " ", :type => "text"}
-            %label.absolute.top-3.-z-10.-translate-y-6.scale-75.transform.text-sm.text-gray-500.duration-300.peer-placeholder-shown:translate-y-0.peer-placeholder-shown:scale-100.peer-focus:left-0.peer-focus:-translate-y-6.peer-focus:scale-75.peer-focus:text-blue-600.peer-focus:dark:text-blue-500{:class => "origin-[0]"}Anti bot question: #{challenge} + #{challenge + 1} is
-          %button.mt-10.rounded-md.bg-cyan-700.px-20.py-2.text-white{:type => "submit"} Send
+            %label.absolute.top-3.-z-10.-translate-y-6.scale-75.transform.text-sm.text-gray-500.duration-300.peer-placeholder-shown:translate-y-0.peer-placeholder-shown:scale-100.peer-focus:left-0.peer-focus:-translate-y-6.peer-focus:scale-75.peer-focus:text-blue-600.peer-focus:dark:text-blue-500{:class => "origin-[0]"}
+              = I18n.t("anti_bot")
+              = challenge
+              +
+              = challenge + 1
+          %button.mt-10.rounded-md.bg-cyan-700.px-20.py-2.text-white{:type => "submit"}= I18n.t("form_send")

data/app/views/breeze/view/_section_cards.haml

@@ -5,9 +5,6 @@
         - unless section.header.blank?
           %h1.section_header.text-2xl.font-bold.tracking-tight.sm:text-4xl
             = section.header_text(current_lang)
-        - if section.has_option?("subheader")
-          %h2.text-xl.pt-10.font-bold.tracking-tight.sm:text-2xl
-            = section.option("subheader")
         - unless section.text.blank?
           .section_text.text-lg.pt-10{ prose_classes }
             = markdown(section , current_lang)

data/app/views/breeze/view/_section_full_up.haml

@@ -3,9 +3,6 @@
     .px-4.py-4.md:py-10.lg:py-16.mx-5.md:mx-12.lg:mx-20{options(section , :text_align , :text_color)}
       %h1.section_header.text-2xl.font-bold.tracking-tight.sm:text-4xl
         = section.header_text(current_lang)
-      -if section.has_option?("subheader")
-        %h4.text-xl.mt-10.md:text-2xl
-          = section.option("subheader")
       .section_text.mt-4.text-lg.pt-10{ prose_classes }
         = markdown(section,current_lang)
       =view_button(section , "my-2")

data/app/views/breeze/view/_section_half_image.haml

@@ -5,9 +5,6 @@
     .mx-auto.max-w-xl{options(section , :text_align , :text_color)}
       %h2.section_header.text-2xl.font-bold.md:text-4xl
         = section.header_text(current_lang)
-      -if section.has_option?("subheader")
-        %h4.text-xl.mt-10.md:text-2xl
-          = section.option("subheader")
       .section_text.mt-8{ prose_classes }
         = markdown(section,current_lang)
       =view_button(section , "my-2")

data/app/views/breeze/view/_section_large_image.haml

@@ -5,9 +5,6 @@
     .flex-1{text_color_option(section)}
       .text-center
         %h2.section_header.text-4xl.font-bold.text-center.mb-4.lg:mb-8= section.header_text(current_lang)
-        -if section.has_option?("subheader")
-          %h4.text-xl.mt-4.lg:mt-8.md:text-2xl
-            = section.option("subheader")
         .section_text.mt-3{ prose_classes }
           = markdown(section,current_lang)
         =view_button(section , "my-2")

data/app/views/breeze/view/_section_slider.haml

@@ -4,9 +4,6 @@
       .px-4.py-4.md:py-10.lg:py-16.mx-5.md:mx-12.lg:mx-20{options(section , :text_align , :text_color)}
         %h1.section_header.text-2xl.font-bold.tracking-tight.sm:text-4xl
           = section.header_text(current_lang)
-        -if section.has_option?("subheader")
-          %h4.text-xl.mt-10.md:text-2xl
-            = section.option("subheader")
         .section_text.mt-4.text-lg.pt-10{ prose_classes }
           = markdown(section,current_lang)
         =view_button(section , "my-2")

data/app/views/breeze/view/_section_small_image.haml

@@ -3,9 +3,6 @@
     = image_for(section ,"object-cover")
   .columns-1.md:columns-2.max-w-full.items-center.w-full.max-w.px-6.mx-auto.mt-6.lg:mt-0{text_color_option(section, "lg:w-2/3")}
     %h2.section_header.text-4xl.font-bold.text-left.mb-4.lg:mb-8{text_align_option(section)}= section.header_text(current_lang)
-    -if section.has_option?("subheader")
-      %h4.text-xl.mt-4.lg:mt-8.md:text-2xl{text_align_option(card)}
-        = section.option("subheader")
     .section_text.mt-3{ prose_classes }
       = markdown(section,current_lang)
     =view_button(section , "my-2")

data/app/views/breeze/view/_section_spacer.haml

@@ -1 +1,2 @@
-.h-24
+%section{ options(section , :background , :margin) , id: section.type_id}
+  %div{options(section, :height)}

data/app/views/breeze/view/_section_text.haml

@@ -4,9 +4,6 @@
       - if !section.header_text(current_lang).blank?
         %h1.section_header.mb-10.text-2xl.font-bold.tracking-tight.sm:text-4xl
           = section.header_text(current_lang)
-      -if section.has_option?("subheader")
-        .section_text.text-xl.pb-6{ prose_classes }
-          = section.option("subheader")
 
   .max-w-full.mt-4.gap-16{ options(section , :text_columns , :prose ) }
     = markdown_image(section,current_lang)

data/app/views/breeze/view/cards/_card_gap_square.haml

@@ -3,8 +3,6 @@
     = image_for( card , "h-full w-full object-cover")
   .grid.h-70{options(card , :text_align , :text_color , :background )}
     %h3.card_header.p-4.mt-10.text-3xl.font-bold= card.header_text(current_lang)
-    -if card.has_option?("subheader")
-      %h4.p-4.text-xl= card.option("subheader")
     .m-6{options(card , :background , :text_color ) }
       .card_text{ prose_classes }
         = markdown(card,current_lang)

data/app/views/breeze/view/cards/_card_normal_round.haml

@@ -1,5 +1,5 @@
 .fex.flex-col.overflow-hidden.rounded-lg.border.border-gray-100.shadow-sm{ id: card.type_id}
-  = image_for( card ,  class: "h-full w-full object-cover")
+  = image_for( card )
   %h3.card_header.p-5.text-2xl.bg-gray-100.text-black.font-bold{ text_align_option(card)}= card.header_text(current_lang)
   %div.h-full{background_option(card)}
     .p-5{options(card , :text_align , :text_color)}

data/app/views/breeze/view/cards/_card_normal_square.haml

@@ -3,7 +3,5 @@
     = image_for( card , "h-full w-full object-cover")
   .m-6{options(card , :text_align , :text_color )}
     %h3.card_header.p-4.text-2xl.font-bold= card.header_text(current_lang)
-    -if card.has_option?("subheader")
-      %h4.p-4.text-xl= card.option("subheader")
     .card_text.mt-2.p-4{prose_classes}= markdown(card,current_lang)
     =view_button(card)

data/app/views/breeze/view/cards/_card_wide_square.haml

@@ -2,7 +2,5 @@
   = image_for( card , "object-cover lg:w-3/5")
   .ml-0.lg:ml-10.mt-6.lg:mt0{options(card , :text_align , :text_color , :order , "lg:w-2/5")}
     %h3.card_header.text-2xl.font-bold= card.header_text(current_lang)
-    -if card.has_option?("subheader")
-      %h4.py-4.text-xl= card.option("subheader")
     .card_text.py-4{prose_classes}= markdown(card,current_lang)
     =view_button(card , "mb-2")

data/app/views/layouts/_plausible.haml

@@ -0,0 +1,38 @@
+:javascript
+  function plausible(domain) {
+      "use strict";
+      var a = window.location,
+          r = window.document,
+          o = r.currentScript,
+          l =  "https://plausible.feenix.community/api/event";
+
+      function s(t, e) {
+          t && console.warn("Ignoring Event: " + t), e && e.callback && e.callback()
+      }
+
+      function t(t, e) {
+          if (/^localhost$|^127(\.[0-9]+){0,2}\.[0-9]+$|^\[::1?\]$/.test(a.hostname) || "file:" === a.protocol) return s("localhost", e);
+          if (window._phantom || window.__nightmare || window.navigator.webdriver || window.Cypress) return s(null, e);
+          try {
+              if ("true" === window.localStorage.plausible_ignore) return s("localStorage flag", e)
+          } catch (t) {}
+          var n = {},
+              i = (n.n = t, n.u = a.href, n.d = domain, n.r = r.referrer || null, e && e.meta && (n.m = JSON.stringify(e.meta)), e && e.props && (n.p = e.props), new XMLHttpRequest);
+          i.open("POST", l, !0), i.setRequestHeader("Content-Type", "text/plain"), i.send(JSON.stringify(n)), i.onreadystatechange = function() {
+              4 === i.readyState && e && e.callback && e.callback()
+          }
+      }
+      var e = window.plausible && window.plausible.q || [];
+      window.plausible = t;
+      for (var n, i = 0; i < e.length; i++) t.apply(this, e[i]);
+
+      function p() {
+          n !== a.pathname && (n = a.pathname, t("pageview"))
+      }
+      var c, w = window.history;
+      w.pushState && (c = w.pushState, w.pushState = function() {
+          c.apply(this, arguments), p()
+      }, window.addEventListener("popstate", p)), "prerender" === r.visibilityState ? r.addEventListener("visibilitychange", function() {
+          n || "visible" !== r.visibilityState || p()
+      }) : p()
+  };

data/config/breeze/card_styles.yml

@@ -24,7 +24,7 @@
     - text_align
 - :template: card_gap_square
   :header: Narrow card with up down section
-  :text: Smaller image, large margins, possible subheader
+  :text: Smaller image, large margins
       Order turns it upside down, image bottom
       Images can be wide or square, for 2 column 800 wide,
       3 column 600 , 4 column 400
@@ -36,12 +36,10 @@
     - text_color
     - order
     - text_align
-    - subheader
 - :template: card_normal_square
   :header: Standard card with square image
   :text: Image, header, text, normal stuff. No margin between image and text.
-        Possible subheader. Text alignment option. Also option to turn upside
-        down with order.
+        Text alignment option. Also option to turn upside down with order.
         Images can be wide or square, for 2 column 800 wide,
         3 column 600 , 4 column 400
   :fields:
@@ -51,7 +49,6 @@
     - background
     - text_color
     - text_align
-    - subheader
     - order
     - button_link
     - button_text
@@ -69,7 +66,6 @@
     - background
     - text_color
     - text_align
-    - subheader
     - order
     - button_link
     - button_text

data/config/breeze/option_definitions.yml

@@ -50,11 +50,6 @@
   :values:
   :default:
   :id: 9
-- :name: subheader
-  :description: Smaller header between Header and text
-  :values:
-  :default:
-  :id: 10
 - :name: text
   :description: Second text. Just a second paragraph
   :values:
@@ -127,3 +122,8 @@
   :values: 1 2 3 4
   :default: 1
   :id: 23
+- :name: height
+  :description: Height of element in rem
+  :values: h-8 h-16 h-24 h-32 h-40 h-48 h-64 h-96
+  :default: h-24
+  :id: 24

data/config/breeze/section_styles.yml

@@ -10,7 +10,6 @@
   :options:
     - background
     - columns
-    - subheader
     - text_color
     - text_align
 - :template: section_slider
@@ -27,7 +26,6 @@
     - background
     - text_color
     - margin
-    - subheader
     - text_align
     - item_align
     - button_link
@@ -44,7 +42,6 @@
   :options:
     - background
     - columns
-    - subheader
     - text_color
     - text_align
 - :template: section_full_up
@@ -57,7 +54,6 @@
     - background
     - text_color
     - margin
-    - subheader
     - text_align
     - item_align
     - button_link
@@ -89,7 +85,6 @@
     - background
     - text_color
     - margin
-    - subheader
     - text_align
     - button_link
     - button_text
@@ -106,7 +101,6 @@
     - order
     - background
     - text_color
-    - subheader
     - text_align
     - button_link
     - button_text
@@ -140,7 +134,6 @@
     - header
     - text
   :options:
-    - subheader
     - margin
     - order
     - text_color
@@ -158,7 +151,6 @@
     - header
     - text
   :options:
-    - subheader
     - margin
     - order
     - text_color
@@ -170,6 +162,10 @@
   :header: Spacer
   :text: Just for extra padding
   :fields:
+  :options:
+    - background
+    - margin
+    - height
 - :template: form_section
   :header: Contact or other form
   :text: Flexible form, with input fields as "cards". Only choose form_field

data/config/locales/breeze_en.yml

@@ -0,0 +1,3 @@
+en:
+  form_send: Send
+  anti_bot: Anti bot challenge

data/config/routes.rb

@@ -36,5 +36,6 @@ Breeze::Engine.routes.draw do
     post :scale
   end
 
-  resources  :translations
+  resources :translations
+  
 end

data/config/tailwind.config.js

@@ -6,6 +6,7 @@ module.exports = {
     './app/**/*.rb',
     './lib/**/*.rb',
     './config/initializers/breeze.rb' ,
+    './config/breeze/*' ,
     './app/javascript/**/*.js',
     './app/views/**/*.{erb,haml,html,slim}'
   ],

data/lib/breeze/engine.rb

@@ -28,7 +28,7 @@ module Breeze
 
     initializer "after_initialize" do |app|
       ActiveSupport::Reloader.to_prepare do
-        [Translation, Section, Card, Page, Image, PageStyle,
+        [Section, Card, Page, Image, PageStyle,
           SectionStyle, CardStyle, OptionDefinition].each do |clazz|
           clazz.reload
         end

data/lib/breeze/version.rb

@@ -1,3 +1,3 @@
 module Breeze
-  VERSION = "0.9.5"
+  VERSION = "0.9.6"
 end

data/lib/breeze_cms.rb

@@ -0,0 +1,3 @@
+# breeze_cms is loaded because the gem is breeze_cms
+# the name is breeze_cms because breeze was taken
+require "breeze"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: breeze_cms
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - Torsten
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-26 00:00:00.000000000 Z
+date: 2024-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '7.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: haml-rails
   requirement: !ruby/object:Gem::Requirement
@@ -185,7 +199,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.15'
 description: |-
-  Breeze renders pages, that are made up of sections,                       that may include cards. Breeze also manages images,                       even lets you edit them, and manages translations when                       you go international.
+  Breeze is a tailwind based CMS for developers.                      It renders pages, that are made up of sections,                       that may include cards. Breeze also manages images,                       even lets you edit them, and manages translations when                       you go international.
                         All data is stored in yaml files, images as assets.
                         Breeze makes commits for changes which developers                       upstream in a very rails sort of way.
 email: torsten@feenix.community
@@ -317,6 +331,7 @@ files:
 - app/views/breeze/view/cards/_form_field.haml
 - app/views/breeze/view/elements/_button.haml
 - app/views/breeze/view/page.haml
+- app/views/layouts/_plausible.haml
 - app/views/layouts/breeze/_header.haml
 - app/views/layouts/breeze/_messages.haml
 - app/views/layouts/breeze/application.haml
@@ -329,6 +344,7 @@ files:
 - config/initializers/breeze.rb
 - config/initializers/rabl.rb
 - config/initializers/simple_form.rb
+- config/locales/breeze_en.yml
 - config/routes.rb
 - config/tailwind.config.js
 - config/tailwind.email.js
@@ -336,6 +352,7 @@ files:
 - lib/breeze/engine.rb
 - lib/breeze/shared_helper.rb
 - lib/breeze/version.rb
+- lib/breeze_cms.rb
 - lib/generators/breeze/install/install_generator.rb
 - lib/generators/breeze/install/templates/empty.yml
 - lib/generators/breeze/install/templates/initializer.rb
@@ -348,7 +365,7 @@ licenses:
 metadata:
   homepage_uri: https://breeze.codeberg.page
   source_code_uri: https://codeberg.org/breeze/breeze
-  changelog_uri: https://codeberg.org/breeze/breeze
+  changelog_uri: https://codeberg.org/breeze/breeze/src/branch/main/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -357,7 +374,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="