wiki.ohea.xyz/gollum
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge pull request #464 from giga/master

Browse Source 
Fix editor when base url is '/'
This commit is contained in:
bootstraponline
2012-08-08 10:53:45 -07:00
parent 410cd912ac 6fbba84725
commit 3df407d9ee
13 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/gollum/frontend/app.rb
+1 -1
View File
@@ -82,7 +82,7 @@ module Precious
end
before do
@base_url = url('/', false)
@base_url = url('/', false).chomp('/')
settings.wiki_options.merge!({ :base_path => @base_url }) unless settings.wiki_options.has_key? :base_path
end
lib/gollum/frontend/public/gollum/javascript/editor/gollum.editor.js
+1 -1
View File
@@ -277,7 +277,7 @@
}
// attempt to load the definition for this language
var script_uri = '.' + baseUrl + '/javascript/editor/langs/' + markup_name + '.js';
var script_uri = baseUrl + '/javascript/editor/langs/' + markup_name + '.js';
$.ajax({
url: script_uri,
dataType: 'script',
lib/gollum/frontend/public/gollum/javascript/gollum.js
+2 -2
View File
@@ -4,7 +4,7 @@ $(document).ready(function() {
var ok = confirm($(this).data('confirm'));
if ( ok ) {
var loc = window.location;
loc = baseUrl + 'delete' + loc.pathname
loc = baseUrl + '/delete' + loc.pathname
window.location = loc;
}
// Don't navigate on cancel.
@@ -138,7 +138,7 @@ $(document).ready(function() {
var msg = 'Renamed ' + oldName + ' to ' + newName;
jQuery.ajax( {
type: 'POST',
url: baseUrl + 'edit/' + oldName,
url: baseUrl + '/edit/' + oldName,
data: { path: path, rename: newName, page: oldName, message: msg },
success: function() {
window.location = baseUrl + encodeURIComponent(newName);
lib/gollum/frontend/templates/compare.mustache
+6 -6
View File
@@ -6,11 +6,11 @@
<li class="minibutton">
{{>searchbar}}
</li>
<li class="minibutton"><a href="{{base_url}}{{escaped_url_path}}"
<li class="minibutton"><a href="{{base_url}}/{{escaped_url_path}}"
class="action-view-page">View Page</a></li>
<li class="minibutton"><a href="{{base_url}}edit/{{escaped_url_path}}"
<li class="minibutton"><a href="{{base_url}}/edit/{{escaped_url_path}}"
class="action-edit-page">Edit Page</a></li>
<li class="minibutton"><a href="{{base_url}}history/{{escaped_url_path}}"
<li class="minibutton"><a href="{{base_url}}/history/{{escaped_url_path}}"
class="action-page-history">Page History</a></li>
</ul>
</div>
@@ -23,10 +23,10 @@
{{#show_revert}}
<ul class="actions">
<li class="minibutton"><a href="{{base_url}}history/{{escaped_url_path}}"
<li class="minibutton"><a href="{{base_url}}/history/{{escaped_url_path}}"
class="action-page-history">Back to Page History</a></li>
<li class="minibutton">
<form name="gollum-revert" action="{{base_url}}revert/{{escaped_url_path}}/{{before}}/{{after}}" method="post" id="gollum-revert-form">
<form name="gollum-revert" action="{{base_url}}/revert/{{escaped_url_path}}/{{before}}/{{after}}" method="post" id="gollum-revert-form">
<a href="#" class="gollum-revert-button">Revert Changes</a>
</form>
</li>
@@ -49,7 +49,7 @@
</div>
<div id="footer">
<ul class="actions">
<li class="minibutton"><a href="{{base_url}}history/{{escaped_url_path}}"
<li class="minibutton"><a href="{{base_url}}/history/{{escaped_url_path}}"
class="action-page-history">Back to Page History</a></li>
{{#show_revert}}
<li class="minibutton">
lib/gollum/frontend/templates/edit.mustache
+2 -2
View File
@@ -2,9 +2,9 @@
<div id="head">
<h1>Editing <strong>{{title}}</strong></h1>
<ul class="actions">
<li class="minibutton"><a href="{{base_url}}{{escaped_url_path}}"
<li class="minibutton"><a href="{{base_url}}/{{escaped_url_path}}"
class="action-view-page">View Page</a></li>
<li class="minibutton"><a href="{{base_url}}history/{{escaped_url_path}}"
<li class="minibutton"><a href="{{base_url}}/history/{{escaped_url_path}}"
class="action-page-history">Page History</a></li>
</ul>
</div>
lib/gollum/frontend/templates/editor.mustache
+3 -3
View File
@@ -1,9 +1,9 @@
<div id="gollum-editor" data-escaped-name="{{escaped_name}}" class="{{#is_create_page}}create{{/is_create_page}}{{#is_edit_page}}edit{{/is_edit_page}}">
{{#is_create_page}}
<form name="gollum-editor" action="{{base_url}}create" method="post">
<form name="gollum-editor" action="{{base_url}}/create" method="post">
{{/is_create_page}}
{{#is_edit_page}}
<form name="gollum-editor" action="{{base_url}}edit/{{escaped_name}}" method="post">
<form name="gollum-editor" action="{{base_url}}/edit/{{escaped_name}}" method="post">
{{/is_edit_page}}
<fieldset id="gollum-editor-fields">
{{#is_create_page}}
@@ -126,7 +126,7 @@
<span class="jaws"><br></span>
<input type="submit" id="gollum-editor-submit" value="Save" title="Save current changes">
<a href="{{base_url}}preview" id="gollum-editor-preview" class="minibutton" title="Preview this Page">Preview</a>
<a href="{{base_url}}/preview" id="gollum-editor-preview" class="minibutton" title="Preview this Page">Preview</a>
</fieldset>
</form>
</div>
lib/gollum/frontend/templates/file_view.mustache
+4 -4
View File
@@ -2,9 +2,9 @@
<html>
<head>
<meta http-equiv="Content-type" content="text/html;charset=utf-8">
<link rel="stylesheet" type="text/css" href="{{base_url}}css/gollum.css" media="all">
<link rel="stylesheet" type="text/css" href="{{base_url}}css/template.css" media="all">
<link rel="stylesheet" type="text/css" href="{{base_url}}css/_styles.css" media="all">
<link rel="stylesheet" type="text/css" href="{{base_url}}/css/gollum.css" media="all">
<link rel="stylesheet" type="text/css" href="{{base_url}}/css/template.css" media="all">
<link rel="stylesheet" type="text/css" href="{{base_url}}/css/_styles.css" media="all">
<title>{{title}}</title>
</head>
<body>
@@ -12,7 +12,7 @@
<div id="home_button">
<ul class="actions">
<li class="minibutton">
<a href="{{base_url}}" class="action-edit-page">Home</a>
<a href="{{base_url}}/" class="action-edit-page">Home</a>
</li>
</ul>
</div>
lib/gollum/frontend/templates/history.mustache
+4 -4
View File
@@ -5,9 +5,9 @@
<li class="minibutton">
{{>searchbar}}
</li>
<li class="minibutton"><a href="{{base_url}}{{escaped_url_path}}"
<li class="minibutton"><a href="{{base_url}}/{{escaped_url_path}}"
class="action-view-page">View Page</a></li>
<li class="minibutton"><a href="{{base_url}}edit/{{escaped_url_path}}"
<li class="minibutton"><a href="{{base_url}}/edit/{{escaped_url_path}}"
class="action-edit-page">Edit Page</a></li>
</ul>
</div>
@@ -19,7 +19,7 @@
</ul>
<form name="compare-versions" id="version-form" method="post"
action="{{base_url}}compare/{{escaped_url_path}}">
action="{{base_url}}/compare/{{escaped_url_path}}">
<fieldset>
<table>
<tbody>
@@ -39,7 +39,7 @@
<td class="commit-name">
<span class="time-elapsed">{{date}}:</span>&nbsp;
{{message}}
[<a href="{{base_url}}{{escaped_url_path}}/{{id}}" title="View commit">{{id7}}</a>]
[<a href="{{base_url}}/{{escaped_url_path}}/{{id}}" title="View commit">{{id7}}</a>]
</td>
</tr>
{{/versions}}
lib/gollum/frontend/templates/layout.mustache
+11 -11
View File
@@ -2,22 +2,22 @@
<html>
<head>
<meta http-equiv="Content-type" content="text/html;charset=utf-8">
<link rel="stylesheet" type="text/css" href="{{base_url}}css/gollum.css" media="all">
<link rel="stylesheet" type="text/css" href="{{base_url}}css/editor.css" media="all">
<link rel="stylesheet" type="text/css" href="{{base_url}}css/dialog.css" media="all">
<link rel="stylesheet" type="text/css" href="{{base_url}}css/template.css" media="all">
<link rel="stylesheet" type="text/css" href="{{base_url}}/css/gollum.css" media="all">
<link rel="stylesheet" type="text/css" href="{{base_url}}/css/editor.css" media="all">
<link rel="stylesheet" type="text/css" href="{{base_url}}/css/dialog.css" media="all">
<link rel="stylesheet" type="text/css" href="{{base_url}}/css/template.css" media="all">
<!--[if IE 7]>
<link rel="stylesheet" type="text/css" href="{{base_url}}css/ie7.css" media="all">
<link rel="stylesheet" type="text/css" href="{{base_url}}/css/ie7.css" media="all">
<![endif]-->
<script>var baseUrl = '{{base_url}}'</script>
<script type="text/javascript" src="{{base_url}}javascript/jquery-1.7.2.min.js"></script>
<script type="text/javascript" src="{{base_url}}javascript/mousetrap.min.js"></script>
<script type="text/javascript" src="{{base_url}}javascript/gollum.js"></script>
<script type="text/javascript" src="{{base_url}}javascript/gollum.dialog.js"></script>
<script type="text/javascript" src="{{base_url}}javascript/gollum.placeholder.js"></script>
<script type="text/javascript" src="{{base_url}}javascript/editor/gollum.editor.js"></script>
<script type="text/javascript" src="{{base_url}}/javascript/jquery-1.7.2.min.js"></script>
<script type="text/javascript" src="{{base_url}}/javascript/mousetrap.min.js"></script>
<script type="text/javascript" src="{{base_url}}/javascript/gollum.js"></script>
<script type="text/javascript" src="{{base_url}}/javascript/gollum.dialog.js"></script>
<script type="text/javascript" src="{{base_url}}/javascript/gollum.placeholder.js"></script>
<script type="text/javascript" src="{{base_url}}/javascript/editor/gollum.editor.js"></script>
{{#mathjax}}<script>(function(d,j){
j = d.createElement('script');
j.src = 'https://c328740.ssl.cf1.rackcdn.com/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML';
lib/gollum/frontend/templates/page.mustache
+6 -6
View File
@@ -5,21 +5,21 @@
<li class="minibutton">
{{>searchbar}}
</li>
<li class="minibutton"><a href="{{base_url}}"
<li class="minibutton"><a href="{{base_url}}/"
class="action-edit-page">Home</a></li>
<li class="minibutton"><a href="{{base_url}}pages"
<li class="minibutton"><a href="{{base_url}}/pages"
class="action-all-pages">All</a></li>
<li class="minibutton"><a href="{{base_url}}fileview"
<li class="minibutton"><a href="{{base_url}}/fileview"
class="action-all-pages">Files</a></li>
<li class="minibutton" class="jaws">
<a href="#" id="minibutton-new-page">New</a></li>
<li class="minibutton" class="jaws">
<a href="#" id="minibutton-rename-page">Rename</a></li>
{{#editable}}
<li class="minibutton"><a href="{{base_url}}edit/{{escaped_url_path}}"
<li class="minibutton"><a href="{{base_url}}/edit/{{escaped_url_path}}"
class="action-edit-page">Edit</a></li>
{{/editable}}
<li class="minibutton"><a href="{{base_url}}history/{{escaped_url_path}}"
<li class="minibutton"><a href="{{base_url}}/history/{{escaped_url_path}}"
class="action-page-history">History</a></li>
</ul>
</div>
@@ -62,7 +62,7 @@
<div id="footer">
<p id="last-edit">Last edited by <b>{{author}}</b>, {{date}}</p>
<p>
<a id="delete-link" href="{{base_url}}{{escaped_url_path}}" data-confirm="Are you sure you want to delete this page?"><span>Delete this Page</span></a>
<a id="delete-link" href="{{base_url}}/{{escaped_url_path}}" data-confirm="Are you sure you want to delete this page?"><span>Delete this Page</span></a>
</p>
</div>
</div>
lib/gollum/frontend/templates/pages.mustache
+1 -1
View File
@@ -5,7 +5,7 @@
<li class="minibutton">
{{>searchbar}}
</li>
<li class="minibutton"><a href="{{base_url}}"
<li class="minibutton"><a href="{{base_url}}/"
class="action-edit-page">Home</a></li>
<li class="minibutton" class="jaws">
<a href="#" id="minibutton-new-page">New</a>
lib/gollum/frontend/templates/search.mustache
+2 -2
View File
@@ -5,7 +5,7 @@
<li class="minibutton">
{{>searchbar}}
</li>
<li class="minibutton"><a href="{{base_url}}"
<li class="minibutton"><a href="{{base_url}}/"
class="action-edit-page">Home</a></li>
</ul>
</div>
@@ -15,7 +15,7 @@
<ul>
{{#results}}
<li>
<a href="{{base_url}}{{name}}">{{name}}</a>
<a href="{{base_url}}/{{name}}">{{name}}</a>
<span class="count">({{count}} matches)</span>
</li>
{{/results}}
lib/gollum/frontend/templates/searchbar.mustache
+1 -1
View File
@@ -1,5 +1,5 @@
<div id="searchbar">
<form action="{{base_url}}search" method="get" id="search-form">
<form action="{{base_url}}/search" method="get" id="search-form">
<div id="searchbar-fauxtext">
<input type="text" name="q" id="search-query" value="Search&hellip;" autocomplete="off">
<a href="#" id="search-submit" title="Search this wiki">