cortex-reaver 0.1.0 → 0.2.0

data/lib/cortex_reaver/view/comments/comment.rhtml

@@ -30,7 +30,7 @@
     <a id="comment_<%= @comment.id %>_comments" ></a>
     <div class="comments">
       <% @comment.comments_dataset.order(:created_on).all.each do |comment| %>
-        <%= render_template '../comments/comment.rhtml', 'comment' => comment %>
+        <%= CortexReaver::CommentController.render_view :comment, :comment => comment %>
       <% end %>
     </div>
   <% end %>

data/lib/cortex_reaver/view/comments/form.rhtml

@@ -19,7 +19,6 @@
       [:body, {:type => 'textarea'}],
       [:comment_id, {:type => 'hidden'}],
       [:journal_id, {:type => 'hidden'}],
-      [:photograph_id, {:type => 'hidden'}],
-      [:project_id, {:type => 'hidden'}]
+      [:photograph_id, {:type => 'hidden'}]
   ] %>
 </div>

data/lib/cortex_reaver/view/comments/post_form.rhtml

@@ -1,15 +1,8 @@
 <div class="post comment_form">
-  <a id="post-comment">
+  <a id="post-comment"></a>
   <h2>Post a Comment</h2>
 
-  <% unless @new_comment.errors.empty? %>
-    <div class="form-errors">
-      <ul>
-      <% @new_comment.errors.each do |attribute, error| %>
-        <li><%= attribute.to_s.titleize %> <%= error %>.</li>
-      <% end %>
-    </div>
-  <% end %>
+  <%= errors_on @new_comment %>
 
   <form class="comment-form" action="<%= CortexReaver::CommentController.r :post %>" method="post">
     <%= form_p :title, :model => @new_comment %>
@@ -35,7 +28,6 @@
     <%= form_p :comment_id, :type => 'hidden', :model => @new_comment %>
     <%= form_p :journal_id, :type => 'hidden', :model => @new_comment %>
     <%= form_p :photograph_id, :type => 'hidden', :model => @new_comment %>
-    <%= form_p :project_id, :type => 'hidden', :model => @new_comment %>
     <%= form_p :page_id, :type => 'hidden', :model => @new_comment %>
     <input type="submit" value="Post Comment" />
   </form>

data/lib/cortex_reaver/view/head.rhtml

@@ -0,0 +1,11 @@
+    <title><%=h (@title || CortexReaver.config[:site][:name]) %></title>
+    <meta http-equiv="Content-Script-Type" content="text/javascript" />
+    <meta http-equiv="Content-Style-Type" content="text/css" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta http-equiv="expires" content="0" />
+    <meta name="description" content="<%= attr_h CortexReaver.config[:site][:description] %>" />
+    <meta name="generator" content="Cortex Reaver <%= CortexReaver::APP_VERSION %>" />
+    <meta name="keywords" content="<%= attr_h CortexReaver.config[:site][:keywords] %>" />
+    <meta name="author" content="<%= attr_h CortexReaver.config[:site][:author] %>" />
+    <meta name="date" content="<%= Time.now.iso8601 %>" />
+    <link rel="stylesheet" type="text/css" href="/css/style.css" />

data/lib/cortex_reaver/view/journals/journal.rhtml

@@ -10,18 +10,18 @@
   </div>
   <div class="footer">
     <ul class="actions">
-      <li><a href="<%= @journal.url %>#comments">
+      <li><a class="comment" href="<%= @journal.url %>#comments">
         <img src="/images/comment.gif" class="icon" alt="comment" />
         <%= @journal.comment_count %> <%= @journal.comment_count == 1 ? 'comment' : 'comments' %>
       </a></li>
       <% if user.can_edit? @journal %>
-        <li><a class="edit-link" href="/journals/edit/<%= @journal.id %>">
+        <li><a class="edit" href="/journals/edit/<%= @journal.id %>">
           <img src="/images/edit.gif" class="icon" alt="edit" /> Edit
         </a></li>
       <% end %>
       <% if user.can_delete? @journal %>
         <li>
-          <a href="<%= CortexReaver::JournalController.r(:delete, @journal.id) %>" onclick="return confirm('Are you sure you want to delete this journal?');">
+          <a class="delete" href="<%= CortexReaver::JournalController.r(:delete, @journal.id) %>" onclick="return confirm('Are you sure you want to delete this journal?');">
             <img src="/images/delete.gif" class="icon" alt="delete" /> Delete
           </a>
         </li>

data/lib/cortex_reaver/view/journals/show.rhtml

@@ -1,5 +1 @@
-<%= model_nav @journal %>
-
 <%= CortexReaver::JournalController.render_view :journal, 'journal' => @journal %>
-
-<%= model_nav @journal %>

data/lib/cortex_reaver/view/js.rhtml

@@ -0,0 +1 @@
+<script type="text/javascript" src="/js/site.js"></script>

data/lib/cortex_reaver/view/pages/list.rhtml

@@ -1,29 +1,9 @@
 <div class="pages">
+  <h1>All Pages</h1>
   <table>
-    <thead>
-      <tr>
-        <th>Name</th>
-        <th>Title</th>
-        <% if user.can_edit? CortexReaver::Page.new %>
-          <th></th>
-        <% end %>
-        <% if user.can_delete? CortexReaver::Page.new %>
-          <th></th>
-        <% end %>
-      </tr>
-    </thead>
     <tbody>
-      <% @pages.all.each do |page| %>
-        <tr>
-          <td><%= a(page.name, page.url) %></td>
-          <td><%= page.title %></td>
-          <% if user.can_edit? page %>
-            <td><a href="/pages/edit/<%= page.id %>">Edit</a></td>
-          <% end %>
-          <% if user.can_delete? page %>
-            <td><%= a 'Delete', CortexReaver::PageController.r(:delete, :id => page.id), :onclick => "return confirm('Are you sure you want to delete this page?');" %></td>
-          <% end %>
-        </tr>
+      <% @pages.top.order(:name).each do |page| %>
+        <%= CortexReaver::MainController.render_view 'pages/row', :page => page %>
       <% end %>
     </tbody>
   </table>

data/lib/cortex_reaver/view/pages/row.rhtml

@@ -0,0 +1,13 @@
+<% @depth ||= 0 %>
+<tr>
+  <td style="padding-left: <%= @depth %>em"><%= CortexReaver::MainController.a(@page.title, @page.url) %></td>
+  <% if user.can_edit? @page %>
+    <td><a href="/pages/edit/<%= @page.id %>">Edit</a></td>
+  <% end %>
+  <% if user.can_delete? @page %>
+    <td><%= a 'Delete', CortexReaver::PageController.r(:delete, :id => @page.id), :onclick => "return confirm('Are you sure you want to delete this page?');" %></td>
+  <% end %>
+</tr>
+<% @page.pages.each do |page| %>
+  <%= CortexReaver::PageController.render_view 'row', :page => page, :depth => @depth + 1 %>
+<% end %>

data/lib/cortex_reaver/view/photographs/grid.rhtml

@@ -1,36 +1,30 @@
-<% columns = 4 %>
-<% i = 0 %>
-<table class="photographs grid">
-  <tr>
-    <% @photographs.all.each do |photograph| %>
-      <td>
-        <table class="thumbnail frame" cellspacing="0" cellpadding="0">
-          <tr>
-            <td class="border_top_left"></td>
-            <td class="border_top"></td>
-            <td class="border_top_right"></td>
-          </tr>
-          <tr>
-            <td class="border_left"></td>
-            <td id="photograph_<%= photograph.name %>" class="content">
-              <a href="<%= photograph.url %>">
-                <img src="<%= photograph.thumbnail_public_path %>" class="grid thumbnail" alt="<%=h photograph.title %>" />
-              </a>
-            </td>
-            <td class="border_right"></td>
-          </tr>
-          <tr>
-            <td class="border_bottom_left"></td>
-            <td class="border_bottom"></td>
-            <td class="border_bottom_right"></td>
-          </tr>
-        </table>
-      </td>
-      <% if (i += 1) == 4 %>
-    </tr>
-    <tr>
-      <% i = 0 %>
-      <% end %>
-    <% end %>
-  </tr>
-</table>
+<ol class="photographs grid">
+  <% @photographs.all.each do |photograph| %>
+    <li id="photograph_<%= photograph.name %>" class="photograph thumb">
+      <a href="<%= photograph.url %>">
+        <img src="<%= photograph.path(:public, 'grid') %>" alt="<%=h photograph.title %>" />
+      </a>
+    </li>
+  <% end %>
+</ol>
+
+<div class="clear" style="height: 4px;"></div>
+
+<script type="text/javascript">
+  /* <![CDATA[ */
+  $(document).ready(function() {
+      $('.grid .photograph > *').each(function(i) {
+      var elem = $(this);
+      elem.corners("6px");
+      elem.hover(
+        function() {
+          elem.animate( {backgroundColor: "#222"}, 1)
+        },
+        function() {
+          elem.animate( {backgroundColor: "#111"}, 200);
+        }
+      );
+    });
+  });
+  /* ]]> */
+</script>

data/lib/cortex_reaver/view/photographs/show.rhtml

@@ -1,114 +1,48 @@
-<table class="photo frame" cellspacing="0" cellpadding="0">
-  <tr>
-    <td class="border_top_left"></td>
-    <td class="border_top"></td>
-    <td class="border_top_right"></td>
-  </tr>
-  <tr>
-    <td class="border_left"></td>
-    <td id="photograph_<%= @photograph.name %>" class="content">
-      <div id="canvas">
-        <div id="bar">
-          <ul class="actions">
-            <% if previous_photo = @photograph.previous %>
-              <li>
-                <a href="<%= previous_photo.url %>">&laquo; Previous</a>
-              </li>
-            <% end %>
-            <li>
-              <a href="<%= @photograph.absolute_window_url %>">Back to Thumbnails</a>
-            </li>
-            <% if user.can_edit? @photograph %>
-              <li>
-                <%= a('Edit', r(:edit, @photograph.id)) %>
-              </li>
-            <% end %>
-            <% if next_photo = @photograph.next %>
-              <li>
-                <a href="<%= next_photo.url %>">Next &raquo;</a>
-              </li>
-            <% end %>
-          </ul>
-        </div>
-        <script type="text/javascript">
-          /* <![CDATA[ */
-          $('#bar').css('margin-bottom', -1 * $('#bar').height());
-          /* ]]> */
-        </script> 
+<div id="top" class="photograph">
+  <% if @model %>
+    <%= model_nav @model %>
+  <% end %>
+  <h1><a href="/"><%=h CortexReaver.config.site.name %></a></h1>
+</div>
 
-        <img src="<%= @photograph.full_public_path %>" id="photo" alt="<%= attr_h @photograph.title %>" title="<%= attr_h @photograph.title %>" />
+<div id="photograph_<%= @photograph.name %>" class="photograph full">
+  <div class="photograph frame">
+    <img src="<%= @photograph.full_public_path %>" alt="<%= attr_h @photograph.title %>" title="<%= attr_h @photograph.title %>" />
+    <div class="byline">
+      <div class="description"><%= description_of @photograph %></div>
+      <% unless @photograph.tags.empty? %>
+        <div class="tags"><%= tags_on @photograph %></div>
+      <% end %>
+    </div>
+  </div>
+  
+  <h2 class="title"><%=h @photograph.title %></h2>
 
-      </div>
 
-      <h2>
-        <% if previous_photo %>
-          <a href="<%= previous_photo.url %>">&laquo;</a>
-        <% end %>
-        <%=h @photograph.title %>
-        <% if next_photo %>
-          <a href="<%= next_photo.url %>">&raquo;</a>
-        <% end %>
-      </h2>
-      <div class="byline">
-        <div class="description"><%= description_of @photograph %></div>
-        <% unless @photograph.tags.empty? %>
-          <div class="tags"><%= tags_on @photograph %></div>
-        <% end %>
-      </div>
-    </td>
-    <td class="border_right"></td>
-  </tr>
-  <tr>
-    <td class="border_bottom_left"></td>
-    <td class="border_bottom"></td>
-    <td class="border_bottom_right"></td>
-  </tr>
-</table>
+  <% unless @photograph.comments.empty? %>
+  <div class="comments frame">
+    <a id="comments"></a>
+    <% @photograph.comments_dataset.order(:created_on).all.each do |comment| %>
+      <%= CortexReaver::CommentController.render_view :comment, 'comment' => comment %>
+    <% end %>
+  </div>
+  <% end %>
 
-<% unless @photograph.comments.empty? %>
-<table class="text frame" cellspacing="0" cellpadding="0">
-  <tr>
-    <td class="border_top_left"></td>
-    <td class="border_top"></td>
-    <td class="border_top_right"></td>
-  </tr>
-  <tr>
-    <td class="border_left"></td>
-    <td class="content">
-      <div class="comments">
-        <a id="comments"></a>
-        <% @photograph.comments_dataset.order(:created_on).all.each do |comment| %>
-          <%= CortexReaver::CommentController.render_view :comment, 'comment' => comment %>
-        <% end %>
-      </div>
+  <div class="comments frame">
+    <%= CortexReaver::CommentController.render_view :post_form, 'comment' => @new_comment %>
+  </div>
 
-    </td>
-    <td class="border_right"></td>
-  </tr>
-  <tr>
-    <td class="border_bottom_left"></td>
-    <td class="border_bottom"></td>
-    <td class="border_bottom_right"></td>
-  </tr>
-</table>
-<% end %>
+  <div id="colophon">
+    Copyright &copy;
+    <%= @model.updated_on.year %>
+    <%= user_link @model %>
+  </div>
 
-<table class="text frame" cellspacing="0" cellpadding="0">
-  <tr>
-    <td class="border_top_left"></td>
-    <td class="border_top"></td>
-    <td class="border_top_right"></td>
-  </tr>
-  <tr>
-    <td class="border_left"></td>
-    <td class="content">
-      <%= CortexReaver::CommentController.render_view :post_form, 'comment' => @new_comment %>
-    </td>
-    <td class="border_right"></td>
-  </tr>
-  <tr>
-    <td class="border_bottom_left"></td>
-    <td class="border_bottom"></td>
-    <td class="border_bottom_right"></td>
-  </tr>
-</table>
+  <script type="text/javascript">
+    /* <![CDATA[ */
+    $(document).ready(function() {
+      $('.photo.full .frame').corners("10px");
+    });
+    /* ]]> */
+  </script>
+</div>

data/lib/cortex_reaver/view/sidebar/explore_photos.rhtml

@@ -0,0 +1,7 @@
+<!-- Here's an example of how to make a custom navigation sidebar box -->
+<div class="explore box">
+  <div class="top">Explore</div>
+  <%= section_nav([
+    ['Favorites', CortexReaver::PhotographController.r(:tagged, :favorite)]
+  ]) %>
+</div>

data/lib/cortex_reaver/view/sidebar/photographs.rhtml

@@ -0,0 +1,15 @@
+<% photographs = CortexReaver::Photograph.recent.viewable_by(user).all %>
+<% if photographs.size > 0 %>
+  <div class="photographs box">
+    <div class="top"><a href="/photographs">Images</a></div>
+    <ul class="photographs strip">
+      <% photographs.each do |photograph| %>
+        <li class="photo thumb" id="photograph_<%= photograph.name %>">
+          <a href="<%= photograph.url %>">
+            <img src="<%= photograph.thumbnail_public_path %>" alt="<%=attr_h photograph.title %>" />
+          </a>
+        </li>
+      <% end %>
+    </ul>
+  </div>
+<% end %>

data/lib/cortex_reaver/view/sidebar/sections.rhtml

@@ -0,0 +1,4 @@
+<div class="sections box">
+  <div class="top"><a href="/">Site</a></div>
+  <%= section_nav CortexReaver.config.view.sections %>
+</div>

data/lib/cortex_reaver/view/sidebar/twitter.rhtml

@@ -0,0 +1,12 @@
+<div class="twitter box">
+  <div class="top"><a href="http://twitter.com/<%= CortexReaver.config.plugins.twitter.username %>">Status</a></div>
+  <ul class="text">
+    <% tweets = CortexReaver::Plugins::Twitter.recent_tweets %>
+    <% tweets.each do |tweet| %>
+      <li class="status">
+        <%= tweet[:html] %><br />
+        <span class="date"><%=h tweet[:created_at].strftime("%b %d %H:%M") %></span>
+      </li>
+    <% end %>
+  </ul>
+</div>

data/lib/cortex_reaver/view/tags/show.rhtml

@@ -11,16 +11,6 @@
         </ul>
       </div>
     <% end %>
-    <% unless (projects = CortexReaver::Project.tagged_with(@tags)).empty? %>
-      <div class="projects">
-        <h3>Projects</h3>
-        <ul>
-          <% projects.each do |project| %>
-            <li><a href="<%= project.url%>"><%= h project.title %></a></li>
-          <% end %>
-        </ul>
-      </div>
-    <% end %>
     <% unless (journals = CortexReaver::Journal.tagged_with(@tags)).empty? %>
       <div class="journals">
         <h3>Journals</h3>

data/lib/cortex_reaver/view/users/list.rhtml

@@ -1,6 +1,4 @@
-<% if @page %>
-  <%= page_nav CortexReaver::User, @page %>
-<% end %>
+<h1>All Users</h1>
 
 <table class="users">
   <thead>
@@ -39,7 +37,3 @@
     <% end %>
   </tbody>
 </table>
-
-<% if @page %>
-  <%= page_nav CortexReaver::User, @page %>
-<% end %>