Merge pull request #787 from akretion/fix-upload-path

fixes bug #786 per_page_uploads: incorrect file path if page is inside some directory

lib/gollum/app.rb

@@ -449,7 +449,7 @@ module Precious
         @content  = page.formatted_data
         @upload_dest = settings.wiki_options[:allow_uploads] ?
                          (settings.wiki_options[:per_page_uploads] ?
-                            @name : 'uploads'
+                            "#{path}/#{@name}".sub(/^\/\//, '') : 'uploads'
                          ) : ''
 
         # Extensions and layout data

lib/gollum/public/gollum/javascript/gollum.js

@@ -155,7 +155,7 @@ $(document).ready(function() {
         fields: [
           {
             type:   'file',
-            context: 'Your uploaded file will be accessible at /'+uploadDest+'/[filename]',
+            context: 'Your uploaded file will be accessible at<br>/'+uploadDest+'/[filename]',
             action: baseUrl + '/uploadFile'
           }
         ],