drg_books 0.5.3.1 → 0.5.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4848afa197de5d5f62be1b590fb7f6c2981e623b
-  data.tar.gz: c65f969fd65aea0569d2e0509ecb536456a30422
+  metadata.gz: 397216fa45fc6a1d60ce5134b6ddb5fd9157e943
+  data.tar.gz: bd50b2dafda80409f1c032e3962e86361de3ac55
 SHA512:
-  metadata.gz: 6e2ee9216ee35d6c31ff661587937bee9eb295f13095f3c8ae9c48070aec9990076501e7e1d7d206feedad05c2349439938e58ad1eea3045f247300e4094009e
-  data.tar.gz: 1411d81e4e8997d4dca8876a4ea2d368108cb27e195aa8f1f5f8b9b9899fe85e9170db84e28480b1be4237cf3fde7fa93a5be9d74757c1eda20551cbda1358d8
+  metadata.gz: ce9d1c60a1fcbea9c19ba9a2dc434eb4ee62c32567badd76979e610eba9f6162200395be11a8e612338bb34726ded259b3473ac6917eee657eb5f4fa465b0fef
+  data.tar.gz: 43b232c1b35f589153c50356c6dba0e9225bb6b47a4871ce969f641a5cceca6242645084fae0ab765820d37fff5438c5ed54badc600be086917fcdded2be4575

data/app/assets/stylesheets/drg_books.css

@@ -45,19 +45,18 @@ font-size: 12px;
 font-size: 18px;
 font-weight: bold;
 background-color: #ff8973;
-border: 1px solid #aaa;
+border: 1px solid #ff8973;
 border-bottom: 0px;
 }
 
 .book-chapter-prev-next {
-padding: 0px 5px;
-/* font-size: 1.2em;*/
-background-color: #ccc;
-border: 1px solid #aaa;
+background-color: #eee;
+border: 1px solid #ddd;
+font-size: 1.1em;
+padding: 4px;
 }
 
 .book-chapter-text {
-font-size: 13px;
 }
 
 .book-content {

data/app/forms/cms_menu.yml

@@ -22,19 +22,18 @@
 #++
 
 menu:
-  30_dc_books: 
+  80_dc_books: 
     caption: Books
+    icon: book lg        
     items:
       10:
         caption: helpers.label.dc_book.tabletitle
         controller: cmsedit
-        picture: dc_book.png
-        params:
-          table: dc_book
+        icon: book lg        
+        table: dc_book
       20: 
         caption: helpers.label.dc_book_chapter.tabletitle
         controller: cmsedit
-        picture: dc_book_chapter.png
-        params:
-          table: dc_book_chapter
+        icon: file-text-o lg        
+        table: dc_book_chapter
                 

data/app/forms/dc_book_chapter.yml

@@ -63,7 +63,7 @@ form:
       10:
         name: dc_book_texts
         type: embedded
-        formname: dc_book_text
+        form_name: dc_book_text
         html:
           height: 1000
 

data/app/helpers/dc_book_renderer.rb

@@ -31,33 +31,36 @@ include DcApplicationHelper
 # List all books
 ########################################################################
 def list
-  html = ''
+  html = "<div class='#{@opts[:div]}'>"
   if @opts[:edit_mode] > 1
     html << dc_link_for_create({ controller: 'cmsedit', table: 'dc_book', title: t('dc_book.new_book') }) 
   end
   books = DcBook.where(active: true).sort(title: 1).to_a
   html << @parent.render( partial: 'dc_book/list', locals: { books: books }, formats: [:html] )
+  html << '</div>'
 end
 
 #########################################################################
 # Table of contents
 ########################################################################
 def toc
-  html = ''
+  html = "<div class='#{@opts[:div]}'>"
   if @opts[:edit_mode] > 1
     dc_add2_record_cookie( { "dc_book_chapter.dc_book_id" => @parent.params[:book_id] } )
     html << dc_link_for_create({ controller: 'cmsedit', table: 'dc_book_chapter', title: t('dc_book.new_chapter') }) 
   end
   book = DcBook.find_by(link: @parent.params[:book_id])
+  @parent.page_title = book.title
   chapters = DcBookChapter.where(dc_book_id: book._id, active: true).sort(chapter: 1).to_a
   html << @parent.render( partial: 'dc_book/toc', locals: { chapters: chapters, book: book }, formats: [:html] )
+  html << '</div>'
 end
 
 #########################################################################
 # chapter
 ########################################################################
 def chapter
-  html = ''
+  html = "<div class='#{@opts[:div]}'>"
 #  texts   = DcBookChapter.where(_id: @parent.params[:book_id], active: true).sort(chapter: 1).to_a
   book    = DcBook.find_by(link: @parent.params[:book_id])
   chapter = DcBookChapter.find_by(dc_book_id: book.id, link: @parent.params[:chapter_id])
@@ -83,13 +86,14 @@ def chapter
       versions = texts.inject([]) {|r,e| r << [e.version, e._id] }
 # display specific version when text_id is specified      
       text = @parent.params[:text_id] ? chapter.dc_book_texts.find(@parent.params[:text_id]) : texts.last
+      @parent.page_title = "#{book.title}-#{chapter.title}"
       html << @parent.render( partial: 'dc_book/chapter', 
                               locals: { chapter: chapter, replies: replies, text: text, versions: versions, 
                               prev_chapter: prev_chapter, next_chapter: next_chapter}, 
                               formats: [:html] )
     end
   end
-  html
+  html << '</div>'
 end
 
 #########################################################################

data/app/models/dc_book.rb

@@ -21,6 +21,22 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
+######################################################################
+# == Schema information
+#
+# Collection name: dc_book : Books
+#
+#  _id                  BSON::ObjectId       _id
+#  created_at           Time                 created_at
+#  updated_at           Time                 updated_at
+#  title                String               Book title
+#  link                 String               link
+#  description          String               Short description of the book
+#  active               Mongoid::Boolean     Active
+#  author               String               Author's name
+#  created_by           BSON::ObjectId       created_by
+#  updated_by           BSON::ObjectId       updated_by
+######################################################################
 class DcBook
   include Mongoid::Document
   include Mongoid::Timestamps

data/app/models/dc_book_chapter.rb

@@ -21,6 +21,26 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
+######################################################################
+# == Schema information
+#
+# Collection name: dc_book_chapter : Chapter
+#
+#  _id                  BSON::ObjectId       _id
+#  created_at           Time                 created_at
+#  updated_at           Time                 updated_at
+#  title                String               Chapter title
+#  chapter              String               Chapter number. Can be nested 01.10.08.1
+#  link                 String               link
+#  author               String               Author's name
+#  can_comment          Mongoid::Boolean     Comments are allowed
+#  active               Mongoid::Boolean     active
+#  created_by           BSON::ObjectId       created_by
+#  updated_by           BSON::ObjectId       updated_by
+#  dc_book_id           Object               Book title
+#  dc_book_texts        Embedded:DcBookText  dc_book_texts
+#  dc_replies           Embedded:DcReply     dc_replies
+######################################################################
 class DcBookChapter
   include Mongoid::Document
   include Mongoid::Timestamps

data/app/models/dc_book_text.rb

@@ -21,6 +21,21 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
+######################################################################
+# == Schema information
+#
+# Collection name: dc_book_text : Chapter text
+#
+#  _id                  BSON::ObjectId       _id
+#  created_at           Time                 created_at
+#  updated_at           Time                 updated_at
+#  body                 String               Text body
+#  version              String               Version number
+#  author               String               Author's name
+#  active               Mongoid::Boolean     active
+#  created_by           BSON::ObjectId       created_by
+#  updated_by           BSON::ObjectId       updated_by
+######################################################################
 class DcBookText
   include Mongoid::Document
   include Mongoid::Timestamps

data/lib/drg_books/version.rb

@@ -1,3 +1,3 @@
 module DrgBooks
-  VERSION = "0.5.3.1"
+  VERSION = "0.5.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drg_books
 version: !ruby/object:Gem::Version
-  version: 0.5.3.1
+  version: 0.5.3.2
 platform: ruby
 authors:
 - Damjan Rems
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-27 00:00:00.000000000 Z
+date: 2018-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: drg_cms
@@ -44,7 +44,6 @@ files:
 - app/helpers/dc_book_renderer.rb
 - app/models/dc_book.rb
 - app/models/dc_book_chapter.rb
-- app/models/dc_book_comment.rb
 - app/models/dc_book_text.rb
 - app/views/dc_book/_chapter.html.erb
 - app/views/dc_book/_chapter_old.html.erb
@@ -110,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: 'DRG CMS: Documentation plugin'

data/app/models/dc_book_comment.rb

@@ -1,41 +0,0 @@
-#--
-# Copyright (c) 2013+ Damjan Rems
-#
-# 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.
-#++
-
-class DcBookComment
-  include Mongoid::Document
-  include Mongoid::Timestamps
-  
-  field :body,        type: String
-  field :author,      type: String,  default: ''
-  field :thumbs_up,   type: Integer
-  field :thumbs_down, type: Integer
-  field :thumbs,      type: Integer
-  field :active,      type: Boolean, default: true
-
-  field :created_by,  type: BSON::ObjectId
-  field :updated_by,  type: BSON::ObjectId
-  
-  belongs_to  :dc_book_page
-  
-  index( { dc_book_page_id: 1 } )
-end