Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Use deface in wiki plugin

Browse source
This commit is contained in:
Patrick Gansterer 2017-10-20 12:06:34 +02:00
parent 8e593f8629
commit da1ebe915c
6 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Gemfile.lock
View file

@ -42,6 +42,7 @@ PATH
foodsoft_wiki (0.0.1) foodsoft_wiki (0.0.1)
acts_as_versioned acts_as_versioned
content_for_in_controllers content_for_in_controllers
deface (~> 1.0)
diffy diffy
rails rails
wikicloth wikicloth

2
app/views/admin/configs/_tab_others.html.haml
View file

@ -1,5 +1,3 @@
- if defined? FoodsoftWiki # avoid requiring deface here (the single exception)
= config_input form, :use_wiki, as: :boolean
= config_input form, :use_nick, as: :boolean = config_input form, :use_nick, as: :boolean
= config_input form, :tolerance_is_costly, as: :boolean = config_input form, :tolerance_is_costly, as: :boolean
= config_input form, :disable_invite, as: :boolean = config_input form, :disable_invite, as: :boolean

3
app/views/sessions/new.html.haml
View file

@ -10,9 +10,6 @@
.alert.alert-error .alert.alert-error
!= t '.nojs', link: link_to(t('.noscript'), "http://noscript.net/") != t '.nojs', link: link_to(t('.noscript'), "http://noscript.net/")
- if defined?(FoodsoftWiki) && (page = Page.public_front_page)
= wikified_body page.body, page.title
= form_tag sessions_path, class: 'form-horizontal' do = form_tag sessions_path, class: 'form-horizontal' do
.control-group .control-group
%label(for='nick' class='control-label') %label(for='nick' class='control-label')

2
plugins/wiki/app/overrides/admin/configs/_tab_others/add_wiki_config.html.haml.deface Normal file
View file

@ -0,0 +1,2 @@
/ insert_before ':root:first-child'
= config_input form, :use_wiki, as: :boolean

3
plugins/wiki/app/overrides/sessions/new/public_frontpage.html.haml.deface Normal file
View file

@ -0,0 +1,3 @@
/ insert_after 'noscript'
- if FoodsoftWiki.enabled? && (page = Page.public_front_page)
= wikified_body page.body, page.title

1
plugins/wiki/foodsoft_wiki.gemspec
View file

@ -19,6 +19,7 @@ Gem::Specification.new do |s|
s.add_dependency "rails" s.add_dependency "rails"
s.add_dependency 'wikicloth' s.add_dependency 'wikicloth'
s.add_dependency 'acts_as_versioned' # need git version, make sure that is included in foodsoft's Gemfile s.add_dependency 'acts_as_versioned' # need git version, make sure that is included in foodsoft's Gemfile
s.add_dependency "deface", "~> 1.0"
s.add_dependency 'diffy' s.add_dependency 'diffy'
s.add_dependency 'content_for_in_controllers' s.add_dependency 'content_for_in_controllers'
s.add_development_dependency "sqlite3" s.add_development_dependency "sqlite3"