@@ -21,6 +21,8 @@
* DONE markitup editor
* DONE switch to maruku
* DONE setup preview
+ * DONE widen edit view and page, make attachment section toggle
+ * DONE remove double click page to edit, did not work right
* Clean up page list eliminating non-markdown pages or at least removing edit and history links
TODO
@@ -96,7 +96,6 @@ ul {
.clearer { clear: both; }
.content {
- margin-left: 35%;
padding: 10px 10px 2px 10px;
}
@@ -167,6 +166,12 @@ ul {
clear: left;
}
+.page_title {
+ float: left;
+ font-size: 1.6em;
+ padding: 3px 10px 0 0;
+}
+
.right { text-align: right; }
.search_result { margin-bottom: 15px; }
@@ -184,7 +189,6 @@ ul {
}
.sub_nav {
- float: left;
padding-top: 8px;
}
@@ -205,6 +209,14 @@ div.attach-options {
}
/* ids */
+#attachments {
+ display: none;
+}
+
+#hideAttachments {
+ display: none;
+}
+
#container {
clear: both;
margin: auto;
public/style.css
@@ -1,4 +1,20 @@
-<h1>Editing <a href="/<%= @page.name %>"><%= @page.title %></a></h1>
+<script type="text/javascript">
+ $(document).ready(function() {
+ $("#showAttachments").click(function(){
+ $("#attachments").toggle();
+ $("#showAttachments").toggle();
+ $("#hideAttachments").toggle();
+ });
+ $("#hideAttachments").click(function(){
+ $("#attachments").toggle();
+ $("#hideAttachments").toggle();
+ $("#showAttachments").toggle();
+ });
+ });
+</script>
+
+
+<div class="page_title">Editing <a href="/<%= @page.name %>"><%= @page.title %></a></div>
<div class="sub_nav">
<a href="/<%= @page.basename %>" class="nav_link">back</a>
@@ -11,11 +27,15 @@
• <a id="delete_link" href="#" class="nav_link">delete</a>
<% if files = @page.attachments %>
- <h3>Attachments</h3>
+ <span id="attachmentsLabel">
+ • Attachments
+ <a id="showAttachments" class="nav_link" href="#">(show)</a>
+ <a id="hideAttachments" class="nav_link" href="#">(hide)</a>
+ </span>
<div id="attachments">
<% files.each do |file| %>
<div class="attachment_item"><a href="<%= file.link_path %>"><%= file.name %></a>
- <span class="detail">(<%= file.size %>)</span>
+ <span class="detail">(<%= file.size %>)</span>
<div class="attach-options">
<a class="delete_attachment" href="<%= file.delete_path %>" aname="<%= file.name %>">delete</a>
• <a class="replace_attachment" href="<%= file.replace_path %>" aname="<%= file.name %>">replace</a>
views/edit.erb
@@ -14,7 +14,7 @@
});
</script>
-<h1><%= @page.title %></h1>
+<div class="page_title"><%= @page.title %></div>
<%= @env %>
@@ -35,13 +35,15 @@
• <a href="/h/<%= @page.basename %>/<%= @page.next_commit %>" class="nav_link">newer</a>
<% end %>
- <div class="sub_nav details">
+ <span class="sub_nav details">
<script type="text/javascript">
document.write(time_ago_in_words(<%= @page.updated_at.for_time_ago_in_words %>) + ' ago');
</script>
- <br />
+
+ <!--
<%= $repo.current_branch %> branch
- </div>
+ -->
+ </span>
</div>
views/show.erb
b7c8b825bc690cf1ab207ee46a1e66170677d328
Jeff Barczewski
jeff@jeff-d820.(none)
http://github.com/jeffbski/git-wiki/commit/d6d52605242d3ccd51781193e518126df73c1157
d6d52605242d3ccd51781193e518126df73c1157
2009-10-29T16:10:21-07:00
2009-10-29T16:10:21-07:00
widen text edit, make attachments toggle, remove doubleclick to edit
0a372bdb0cd06783a82a747cc9052ceee1e1f831
Jeff Barczewski
jeff@jeff-d820.(none)