drg_manual 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a666e55db6f88c63215dbac8fe242de14bde0ee1dd64ab94bd2f3f8796431ed
-  data.tar.gz: 315cb4b0d3674a8e9e5d0a35e87cbfaa7ffa5c272a9d66777ed9aeb22c174045
+  metadata.gz: 47c4f5d856a68ffb3c41fd2f495ad40682661e4d76fb323be3f8d602391eb2f5
+  data.tar.gz: e723ba98794dbe7e85fafcb482e898d267deb6e3453de2e9ae19bae782c47fae
 SHA512:
-  metadata.gz: fffbe35f36ca2e9285dc917ea6d93af305b86caf176f28f5d7f1375cf4f4f8bc6ab507337731c7a82015512095c34926c608170c3bbc586b7a3a54dd02190f47
-  data.tar.gz: 7cfa02da35744e6fe48dbf58ae9b59ef0bc8e6148baf98be59b4ae9c6380e83b3db19aba668509ce077392716a2cc55e28428a9921a54aa8f2fa5782c16c6425
+  metadata.gz: ca2264bac60ea2f840f4906cdc355086b470441943d4bafa6764b57261668b406c6a0a45bde6db3c7f17c929f0a029b1224e5903788ddc6fd327fa331d893ff2
+  data.tar.gz: d375d13ecf71ef4e9778cacf03b2b49efc89f1c1b8c2eb42a83cfde01a84c9c95598374501f115b25132c24fc88f05015c95867f03d91df05493fa0a5a71cf63

data/app/forms/dc_manual.yml

@@ -29,6 +29,10 @@ form:
         name: title
         type: text_field
         size: 80
+      15:
+        name: description
+        type: text_field
+        size: 80
       20:
         name: link
         type: text_field

data/app/{helpers → renderers}/dc_manual_renderer.rb

@@ -1,4 +1,3 @@
-#coding: utf-8
 #--
 # Copyright (c) 2018+ Damjan Rems
 #
@@ -27,6 +26,7 @@
 ########################################################################
 class DcManualRenderer
 include DcApplicationHelper
+include CmsCommonHelper
 
 ########################################################################
 #
@@ -54,27 +54,27 @@ end
 # Find document.
 ########################################################################
 def find_document
-# found bookname in path link 
+  # found bookname in path link
   book_name_ix = @path.index(@parent.page.link)
   @manual      = DcManual.find_by(link: @path[book_name_ix+1])
   if @manual
     @prepand_path = @path.shift(book_name_ix+2)
   else
-# manual_id should be set in page settings   
-    manual_id  = @opts.dig(:settings, 'manual', 'manual_id')
+    # manual_id should be set in page settings
+    manual_id     = @opts.dig(:settings, 'manual', 'manual_id')
     @prepand_path = @path.shift(book_name_ix+1)
     @manual       = DcManual.find(manual_id) if manual_id
   end  
   return if @manual.nil?
-# ids for editing manual page
+  # ids for editing manual page
   @manual_ids  = '' 
-# Determine selected page
+  # Determine selected page
   @manual_page = @manual
   while (link_page = @path.shift) != nil do
     @manual_ids << (@manual_ids.blank? ? '' : ';') + "#{@manual_page.id}"
     @manual_page = @manual_page.dc_manual_pages.find_by(link: link_page)
     if @manual_page.nil?
-# select first page if path is in error    
+      # select first page if path is in error
       @manual_page = @manual
       break 
     end      
@@ -95,15 +95,15 @@ end
 # Create submenus for a menu
 ########################################################################
 def submenu(menu_item, menu, parent_path)
-# is active when ids path matches parent path or last (my id) matches manual_page
+  # is active when ids path matches parent path or last (my id) matches manual_page
   last_item = menu_item[1].split(';').last
   is_active = (@manual_ids.match(menu_item[1]) or last_item.match(@manual_page.id.to_s)) ? ' is-active' : '' 
   
   html = parent_path.blank? ? '' : "<li class=\"#{is_active}\">#{menu_link_for(menu_item, parent_path)}" 
-# select subpages  
+  # select subpages
   sub_pages = menu.select {|e| e[2] == menu_item[1]}
   return html if sub_pages.size == 0
-#  
+
   sub_pages.sort! {|a,b| a[3] <=> b[3]}
   sub_pages.each do |page|
     html << %Q[<ul class="menu vertical nested #{is_active}" >]
@@ -125,13 +125,20 @@ def manual_menu
 </ul>]
 end
 
+########################################################################
+# 
+########################################################################
+def body_for_examples
+  @manual_page.body
+end
+
 #######################################################################
 # Render manual data
 #######################################################################
 def default
   @path = @opts[:path]
-  return list if @path.size == 1 
-# link for manual settings on the page  
+  return list if @path.size == 1 and @opts.dig(:settings, 'manual', 'manual_id').nil?
+  # link for manual settings on the page
   edit_html = ''
   if dc_edit_mode?
     edit_html << @parent.dc_link_for_edit(table: 'dc_memory', title: 'dc_manual.settings', 
@@ -142,13 +149,13 @@ def default
   end
   find_document()
   return "ERROR! #{@parent.params[:path]} #{edit_html}" if @manual.nil? or @manual_page.nil?
-#  
+
   if dc_edit_mode?
     opts = { action: 'edit', table: 'dc_manual', 
              id: @manual._id, title: 'dc_manual.edit' }
     edit_html << dc_link_for_edit(opts)    
   end
-#
+
   html = %Q[
 <div class="wrap">
 <div class="row manual">
@@ -156,8 +163,8 @@ def default
     #{edit_html}#{manual_menu()}
   </div>
   <div class="column small-12 medium-9 large-8 body">]
-#
-# ;add dc_manual_pages 
+
+  # ;add dc_manual_pages
   no_subsections = @manual_ids.split(';').size
   table = 'dc_manual' + ';dc_manual_page'*no_subsections
   form_name = @manual_ids.blank? ? 'dc_manual' : 'dc_manual_page'
@@ -168,7 +175,7 @@ def default
                title: I18n.t('dc_manual.edit_chapter', title: @manual_page.title) }
       html << dc_link_for_edit(opts) + '<br>'.html_safe
     end
-# Add new subchapter
+    # Add new subchapter
     ids = @manual_ids + (@manual_ids.blank? ? '' : ';') + @manual_page.id.to_s
     table = 'dc_manual' + ';dc_manual_page'*(no_subsections+1)
     opts = { controller: 'cmsedit', action: 'new', form_name: 'dc_manual_page', 
@@ -176,17 +183,19 @@ def default
              title: I18n.t('dc_manual.new_chapter', title: @manual_page.title) }
     html << dc_link_for_create(opts) + '<br>'.html_safe  
   end
-#    
+
   can_view, msg = dc_user_can_view(@parent, @manual_page)
+  # process body before it is outputed to browser
+  body = @opts[:body_render] ? send(@opts[:body_render]) : @manual_page.body
   html << if can_view
-%Q[<h1>#{@manual_page.title}</h1>#{@manual_page.body}<br>
+%Q[<h1>#{@manual_page.title}</h1>#{body}<br>
 <div class='updated'>
   #{t('dc_manual.updated')} <b>#{@manual_page.updated_at.strftime('%d.%m.%Y')}</b>
 </div>]
   else
     msg
   end
-  html << '</div></div></div>'
+  html << '</div>'*3
 end
 
 ########################################################################

data/lib/drg_manual/version.rb

@@ -1,3 +1,3 @@
 module DrgManual
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drg_manual
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Damjan Rems
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-27 00:00:00.000000000 Z
+date: 2021-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: drg_cms
@@ -39,9 +39,9 @@ files:
 - app/forms/dc_manual.yml
 - app/forms/dc_manual_page.yml
 - app/forms/dc_manual_settings.yml
-- app/helpers/dc_manual_renderer.rb
 - app/models/dc_manual.rb
 - app/models/dc_manual_page.rb
+- app/renderers/dc_manual_renderer.rb
 - app/views/dc_manual/_list.html.erb
 - config/locales/dc_manual_en.yml
 - config/locales/dc_manual_sl.yml
@@ -87,7 +87,7 @@ licenses:
 - MIT-LICENSE
 metadata:
   source_code: https://github.com/drgcms/drg-manual
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -102,39 +102,39 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: 'DRG CMS: Manual plugin'
 test_files:
-- test/drg_manual_test.rb
-- test/test_helper.rb
 - test/integration/navigation_test.rb
+- test/test_helper.rb
+- test/dummy/script/rails
 - test/dummy/README.rdoc
-- test/dummy/config/locales/en.yml
-- test/dummy/config/initializers/secret_token.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/wrap_parameters.rb
+- test/dummy/app/views/layouts/application.html.erb
+- test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/assets/stylesheets/application.css
+- test/dummy/app/assets/javascripts/application.js
+- test/dummy/public/422.html
+- test/dummy/public/404.html
+- test/dummy/public/favicon.ico
+- test/dummy/public/500.html
+- test/dummy/Rakefile
+- test/dummy/config.ru
 - test/dummy/config/environment.rb
+- test/dummy/config/boot.rb
+- test/dummy/config/routes.rb
 - test/dummy/config/application.rb
 - test/dummy/config/database.yml
-- test/dummy/config/routes.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/environments/development.rb
 - test/dummy/config/environments/test.rb
 - test/dummy/config/environments/production.rb
-- test/dummy/public/favicon.ico
-- test/dummy/public/404.html
-- test/dummy/public/422.html
-- test/dummy/public/500.html
-- test/dummy/Rakefile
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/config.ru
-- test/dummy/script/rails
+- test/dummy/config/environments/development.rb
+- test/dummy/config/locales/en.yml
+- test/dummy/config/initializers/secret_token.rb
+- test/dummy/config/initializers/inflections.rb
+- test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/backtrace_silencers.rb
+- test/dummy/config/initializers/wrap_parameters.rb
+- test/dummy/config/initializers/session_store.rb
+- test/drg_manual_test.rb