Skip to content

Merge down online => master #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nhr merged 6 commits into from
Sep 24, 2014
Merged

Merge down online => master #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
77bd0b2
Modified README to reflect new branch
nhr Sep 16, 2014
db70d93
Merge pull request #17 from nhr/online
nhr Sep 16, 2014
686b3ab
Beginning migration of UG topics
Sep 22, 2014
a147fa6
Merge pull request #19 from CowboysFan/online_userguide
nhr Sep 23, 2014
be7aa26
Fixed generator logic, improved Guard
nhr Sep 24, 2014
dc6e960
Merge pull request #20 from nhr/generator_improvements
nhr Sep 24, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions Guardfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,14 @@
require 'asciidoctor'
require 'erb'
require 'haml'
require 'tilt'

guard 'shell' do
watch(/^.*\.adoc$/) { |m|
if not m[0].start_with?('_preview')
src_group_path = m[0].split('/')[0]
filename = m[0].split('/')[-1][0..-6]
tgt_file_path = "_preview/#{src_group_path}"
Asciidoctor.render_file m[0], :in_place => true, :safe => :unsafe, :template_dir => '_template', :attributes => ['source-highlighter=coderay','coderay-css=style',"stylesdir=_preview/stylesheets","imagesdir=#{src_group_path}/images",'stylesheet=origin.css','linkcss!','icons=font','idprefix=','idseparator=-','sectanchors']
system('mv', "#{src_group_path}/#{filename}.html", "#{tgt_file_path}/")
system("bundle exec rake refresh_page['#{src_group_path}:#{filename}']")
end
}
end

guard 'livereload' do
watch(%r{^_preview\.(css|js|html)$})
watch(%r{^_preview/.+\.(css|js|html)$})
watch(%r{^_preview/.+\/.+\/.+\.(css|js|html)$})
end
2 changes: 1 addition & 1 deletion README.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
= OpenShift Documentation
= OpenShift Documentation (ONLINE BRANCH)

This repo contains the documentation for

Expand Down
Loading