annex-cms 0.1.8 → 0.2.0

Sign up to get free protection for your applications and to get access to all the features.
@@ -1,4 +1,9 @@
1
1
  module Annex
2
+ #
3
+ # Block Model
4
+ #
5
+ # Stores the raw information in the database
6
+ #
2
7
  class Block
3
8
  include Mongoid::Document
4
9
  include Mongoid::Timestamps
@@ -1,2 +1,2 @@
1
- .redactor{ { data: { identifier: identifier, route: route }.deep_merge(opts) } }
1
+ .redactor{ { data: { identifier: identifier }.deep_merge(opts) } }
2
2
  = content.html_safe if content
data/lib/annex/version.rb CHANGED
@@ -2,5 +2,5 @@
2
2
  # Annex
3
3
  #
4
4
  module Annex
5
- VERSION = '0.1.8'
5
+ VERSION = '0.2.0'
6
6
  end
@@ -18,11 +18,7 @@ module Annex
18
18
 
19
19
  content = doc.content.try(:[], identifier.to_s) || opts[:default]
20
20
 
21
- render partial: 'annex/block', locals: { content: content, route: opts[:route], identifier: identifier, opts: opts }
22
- end
23
-
24
- def annex_clips(clip)
25
- render partial: 'annex/clips'
21
+ render partial: 'annex/block', locals: { content: content, identifier: identifier, opts: opts }
26
22
  end
27
23
 
28
24
  def current_route
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: annex-cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.8
4
+ version: 0.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Clay McIlrath
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-07-17 00:00:00.000000000 Z
11
+ date: 2014-10-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -51,9 +51,16 @@ files:
51
51
  - app/assets/javascripts/annex.js.coffee
52
52
  - app/assets/javascripts/annex/cms.js.coffee
53
53
  - app/assets/javascripts/annex/jquery.redactor.clips.js
54
+ - app/assets/javascripts/annex/jquery.redactor.definedlinks.js
55
+ - app/assets/javascripts/annex/jquery.redactor.filemanager.js
56
+ - app/assets/javascripts/annex/jquery.redactor.fontcolor.js
57
+ - app/assets/javascripts/annex/jquery.redactor.fontsize.js
54
58
  - app/assets/javascripts/annex/jquery.redactor.fullscreen.js
59
+ - app/assets/javascripts/annex/jquery.redactor.imagemanager.js
55
60
  - app/assets/javascripts/annex/jquery.redactor.js
56
61
  - app/assets/javascripts/annex/jquery.redactor.save.js
62
+ - app/assets/javascripts/annex/jquery.redactor.table.js
63
+ - app/assets/javascripts/annex/jquery.redactor.video.js
57
64
  - app/assets/stylesheets/annex.css.scss
58
65
  - app/assets/stylesheets/annex/redactor.css.scss
59
66
  - app/controllers/annex/application_controller.rb
@@ -62,7 +69,6 @@ files:
62
69
  - app/models/annex/block.rb
63
70
  - app/models/annex/file.rb
64
71
  - app/views/annex/_block.html.haml
65
- - app/views/annex/_clips.html.haml
66
72
  - config/routes.rb
67
73
  - lib/annex-cms.rb
68
74
  - lib/annex/config.rb
@@ -1,11 +0,0 @@
1
- #clipsmodal
2
- %section
3
- %ul.redactor_clips_box
4
- %li
5
- %a.redactor_clip_link{href: "#"} Lorem ipsum …
6
- .redactor_clip{style: "display: none;"}
7
- Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
8
- %li
9
- = content_for :annex_clip
10
- %footer
11
- %a.redactor_modal_btn.redactor_btn_modal_close{href: "#"} Close