togo 0.4.1 → 0.6.0

data/lib/togo/admin/public/js/index.js

@@ -6,7 +6,7 @@ var app = (function() {
 
     var searchInputHandler = function(action) {
         return function(e) {
-            console.log(e);
+            e = e || window.event;
             if (this.value == '') {
                 this.value = searchInputDefaultValue;
             }
@@ -17,6 +17,7 @@ var app = (function() {
     };
 
     var handleMultiSelect = function(e) {
+        e = e || window.event;
         var id = e.target.getAttribute('id').split('_')[1];
         if (e.target.checked) {
             selectedItems.push(id);
@@ -42,7 +43,7 @@ var app = (function() {
     var c = el('list-table').getElementsByTagName('input');
     for (var i = 0; i < c.length; i++) {
         if (c[i].getAttribute('type') == 'checkbox') {
-            c[i].addEventListener('click', handleMultiSelect, false);
+            listen('click', c[i], handleMultiSelect);
         }
     }
 

data/lib/togo/admin/public/js/togo.js

@@ -1,3 +1,22 @@
+if (!Array.prototype.some)
+{
+  Array.prototype.some = function(fun /*, thisp*/)
+  {
+    var len = this.length;
+    if (typeof fun != "function")
+      throw new TypeError();
+
+    var thisp = arguments[1];
+    for (var i = 0; i < len; i++)
+    {
+      if (i in this &&
+          fun.call(thisp, this[i], i, this))
+        return true;
+    }
+
+    return false;
+  };
+}
 function el(node) {
     return document.getElementById(node);
 }
@@ -86,6 +105,20 @@ var ajax = function(opts) {
     req.send(null);
 };
 
+var ensureEvent = function(func) {
+    return function() {
+        var e = window.event;
+        e.target = e.srcElement;
+        e.preventDefault = function() {
+            e.returnValue = false;
+        };
+        e.stopPropagation = function() {
+            e.cancelBubble = true;
+        };
+        func.call(e.srcElement,e);
+    };
+};
+
 var listen = function(evnt, elem, func) {
     if (elem.addEventListener) {
         listen = function(evnt, elem, func) {
@@ -93,7 +126,7 @@ var listen = function(evnt, elem, func) {
         };
     } else if (elem.attachEvent) {
         listen = function(evnt, elem, func) {
-            elem.attachEvent('on' + evnt, func);
+            elem.attachEvent('on' + evnt, ensureEvent(func));
         };
     }
     listen(evnt,elem,func);
@@ -106,7 +139,7 @@ var unlisten = function(evnt, elem, func) {
         };
     } else if (elem.attachEvent) {
         unlisten = function(evnt, elem, func) {
-            elem.detachEvent('on' + evnt, func);
+            elem.detachEvent('on' + evnt, ensureEvent(func));
         };
     }
     unlisten(evnt,elem,func);
@@ -232,23 +265,24 @@ AssociationManager.prototype.addLinkToValue = function(id, value, linkIt) {
     return '<a href="/edit/' + this.model + '/' + id + '">' + value + '</a>';
 };
 
-AssociationManager.prototype.generateRow = function(data) {
-    var out = '<tr><td class="checkbox active">' +
-        '<input type="' + this.selectorType + '" value="' + data.id + '" id="selection_' + this.model + '_' + data.id + '"';
+AssociationManager.prototype.appendRow = function(data) {
+    var tr = this.tbody.insertRow(-1);
+    var td = tr.insertCell(-1);
+    var cb = '<input type="' + this.selectorType + '" value="' + data.id + '" id="selection_' + this.model + '_' + data.id + '"';
     if (this.relatedIds[data.id]) {
-        out += ' checked="checked"';
+        cb += ' checked="checked"';
     }
     if (this.selectorType == 'radio') {
-        out += ' name=' + this.model + '_' + this.name + '_selection';
+        cb += ' name="' + this.model + '_' + this.name + '_selection"';
     }
-    out += ' /></td>';
+    cb += ' />';
+    addClass(td, 'checkbox active');
+    td.innerHTML = cb;
     var linkIt = true;
     for (var i = 0, len = this.fields.length; i < len; i++) {
         if (i == 1) { linkIt = false; }
-        out += '<td>' + this.addLinkToValue(data.id, (data[this.fields[i]] == null ? '-' : data[this.fields[i]]), linkIt) + '</td>';
+        tr.insertCell(-1).innerHTML = this.addLinkToValue(data.id, (data[this.fields[i]] == null ? '-' : data[this.fields[i]]), linkIt);
     }
-    out += '</tr>';
-    return out;
 };
 
 AssociationManager.prototype.clearTable = function() {
@@ -330,11 +364,9 @@ AssociationManager.prototype.searchResultsHandler = function(handler) {
         handler.pageCountField.innerHTML = handler.pageCount;
         handler.pageNumberField.innerHTML = handler.pageNumber;
         if (data.results.length > 0) {
-            var out = [];
             for (var i = 0, len = data.results.length; i < len; i++) {
-                out.push(handler.generateRow(data.results[i]));
+                handler.appendRow(data.results[i]);
             }
-            handler.tbody.innerHTML = out.join('');
         } else {
         }
         handler.toggleCheckboxes();

data/lib/togo/admin/views/_paging.erb

@@ -0,0 +1,14 @@
+<div id="paging" class="paging">
+  <%= @count %> result<%= @count != 1 ? 's' : '' %>
+  <% if @page_count > 1 %>
+    / Page <span class="page-number"><%= @p %></span> of <span class="page-count"><%= @page_count %></span> /
+    <% prev_link, next_link = paging_links(@p, @page_count, :q => params[:q], :o => params[:o]) %> 
+    <%= prev_link %>
+    <%= next_link %>
+  <% end %>
+  <form method="get" id="search-form">
+    <fieldset>
+      <input type="text" name="q" value="<%= params[:q].blank? ? 'Search...' : params[:q] %>" size="40" />
+    </fieldset>
+  </form>
+</div>

data/lib/togo/admin/views/edit.erb

@@ -1,6 +1,9 @@
-<h1><a href="/<%= @model.name %>"><%= @model.display_name %></a> / Edit</h1>
 <form action="/update/<%= @model.name %>/<%= @content.id %>" method="post" id="edit-form">
-  <div class="wrapper">
+  <input type="hidden" name="return_url" value="<%= request.referer || '/locations' %>" />
+  <div id="subhead">
+    <h1><a href="/<%= @model.name %>"><%= @model.display_name %></a> / Edit</h1>
+  </div>
+  <div id="main">
     <% if @errors %><div id="save_errors" class="errors"><%= @errors %></div><% end %>
     <% @model.get_form_properties.each do |p| %>
     <fieldset id="property-<%= p.name %>" class="<%= @model.field_class_for(p) %>">
@@ -9,13 +12,7 @@
     <% end %>
   </div>
   <div class="actions">
-    <button type="submit" class="save">Save</button>
+    <button type="submit" class="save">Save <%= @model.display_name.singularize %></button>
   </div>
 </form>
-<div class="actions external">
-  <form action="/delete/<%= @model.name %>" method="post" id="delete-form">
-    <input type="hidden" id="delete-list" name="id" value="<%= @content.id %>" />
-    <button type="submit" id="delete-button">Delete</button>
-  </form>
-</div>
 <script type="text/javascript" src="/js/edit.js"></script>

data/lib/togo/admin/views/index.erb

@@ -1,53 +1,53 @@
-<h1><%= @model.display_name %></h1>
-<div id="paging">
-    <%= @count %> item<%= @count != 1 ? 's' : '' %>
-  <% if @page_count > 1 %>
-    Page <span class="page-number"><%= @p %></span> of <span class="page-count"><%= @page_count %></span>
-    <% prev_link, next_link = paging_links(@p, @page_count, :q => params[:q]) %>
-    <%= prev_link %>
-    <%= next_link %>
-  <% end %>
-</div>
-<form method="get" id="search-form">
-  <fieldset>
-    <input type="text" name="q" value="<%= params[:q].blank? ? 'Search...' : params[:q] %>" size="40" />
-  </fieldset>
-</form>
-<div class="wrapper">
-<table id="list-table">
-  <thead>
-    <tr>
-      <% if not @content.empty? %>
-      <th></th>
-      <% end %>
-      <% @model.get_list_properties.each do |p| %>
-      <th><%= p.name.to_s.humanize.titleize %></th>
+<div id="subhead">
+  <h1><%= @model.display_name %>
+  <div id="model-select">
+    <ul>
+      <% Togo.models.each do |m| %>
+        <% next if m == @model %>
+        <li><a href="/<%= m.name %>"><%= m.display_name %></a></li>
       <% end %>
-    </tr>
-  </thead>
-  <tbody>
-    <% if @content.empty? %>
-    <tr>
-      <td colspan="<%= @model.get_list_properties.size %>"><% if params[:q] %>No results for '<%= params[:q] %>'<% else %>No content has been created yet.<% end %></td>
-    </tr>
-    <% else %>
-    <% @content.each do |c| %>
-    <tr>
-      <td class="checkbox"><input type="checkbox" name="selection[<%= c.id %>]" value="1" id="selection_<%= c.id %>" /></td>
-      <% @model.get_list_properties.each_with_index do |p,i| %>
-      <td><% if i == 0 %><a href="/edit/<%= @model.name %>/<%= c.id %>"><%= c.send(p.name.to_sym) || '-' %></a><% else %><%= c.send(p.name.to_sym) %><% end %></td>
-      <% end %>
-    </tr>
-    <% end %>
-    <% end %>
-  </tbody>
-</table>
+    </ul>
+  </div>
+  </h1>
+</div>
+<div id="main">
+  <%= partial :_paging %>
+  <div class="list-table-wrapper">
+    <table cellspacing="0" id="list-table">
+      <thead>
+        <tr>
+          <% if not @content.empty? %>
+            <th>&nbsp;</th>
+          <% end %>
+          <% @model.get_list_properties.each do |p| %>
+            <th><%= column_head_link(p, @order, :q => params[:q], :p => params[:p]) %></th>
+          <% end %>
+        </tr>
+      </thead>
+      <tbody>
+        <% if @content.empty? %>
+          <tr>
+            <td colspan="<%= @model.get_list_properties.size %>"><% if params[:q] %>No results for '<%= params[:q] %>'<% else %>No content has been created yet.<% end %></td>
+          </tr>
+        <% else %>
+          <% @content.each do |c| %>
+            <tr>
+              <td class="checkbox"><input type="checkbox" name="selection[<%= c.id %>]" value="1" id="selection_<%= c.id %>" /></td>
+              <% @model.get_list_properties.each_with_index do |p,i| %>
+                <td><% if i == 0 %><a href="/edit/<%= @model.name %>/<%= c.id %>"><%= c.send(p.name.to_sym) || '-' %></a><% else %><%= c.send(p.name.to_sym) %><% end %></td>
+              <% end %>
+            </tr>
+          <% end %>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
 </div>
 <div class="actions">
-  <a href="/new/<%= @model.name %>" class="action new" id="new-button">New</a>
   <form action="/delete/<%= @model.name %>" method="post" id="delete-form">
     <input type="hidden" id="delete-list" name="id" value="" />
     <button type="submit" id="delete-button" disabled="disabled" onclick="return confirm('Are you sure you want to delete these items?');">Delete</button>
   </form>
+  <button onclick="window.location='/new/<%= @model.name %>'; return false;">New...</button>
 </div>
 <script type="text/javascript" src="/js/index.js"></script>

data/lib/togo/admin/views/layout.erb

@@ -1,24 +1,22 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html>
+<html>
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
     <title>Togo Admin</title>
-    <link rel="stylesheet" href="/css/screen.css" />
+    <link rel="stylesheet" href="/css/screen.css" type="text/css" media="screen" />
     <script type="text/javascript" src="/js/togo.js"></script>
   </head>
-  <body>
-    <div id="header">Togo</div>
-    <div id="nav">
-      <ul>
-        <% Togo.models.each do |m| %>
-        <li><a href="/<%= m.name %>" class="<%= @model.name == m.name ? 'selected' : '' %>"><%= m.display_name %></a></li>
-        <% end %>
-      </ul>
-    </div>
-    <div id="main">
-      <%= yield %>
+  <body id="<%= @body_id %>">
+    <div id="container">
+      <div id="header">
+        <h1>Togo Admin</h1>
+        <div id="system-menu">
+          <span>System Menu</span>
+        </div>
+      </div>
+      <div id="content">
+        <%= yield %>
+      </div>
     </div>
   </body>
 </html>

data/lib/togo/admin/views/new.erb

@@ -1,6 +1,9 @@
-<h1><a href="/<%= @model.name %>"><%= @model.display_name %></a> / New</h1>
 <form action="/create/<%= @model.name %>" method="post" id="edit-form">
-  <div class="wrapper">
+  <input type="hidden" name="return_url" value="<%= request.referer || '/locations' %>" />
+  <div id="subhead">
+    <h1><a href="/<%= @model.name %>"><%= @model.display_name %></a> / New</h1>
+  </div>
+  <div id="main">
     <% if @errors %><div id="save_errors" class="errors"><%= @errors %></div><% end %>
     <% @model.get_form_properties.each do |p| %>
     <fieldset id="property-<%= p.name %>" class="<%= @model.field_class_for(p) %>">

data/lib/togo/model/model.rb

@@ -1,4 +1,7 @@
 require 'erubis/tiny'
+%w( relationship_manager many_to_one one_to_many ).each{|l|
+  require "togo/model/relationship_manager/#{l}"
+}
 
 module Togo
   module DataMapper
@@ -13,6 +16,8 @@ module Togo
         base.send(:class_variable_set, :@@user_form_properties, [])
         base.send(:class_variable_set, :@@custom_form_templates, {})
         base.send(:class_variable_set, :@@property_options, {})
+        base.send(:class_variable_set, :@@inflector, (Extlib::Inflection rescue ActiveSupport::Inflector))
+
         if MODELS.include?(base) # support code reloading
           MODELS[MODELS.index(base)] = base # preserve order of which models were loaded
         else
@@ -44,11 +49,11 @@ module Togo
         end
 
         def update_content!(id,attrs)
-          stage_content(get(id),attrs).save!
+          stage_content(get(id),attrs).save
         end
 
         def create_content!(attrs)
-          stage_content(new,attrs).save!
+          stage_content(new,attrs).save
         end
 
         def stage_content(content,attrs)
@@ -56,7 +61,7 @@ module Togo
           relationships.each do |r| 
             val = attrs["related_#{r[0]}".to_sym]
             next if not val or val == 'unset'
-            content = RelationshipManager.new(content, r, :ids => val).relate
+            content = RelationshipManager.create(content, r, :ids => val).relate
           end
           content
         end
@@ -77,6 +82,7 @@ module Togo
           q = "%#{opts[:q].gsub(/\s+/,'%')}%"
           limit = opts[:limit]
           offset = opts[:offset]
+          order = opts[:order]
           conditions, values = [], []
           search_properties.each{|l|
             conditions << "#{l.name} like ?"
@@ -84,6 +90,7 @@ module Togo
           }
           params = {:conditions => [conditions.join(' OR ')] + values}
           params.merge!(:limit => limit.to_i, :offset => offset.to_i) if limit and offset
+          params.merge!(:order => order) if order
           all(params)
         end
 
@@ -107,19 +114,27 @@ module Togo
 
         def type_from_property(property)
           case property
-            when ::DataMapper::Property
-              Extlib::Inflection.demodulize(property.type || property.class).downcase # type seems to be deprecated in 1.0
+            when ::DataMapper::Property::Text
+              'text'
+            when (defined?(::DataMapper::Property::Enum) and ::DataMapper::Property::Enum)
+              'string'
             when ::DataMapper::Associations::ManyToMany::Relationship
               'many_to_many'
             when ::DataMapper::Associations::ManyToOne::Relationship
               'belongs_to'
             when ::DataMapper::Associations::OneToMany::Relationship
               'has_n'
+            when ::DataMapper::Property
+              class_variable_get(:@@inflector).demodulize(property.type || property.primitive || property.class).downcase # type seems to be deprecated in 1.0
             else
               'string'
           end
         end
 
+        def is_extended_type?(property)
+          
+        end
+
         def pick_properties(selection, args)
           if class_variable_get(:"@@#{selection}_properties").empty?
             args = shown_properties.map{|p| p.name} if args.empty?
@@ -146,38 +161,5 @@ module Togo
       end
 
     end # Model
-
-    class RelationshipManager
-      def initialize(content, relationship, opts = {})
-        @content = content
-        @relationship = relationship[1]
-        @relationship_name = relationship[0]
-        @ids = (opts[:ids] || '').split(',').map(&:to_i)
-        define_values
-      end
-
-      def relate
-        @content.send("#{@relationship_name}=", find_for_assignment)
-        @content
-      end
-      
-      def define_values
-        case @relationship
-          when ::DataMapper::Associations::ManyToOne::Relationship
-            @unset_value = nil
-            @related_model = @relationship.parent_model
-            @find_op = Proc.new{|p| p.get(@ids.first)}
-          when ::DataMapper::Associations::OneToMany::Relationship
-            @unset_value = []
-            @related_model = @relationship.child_model
-            @find_op = Proc.new{|p| p.all(:id => @ids)}
-        end
-      end
-
-      def find_for_assignment
-        return @unset_value if @ids.blank?
-        @find_op.call(@related_model)
-      end
-    end # RelationshipManager
   end # DataMapper
 end # Togo

data/lib/togo/model/relationship_manager/many_to_one.rb

@@ -0,0 +1,19 @@
+module Togo
+  module DataMapper
+    
+    class ManyToOne < RelationshipManager
+      def unset_value
+        nil
+      end
+
+      def related_model
+        @relationship.parent_model
+      end
+
+      def find_for_assignment
+        related_model.get(@ids.first)
+      end
+    end
+
+  end # DataMapper
+end # Model

data/lib/togo/model/relationship_manager/one_to_many.rb

@@ -0,0 +1,19 @@
+module Togo
+  module DataMapper
+    
+    class OneToMany < RelationshipManager
+      def unset_value
+        []
+      end
+
+      def related_model
+        @relationship.child_model
+      end
+
+      def find_for_assignment
+        related_model.all(:id => @ids)
+      end
+    end
+
+  end # DataMapper
+end # Model

data/lib/togo/model/relationship_manager/relationship_manager.rb

@@ -0,0 +1,40 @@
+module Togo
+  module DataMapper
+    class RelationshipManager
+
+      def self.create(content, relationship, opts = {})
+        case relationship[1]
+        when ::DataMapper::Associations::ManyToOne::Relationship
+          ManyToOne.new(content, relationship, opts)
+        when ::DataMapper::Associations::OneToMany::Relationship
+          OneToMany.new(content, relationship, opts)
+        end
+      end
+
+      def initialize(content, relationship, opts = {})
+        @content = content
+        @relationship = relationship[1]
+        @relationship_name = relationship[0]
+        @ids = (opts[:ids] || '').split(',').map(&:to_i)
+      end
+
+      def relate
+        @content.send("#{@relationship_name}=", find_for_assignment)
+        @content
+      end
+      
+      def unset_values
+        raise NotImplementedError
+      end
+
+      def related_model
+        raise NotImplementedError
+      end
+
+      def find_for_assignment
+        raise NotImplementedError
+      end
+
+    end
+  end # DataMapper
+end # Togo

data/lib/togo/model/types/belongs_to.erb

@@ -5,49 +5,51 @@
 <input type="hidden" name="related_<%= property.name %>" class="related_ids" value="unset" />
 <label for="<%= property.name %>"><%= related_model.display_name %></label>
 <div class="search" id="search-<%= related_model.name %>">
-  <input type="text" name="search-<%= property.name %>" value="Search..." />
   <div class="paging">
-    Page <span class="page-number">1</span> of <span class="page-count"><%= (content_count/10).ceil %></span>
-    <a href="#" rel="prev">&laquo; Previous</a> <a href="#" rel="next">Next &raquo;</a>
+    <input type="text" name="search-<%= property.name %>" value="Search..." />
+    Page <span class="page-number">1</span> of <span class="page-count"><%= (content_count/10).ceil %></span> /
+    <a href="#" rel="prev">Previous</a> <a href="#" rel="next">Next</a>
   </div>
 </div>
-<table>
-  <thead>
-    <tr>
-      <th class="checkbox"></th>
-      <% related_model.get_list_properties.each do |p| %>
-      <th><%= p.name.to_s.humanize.titleize %></th>
-      <% end %>
-    </tr>
-  </thead>
-  <tfoot>
-    <tr>
-      <td class="checkbox"></td>
-      <td colspan="<%= related_model.get_form_properties.size-2 %>">
-        <span class="associated-count-display" style="display: none;">
-          ...and <span class="associated-count"><%= content_count-related_content.size %></span> more associated items
-        </span>
-        <button class="association-modify">Modify</button>
-      </td>
-    </tr>
-  </tfoot>
-  <tbody>
-    <% if related_content.empty? %>
-    <tr>
-      <td colspan="<%= related_model.get_form_properties.size %>">No Content Associated.</td>
-    </tr>
-    <% else %>
-    <% related_content.each do |c| %>
-    <tr>
-      <td class="checkbox"><input type="radio" name="selection[<%= c.id %>]" value="<%= c.id %>" id="selection_<%= related_model.name %>_<%= c.id %>" checked="checked" /></td>
-      <% related_model.get_list_properties.each_with_index do |p,i| %>
-      <td><% if i == 0 %><a href="/edit/<%= related_model.name %>/<%= c.id %>"><%= c.send(p.name.to_sym) || '-' %></a><% else %><%= c.send(p.name.to_sym) %><% end %></td>
-      <% end %>
-    </tr>   
-    <% end %>
-    <% end %>
-  </tbody>
-</table>
+  <div class="list-table-wrapper">
+    <table cellspacing="0">
+      <thead>
+        <tr>
+          <th class="checkbox">&nbsp;</th>
+          <% related_model.get_list_properties.each do |p| %>
+            <th><%= p.name.to_s.humanize.titleize %></th>
+          <% end %>
+        </tr>
+      </thead>
+      <tfoot>
+        <tr>
+          <td class="checkbox"></td>
+          <td colspan="<%= related_model.get_list_properties.size %>">
+            <span class="associated-count-display" style="display: none;">
+              ...and <span class="associated-count"><%= content_count-related_content.size %></span> more associated items
+            </span>
+            <button class="association-modify">Modify</button>
+          </td>
+        </tr>
+      </tfoot>
+      <tbody>
+        <% if related_content.empty? %>
+          <tr>
+            <td colspan="<%= related_model.get_list_properties.size %>">No Content Associated.</td>
+          </tr>
+        <% else %>
+          <% related_content.each do |c| %>
+            <tr>
+              <td class="checkbox"><input type="radio" name="selection[<%= c.id %>]" value="<%= c.id %>" id="selection_<%= related_model.name %>_<%= c.id %>" checked="checked" /></td>
+              <% related_model.get_list_properties.each_with_index do |p,i| %>
+                <td><% if i == 0 %><a href="/edit/<%= related_model.name %>/<%= c.id %>"><%= c.send(p.name.to_sym) || '-' %></a><% else %><%= c.send(p.name.to_sym) %><% end %></td>
+              <% end %>
+            </tr>   
+          <% end %>
+        <% end %>
+      </tbody>
+    </table>
+</div>
 <script type="text/javascript">
   new AssociationManager({
     relationship: 'belongs_to',