Merge branch 'master' of
ssh://ovander@git.eclipse.org/gitroot/epf/org.eclipse.epf.wiki.git
Conflicts:
source/app/models/version.rb
diff --git a/source/app/models/version.rb b/source/app/models/version.rb
index 4623f16..806db21 100644
--- a/source/app/models/version.rb
+++ b/source/app/models/version.rb
@@ -136,16 +136,12 @@
# Absolute path to the diff file and paths to the intermediate (tidied, cleaned) HTML files
def path_to_diff(from_version)
- "#{ENV['EPFWIKI_ROOT_DIR']}#{ENV['EPFWIKI_PUBLIC_FOLDER']}/#{relpath_to_diff(from_version)}"
+ return "#{ENV['EPFWIKI_ROOT_DIR']}#{ENV['EPFWIKI_PUBLIC_FOLDER']}/#{relpath_to_diff(from_version)}"
end
# Relative path to the diff file
def relpath_to_diff(from_version)
- '/' + self.wiki.rel_path + '/' + self.page.rel_path + "_EPFWIKI_DIFF_V#{from_version.version}_V#{self.version}.html"
- end
-
- def url_to_diff(from_version)
- ENV['EPFWIKI_BASE_URL'] + self.relpath_to_diff(from_version)
+ return ENV['EPFWIKI_BASE_URL'] + self.wiki.rel_path + '/' + self.page.rel_path + "_EPFWIKI_DIFF_V#{from_version.version}_V#{self.version}.html"
end
# Path intermediate (tidied, cleaned) HTML files, prepared for XHTMLDiff
diff --git a/source/app/views/versions/diff.html.erb b/source/app/views/versions/diff.html.erb
index e7fd69e..98f9d4f 100644
--- a/source/app/views/versions/diff.html.erb
+++ b/source/app/views/versions/diff.html.erb
@@ -33,10 +33,10 @@
Differences
</th>
<td class="sectionTableCell">
- <p><a href="<%= @version.url_to_diff(@version.source_version) %>" target="_blank">Open in a new window</a></p>
+ <p><a href="<%= @version.relpath_to_diff(@version.source_version) %>" target="_blank">Open in a new window</a></p>
<iframe
height = "600"
- src ="<%= @version.url_to_diff(@version.source_version) %>"
+ src ="<%= @version.relpath_to_diff(@version.source_version) %>"
width="100%">
</iframe>
</td>
diff --git a/source/config/environments/production.rb.example b/source/config/environments/production.rb.example
index 0607796..e46ff14 100644
--- a/source/config/environments/production.rb.example
+++ b/source/config/environments/production.rb.example
@@ -3,7 +3,7 @@
ENV['EPFWIKI_APP_NAME'] = 'EPF Wiki'
ENV['EPFWIKI_REPLY_ADDRESS'] = "no-reply@epf.eclipse.org"
- ENV['EPFWIKI_BASE_URL'] = "http://localhost" # used for creating absolute links in emails, without trailing slash
+ ENV['EPFWIKI_BASE_URL'] = "http://localhost" # used for creating absolute links in emails, including slash
ENV['EPFWIKI_WINDOWS'] = 'N' # Y/N
ENV['EPFWIKI_PUBLIC_FOLDER'] = 'public'
ENV['EPFWIKI_ROOT_DIR'] = File.expand_path(Rails.root) + '/'
diff --git a/source/public/pages/view/.htaccess b/source/public/pages/view/.htaccess
deleted file mode 100644
index 91091a7..0000000
--- a/source/public/pages/view/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-ForceType text/javascript;charset=utf-8
\ No newline at end of file
diff --git a/source/tmp/pids/server.pid b/source/tmp/pids/server.pid
index 12659e6..fa2e567 100644
--- a/source/tmp/pids/server.pid
+++ b/source/tmp/pids/server.pid
@@ -1 +1 @@
-22283
\ No newline at end of file
+18986
\ No newline at end of file
