cortex-reaver 0.1.0 → 0.2.0

data/lib/cortex_reaver/helper/form.rb

@@ -8,7 +8,10 @@ module Ramaze
         unless model.errors.empty?
           s = "<div class=\"form-errors\">\n<h3>Errors</h3>\n<ul>\n"
           model.errors.each do |attribute, error|
-            s << "<li>#{attribute} #{error}</li>\n"
+            if error.kind_of? Array
+              error = error.join(', ')
+            end
+            s << "<li>#{attribute.to_s.titleize} #{error}.</li>\n"
           end
           s << "</ul></div>"
         end
@@ -25,17 +28,11 @@ module Ramaze
 
         f = ''
 
-        unless model.errors.empty?
-          f << "<div class=\"form-errors\">\n"
-          f << "<ul>\n"
-          model.errors.each do |attribute, error|
-            f << "<li>#{attribute} #{error}\n</li>"
-          end
-          f << "</ul>\n"
-          f << "</div>\n"
+        if model
+          f << errors_on(model) 
         end
 
-        f = "<form action=\"#{action}\" method=\"post\" class=\"edit-form\">"
+        f << "<form action=\"#{action}\" method=\"post\" class=\"edit-form\">"
 
         fields.each do |field|
           case field
@@ -58,7 +55,7 @@ module Ramaze
       #   :default => The default value for the field (inferred from model and id)
       #   :p_class => Class attached to the paragraph
       def form_p(id, params = {})
-        type = params[:type]
+        type = params[:type].to_s
         p_class = params[:p_class]
         description = params[:description] || id.to_s.titleize
         model = params[:model]
@@ -79,14 +76,13 @@ module Ramaze
         end
 
         f = "<p #{p_class.nil? ? '' : 'class="' + attr_h(p_class) + '"'}>"
-        unless type == 'checkbox' or type == 'hidden'
+        if type == 'checkbox' or type == 'hidden'
+        elsif type == 'textarea'
+          f << "<label class=\"textarea\" for=\"#{id}\">#{description}</label><br />"
+        else
           f << "<label for=\"#{id}\">#{description}</label>"
         end
 
-        if type == 'textarea'
-          f << '<br />'
-        end
-
         case type
         when 'textarea'
           f << "<textarea name=\"#{id}\" id=\"#{id}\">#{Rack::Utils::escape_html default}</textarea>"

data/lib/cortex_reaver/helper/navigation.rb

@@ -39,17 +39,32 @@ module Ramaze
         s << '</span>'
       end
 
-      # Returns a div with next/up/previous links for the record.
+      # Returns a full URL from a relative one.
+      def full_url(relative)
+        "#{CortexReaver.config.site.url.chomp('/')}#{relative}"
+      end
+
+      # Returns a list with next/up/previous links for the record.
       def model_nav(model)
-        n = '<div class="navigation actions">'
+        if not model.respond_to? :next
+          # Not applicable
+          return
+        elsif CortexReaver::User === model or CortexReaver::Page === model
+          return
+        end
+
+        n = '<ul class="' + model.class.to_s.underscore + ' navigation actions">'
         if model.previous
-          n << '  <a class="previous" href="' + model.previous.url + '">&laquo; Previous ' + model.class.to_s.demodulize + '</a>'
+          n << '  <li><a class="previous" href="' + model.previous.url + '">&laquo; Previous ' + model.class.to_s.demodulize + '</a></li>'
+        end
+        n << '  <li><a class="up" href="' + model.absolute_window_url + '">Back to ' + model.class.to_s.demodulize.pluralize + '</a></li>'
+        if user.can_edit? model
+          n << '  <li><a class="edit" href="' + r(:edit, model.id).to_s + '">Edit</a></li>'
         end
-        n << '  <a class="up" href="' + model.absolute_window_url + '">Back to ' + model.class.to_s.demodulize.pluralize + '</a>'
         if model.next
-          n << '  <a class="next" href="' + model.next.url + '">Next ' + model.class.to_s.demodulize + ' &raquo;</a>'
+          n << '  <li><a class="next" href="' + model.next.url + '">Next ' + model.class.to_s.demodulize + ' &raquo;</a></li>'
         end
-        n << '</div>'
+        n << '</ul>'
       end
 
       # Generate pagination links from a Sequenceable class and index.
@@ -104,12 +119,14 @@ module Ramaze
           pages = [0] + (first_page..last_page).to_a + [window_count - 1]
         else
           # The window encompasses the entire set of pages
-          pages = (0 .. window_count - 1).to_a
+          pages = (0 ... window_count).to_a
         end
 
         if page > 0
           # Add "previous page" link.
-          links << "<li><a href=\"#{klass.url}/page/#{page - 1}\">&laquo; Previous</a></li>"
+          links << "<li><a class=\"previous\" href=\"#{klass.url}/page/#{page - 1}\">&laquo; Previous</a></li>"
+        else
+          links << "<li class=\"placeholder\"><span class=\"previous\"></span></li>"
         end
 
         # Convert pages to links
@@ -117,12 +134,12 @@ module Ramaze
           pages.inject(pages.first - 1) do |previous, i|
             if (i - previous) > 1
               # These pages are not side-by-side.
-              links << '<li>&hellip;</li>'
+              links << '<li class="elided"><span>&hellip;</span></li>'
             end
 
             if i == page
               # This is a link to the current page.
-              links << "<li class=\"current\">#{i + 1}</li>"
+              links << "<li class=\"current\"><span>#{i + 1}</span></li>"
             else
               # This is a link to a different page.
               links << "<li><a href=\"#{klass.url}/page/#{i}\">#{i + 1}</a></li>"
@@ -135,7 +152,9 @@ module Ramaze
 
         if page < klass.window_count - 1
           # Add "next page" link.
-          links << "<li><a href=\"#{klass.url}/page/#{page + 1}\">Next &raquo;</a></li>"
+          links << "<li><a class=\"next\" href=\"#{klass.url}/page/#{page + 1}\">Next &raquo;</a></li>"
+        else
+          links << "<li class=\"placeholder\"><span class=\"next\"></span></li>"
         end
 
         links << '</ol>'
@@ -143,14 +162,14 @@ module Ramaze
 
       # Produces a section navigation list from an array of titles to urls.
       def section_nav(sections)
-        s = "<ul>\n"
+        s = "<ul class=\"actions\">\n"
         sections.each do |section|
           title = section.first
-          url = section.last
+          url = section.last.to_s
           klass = url.gsub(/\//, '').gsub(/_/, '-')
-          s << '<li><a class="' + klass
-          s << ' selected' if request.request_uri == url 
-          s << '" href="' + attr_h(url) + '">'
+          s << '<li class="' + klass
+          s << ' current' if request.request_uri[url]
+          s << '"><a href="' + attr_h(url) + '">'
           s << title
           s << "</a></li>\n"
         end

data/lib/cortex_reaver/helper/photographs.rb

@@ -24,9 +24,9 @@ module Ramaze
       # 1/60 => '1/60th'
       def neat_time(rational)
         if rational.denominator == 1
-          rational.numerator.ordinal.to_s
+          rational.numerator.to_s + ' seconds'
         else
-          "#{rational.numerator}/#{rational.denominator.ordinal.to_s}"
+          "#{rational.numerator}/#{rational.denominator.ordinal.to_s} of a second"
         end
       end
     end

data/lib/cortex_reaver/helper/sidebar.rb

@@ -0,0 +1,44 @@
+module Ramaze
+  module Helper
+    # Provides programmatic sidebar boxes
+    module Sidebar
+      # Renders the sidebar
+      def sidebar
+        sidebar = ''
+        CortexReaver.config.view.sidebar.each do |path, view|
+          if path_matches? path
+            sidebar << CortexReaver::MainController.render_view('sidebar/' + view)
+          end
+        end
+        sidebar
+      end
+
+      # True if the given glob matches our request path.
+      def path_matches?(path)
+        case path
+        when String
+          # Convert string to regex.
+          pattern = path.gsub(/\*(\*)?/) do |match|
+            if match[1]
+              '.*'
+            else
+              '[^\/]*'
+            end
+          end
+
+          if Regexp.new("^#{pattern}$").match request.path_info
+            true
+          else
+            false
+          end
+        when Regexp
+          if path.match request.path_info
+            true
+          else
+            false
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cortex_reaver/helper/tags.rb

@@ -1,23 +1,41 @@
 module Ramaze
   module Helper
     module Tags
+      Helper::LOOKUP << self
+
+      # Finds models with a given tag.
+      def tagged(tags)
+        tags = tags.split(',').map! do |tag|
+          CortexReaver::Tag.get(tag.gsub(/[^-_\w]+/, '').strip)
+        end
+
+        @title = "#{model_class.to_s.demodulize.pluralize.titleize}: #{tags.join(', ')}"
+        @models = model_class.tagged_with(tags)
+        set_plural_model_var @models
+
+        if user.can_create? model_class.new
+          workflow "New #{model_class.to_s.demodulize}", rs(:new)
+        end
+
+        render_view(:list)
+      end
+
+      private
       # Adds an AJAX-ified tag editor for a model.
       def live_tags_field(model, opts={:name => 'tags'})
         name = opts[:name]
         title = opts[:title] || name.to_s.titleize
         
         s = "<p><label for=\"#{name}\">#{title}</label>\n"
-        s << "<ul id=\"#{name}-holder\" class=\"acfb-holder\">\n"
-        s << "<input name=\"#{name}\" id=\"#{name}\" type=\"text\" class=\"acfb-input\" value=\"#{attr_h(tags_on(model, false))}\" />"
-        s << "</ul></p>"
+        s << "<input name=\"#{name}\" id=\"#{name}\" type=\"text\" value=\"#{attr_h(tags_on(model, false))}\" />"
+        s << "</p>"
 
         s << <<EOF
 <script type="text/javascript">
     /* <![CDATA[ */
     $(document).ready(function() {
-      $("##{name}-holder").autoCompletefb({
-        urlLookup:'/tags/autocomplete',
-        acOptions:{extraParams:{id:'title'}}
+      $("##{name}").autotags({
+        url: "#{CortexReaver::TagController.r(:autocomplete)}"
       });
     });
     /* ]]> */
@@ -25,16 +43,21 @@ module Ramaze
 EOF
       end
 
-      # Returns an html list of tags on a model that supports #tags.
-      def tags_on(model, html=true)
+      # Returns a list of tags on a model that supports #tags.
+      def tags_on(model, format = :html)
         begin
-          if html
+          case format
+          when :html
             #t = '<img src="/images/tag.gif" alt="Tags" />'
             t = '<ul class="tags">'
             model.tags.each do |tag|
               t << "<li><a href=\"#{tag.url}\">#{tag.title}</a></li>"
             end
             t << '</ul>'
+          when :json
+            model.tags.map { |t|
+              {:id => t.name, :name => t.title}
+            }.to_json
           else
             t = model.tags.map{ |t| t.title }.join(', ')
           end

data/lib/cortex_reaver/helper/workflow.rb

@@ -6,21 +6,9 @@ module Ramaze
         @workflows
       end
 
-      def workflow(name, href)
+      def workflow(name, href, *classes)
         @workflows ||= []
-        @workflows << [name, href]
-      end
-
-      def workflowbox
-        if @workflows
-          b = '<div class="workflows">'
-          b << '  <ul>'
-          @workflows.each do |name, href|
-            b << "    <li><a href=\"#{href}\">#{name}</a></li>"
-          end
-          b << '  </ul>'
-          b << '</div>'
-        end
+        @workflows << [name, href, classes]
       end
     end
   end

data/lib/cortex_reaver/layout/blank.rhtml

@@ -3,45 +3,41 @@
   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
-    <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/main.css" />
-    <link rel="stylesheet" type="text/css" href="/css/admin.css" />
-    <link rel="stylesheet" type="text/css" href="/css/photo.css" />
-    <link rel="stylesheet" type="text/css" href="/css/text.css" />
-    <link rel="stylesheet" type="text/css" href="/css/form.css" />
-    <link rel="stylesheet" type="text/css" href="/css/code.css" />
-    <link rel="stylesheet" type="text/css" href="/css/custom.css" />
     <% if defined? feeds %>
       <% feeds.each do |title, feed| %>
         <link rel="alternate" type="application/atom+xml" href="<%= attr_h feed %>" title="<%= attr_h title %>" />
       <% end %>
     <% end %>
+    
+    <%= CortexReaver::MainController.render_view('head') %>
   </head>
-  <body class="blank">
-    <script type="text/javascript" src="/js/jquery.js"></script>
-    <script type="text/javascript" defer="defer" src="/js/cookie.js"></script>
-    <script type="text/javascript" defer="defer" src="/js/admin.js"></script>
-    <script type="text/javascript" src="/js/photo.js"></script>
-  
+  <body class="blank <%= @body_class %>">
+    <%= CortexReaver::MainController.render_view('js') %>
+
     <%= CortexReaver::MainController.render_view('adminbox') %>
 
-    <%= flashbox %>
-            
-    <div id="content">
-      <%= @content %>
-    </div>
+    <%= @content %>
+
+    <%= CortexReaver::MainController.render_view('tracker') %>
+
+    <script type="text/javascript">
+    /* <![CDATA[ */ 
+      $(document).ready(function() {
+        $('#main').corners('10px');
 
-    <div id="colophon">
-      Copyright &copy; 2001&mdash;<%= Time.now.strftime('%Y') %> Aphyr
-    </div>
+        $('.pagination').each(function() {
+          $(this).find('li:not(.placeholder):first').corners("left");
+          $(this).find('li:not(.placeholder):last').corners("right");
+        });
+        $('.pagination li').not('.elided').add('.actions > li').not('.current').not('.placeholder').each(function(i) {
+          $(this).fadeTo(0,0.8);
+          $(this).hover(
+            function() { $(this).fadeTo(0,1) },
+            function() { $(this).fadeTo(200,0.8) }
+          );
+        });
+      });
+    /* ]]> */
+    </script>
   </body>
 </html>

data/lib/cortex_reaver/layout/text.rhtml

@@ -3,83 +3,70 @@
   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
-    <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/main.css" />
-    <link rel="stylesheet" type="text/css" href="/css/admin.css" />
-    <link rel="stylesheet" type="text/css" href="/css/photo.css" />
-    <link rel="stylesheet" type="text/css" href="/css/text.css" />
-    <link rel="stylesheet" type="text/css" href="/css/form.css" />
-    <link rel="stylesheet" type="text/css" href="/css/code.css" />
-    <link rel="stylesheet" type="text/css" href="/css/custom.css" />
-    <% if @feeds %>
-      <% @feeds.each do |title, feed| %>
+    <% if defined? feeds %>
+      <% feeds.each do |title, feed| %>
         <link rel="alternate" type="application/atom+xml" href="<%= attr_h feed %>" title="<%= attr_h title %>" />
       <% end %>
     <% end %>
+    
+    <%= CortexReaver::MainController.render_view('head') %>
   </head>
-  <body>
-    <script type="text/javascript" src="/js/jquery.js"></script>
-    <script type="text/javascript" defer="defer" src="/js/cookie.js"></script>
-    <script type="text/javascript" defer="defer" src="/js/admin.js"></script>
-    <% if user.admin? or user.contributor? or user.editor? or user.moderator? %>
-      <script type="text/javascript" defer="defer" src="/js/jquery.autocomplete.js"></script>
-      <script type="text/javascript" defer="defer" src="/js/jquery.bgiframe.min.js"></script>
-      <script type="text/javascript" defer="defer" src="/js/jquery.dimensions.js"></script>
-      <script type="text/javascript" defer="defer" src="/js/jquery.autocompletefb.js"></script>
-    <% end %>
-  
-    <div id="top">
-      <a href="/">
-        <img id="header" src="/images/header.png" alt="<%= attr_h CortexReaver.config[:site][:name] %>" />
-      </a>
-    </div>
+  <body class="<%= @body_class %>">
+    <%= CortexReaver::MainController.render_view('js') %>
 
-    <div id="sections">
-      <%= section_nav([
-            ['Journals', '/journals'],
-            ['Photographs', '/photographs'],
-            ['Projects', '/projects'],
-            ['Tags', '/tags'],
-            ['Comments', '/comments'],
-            ['About', '/about']
-      ]) %>
-    </div>
+    <%= CortexReaver::MainController.render_view('adminbox') %>
 
-    <div id="middle">
-      <table id="columns">
-        <tbody>
-          <tr>
-            <td id="main">
-              <%= CortexReaver::MainController.render_view('adminbox') %>
+    <div id="content">
+      <div id="top">
+        <% if @model %>
+          <%= model_nav @model %>
+        <% end %>
+        <h1><a href="/"><%=h CortexReaver.config.site.name %></a></h1>
+      </div>
 
-              <%= flashbox %>
+      <div id="boxes">
+        <%= sidebar %>
+      </div>
 
-              <div id="content">
-                <%= @content %>
-              </div>
-            </td>
+      <div id="main-container">
+        <div id="main">
+          <%= flashbox %>
 
-            <% if @sidebar %>
-              <td id="sidebar">
-                <%= @sidebar %>
-              </td>
-            <% end %>
-          </tr>
-        </tbody>
-      </table>
-    </div>
+          <%= @content %>
+        </div>
 
-    <div id="colophon">
-      Copyright &copy; 2001&mdash;<%= Time.now.strftime('%Y') %> <%=h CortexReaver.config[:site][:author] %>
+        <div id="colophon">
+          Copyright &copy; <% if @model %>
+            <%= @model.updated_on.year %>
+            <%= user_link @model %> 
+          <% else %>
+            <%= CortexReaver.content_range.begin.year %>&mdash;<%= CortexReaver.content_range.end.year %>    
+            <%=h CortexReaver.config.site.author %>
+          <% end %>
+        </div>
+      </div>
     </div>
+
+    <%= CortexReaver::MainController.render_view('tracker') %>
+
+    <script type="text/javascript">
+    /* <![CDATA[ */ 
+      $(document).ready(function() {
+        $('#main').corners('10px');
+
+        $('.pagination').each(function() {
+          $(this).find('li:not(.placeholder):first').corners("left");
+          $(this).find('li:not(.placeholder):last').corners("right");
+        });
+        $('.pagination li').add('.actions > li').not('.elided').not('.current').not('.placeholder').each(function(i) {
+          $(this).fadeTo(0,0.8);
+          $(this).hover(
+            function() { $(this).fadeTo(0,1) },
+            function() { $(this).fadeTo(200,0.8) }
+          );
+        });
+      });
+    /* ]]> */
+    </script>
   </body>
 </html>