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

Merge branch 'master' into base-url

Browse Source 
Conflicts:
	lib/gollum/frontend/public/gollum/css/_styles.css
	lib/gollum/frontend/public/gollum/javascript/gollum.js
	lib/gollum/frontend/public/gollum/livepreview/js/livepreview.js
	lib/gollum/frontend/templates/file_view.mustache
	lib/gollum/frontend/templates/layout.mustache
	lib/gollum/frontend/templates/page.mustache
This commit is contained in:
Sunny Ripert
2012-07-25 10:00:52 +02:00
parent 0269cd0b3b f811ac510e
commit b5653464d2
119 changed files with 1324 additions and 11613 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/gollum/frontend/templates/page.mustache
+10 -5
View File
@@ -6,17 +6,19 @@
{{>searchbar}}
</li>
<li class="minibutton"><a href="{{base_url}}pages"
class="action-all-pages">All Pages</a></li>
class="action-all-pages">All</a></li>
<li class="minibutton"><a href="{{base_url}}fileview"
class="action-all-pages">File View</a></li>
class="action-all-pages">Files</a></li>
<li class="minibutton" class="jaws">
<a href="#" id="minibutton-new-page">New Page</a></li>
<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}}"
class="action-edit-page">Edit Page</a></li>
class="action-edit-page">Edit</a></li>
{{/editable}}
<li class="minibutton"><a href="{{base_url}}history/{{escaped_url_path}}"
class="action-page-history">Page History</a></li>
class="action-page-history">History</a></li>
</ul>
</div>
<div id="wiki-content">
@@ -57,5 +59,8 @@
</div>
<div id="footer">
<p id="last-edit">Last edited by <b>{{author}}</b>, {{date}}</p>
<p>
<a id="delete-link" href="{{escaped_url_path}}" data-confirm="Are you sure you want to delete this page?"><span>Delete this Page</span></a>
</p>
</div>
</div>