gollum 1.1.1 → 1.2.0

data/lib/gollum/frontend/templates/compare.mustache

@@ -1,33 +1,53 @@
-<div class="guide">
-  <div class="main">
-    <div class="actions">
-      <a href="/{{escaped_name}}">&laquo; Back</a>
-    </div>
-    <h1>{{title}}: {{before}} &rarr; {{after}}</h1>
-    <div id="files">
-      <div class="file">
-        <div class="meta">
-          <div class="info">
-            <span class="icon">
-              <img alt="Txt" height="16" src="/images/txt.png" width="16">
-            </span>
-            {{path}}
-          </div>
-        </div>
-        <div class="data highlight">
-          <table cellpadding="0" cellspacing="0" width="100%">
-            {{#lines}}
-              <tr>
-                <td class="line_numbers">{{ldln}}</td>
-                <td class="line_numbers">{{rdln}}</td>
-                <td width="100%">
-                  <pre><div class="{{class}}">{{line}}</div></pre>
-                </td>
-              </tr>
-            {{/lines}}
-          </table>
-        </div>
-      </div>
-    </div>
+<div id="wiki-wrapper" class="compare">
+<div id="head">
+  <h1>History for <strong>{{path}}</strong></h1>
+  
+  <ul class="actions">
+    <li class="minibutton"><a href="/history/{{escaped_name}}"
+       class="action-page-history">Back to Page History</a></li>
+  </ul>
+  {{>searchbar}}
+</div>
+
+{{#message}}
+<p>{{message}}</p>
+{{/message}}
+
+<div id="compare-content">
+  
+  {{#show_revert}}
+  <ul class="actions">
+    <li class="minibutton">
+      <form name="gollum-revert" action="/revert/{{escaped_name}}/{{before}}/{{after}}" method="post" id="gollum-revert-form">
+      <a href="#" class="gollum-revert-button">Revert Changes</a>
+      </form>
+    </li>
+  </ul>
+  {{/show_revert}}
+  
+  <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">
+    {{#show_revert}}
+    <li class="minibutton">
+      <a href="#" class="gollum-revert-button">Revert Changes</a>
+    </li>
+    {{/show_revert}}
+    <li class="minibutton"><a href="#">Back to Top</a></li>
+  </ul>
+</div>
+</div>
 </div>

data/lib/gollum/frontend/templates/create.mustache

@@ -1,39 +1,15 @@
-<div class="write">
-  <a href="/">&laquo; Home</a>
-  <h1>{{title}}</h1>
-
-  <form class="new_wiki" method="post" action="/create/{{escaped_name}}">
-    <div>
-      <label>
-        Title<br />
-        <input class="text" type="text" name="page" value="{{page_name}}" />
-      </label>
-      <br />
-
-      <div id="wiki-form" class="comment-form wiki-form">
-        <ul class="tabs inline-tabs">
-          <li><a href="#write_bucket" action="write">Write</a></li>
-          <li><a href="#preview_bucket" action="preview">Preview</a></li>
-        </ul>
-        <div id="write_bucket" class="tab-content">
-          {{>editbar}}
-          <div class="inner">
-            <textarea name="content">{{content}}</textarea>
-          </div>
-        </div>
-        <div id="preview_bucket" class="tab-content content-body content wikistyle gollum">
-          <p>Loading content...</p>
-        </div>
-      </div>
-
-      <label>
-        Edit Summary <small>(Briefly describe the changes you have made)</small><br />
-        <input type="text" class="text" name="message" value="Create '{{name}}' page." />
-      </label>
-
-      <div class="actions">
-        <input type="submit" value="Create page" />
-      </div>
-    </div>
-  </form>
-</div>
+<div id="wiki-wrapper">
+<div id="head">
+  <h1>Create New Page</h1>
+</div>
+<div id="wiki-content" class="create edit">
+  <div class="has-rightbar">
+    {{>editor}}
+  </div>
+</div>
+</div>
+<script type="text/javascript">
+jQuery(document).ready(function() {
+  $.GollumEditor({ NewFile: true });
+});
+</script>

data/lib/gollum/frontend/templates/edit.mustache

@@ -1,38 +1,17 @@
-<div class="write">
-  <a href="/{{escaped_name}}">&laquo; Back</a>
-  <h1>{{title}}</h1>
-
-  <form class="edit_wiki" method="post" action="/edit/{{escaped_name}}">
-    <div>
-      <label>
-        Title<br />
-        <input class="text" type="text" name="rename" value="{{name}}" />
-      </label>
-      <br />
-
-      <div id="wiki-form" class="comment-form wiki-form">
-        <ul class="tabs inline-tabs">
-          <li><a href="#write_bucket" action="write">Write</a></li>
-          <li><a href="#preview_bucket" action="preview">Preview</a></li>
-        </ul>
-        <div id="write_bucket" class="tab-content">
-          {{>editbar}}
-          <div class="inner">
-            <textarea name="content">{{content}}</textarea>
-          </div>
-        </div>
-        <div id="preview_bucket" class="tab-content content-body content wikistyle gollum">
-          <p>Loading content...</p>
-        </div>
-      </div>
-
-      <label>
-        Edit Summary <small>(Briefly describe the changes you have made)</small><br />
-        <input type="text" class="text" name="message" />
-      </label>
-      <div class="actions">
-        <input type="submit" value="Save page" />
-      </div>
-    </div>
-  </form>
-</div>
+<div id="wiki-wrapper" class="edit">
+<div id="head">
+  <h1>Editing <strong>{{title}}</strong></h1>
+  <ul class="actions">
+    <li class="minibutton"><a href="/{{escaped_name}}"
+       class="action-view-page">View Page</a></li>
+    <li class="minibutton"><a href="/history/{{escaped_name}}"
+       class="action-page-history">Page History</a></li>
+  </ul>
+</div>
+  <div id="wiki-content">{{>editor}}</div>
+</div>
+<script type="text/javascript">
+jQuery(document).ready(function() {
+  $.GollumEditor();
+});
+</script>

data/lib/gollum/frontend/templates/editor.mustache

@@ -0,0 +1,116 @@
+<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="/create" method="post">
+{{/is_create_page}}
+{{#is_edit_page}}
+<form name="gollum-editor" action="/edit/{{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}}">
+  </div>
+  {{/is_create_page}}
+  {{#is_edit_page}}
+  <input type="hidden" name="page" id="gollum-editor-page-title" value="{{page_name}}">
+  {{/is_edit_page}}
+  <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>
+    </div>
+      
+    <div id="gollum-editor-format-selector"> 
+      <select id="wiki_format" name="format">
+      {{#formats}}
+        <option {{#selected}}selected="selected" {{/selected}}value="{{id}}">
+          {{name}}
+        </option>
+      {{/formats}}
+     </select>
+      <label for="format">Edit Mode</label>
+    </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>
+      <li><a href="javascript:void(0);">Help 1</a></li>
+      <li><a href="javascript:void(0);">Help 1</a></li>
+    </ul>
+    <ul id="gollum-editor-help-list">
+      <li><a href="javascript:void(0);">Help 2</a></li>
+      <li><a href="javascript:void(0);">Help 3</a></li>
+      <li><a href="javascript:void(0);">Help 4</a></li>
+      <li><a href="javascript:void(0);">Help 5</a></li>
+      <li><a href="javascript:void(0);">Help 6</a></li>
+      <li><a href="javascript:void(0);">Help 7</a></li>
+      <li><a href="javascript:void(0);">Help 8</a></li>
+    </ul>
+    <div id="gollum-editor-help-wrapper">
+      <div id="gollum-editor-help-content">
+      <p>
+      </p>
+      </div>
+    </div>
+  </div>
+    <textarea id="gollum-editor-body"
+     data-markup-lang="{{format}}" name="content">{{content}}</textarea>
+     
+    {{#footer}}
+    <div id="gollum-editor-edit-footer" class="collapsed">
+      <a href="#" class="button"><span>Expand/Collapse</span></a>
+      <h4>Footer</h4>
+      <textarea id="gollum-editor-footer" name="footer">{{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>
+    </div>
+    {{/sidebar}}
+    
+    <div id="gollum-editor-edit-summary" class="singleline">
+      <label for="message" class="jaws">Edit message:</label>
+      <input type="text" name="message" id="gollum-editor-message-field" value="Write a small message here explaining this change. (Optional)">
+    </div>
+    
+    
+    <span class="jaws"><br></span>
+    <input type="submit" id="gollum-editor-submit" value="Save" title="Save current changes">
+    <a href="javascript:void(0)" id="gollum-editor-preview" class="minibutton" title="Preview this Page">Preview</a>
+  </fieldset>
+</form>
+</div>

data/lib/gollum/frontend/templates/error.mustache

@@ -1,11 +1,8 @@
-<div class="guide">
-  <div class="main">
-    <div class="actions">
-      <a href="/">Home</a>
-    </div>
+<div id="wiki-wrapper" class="error">
+  <div id="error">
     <h1>Error</h1>
-    <div class="error">
+    <p>
       {{message}}
-    </div>
+    </p>
   </div>
-</div>
+</div>

data/lib/gollum/frontend/templates/history.mustache

@@ -1,37 +1,60 @@
-<div class="guide">
-  <div class="main">
-    <div class="actions">
-      <a href="/{{escaped_name}}">&laquo; Back</a>
-    </div>
-    <h1>{{title}}</h1>
-    <form id="history" method="post" action="/compare/{{escaped_name}}">
-      <table class="commits" cellpadding="0" cellspacing="0">
-        <tr>
-          <th colspan="5">
-            Select any two versions to <input type="submit" value="Compare" />
-          </th>
-        </tr>
-        {{#versions}}
-          <tr class="commit">
-            <td class="checkbox">
-              <input name="versions[]" type="checkbox" value="{{id}}" />
-            </td>
-            <td class="sha">
-              <a href="/{{escaped_name}}/{{id}}">{{id7}}</a>
-            </td>
-            <td nowrap class="author">
-              <img src="http://www.gravatar.com/avatar/{{gravatar}}?s=16" alt="Gravatar" />
-              {{author}}
-            </td>
-            <td class="message">{{message}}</td>
-            <td nowrap class="date">{{date}}</td>
-          </tr>
-        {{/versions}}
-      </table>
-      <div class="pagination">
-        {{{previous_link}}}
-        {{{next_link}}}
-      </div>
-    </form>
-  </div>
+<div id="wiki-wrapper" class="history">
+<div id="head">
+  <h1>History for <strong>{{title}}</strong></h1>
+  <ul class="actions">
+    <li class="minibutton"><a href="/{{escaped_name}}"
+       class="action-view-page">View Page</a></li>
+    <li class="minibutton"><a href="/edit/{{escaped_name}}"
+       class="action-edit-page">Edit Page</a></li>
+  </ul>
+  {{>searchbar}}
+</div>
+<div id="wiki-history">
+  
+  <ul class="actions">
+    <li class="minibutton"><a href="javascript:void(0);"
+       class="action-compare-revision">Compare Revisions</a></li>
+  </ul>
+
+  <form name="compare-versions" id="version-form" method="post"
+   action="/compare/{{escaped_name}}">
+  <fieldset>
+  <table>
+    <tbody>
+      
+      {{#versions}}
+      <tr>
+        <td class="checkbox">
+          <input type="checkbox" name="versions[]" value="{{id}}">
+        </td>
+        <td class="author">
+          <a href="javascript:void(0)">
+            <img src="http://www.gravatar.com/avatar/{{gravatar}}?s=16"
+             alt="avatar: {{author}}" class="mini-gravatar">
+            <span class="username">{{author}}</span>
+          </a>
+        </td>
+        <td class="commit-name">
+          <span class="time-elapsed">{{date}}:</span>&nbsp;
+          {{message}}
+          [<a href="/{{escaped_name}}/{{id}}" title="View commit">{{id7}}</a>]
+        </td>
+      </tr>
+      {{/versions}}
+      
+    </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>
 </div>

data/lib/gollum/frontend/templates/layout.mustache

@@ -1,33 +1,28 @@
 <!DOCTYPE html>
-
 <html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-    <title>{{title}}</title>
-    <link rel="stylesheet" href="/css/screen.css" type="text/css" charset="utf-8" />
-    <link rel="stylesheet" href="/css/gollum.css" type="text/css" charset="utf-8" />
-    <link rel="stylesheet" href="/css/syntax.css" type="text/css" charset="utf-8" />
-    <link rel="stylesheet" href="/css/editbar.css" type="text/css" charset="utf-8" />
-    <script src="/javascript/jquery-1.4.2.min.js" type="text/javascript"></script>
-    <script src="/javascript/jquery.text_selection-1.0.0.min.js" type="text/javascript"></script>
-    <script src="/javascript/jquery.previewable_comment_form.js" type="text/javascript"></script>
-    <script src="/javascript/jquery.tabs.js" type="text/javascript"></script>
-    <script src="/javascript/gollum.js" type="text/javascript"></script>
-    <script src="/javascript/MathJax/MathJax.js" type="text/javascript">
-      MathJax.OutputJax.fontDir = "http://github-assets.s3.amazonaws.com/javascripts/MathJax/fonts"
-      MathJax.Hub.Config({
-        jax: ["input/TeX", "output/HTML-CSS"]
-      })
-    </script>
-  </head>
+<head>
+  <meta http-equiv="Content-type" content="text/html;charset=utf-8">
+  <link rel="stylesheet" type="text/css" href="/css/gollum.css" media="all">
+  <link rel="stylesheet" type="text/css" href="/css/editor.css" media="all">
+  <link rel="stylesheet" type="text/css" href="/css/dialog.css" media="all">
+  <link rel="stylesheet" type="text/css" href="/css/template.css" media="all">
+  
+  <!--[if IE 7]>
+  <link rel="stylesheet" type="text/css" href="/css/ie7.css" media="all">
+  <![endif]-->
+  
+  <script type="text/javascript" src="/javascript/jquery.js"></script>
+  <script type="text/javascript" src="/javascript/gollum.js"></script>
+  <script type="text/javascript" src="/javascript/gollum.dialog.js"></script>
+  <script type="text/javascript" src="/javascript/gollum.placeholder.js"></script>
+  
+  <script type="text/javascript" 
+    src="/javascript/editor/gollum.editor.js"></script>
+  <title>{{title}}</title>
+</head>
+<body>
+
+{{{yield}}}
 
-  <body>
-    <div id="main">
-      <div class="site">
-        <div id="guides">
-          {{{yield}}}
-        </div>
-      </div>
-    </div>
-  </body>
+</body>
 </html>