card 1.15.pre → 1.15.pre2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/VERSION +1 -1
- data/db/bootstrap/card_actions.yml +1039 -668
- data/db/bootstrap/card_acts.yml +1 -1
- data/db/bootstrap/card_changes.yml +3614 -2523
- data/db/bootstrap/card_references.yml +1401 -1163
- data/db/bootstrap/cards.yml +2832 -1848
- data/db/migrate_core_cards/20150202143810_import_bootstrap_layout.rb +58 -4
- data/db/migrate_core_cards/20150317162412_bootstrap_themes.rb +37 -0
- data/db/migrate_core_cards/data/1.12_stylesheets/traditional.scss +1 -1
- data/db/migrate_core_cards/data/bootstrap_layout.json +39 -24
- data/db/migrate_core_cards/data/skin_images.json +91 -0
- data/db/schema.rb +1 -1
- data/db/version_core_cards.txt +1 -1
- data/lib/card/format.rb +6 -6
- data/lib/card/migration.rb +7 -2
- data/mod/01_core/chunk/include.rb +10 -0
- data/mod/01_core/format/html_format.rb +2 -8
- data/mod/01_core/set/all/collection.rb +4 -0
- data/mod/01_core/set/all/states.rb +1 -1
- data/mod/01_core/set/all/utils.rb +3 -2
- data/mod/01_core/set_pattern/02_all_plus.rb +1 -1
- data/mod/01_core/set_pattern/04_star.rb +2 -2
- data/mod/01_core/set_pattern/05_rstar.rb +2 -2
- data/mod/01_core/set_pattern/07_type_plus_right.rb +1 -1
- data/mod/01_core/spec/format/html_format_spec.rb +23 -24
- data/mod/01_history/set/all/history.rb +6 -7
- data/mod/02_basic_types/set/all/all_css.rb +1 -1
- data/mod/02_basic_types/set/all/all_csv.rb +2 -2
- data/mod/02_basic_types/set/all/json.rb +1 -1
- data/mod/02_basic_types/set/type/plain_text.rb +1 -1
- data/mod/02_basic_types/set/type/pointer.rb +25 -29
- data/mod/03_machines/lib/javascript/wagn.js.coffee +7 -6
- data/mod/03_machines/lib/javascript/wagn_mod.js.coffee +2 -1
- data/mod/03_machines/lib/stylesheets/style_bootstrap_compatible.css +154 -0
- data/mod/03_machines/lib/stylesheets/{standard.scss → style_cards.scss} +260 -166
- data/mod/03_machines/set/self/style_bootstrap_compatible.rb +9 -0
- data/mod/03_machines/set/self/{style_functional.rb → style_cards.rb} +1 -1
- data/mod/03_machines/spec/set/type/scss_spec.rb +1 -1
- data/mod/04_settings/set/type/setting.rb +1 -1
- data/mod/05_email/set/all/notify.rb +1 -1
- data/mod/05_email/set/self/follow_defaults.rb +3 -3
- data/mod/05_standard/file/{790/icon-6419.png → credit/icon-image.png} +0 -0
- data/mod/05_standard/file/{790/large-6419.png → credit/large-image.png} +0 -0
- data/mod/05_standard/file/{790/medium-6419.png → credit/medium-image.png} +0 -0
- data/mod/05_standard/file/{790/original-6419.png → credit/original-image.png} +0 -0
- data/mod/05_standard/file/{790/small-6419.png → credit/small-image.png} +0 -0
- data/mod/05_standard/file/{103/icon-6566.ico → favicon/icon-image.ico} +0 -0
- data/mod/05_standard/file/{103/large-6566.ico → favicon/large-image.ico} +0 -0
- data/mod/05_standard/file/{103/medium-6566.ico → favicon/medium-image.ico} +0 -0
- data/mod/05_standard/file/{103/original-6566.ico → favicon/original-image.ico} +0 -0
- data/mod/05_standard/file/{103/small-6566.ico → favicon/small-image.ico} +0 -0
- data/mod/05_standard/file/{79/icon-6556.png → logo/icon-image.png} +0 -0
- data/mod/05_standard/file/{79/large-6556.png → logo/large-image.png} +0 -0
- data/mod/05_standard/file/{79/medium-6556.png → logo/medium-image.png} +0 -0
- data/mod/05_standard/file/{79/original-6556.png → logo/original-image.png} +0 -0
- data/mod/05_standard/file/{79/small-6556.png → logo/small-image.png} +0 -0
- data/mod/05_standard/set/all/attach.rb +8 -10
- data/mod/05_standard/set/all/comment.rb +1 -1
- data/mod/05_standard/set/all/error.rb +1 -1
- data/mod/05_standard/set/all/rich_html/content.rb +14 -2
- data/mod/05_standard/set/all/rich_html/editing.rb +19 -18
- data/mod/05_standard/set/all/rich_html/form.rb +38 -47
- data/mod/05_standard/set/all/rich_html/header.rb +37 -14
- data/mod/05_standard/set/all/rich_html/wrapper.rb +3 -3
- data/mod/05_standard/set/rstar/rules.rb +18 -18
- data/mod/05_standard/set/self/account_links.rb +6 -18
- data/mod/05_standard/set/self/navbox.rb +23 -10
- data/mod/05_standard/set/self/recent.rb +1 -1
- data/mod/05_standard/set/self/signin.rb +6 -3
- data/mod/05_standard/set/type/cardtype.rb +1 -1
- data/mod/05_standard/set/type/html.rb +1 -1
- data/mod/05_standard/set/type/search_type.rb +76 -54
- data/mod/05_standard/set/type/signup.rb +5 -5
- data/mod/05_standard/set/type/user.rb +4 -4
- data/mod/05_standard/spec/set/all/rich_html/wrapper_spec.rb +2 -2
- data/mod/05_standard/spec/set/self/account_links_spec.rb +1 -1
- data/mod/06_bootstrap/file/cerulean_skin/icon-image.png +0 -0
- data/mod/06_bootstrap/file/cerulean_skin/large-image.png +0 -0
- data/mod/06_bootstrap/file/cerulean_skin/medium-image.png +0 -0
- data/mod/06_bootstrap/file/cerulean_skin/original-image.png +0 -0
- data/mod/06_bootstrap/file/cerulean_skin/small-image.png +0 -0
- data/mod/06_bootstrap/file/cosmo_skin/icon-image.png +0 -0
- data/mod/06_bootstrap/file/cosmo_skin/large-image.png +0 -0
- data/mod/06_bootstrap/file/cosmo_skin/medium-image.png +0 -0
- data/mod/06_bootstrap/file/cosmo_skin/original-image.png +0 -0
- data/mod/06_bootstrap/file/cosmo_skin/small-image.png +0 -0
- data/mod/06_bootstrap/file/cyborg_skin/icon-image.png +0 -0
- data/mod/06_bootstrap/file/cyborg_skin/large-image.png +0 -0
- data/mod/06_bootstrap/file/cyborg_skin/medium-image.png +0 -0
- data/mod/06_bootstrap/file/cyborg_skin/original-image.png +0 -0
- data/mod/06_bootstrap/file/cyborg_skin/small-image.png +0 -0
- data/mod/06_bootstrap/file/darkly_skin/icon-image.png +0 -0
- data/mod/06_bootstrap/file/darkly_skin/large-image.png +0 -0
- data/mod/06_bootstrap/file/darkly_skin/medium-image.png +0 -0
- data/mod/06_bootstrap/file/darkly_skin/original-image.png +0 -0
- data/mod/06_bootstrap/file/darkly_skin/small-image.png +0 -0
- data/mod/06_bootstrap/file/flatly_skin/icon-image.png +0 -0
- data/mod/06_bootstrap/file/flatly_skin/large-image.png +0 -0
- data/mod/06_bootstrap/file/flatly_skin/medium-image.png +0 -0
- data/mod/06_bootstrap/file/flatly_skin/original-image.png +0 -0
- data/mod/06_bootstrap/file/flatly_skin/small-image.png +0 -0
- data/mod/06_bootstrap/file/journal_skin/icon-image.png +0 -0
- data/mod/06_bootstrap/file/journal_skin/large-image.png +0 -0
- data/mod/06_bootstrap/file/journal_skin/medium-image.png +0 -0
- data/mod/06_bootstrap/file/journal_skin/original-image.png +0 -0
- data/mod/06_bootstrap/file/journal_skin/small-image.png +0 -0
- data/mod/06_bootstrap/file/lumen_skin/icon-image.png +0 -0
- data/mod/06_bootstrap/file/lumen_skin/large-image.png +0 -0
- data/mod/06_bootstrap/file/lumen_skin/medium-image.png +0 -0
- data/mod/06_bootstrap/file/lumen_skin/original-image.png +0 -0
- data/mod/06_bootstrap/file/lumen_skin/small-image.png +0 -0
- data/mod/06_bootstrap/file/paper_skin/icon-image.png +0 -0
- data/mod/06_bootstrap/file/paper_skin/large-image.png +0 -0
- data/mod/06_bootstrap/file/paper_skin/medium-image.png +0 -0
- data/mod/06_bootstrap/file/paper_skin/original-image.png +0 -0
- data/mod/06_bootstrap/file/paper_skin/small-image.png +0 -0
- data/mod/06_bootstrap/file/readable_skin/icon-image.png +0 -0
- data/mod/06_bootstrap/file/readable_skin/large-image.png +0 -0
- data/mod/06_bootstrap/file/readable_skin/medium-image.png +0 -0
- data/mod/06_bootstrap/file/readable_skin/original-image.png +0 -0
- data/mod/06_bootstrap/file/readable_skin/small-image.png +0 -0
- data/mod/06_bootstrap/file/sandstone_skin/icon-image.png +0 -0
- data/mod/06_bootstrap/file/sandstone_skin/large-image.png +0 -0
- data/mod/06_bootstrap/file/sandstone_skin/medium-image.png +0 -0
- data/mod/06_bootstrap/file/sandstone_skin/original-image.png +0 -0
- data/mod/06_bootstrap/file/sandstone_skin/small-image.png +0 -0
- data/mod/06_bootstrap/file/simplex_skin/icon-image.png +0 -0
- data/mod/06_bootstrap/file/simplex_skin/large-image.png +0 -0
- data/mod/06_bootstrap/file/simplex_skin/medium-image.png +0 -0
- data/mod/06_bootstrap/file/simplex_skin/original-image.png +0 -0
- data/mod/06_bootstrap/file/simplex_skin/small-image.png +0 -0
- data/mod/06_bootstrap/file/slate_skin/icon-image.png +0 -0
- data/mod/06_bootstrap/file/slate_skin/large-image.png +0 -0
- data/mod/06_bootstrap/file/slate_skin/medium-image.png +0 -0
- data/mod/06_bootstrap/file/slate_skin/original-image.png +0 -0
- data/mod/06_bootstrap/file/slate_skin/small-image.png +0 -0
- data/mod/06_bootstrap/file/spacelab_skin/icon-image.png +0 -0
- data/mod/06_bootstrap/file/spacelab_skin/large-image.png +0 -0
- data/mod/06_bootstrap/file/spacelab_skin/medium-image.png +0 -0
- data/mod/06_bootstrap/file/spacelab_skin/original-image.png +0 -0
- data/mod/06_bootstrap/file/spacelab_skin/small-image.png +0 -0
- data/mod/06_bootstrap/file/superhero_skin/icon-image.png +0 -0
- data/mod/06_bootstrap/file/superhero_skin/large-image.png +0 -0
- data/mod/06_bootstrap/file/superhero_skin/medium-image.png +0 -0
- data/mod/06_bootstrap/file/superhero_skin/original-image.png +0 -0
- data/mod/06_bootstrap/file/superhero_skin/small-image.png +0 -0
- data/mod/06_bootstrap/file/united_skin/icon-image.png +0 -0
- data/mod/06_bootstrap/file/united_skin/large-image.png +0 -0
- data/mod/06_bootstrap/file/united_skin/medium-image.png +0 -0
- data/mod/06_bootstrap/file/united_skin/original-image.png +0 -0
- data/mod/06_bootstrap/file/united_skin/small-image.png +0 -0
- data/mod/06_bootstrap/file/yeti_skin/icon-image.png +0 -0
- data/mod/06_bootstrap/file/yeti_skin/large-image.png +0 -0
- data/mod/06_bootstrap/file/yeti_skin/medium-image.png +0 -0
- data/mod/06_bootstrap/file/yeti_skin/original-image.png +0 -0
- data/mod/06_bootstrap/file/yeti_skin/small-image.png +0 -0
- data/mod/06_bootstrap/lib/stylesheets/bootstrap_cards.scss +199 -0
- data/mod/06_bootstrap/lib/stylesheets/{bootstrap.css → bootstrap_css.css} +0 -0
- data/mod/06_bootstrap/lib/stylesheets/theme_amelia.css +5871 -0
- data/mod/06_bootstrap/lib/stylesheets/{bootstrap-theme.css → theme_bootstrap_default.css} +0 -0
- data/mod/06_bootstrap/lib/stylesheets/theme_cerulean.css +5893 -0
- data/mod/06_bootstrap/lib/stylesheets/theme_cosmo.css +5898 -0
- data/mod/06_bootstrap/lib/stylesheets/theme_cyborg.css +5876 -0
- data/mod/06_bootstrap/lib/stylesheets/theme_darkly.css +5986 -0
- data/mod/06_bootstrap/lib/stylesheets/{darkly.css → theme_flatly.css} +574 -327
- data/mod/06_bootstrap/lib/stylesheets/theme_holo.css +183 -0
- data/mod/06_bootstrap/lib/stylesheets/theme_journal.css +6647 -0
- data/mod/06_bootstrap/lib/stylesheets/theme_lumen.css +6097 -0
- data/mod/06_bootstrap/lib/stylesheets/theme_paper.css +6647 -0
- data/mod/06_bootstrap/lib/stylesheets/theme_readable.css +5896 -0
- data/mod/06_bootstrap/lib/stylesheets/theme_sandstone.css +6733 -0
- data/mod/06_bootstrap/lib/stylesheets/theme_simplex.css +5886 -0
- data/mod/06_bootstrap/lib/stylesheets/theme_slate.css +7057 -0
- data/mod/06_bootstrap/lib/stylesheets/theme_spacelab.css +5935 -0
- data/mod/06_bootstrap/lib/stylesheets/theme_superhero.css +5964 -0
- data/mod/06_bootstrap/lib/stylesheets/theme_united.css +6588 -0
- data/mod/06_bootstrap/lib/stylesheets/theme_yeti.css +6088 -0
- data/mod/06_bootstrap/set/all/rich_bootstrap.rb +0 -16
- data/mod/06_bootstrap/set/self/bootstrap_cards.rb +9 -0
- data/mod/06_bootstrap/set/self/bootstrap_css.rb +5 -3
- data/mod/06_bootstrap/set/self/theme_bootstrap_default.rb +2 -0
- data/mod/06_bootstrap/set/self/theme_cerulean.rb +2 -0
- data/mod/06_bootstrap/set/self/theme_cosmo.rb +2 -0
- data/mod/06_bootstrap/set/self/theme_cyborg.rb +2 -0
- data/mod/06_bootstrap/set/self/theme_darkly.rb +2 -0
- data/mod/06_bootstrap/set/self/theme_flatly.rb +2 -0
- data/mod/06_bootstrap/set/self/theme_journal.rb +2 -0
- data/mod/06_bootstrap/set/self/theme_lumen.rb +2 -0
- data/mod/06_bootstrap/set/self/theme_paper.rb +2 -0
- data/mod/06_bootstrap/set/self/theme_readable.rb +2 -0
- data/mod/06_bootstrap/set/self/theme_sandstone.rb +2 -0
- data/mod/06_bootstrap/set/self/theme_simplex.rb +2 -0
- data/mod/06_bootstrap/set/self/theme_slate.rb +2 -0
- data/mod/06_bootstrap/set/self/theme_spacelab.rb +2 -0
- data/mod/06_bootstrap/set/self/theme_superhero.rb +2 -0
- data/mod/06_bootstrap/set/self/theme_united.rb +2 -0
- data/mod/06_bootstrap/set/self/theme_yeti.rb +2 -0
- data/test/fixtures/card_actions.yml +1951 -1580
- data/test/fixtures/card_acts.yml +282 -282
- data/test/fixtures/card_changes.yml +6769 -5678
- data/test/fixtures/card_references.yml +2086 -1848
- data/test/fixtures/cards.yml +4167 -3183
- metadata +142 -30
- data/mod/03_machines/lib/stylesheets/functional.scss +0 -184
- data/mod/03_machines/set/self/style_standard.rb +0 -8
- data/mod/03_machines/spec/set/self/style_functional_spec.rb +0 -5
- data/mod/03_machines/spec/set/self/style_standard_spec.rb +0 -5
- data/mod/06_bootstrap/set/all/bootstrap/header.rb +0 -29
- data/mod/06_bootstrap/set/self/bootstrap_theme_css.rb +0 -7
- data/mod/06_bootstrap/set/self/navbox.rb +0 -32
- data/mod/06_bootstrap/set/type/search_type.rb +0 -79
@@ -1,32 +0,0 @@
|
|
1
|
-
|
2
|
-
format :html do
|
3
|
-
|
4
|
-
view :raw do |args|
|
5
|
-
input_args = { :class=>'navbox form-control' }
|
6
|
-
@@placeholder ||= begin
|
7
|
-
p = Card["#{Card[:navbox].name}+*placeholder"] and p.raw_content
|
8
|
-
end
|
9
|
-
input_args[:placeholder] = @@placeholder if @@placeholder
|
10
|
-
|
11
|
-
content_tag :div, :class=>'form-group' do
|
12
|
-
text_field_tag :_keyword, '', input_args
|
13
|
-
end
|
14
|
-
end
|
15
|
-
|
16
|
-
view :navbar_left do |args|
|
17
|
-
_render_core args.merge(:navbar_class=>'navbar-form navbar-left')
|
18
|
-
end
|
19
|
-
|
20
|
-
view :navbar_right do |args|
|
21
|
-
_render_core args.merge(:navbar_class=>'navbar-form navbar-right')
|
22
|
-
end
|
23
|
-
|
24
|
-
view :core do |args|
|
25
|
-
form_tag Card.path_setting('/:search'), :method => 'get', :role => 'search',
|
26
|
-
:class => "nodblclick navbox-form #{args[:navbar_class]}" do
|
27
|
-
_render_raw args
|
28
|
-
end
|
29
|
-
|
30
|
-
end
|
31
|
-
|
32
|
-
end
|
@@ -1,79 +0,0 @@
|
|
1
|
-
format do
|
2
|
-
def page_link text, page, current=false, options={}
|
3
|
-
@paging_path_args[:offset] = page * @paging_limit
|
4
|
-
options.merge!(:class=>'card-paging-link slotter', :remote => true)
|
5
|
-
link_to raw(text), path(@paging_path_args), options
|
6
|
-
end
|
7
|
-
|
8
|
-
def page_li text, page, current=false, options={}
|
9
|
-
css_class = if current
|
10
|
-
'active'
|
11
|
-
elsif !page
|
12
|
-
'disabled'
|
13
|
-
end
|
14
|
-
page ||= 0
|
15
|
-
content_tag :li, :class=>css_class do
|
16
|
-
page_link text, page, current, options
|
17
|
-
end
|
18
|
-
end
|
19
|
-
|
20
|
-
def previous_page_link page
|
21
|
-
page_li '<span aria-hidden="true">«</span>', page, false, 'aria-label'=>"Previous"
|
22
|
-
end
|
23
|
-
|
24
|
-
def next_page_link page
|
25
|
-
page_li '<span aria-hidden="true">»</span>', page, false, 'aria-label'=>"Next"
|
26
|
-
end
|
27
|
-
|
28
|
-
def ellipse_page
|
29
|
-
content_tag :li, content_tag(:span, '...')
|
30
|
-
end
|
31
|
-
end
|
32
|
-
|
33
|
-
format :html do
|
34
|
-
view :paging do |args|
|
35
|
-
s = card.query search_params
|
36
|
-
offset, limit = s[:offset].to_i, s[:limit].to_i
|
37
|
-
return '' if limit < 1
|
38
|
-
return '' if offset==0 && limit > offset + search_vars[:results].length #avoid query if we know there aren't enough results to warrant paging
|
39
|
-
total = card.count search_params
|
40
|
-
return '' if limit >= total # should only happen if limit exactly equals the total
|
41
|
-
|
42
|
-
@paging_path_args = { :limit => limit, :item=> inclusion_defaults[:view] }
|
43
|
-
@paging_limit = limit
|
44
|
-
|
45
|
-
s[:vars].each { |key, value| @paging_path_args["_#{key}"] = value }
|
46
|
-
|
47
|
-
out = ['<nav><ul class="pagination paging">' ]
|
48
|
-
|
49
|
-
total_pages = ((total-1) / limit).to_i
|
50
|
-
current_page = ( offset / limit).to_i # should already be integer
|
51
|
-
window = 2 # should be configurable
|
52
|
-
window_min = current_page - window
|
53
|
-
window_max = current_page + window
|
54
|
-
|
55
|
-
previous_page = current_page > 0 ? current_page - 1 : false
|
56
|
-
out << previous_page_link(previous_page)
|
57
|
-
if window_min > 0
|
58
|
-
out << page_li( 1, 0 )
|
59
|
-
out << ellipse_page if window_min > 1
|
60
|
-
end
|
61
|
-
|
62
|
-
(window_min .. window_max).each do |page|
|
63
|
-
next if page < 0 or page > total_pages
|
64
|
-
text = page + 1
|
65
|
-
out << page_li( text, page, page==current_page )
|
66
|
-
end
|
67
|
-
|
68
|
-
if total_pages > window_max
|
69
|
-
out << ellipse_page if total_pages > window_max + 1
|
70
|
-
out << page_li( total_pages + 1, total_pages )
|
71
|
-
end
|
72
|
-
|
73
|
-
next_page = current_page < total_pages ? current_page + 1 : false
|
74
|
-
out << next_page_link(next_page)
|
75
|
-
|
76
|
-
out << %{</ul></nav>}
|
77
|
-
out.join
|
78
|
-
end
|
79
|
-
end
|