gollum 4.1.4 → 5.0.0

data/lib/gollum/templates/compare.mustache

@@ -1,69 +1,52 @@
 <div id="wiki-wrapper" class="compare">
-<div id="head">
-  <h1>History for <strong>{{path}}</strong></h1>
-
-  <ul class="actions">
-    <li class="minibutton">
-      {{>searchbar}}
-    </li>
-    <li class="minibutton"><a href="{{base_url}}/{{escaped_url_path}}"
-       class="action-view-page">View Page</a></li>
-    {{#allow_editing}}
-      <li class="minibutton"><a href="{{base_url}}/edit/{{escaped_url_path}}"
-         class="action-edit-page">Edit Page</a></li>
-    {{/allow_editing}}
-    <li class="minibutton"><a href="{{base_url}}/history/{{escaped_url_path}}"
-       class="action-page-history">Page History</a></li>
-  </ul>
-</div>
+	<div id="head">
+		{{>navbar}}
+	  <h1 class="py-4"><span class="f1-light text-gray-light">Comparing versions of</span> {{name}}</h1>
+	</div>
 
 {{#message}}
-<p>{{message}}</p>
+	<p>{{message}}</p>
 {{/message}}
 
-<div id="compare-content">
+	<div id="compare-content">
 
-  {{#show_revert}}
-  <ul class="actions">
-    <li class="minibutton"><a href="{{base_url}}/history/{{escaped_url_path}}"
-       class="action-page-history">Back to Page History</a></li>
-    {{#allow_editing}}
-      <li class="minibutton">
-        <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>
-    {{/allow_editing}}
-  </ul>
-  {{/show_revert}}
+		<div class="py-4" id="actions">
+		  {{#show_revert}}
+		    {{#allow_editing}}
+				<form name="gollum-revert" action="{{revert_path}}/{{escaped_url_path}}/{{before}}/{{after}}" method="post" id="gollum-revert-form"></form>
+				<span class="pb-4">
+					<button class="btn btn-sm" type="submit" onclick="$('#gollum-revert-form').submit()">Revert Changes</button>
+				</span>
+		    {{/allow_editing}}
+		  {{/show_revert}}
+			<a href="{{history_path}}/{{escaped_url_path}}" class="btn btn-sm action-page-history">Back to Page History</a>
+		</div>
 
-  <div class="data highlight">
-    <table cellpadding="0" cellspacing="0">
-      {{#lines}}
-        <tr>
-          <td class="line_numbers">{{ldln}}</td>
-          <td class="line_numbers">{{rdln}}</td>
-          <td>
-            <pre><div class="{{class}}">{{line}}</div></pre>
-          </td>
-        </tr>
-      {{/lines}}
-    </table>
-  </div>
-</div>
-<div id="footer">
-  <ul class="actions">
-    <li class="minibutton"><a href="{{base_url}}/history/{{escaped_url_path}}"
-       class="action-page-history">Back to Page History</a></li>
-    {{#show_revert}}
-    {{#allow_editing}}
-      <li class="minibutton">
-        <a href="#" class="gollum-revert-button">Revert Changes</a>
-      </li>
-    {{/allow_editing}}
-    {{/show_revert}}
-    <li class="minibutton"><a href="#">Back to Top</a></li>
-  </ul>
-</div>
-</div>
+	  <div class="Box data highlight">
+			<div class="Box-header Box--condensed Box-header--gray">{{path}} <span class="px-2 float-right">Comparing {{before}} to {{after}}</span></div>
+	    <table >
+	      {{#lines}}
+	        <tr>
+	          <td class="line_numbers">{{ldln}}</td>
+	          <td class="line_numbers">{{rdln}}</td>
+	          <td>
+	            <div class="{{class}} pl-2">{{line}}</div>
+	          </td>
+	        </tr>
+	      {{/lines}}
+	    </table>
+		</div>
+	</div>
+
+	<div class="pt-4" id="footer">
+	   {{#show_revert}}
+	   {{#allow_editing}}
+				<span class="pt-4"><button class="btn btn-sm gollum-revert-button" type="submit" onclick="$('#gollum-revert-form').submit()">Revert Changes</button></span>
+	   {{/allow_editing}}
+	   {{/show_revert}}
+		<div class="pt-4">
+	   <a href="#">Back to Top</a>
+		</div>
+	</div>
 </div>
+

data/lib/gollum/templates/create.mustache

@@ -1,14 +1,21 @@
 <div id="wiki-wrapper" class="create">
 <div id="head">
-  <h1>Create New Page</h1>
+	{{>navbar}}
+  <h1 class="py-4">Create New Page</h1>
 </div>
 <div id="wiki-content" class="create edit">
-  <div class="has-sidebar">
+	<div class="tabnav">
+	  <nav class="tabnav-tabs" aria-label="Foo bar">
+	    <a href="#" id="edit" class="tabnav-tab selected" aria-current="edit">Edit</a>
+	    <a href="#" id="preview" class="tabnav-tab" aria-current="preview">Preview</a>
+	  </nav>
+	</div>
+	
+  <div class="has-sidebar tabnav-div" id="edit-content">
     {{>editor}}
   </div>
+	<div class="tabnav-div" id="preview-content">
+	</div>
 </div>
 </div>
-<script type="text/javascript">
-var default_markup = '{{default_markup}}';
-</script>
 {{something}}

data/lib/gollum/templates/edit.mustache

@@ -1,12 +1,14 @@
 <div id="wiki-wrapper" class="edit">
 <div id="head">
-  <h1>Editing <strong>{{title}}</strong></h1>
-  <ul class="actions">
-    <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}}"
-       class="action-page-history">Page History</a></li>
-  </ul>
+	{{>navbar}}
+  <h1 class="py-4">Editing <strong>{{title}}</strong></h1>
 </div>
-  <div id="wiki-content">{{>editor}}</div>
+<div class="tabnav">
+  <nav class="tabnav-tabs">
+    <a href="#" id="edit" class="tabnav-tab selected" aria-current="edit">Edit</a>
+    <a href="#" id="preview" class="tabnav-tab" aria-current="preview">Preview</a>
+  </nav>
+</div>
+  <div class="tabnav-div" id="edit-content">{{>editor}}</div>
+	<div class="tabnav-div" id="preview-content"></div>
 </div>

data/lib/gollum/templates/editor.mustache

@@ -1,15 +1,15 @@
-<div id="gollum-editor" data-escaped-name="{{escaped_name}}" class="{{#is_create_page}}create{{/is_create_page}}{{#is_edit_page}}edit{{/is_edit_page}} {{#allow_uploads}}uploads-allowed{{/allow_uploads}}">
+<div id="gollum-editor" data-escaped-name="{{escaped_name}}" class="{{#is_create_page}}create{{/is_create_page}}{{#is_edit_page}}edit{{/is_edit_page}} {{#allow_uploads}}uploads-allowed{{/allow_uploads}} tex2jax_ignore">
 {{#is_create_page}}
-<form name="gollum-editor" action="{{base_url}}/create" method="post">
+<form id="gollum-editor-form" name="gollum-editor" action="{{create_path}}" method="post">
 {{/is_create_page}}
 {{#is_edit_page}}
-<form name="gollum-editor" action="{{base_url}}/edit/{{escaped_name}}" method="post">
+<form id="gollum-editor-form" name="gollum-editor" action="{{edit_path}}/{{escaped_name}}" method="post">
 {{/is_edit_page}}
   <fieldset id="gollum-editor-fields">
   {{#is_create_page}}
   <div id="gollum-editor-title-field" class="singleline">
     <label for="page" class="jaws">Page Title</label>
-    <input type="text" name="page" id="gollum-editor-page-title" value="{{page_name}}">
+    <input class="form-control input-lg" placeholder="Page title" type="text" name="page" id="gollum-editor-page-title" value="{{page_name}}">
     {{#has_path}}
     <p class="path_note"><strong>NOTE:</strong> This page will be created within the &quot;<strong>{{path}}</strong>&quot; directory</p>
     {{/has_path}}
@@ -17,54 +17,64 @@
   {{/is_create_page}}
   {{#is_edit_page}}
   <input type="hidden" name="page" id="gollum-editor-page-title" value="{{page_name}}">
+  <input type="hidden" name="etag" id="gollum-editor-etag" value="{{etag}}">
   {{/is_edit_page}}
   <input type="hidden" name="path" id="gollum-editor-page-path" value="{{path}}">
-  <div id="gollum-editor-function-bar">
+  
+	<div id="gollum-editor-function-bar">
     <div id="gollum-editor-function-buttons">
-    <a href="#" id="function-bold" class="function-button">
-      <span>Bold</span></a>
-    <a href="#" id="function-italic" class="function-button">
-      <span>Italic</span></a>
-    <a href="#" id="function-code" class="function-button">
-      <span>Code</span></a>
-    <span class="function-divider">&nbsp;</span>
-    <a href="#" id="function-ul" class="function-button">
-      <span>Unordered List</span></a>
-    <a href="#" id="function-ol" class="function-button">
-      <span>Ordered List</span></a>
-    <a href="#" id="function-blockquote" class="function-button">
-      <span>Blockquote</span></a>
-
-    <a href="#" id="function-hr" class="function-button">
-      <span>Horizontal Rule</span></a>
-    <span class="function-divider">&nbsp;</span>
-    <a href="#" id="function-h1" class="function-button">
-      <span>h1</span></a>
-    <a href="#" id="function-h2" class="function-button">
-      <span>h2</span></a>
-    <a href="#" id="function-h3" class="function-button">
-      <span>h3</span></a>
-    <span class="function-divider">&nbsp;</span>
-    <a href="#" id="function-link" class="function-button">
-      <span>Link</span></a>
-    <a href="#" id="function-image" class="function-button">
-      <span>Image</span></a>
-    <span class="function-divider">&nbsp;</span>
-    <a href="#" id="function-help" class="function-button">
-      <span>Help</span></a>
+			<button class="btn btn-sm function-button" id="function-bold" title="Bold">{{#octicon}}bold{{/octicon}}</button>
+			<button class="btn btn-sm function-button" id="function-italic" title="Italic">{{#octicon}}italic{{/octicon}}</button>
+			<button class="btn btn-sm function-button" id="function-code" title="Code">{{#octicon}}code{{/octicon}}</button>
+			<span class="pr-2"></span>
+			<button class="btn btn-sm function-button" id="function-ul" title="Unordered list">{{#octicon}}list-unordered{{/octicon}}</button>
+			<button class="btn btn-sm function-button" id="function-ol" title="Ordered list">{{#octicon}}list-ordered{{/octicon}}</button>
+			<button class="btn btn-sm function-button" id="function-blockquote" title="Blockquote">{{#octicon}}quote{{/octicon}}</button>
+			<button class="btn btn-sm function-button" id="function-hr" title="Horizontal rule">{{#octicon}}horizontal-rule{{/octicon}}</button>
+			<span class="pr-2"></span>
+			<button class="btn btn-sm function-button" id="function-h1" title="Heading 1">h1</button>
+			<button class="btn btn-sm function-button" id="function-h2" title="Heading 2">h2</button>
+			<button class="btn btn-sm function-button" id="function-h3" title="Heading 3">h3</button>
+			<span class="pr-2"></span>
+			<button class="btn btn-sm function-button" id="function-link" title="Link">{{#octicon}}link{{/octicon}}</button>
+			<button class="btn btn-sm function-button" id="function-image" title="Image">{{#octicon}}file-media{{/octicon}}</button>
+			<span class="pr-2"></span>
+			{{#critic_markup}}
+			<button class="btn btn-sm function-button" id="function-critic-accept" title="Accept Selected CriticMarkup">{{#octicon}}plus{{/octicon}}</button>
+			<button class="btn btn-sm function-button" id="function-critic-reject" title="Reject Selected CriticMarkup">{{#octicon}}dash{{/octicon}}</button>					
+			<span class="pr-2"></span>
+			{{/critic_markup}}
+      <button class="btn btn-sm function-button" id="function-text-direction" title="Reverse Text Direction">{{#octicon}}arrow-both{{/octicon}}</button>
+			<button class="btn btn-sm function-button" id="function-help" title="Help">{{#octicon}}question{{/octicon}}</button>
     </div>
 
     <div id="gollum-editor-format-selector">
-      <label for="format">Edit Mode</label>
-      <select id="wiki_format" name="format">
+      <label for="format">Keybinding</label>
+      <select id="keybinding" name="keybinding" class="form-select">
+        <option selected="selected">default</option>
+        <option>vim</option>
+        <option>emacs</option>
+      </select>
+      <label for="format">Markup</label>
+      <select id="wiki_format" name="format" class="form-select">
+      {{#formats}}
+      {{#enabled}}
+      <option {{#selected}}selected="selected" {{/selected}}value="{{id}}" data-ext="{{ext}}">
+        {{name}}
+        </option>
+      {{/enabled}}
+      {{/formats}}
       {{#formats}}
-        <option {{#selected}}selected="selected" {{/selected}}value="{{id}}">
-          {{name}}
+      {{^enabled}}
+      <option class="disabled" {{#selected}}selected="selected" {{/selected}}value="{{id}}" data-ext="{{ext}}">
+        {{name}}
         </option>
+      {{/enabled}}
       {{/formats}}
-     </select>
+      </select>
     </div>
   </div>
+
   <div id="gollum-editor-help" class="jaws">
     <ul id="gollum-editor-help-parent">
       <li><a href="javascript:void(0);" class="selected">Help 1</a></li>
@@ -87,50 +97,53 @@
       </div>
     </div>
   </div>
-    <textarea id="gollum-editor-body"
+    <textarea id="gollum-editor-body" class="form-control"
      data-markup-lang="{{format}}" name="content" class="mousetrap">{{content}}</textarea>
-    <div>
-      <i class="fa fa-spinner fa-spin"></i>
-      Uploading file ...
+    <div id="uploading">
+      <p><div class="dotted-spinner"></div> Uploading file...</p>
     </div>
 
     {{#header}}
+
     <div id="gollum-editor-edit-header" class="collapsed">
-      <a href="#" class="button"><span>Expand/Collapse</span></a>
+			<button class="btn btn-sm collapsable">{{#octicon}}triangle-down{{/octicon}}</button><button class="btn btn-sm collapsable" hidden>{{#octicon}}triangle-up{{/octicon}}</button>
       <h4>Header</h4>
-      <textarea id="gollum-editor-header" name="header">{{header}}</textarea>
+      <textarea id="gollum-editor-header" name="header" class="form-control">{{header}}</textarea>
     </div>
     {{/header}}
 
     {{#footer}}
     <div id="gollum-editor-edit-footer" class="collapsed">
-      <a href="#" class="button"><span>Expand/Collapse</span></a>
+      <button class="btn btn-sm collapsable">{{#octicon}}triangle-down{{/octicon}}</button><button class="btn btn-sm collapsable" hidden>{{#octicon}}triangle-up{{/octicon}}</button>
       <h4>Footer</h4>
-      <textarea id="gollum-editor-footer" name="footer">{{footer}}</textarea>
+      <textarea id="gollum-editor-footer" name="footer" class="form-control">{{footer}}</textarea>
     </div>
     {{/footer}}
 
     {{#sidebar}}
     <div id="gollum-editor-edit-sidebar" class="collapsed">
-      <a href="#" class="button"><span>Expand/Collapse</span></a>
-      <h4>Sidebar</h4>
-      <textarea id="gollum-editor-sidebar" name="sidebar">{{sidebar}}</textarea>
+      <button class="btn btn-sm collapsable">{{#octicon}}triangle-down{{/octicon}}</button><button class="btn btn-sm collapsable" hidden>{{#octicon}}triangle-up{{/octicon}}</button>
+			<h4>Sidebar</h4>
+      
+      <textarea id="gollum-editor-sidebar" name="sidebar" class="form-control">{{sidebar}}</textarea>
     </div>
     {{/sidebar}}
 
     <div id="gollum-editor-edit-summary" class="singleline">
       <label for="message" class="jaws">Edit message:</label>
       {{#is_create_page}}
-      <input type="text" name="message" id="gollum-editor-message-field" value="Created {{page_name}} ({{format}})">
+      <input type="text" name="message" class="form-control input-block" id="gollum-editor-message-field" value="Created {{page_name}} ({{format}})">
       {{/is_create_page}}
       {{#is_edit_page}}
-      <input type="text" name="message" id="gollum-editor-message-field" value="Updated {{page_name}} ({{format}})">
+      <input type="text" name="message" class="form-control input-block" id="gollum-editor-message-field" value="Updated {{page_name}} ({{format}})">
       {{/is_edit_page}}
     </div>
 
     <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>
+		<div class="form-actions">
+    	<input type="submit" id="gollum-editor-submit" class="btn btn-primary" value="Save" title="Save current changes">
+    	<a id="gollum-editor-cancel" class="btn" type="button" title="Cancel editing" onClick="window.history.back()">Cancel</a>
+		</div>
   </fieldset>
 </form>
 </div>

data/lib/gollum/templates/history.mustache

@@ -1,60 +1,35 @@
 <div id="wiki-wrapper" class="history">
 <div id="head">
-  <h1>History for <strong>{{title}}</strong></h1>
-  <ul class="actions">
-    <li class="minibutton">
-      {{>searchbar}}
-    </li>
-    <li class="minibutton"><a href="{{base_url}}/{{escaped_url_path}}"
-       class="action-view-page">View Page</a></li>
-    {{#allow_editing}}
-      <li class="minibutton"><a href="{{base_url}}/edit/{{escaped_url_path}}"
-         class="action-edit-page">Edit Page</a></li>
-    {{/allow_editing}}
-  </ul>
+	{{>navbar}}
+  <h1 class="py-4"><span class="f1-light text-gray-light">History for</span> {{name}}</h1>
 </div>
-<div id="wiki-history">
+<div id="page-history">
 
-  <ul class="actions">
-    <li class="minibutton"><a href="javascript:void(0);"
-       class="action-compare-revision">Compare Revisions</a></li>
-  </ul>
+  {{>pagination}}
 
-  <form name="compare-versions" id="version-form" method="post"
-   action="{{base_url}}/compare/{{escaped_url_path}}">
-  <fieldset>
-  <table>
-    <tbody>
+    <form name="selection-form" id="selection-form" method="post" action="{{compare_path}}/{{escaped_url_path}}"></form>
 
-      {{#versions}}
-      <tr>
-        <td class="checkbox">
-          <input type="checkbox" name="versions[]" value="{{id}}">
-        </td>
-        <td class="author">
-            {{>author_template}}
-        </td>
-        <td class="commit-name">
-          <span class="time-elapsed" title="{{date_full}}">{{date}}:</span>&nbsp;
-          {{message}}
-          [<a href="{{base_url}}/{{escaped_url_path}}/{{id}}" title="View commit">{{id7}}</a>]
-        </td>
-      </tr>
-      {{/versions}}
+	<div id="page-history-list" class="Box Box--condensed flex-auto">
+		<form id="version-form">
+			<ul> 	
+	    	{{#versions}}
+				<li class="Box-row border-top Box-row--hover-gray d-flex flex-items-center">
+					<span class="pr-2"><input class="checkbox" type="checkbox" name="versions[]" value="{{id}}"></span>
+					<span class="float-left col-2" id="user-icons">{{>author_template}}</span>
+					<span class="flex-auto col-1 text-gray-light">{{date}}</span>
+					<span class="flex-auto col-5">{{message}}</span>
+					<span class="pl-4 float-right">[<a href="{{base_url}}/{{filename}}/{{id}}" title="View commit">{{id7}}</a>]</span>
+				</li>
+				{{/versions}}
+			</ul>
+		</form>
+	</div>
+	
 
-    </tbody>
-  </table>
-  </fieldset>
-  </form>
-</div>
-<div id="footer">
-  <ul class="actions">
-    <li class="minibutton"><a href="javascript:void(0);"
-       class="action-compare-revision">Compare Revisions</a></li>
 
-    <!-- only show this button if we have more than 20 revisions -->
-    <li class="minibutton"><a href="#"
-       class="action-back-to-top">Back to Top</a></li>
-  </ul>
+<div id="footer">
+	<div class="pt-4">
+  	<button class="btn btn-sm action-compare-revision" type="submit">Compare Revisions</button>
+	</div>
 </div>
 </div>

data/lib/gollum/templates/history_authors/gravatar.mustache

@@ -1,5 +1,2 @@
-<a href="javascript:void(0)">
-<img src="https://secure.gravatar.com/avatar/{{gravatar}}?s=16"
-    alt="avatar: {{author}}" class="mini-gravatar"/>
-    <span class="username">{{author}}</span>
-</a>
+<img src="https://secure.gravatar.com/avatar/{{user_icon}}?s=20" class="mini-gravatar" onerror="brokenAvatarImage(this);" />
+&nbsp;<a href="https://gravatar.com/{{user_icon}}">{{author}}</a>