tenon 1.0.53 → 1.0.54
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/images/tenon/tenon-content/SixColumnImage.png +0 -0
- data/app/assets/images/tenon/tenon-content/SixColumnImageAndText.png +0 -0
- data/app/assets/images/tenon/tenon-content/SixColumnImageAndText_hover.png +0 -0
- data/app/assets/images/tenon/tenon-content/SixColumnImage_hover.png +0 -0
- data/app/assets/javascripts/tenon/medium-on-tenon.js +4 -2
- data/app/models/tenon/tenon_content/row_types/six_column_image.rb +20 -0
- data/app/models/tenon/tenon_content/row_types/six_column_image_and_text.rb +26 -0
- data/app/models/tenon/tenon_content/row_types.rb +4 -2
- data/app/views/tenon/tenon_content/row_types/display/_four_column_image.html.haml +1 -1
- data/app/views/tenon/tenon_content/row_types/display/_four_column_image_and_text.html.haml +1 -1
- data/app/views/tenon/tenon_content/row_types/display/_full_width_image.html.haml +1 -1
- data/app/views/tenon/tenon_content/row_types/display/_left_image_right_text.html.haml +1 -1
- data/app/views/tenon/tenon_content/row_types/display/_six_column_image.html.haml +8 -0
- data/app/views/tenon/tenon_content/row_types/display/_six_column_image_and_text.html.haml +13 -0
- data/app/views/tenon/tenon_content/row_types/display/_three_column_image.html.haml +1 -1
- data/app/views/tenon/tenon_content/row_types/display/_three_column_image_and_text.html.haml +1 -1
- data/app/views/tenon/tenon_content/row_types/display/_two_column_image_and_text.html.haml +1 -1
- data/app/views/tenon/tenon_content/row_types/form/_six_column_image.html.haml +10 -0
- data/app/views/tenon/tenon_content/row_types/form/_six_column_image_and_text.html.haml +16 -0
- data/lib/tenon/version.rb +1 -1
- metadata +11 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 1bbdf1cfb7234497e600ba4d2733a20f3b3c8cfe
|
|
4
|
+
data.tar.gz: 0093e9f22e73bb6ef664146f0437dbbb6d87ff5e
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 73a24e69d4367da9803e562dfb1dde85ffcdb7791b204a937b788ffb179e31af54eda46c61156e6cb084983f2b975d5f1886a77492740cf6aea3d522d11d36dd
|
|
7
|
+
data.tar.gz: c7ddfdafeb1b28101c0b638b0115b3c7895671f0cea4f755ad9d8a78da624fc0b01ab9eb14a852976ab5a48426494f03a22257e7656a6ac07546881420fe8e0b
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
@@ -453,13 +453,15 @@ if (typeof module === 'object') {
|
|
|
453
453
|
icon = document.createElement('i');
|
|
454
454
|
|
|
455
455
|
cancel.setAttribute('href', '#');
|
|
456
|
+
cancel.setAttribute('title', 'Cancel');
|
|
457
|
+
cancel.setAttribute('data-tooltip', 'true');
|
|
456
458
|
cancel.className = 'medium-editor-cancel';
|
|
457
459
|
|
|
458
460
|
asset_button.className = 'medium-editor-link-to-asset';
|
|
459
461
|
asset_button.setAttribute('href', '/tenon/item_assets/new?hide_upload=true');
|
|
460
|
-
asset_button.setAttribute('data-modal-remote', 'true');
|
|
461
|
-
asset_button.setAttribute('data-tooltip', 'true');
|
|
462
462
|
asset_button.setAttribute('title', 'Link to an Asset');
|
|
463
|
+
asset_button.setAttribute('data-tooltip', 'true');
|
|
464
|
+
asset_button.setAttribute('data-modal-remote', 'true');
|
|
463
465
|
asset_button.setAttribute('data-modal-title', 'Link to Asset');
|
|
464
466
|
asset_button.setAttribute('data-modal-handler', 'Tenon.features.tenonContent.AssetLink');
|
|
465
467
|
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
module Tenon
|
|
2
|
+
module TenonContent
|
|
3
|
+
module RowTypes
|
|
4
|
+
class SixColumnImage < TenonContent::RowTypes::Base
|
|
5
|
+
class << self
|
|
6
|
+
def add_pieces_to(row)
|
|
7
|
+
if row.pieces.empty?
|
|
8
|
+
row.pieces.build(piece_type: 'Image', position: 0)
|
|
9
|
+
row.pieces.build(piece_type: 'Image', position: 1)
|
|
10
|
+
row.pieces.build(piece_type: 'Image', position: 2)
|
|
11
|
+
row.pieces.build(piece_type: 'Image', position: 3)
|
|
12
|
+
row.pieces.build(piece_type: 'Image', position: 4)
|
|
13
|
+
row.pieces.build(piece_type: 'Image', position: 5)
|
|
14
|
+
end
|
|
15
|
+
end
|
|
16
|
+
end
|
|
17
|
+
end
|
|
18
|
+
end
|
|
19
|
+
end
|
|
20
|
+
end
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
module Tenon
|
|
2
|
+
module TenonContent
|
|
3
|
+
module RowTypes
|
|
4
|
+
class SixColumnImageAndText < TenonContent::RowTypes::Base
|
|
5
|
+
class << self
|
|
6
|
+
def add_pieces_to(row)
|
|
7
|
+
if row.pieces.empty?
|
|
8
|
+
row.pieces.build(piece_type: 'Image', position: 0, size: 'two')
|
|
9
|
+
row.pieces.build(piece_type: 'Text', position: 1, size: 'two')
|
|
10
|
+
row.pieces.build(piece_type: 'Image', position: 2, size: 'two')
|
|
11
|
+
row.pieces.build(piece_type: 'Text', position: 3, size: 'two')
|
|
12
|
+
row.pieces.build(piece_type: 'Image', position: 4, size: 'two')
|
|
13
|
+
row.pieces.build(piece_type: 'Text', position: 5, size: 'two')
|
|
14
|
+
row.pieces.build(piece_type: 'Image', position: 6, size: 'two')
|
|
15
|
+
row.pieces.build(piece_type: 'Text', position: 7, size: 'two')
|
|
16
|
+
row.pieces.build(piece_type: 'Image', position: 8, size: 'two')
|
|
17
|
+
row.pieces.build(piece_type: 'Text', position: 9, size: 'two')
|
|
18
|
+
row.pieces.build(piece_type: 'Image', position: 10, size: 'two')
|
|
19
|
+
row.pieces.build(piece_type: 'Text', position: 11, size: 'two')
|
|
20
|
+
end
|
|
21
|
+
end
|
|
22
|
+
end
|
|
23
|
+
end
|
|
24
|
+
end
|
|
25
|
+
end
|
|
26
|
+
end
|
|
@@ -10,12 +10,14 @@ module Tenon
|
|
|
10
10
|
'Three Images' => 'ThreeColumnImage',
|
|
11
11
|
'Four Columns of Text' => 'FourColumnText',
|
|
12
12
|
'Four Images' => 'FourColumnImage',
|
|
13
|
-
'Embedded Content' => 'FullWidthEmbeddedContent',
|
|
14
13
|
'Wrapped Image with Text' => 'LeftWrappedImageWithText',
|
|
14
|
+
'Six Images' => 'SixColumnImage',
|
|
15
|
+
'Embedded Content' => 'FullWidthEmbeddedContent',
|
|
15
16
|
'Image and Text (No Wrap)' => 'LeftImageRightText',
|
|
16
17
|
'Two Column Image and Text' => 'TwoColumnImageAndText',
|
|
17
18
|
'Three Column Image and Text' => 'ThreeColumnImageAndText',
|
|
18
|
-
'Four Column Image and Text' => 'FourColumnImageAndText'
|
|
19
|
+
'Four Column Image and Text' => 'FourColumnImageAndText',
|
|
20
|
+
'Six Column Image and Text' => 'SixColumnImageAndText'
|
|
19
21
|
}
|
|
20
22
|
end
|
|
21
23
|
end
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
.three{class: cycle('', '', '', 'omega')}
|
|
4
4
|
- row.pieces.select { |p| positions.include?(p.position) }.each do |piece|
|
|
5
5
|
- if piece.piece_type == 'Image'
|
|
6
|
-
.tn-tc-piece
|
|
6
|
+
.tn-tc-piece.asset-field
|
|
7
7
|
= render "tenon/tenon_content/piece_types/display/image", piece: piece
|
|
8
8
|
- else
|
|
9
9
|
.tn-tc-piece
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
.left-image-right-text.image-and-text
|
|
2
2
|
- row.pieces.each do |piece|
|
|
3
3
|
- if piece.piece_type == "Image"
|
|
4
|
-
.tn-tc-piece{:class => piece.size}
|
|
4
|
+
.tn-tc-piece.asset-field{:class => piece.size}
|
|
5
5
|
= render "tenon/tenon_content/piece_types/display/image", piece: piece
|
|
6
6
|
- elsif piece.piece_type == "Text"
|
|
7
7
|
.tn-tc-piece.omega{:class => piece.size}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
.six-column-image
|
|
2
|
+
- [ [0, 1], [2, 3], [4, 5] ].each_with_index do |columns, i|
|
|
3
|
+
.four{class: i == 2 ? 'omega' : ''}
|
|
4
|
+
- columns.each do |position|
|
|
5
|
+
.tn-tc-piece.asset-field.six{class: cycle('', 'omega')}
|
|
6
|
+
- row.pieces.select { |p| p.position == position }.each do |piece|
|
|
7
|
+
= render 'tenon/tenon_content/piece_types/display/image', piece: piece
|
|
8
|
+
.spacer
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
.six-column-image-and-text.stacked-image-and-text
|
|
2
|
+
- [ [ [0,1], [2,3] ], [ [4,5], [6,7] ], [ [8,9], [10,11] ] ].each_with_index do |columns, i|
|
|
3
|
+
.four{class: i == 2 ? 'omega' : ''}
|
|
4
|
+
- columns.each do |positions|
|
|
5
|
+
.six{class: cycle('', 'omega')}
|
|
6
|
+
- row.pieces.select { |p| positions.include?(p.position) }.each do |piece|
|
|
7
|
+
- if piece.piece_type == 'Image'
|
|
8
|
+
.tn-tc-piece.asset-field
|
|
9
|
+
= render "tenon/tenon_content/piece_types/display/image", piece: piece
|
|
10
|
+
- else
|
|
11
|
+
.tn-tc-piece
|
|
12
|
+
= render 'tenon/tenon_content/piece_types/display/text', piece: piece
|
|
13
|
+
.spacer
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
.four{class: cycle('', '', 'omega')}
|
|
4
4
|
- row.pieces.select { |p| positions.include?(p.position) }.each do |piece|
|
|
5
5
|
- if piece.piece_type == 'Image'
|
|
6
|
-
.tn-tc-piece
|
|
6
|
+
.tn-tc-piece.asset-field
|
|
7
7
|
= render "tenon/tenon_content/piece_types/display/image", piece: piece
|
|
8
8
|
- else
|
|
9
9
|
.tn-tc-piece
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
.six{class: cycle('', 'omega')}
|
|
4
4
|
- row.pieces.select { |p| positions.include?(p.position) }.each do |piece|
|
|
5
5
|
- if piece.piece_type == 'Image'
|
|
6
|
-
.tn-tc-piece
|
|
6
|
+
.tn-tc-piece.asset-field
|
|
7
7
|
= render "tenon/tenon_content/piece_types/display/image", piece: piece
|
|
8
8
|
- else
|
|
9
9
|
.tn-tc-piece
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
.four-column-image
|
|
2
|
+
= f.hidden_field :list_order
|
|
3
|
+
= f.hidden_field :row_type
|
|
4
|
+
- [ [0, 1], [2, 3], [4, 5] ].each_with_index do |columns, i|
|
|
5
|
+
.four{class: i == 2 ? 'omega' : ''}
|
|
6
|
+
- columns.each do |position|
|
|
7
|
+
.tn-tc-piece.asset-field.six{class: cycle('', 'omega')}
|
|
8
|
+
= f.fields_for :pieces, f.object.pieces.select{ |p| p.position == position } do |piece|
|
|
9
|
+
= render 'tenon/tenon_content/piece_types/form/image', f: piece, position: piece.object.position
|
|
10
|
+
.spacer
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
.six-column-image-and-text.stacked-image-and-text
|
|
2
|
+
= f.hidden_field :row_type
|
|
3
|
+
= f.hidden_field :list_order
|
|
4
|
+
- [ [ [0,1], [2,3] ], [ [4,5], [6,7] ], [ [8,9], [10,11] ] ].each_with_index do |columns, i|
|
|
5
|
+
.four{class: i == 2 ? 'omega' : ''}
|
|
6
|
+
- columns.each do |positions|
|
|
7
|
+
.six{class: cycle('', 'omega')}
|
|
8
|
+
= f.fields_for :pieces, f.object.pieces.select { |p| positions.include?(p.position) } do |piece|
|
|
9
|
+
= piece.hidden_field :piece_type
|
|
10
|
+
- if piece.object.piece_type == 'Image'
|
|
11
|
+
.tn-tc-piece.asset-field
|
|
12
|
+
= render 'tenon/tenon_content/piece_types/form/image', f: piece, style: 'half'
|
|
13
|
+
- else
|
|
14
|
+
.tn-tc-piece
|
|
15
|
+
= render 'tenon/tenon_content/piece_types/form/text', f: piece
|
|
16
|
+
.spacer
|
data/lib/tenon/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: tenon
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.0.
|
|
4
|
+
version: 1.0.54
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- factor[e] design initiative
|
|
@@ -921,6 +921,10 @@ files:
|
|
|
921
921
|
- app/assets/images/tenon/tenon-content/LeftImageRightText_hover.png
|
|
922
922
|
- app/assets/images/tenon/tenon-content/LeftWrappedImageWithText.png
|
|
923
923
|
- app/assets/images/tenon/tenon-content/LeftWrappedImageWithText_hover.png
|
|
924
|
+
- app/assets/images/tenon/tenon-content/SixColumnImage.png
|
|
925
|
+
- app/assets/images/tenon/tenon-content/SixColumnImageAndText.png
|
|
926
|
+
- app/assets/images/tenon/tenon-content/SixColumnImageAndText_hover.png
|
|
927
|
+
- app/assets/images/tenon/tenon-content/SixColumnImage_hover.png
|
|
924
928
|
- app/assets/images/tenon/tenon-content/ThreeColumnImage.png
|
|
925
929
|
- app/assets/images/tenon/tenon-content/ThreeColumnImageAndText.png
|
|
926
930
|
- app/assets/images/tenon/tenon-content/ThreeColumnImageAndText_hover.png
|
|
@@ -1146,6 +1150,8 @@ files:
|
|
|
1146
1150
|
- app/models/tenon/tenon_content/row_types/left_text_right_image.rb
|
|
1147
1151
|
- app/models/tenon/tenon_content/row_types/left_wrapped_image_with_text.rb
|
|
1148
1152
|
- app/models/tenon/tenon_content/row_types/right_wrapped_image_with_text.rb
|
|
1153
|
+
- app/models/tenon/tenon_content/row_types/six_column_image.rb
|
|
1154
|
+
- app/models/tenon/tenon_content/row_types/six_column_image_and_text.rb
|
|
1149
1155
|
- app/models/tenon/tenon_content/row_types/three_column_image.rb
|
|
1150
1156
|
- app/models/tenon/tenon_content/row_types/three_column_image_and_text.rb
|
|
1151
1157
|
- app/models/tenon/tenon_content/row_types/three_column_text.rb
|
|
@@ -1283,6 +1289,8 @@ files:
|
|
|
1283
1289
|
- app/views/tenon/tenon_content/row_types/display/_left_text_right_image.html.haml
|
|
1284
1290
|
- app/views/tenon/tenon_content/row_types/display/_left_wrapped_image_with_text.html.haml
|
|
1285
1291
|
- app/views/tenon/tenon_content/row_types/display/_right_wrapped_image_with_text.html.haml
|
|
1292
|
+
- app/views/tenon/tenon_content/row_types/display/_six_column_image.html.haml
|
|
1293
|
+
- app/views/tenon/tenon_content/row_types/display/_six_column_image_and_text.html.haml
|
|
1286
1294
|
- app/views/tenon/tenon_content/row_types/display/_three_column_image.html.haml
|
|
1287
1295
|
- app/views/tenon/tenon_content/row_types/display/_three_column_image_and_text.html.haml
|
|
1288
1296
|
- app/views/tenon/tenon_content/row_types/display/_three_column_text.html.haml
|
|
@@ -1299,6 +1307,8 @@ files:
|
|
|
1299
1307
|
- app/views/tenon/tenon_content/row_types/form/_left_text_right_image.html.haml
|
|
1300
1308
|
- app/views/tenon/tenon_content/row_types/form/_left_wrapped_image_with_text.html.haml
|
|
1301
1309
|
- app/views/tenon/tenon_content/row_types/form/_right_wrapped_image_with_text.html.haml
|
|
1310
|
+
- app/views/tenon/tenon_content/row_types/form/_six_column_image.html.haml
|
|
1311
|
+
- app/views/tenon/tenon_content/row_types/form/_six_column_image_and_text.html.haml
|
|
1302
1312
|
- app/views/tenon/tenon_content/row_types/form/_three_column_image.html.haml
|
|
1303
1313
|
- app/views/tenon/tenon_content/row_types/form/_three_column_image_and_text.html.haml
|
|
1304
1314
|
- app/views/tenon/tenon_content/row_types/form/_three_column_text.html.haml
|