wontomedia 0.2.0 → 0.2.1

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 2
-:patch: 0
+:patch: 1

data/app/controllers/connections_controller.rb

@@ -143,7 +143,7 @@ class ConnectionsController < ApplicationController
       redirect_to connection_path(@connection)
     else
       @connection.destroy
-      redirect_to connections_url
+      redirect_to( params[:goto] ? params[:goto] : connections_url )
     end
   end
 

data/app/controllers/items_controller.rb

@@ -261,7 +261,23 @@ class ItemsController < ApplicationController
     # add blank-object connections to serve as basis for connection "quick add"
     @intances_of_type_item_classes = {}
     if class_item = @item.instance_of
-      find_applied_properties( class_item ).each do |property_item|
+      find_applied_properties( class_item ).select do |property_item|
+        if (max_connection = Connection.first( :conditions => [
+              "subject_id = ? AND predicate_id = ?",
+              property_item.id, Item.find_by_name('max_uses_per_item').id ])) &&
+            max_connection.kind_of_obj == Connection::OBJECT_KIND_SCALAR      &&
+            (max = max_connection.scalar_obj.to_i) > 0
+
+          count = Connection.all(
+              :conditions => [ "subject_id = ? AND predicate_id = ?",
+              @item.id, property_item.id ]).
+            length
+
+          count < max
+        else
+          true
+        end
+      end.each do |property_item|
         if connection = Connection.first( :conditions =>
             [ "subject_id = ? AND predicate_id = ?",
             property_item.id, Item.find_by_name('has_scalar_object').id ])
@@ -348,11 +364,17 @@ class ItemsController < ApplicationController
     unless used_as_obj.empty?
       @connection_list << used_as_obj
     end
-
-
     unless used_as_pred.empty?
       @connection_list << used_as_pred
     end
+
+
+    @properties_of_url_type = {}
+    Connection.all( :conditions => [
+        "predicate_id = ? AND obj_id = ?",
+        Item.find_by_name('has_scalar_object').id,
+        Item.find_by_name('URL_Value').id
+      ]).each {|con| @properties_of_url_type[con.subject_id] = true }
   end
 
   # GET /items/1/edit

data/app/helpers/connections_helper.rb

@@ -34,7 +34,7 @@ module ConnectionsHelper
   # the first occurrance of that link in the current view.  An instance
   # variable is created within the current view object to flag the
   # generation of each type of link.
-  def generate_connection_links(con)
+  def generate_connection_links(con, after_delete = nil)
     concat(
       link_with_help_icon({
         :destination => link_to( 'Show', connection_path(con) ),
@@ -53,10 +53,11 @@ module ConnectionsHelper
           :which_help => 'ConnectionEdit' }) )
       @edit_help_icon_used = true
 
+      goto_param = after_delete ? '?goto='+after_delete : ''
       concat(
         link_with_help_icon({
           :destination => link_to(
-            'Delete', connection_path(con), :rel => 'nofollow',
+            'Delete', connection_path(con)+goto_param, :rel => 'nofollow',
             :confirm => 'Are you sure?', :method => :delete ),
           :already_generated => @delete_help_icon_used,
           :help_alt => 'Help delete connection',

data/app/helpers/format_helper.rb

@@ -38,6 +38,11 @@ module FormatHelper
     title_out
   end
 
+  def last_word(text)
+    text =~ /([^\s]+)$/
+    $1
+  end
+
   # This method is used to wrap long strings that don't contain spaces
   # (which would allow the browser to wrap them), such as an
   # <tt>Item.name</tt> string.  The +len+ parameter is a length in

data/app/helpers/items_helper.rb

@@ -145,4 +145,36 @@ module ItemsHelper
     options_for_select( option_array,
       this_class_item.nil? ? "" : this_class_item.id )
   end
+
+  def link_to_item_by_name(name, text=nil)
+    init_name_to_item_hash unless defined? @items_by_name
+
+    item = @items_by_name[name]
+    if item
+      return link_to( (text ? text : h(item.title)),
+        item_by_name_path(item.name) )
+    else
+      return '<i>[missing]</i>'
+    end
+  end
+
+  def link_to_create_instance_of(name, text=nil)
+    init_name_to_item_hash unless defined? @items_by_name
+
+    item = @items_by_name[name]
+    if item
+      return link_to(
+        text ? text : "Add a new <b>#{h name}</b>",
+        new_item_path + "?class_item=" + item.id.to_s )
+    else
+      return '<i>[missing]</i>'
+    end
+  end
+
+  def init_name_to_item_hash
+    @items_by_name = {}
+    @nouns.each do |item|
+      @items_by_name[item.name] = item
+    end
+  end
 end

data/app/views/items/_core_tasks.html.erb

@@ -35,8 +35,8 @@
   }
 </style>
 
-<div style="padding-left: 10%;">
-  <div id="add-class-instances-list" style="width: 88.9%;">
+<div>
+  <div id="add-class-instances-list">
     <ul><%
       spo_item_id = Item.find_by_name('sub_property_of').id
       @class_list.select do |class_item|

data/app/views/items/_inline_add_popopen.html.erb

@@ -0,0 +1,34 @@
+<%
+# WontoMedia - a wontology web application
+# Copyright (C) 2010 - Glen E. Ivey
+#    www.wontology.com
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License version
+# 3 as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program in the file COPYING and/or LICENSE.  If not,
+# see "http://www.gnu.org/licenses/".
+%>
+
+<div id='inline-add-<%= id -%>-link'>
+  <div style='font-size: 70%;'>
+    <%= link_to_function 'Add new',
+          "$('inline-add-#{id}-link').style.display = 'none'; " +
+          "$('inline-add-#{id}-form').style.display = 'block';" +
+          "$('object-item-#{id}').style.listStyleType = 'circle';"
+     %>
+    <script type='text/javascript'>
+      $('object-item-<%= id -%>').style.listStyleType = 'none';
+    </script>
+  </div>
+</div>
+<div id='inline-add-<%= id -%>-form' style='display: none;'>
+  <%= yield %>
+</div>

data/app/views/items/_inline_item_add_form.html.erb

@@ -18,7 +18,6 @@
 %>
 
 
-
 <% form_for( con, :url => connections_path+"?goto=#{@item.name}" ) do |f|
      @connection = con  # yes, fibbing to Rails, so shoot me....
      %>

data/app/views/items/show.html.erb

@@ -97,7 +97,7 @@
   padding-left: 0;
 }
 .instance-list li {
-  color: #ffff60;
+  color: #f4f420;
   margin-right: 1.5em;
   display: inline;
 }
@@ -107,35 +107,40 @@
 }
 .instance-list li span {
   color: black;
+  white-space: nowrap;
 }
 </style>
 
 <% if @item.is_class? %>
+<div style='margin-bottom: 5ex;'>
   <h2 class="subheading"><%= h filter_parenthetical @item.title -%></h2>
-  <ul class='instance-list'>
+  <ul class='instance-list' style='font-size: 115%;'>
     <%
       # we know that all the connections where this item is the object are
       # located in the last array within @connection_list.  Search through
       # it for all of the connections where 'is_instance_of' is the predicate
 
       iio_item_id = nil
-      @connection_list[-1].each do |maybe_iio_connection|
-        unless iio_item_id
-          if @item_hash[maybe_iio_connection.predicate_id].
-              name == 'is_instance_of'
-            iio_item_id = maybe_iio_connection.predicate_id
+      @connection_list[-1].select do |maybe_iio_connection|
+          unless iio_item_id
+            if @item_hash[maybe_iio_connection.predicate_id].
+                name == 'is_instance_of'
+              iio_item_id = maybe_iio_connection.predicate_id
+            end
           end
-        end
 
-        if iio_item_id == maybe_iio_connection.predicate_id %>
+          iio_item_id == maybe_iio_connection.predicate_id
+        end.
+        map{|connection| @item_hash[connection.subject_id] }.
+        sort{|a,b| last_word(filter_parenthetical(a.title)) <=>
+                   last_word(filter_parenthetical(b.title))      }.
+        each do |item| %>
           <li><span>
-            <%= item = @item_hash[maybe_iio_connection.subject_id]
-                link_to (h item.name), item_by_name_path(item.name) %>
+            <%= link_to (h filter_parenthetical item.title), item_by_name_path(item.name) %>
           </span></li>
-        <% end %>
-    <% end %>
+     <% end %>
   </ul>
-<% end %>
+</div><% end %>
 
 
 <h3 class="subheading">This Class' Relationships</h3>
@@ -153,6 +158,8 @@
      @delete_help_icon_used = false
      @add_scalar_help_icon_used = false
      @add_item_help_icon_used = false
+     item_counter = 0
+
 
      array_of_arrays_of_connections = @connection_list.to_enum
 
@@ -194,12 +201,15 @@
                    link_with_tooltip (h filter_parenthetical item.title ),
                      h( item.name ), item_by_name_path(item.name) %>
                <ul style="list-style-type: circle;">
-<%         end %>
+<%         end
+
 
-           <li>
-             <div style="float: right; font-size: 80%; margin-right: 6em;">
+           item_counter += 1
+ %>        <li id='object-item-<%= item_counter -%>' >
+             <div class="floating-links">
                <% if connection.id
-                    generate_connection_links(connection)
+                    generate_connection_links(connection,
+                      item_by_name_path(@item.name) )
                   elsif connection.obj_id
                     generate_inverse_link(@inverses_map[connection])
                   end %>
@@ -208,14 +218,17 @@
              <% if connection.kind_of_obj == Connection::OBJECT_KIND_SCALAR &&
                     connection.scalar_obj.nil? %>
                <%= render :partial => "inline_scalar_add_form",
-                     :locals => { :con => connection } %>
+                     :layout => "inline_add_popopen",
+                     :locals => { :con => connection, :id => item_counter } %>
 
              <% elsif connection.kind_of_obj == Connection::OBJECT_KIND_ITEM &&
                     connection.obj_id.nil? %>
                <%= items = @intances_of_type_item_classes[connection.type_item]
                    items = Item.all unless !items.nil?
                    render :partial => "inline_item_add_form",
-                     :locals => { :con => connection, :items => items } %>
+                     :layout => "inline_add_popopen",
+                     :locals => { :con => connection, :items => items,
+                       :id => item_counter } %>
 
              <% elsif connection.kind_of_obj == Connection::OBJECT_KIND_ITEM %>
                <%= item = @item_hash[connection.obj_id]
@@ -223,7 +236,10 @@
                      h( item.name ), item_by_name_path(item.name) %>
 
              <% else %>
-               <%= h connection.scalar_obj %>
+               <%= @properties_of_url_type[connection.predicate_id]          ?
+                   link_to( h(connection.scalar_obj), connection.scalar_obj)   :
+                   h(connection.scalar_obj)
+                %>
              <% end %>
            </li>
 
@@ -277,7 +293,8 @@
                  <% end %>
                </td><td style="font-size: 80%">
                  <% if connection.id
-                      generate_connection_links(connection)
+                      generate_connection_links(connection,
+                        item_by_name_path(@item.name) )
                     else
                       generate_inverse_link(@inverses_map[connection])
                     end %>

data/default-custom/public/stylesheets/wm.css

@@ -14,6 +14,7 @@
     (logo fill, bullets)
   subdued accent:          light yellow          #ffff60
     (question-mark help icon)
+  accent text:             dark yellow           #f4f420
 */
 
 
@@ -167,7 +168,11 @@ hr {
   padding-left: 1em;
   text-indent: -1em;
 }
-
+.floating-links {
+  float: right;
+  font-size: 80%;
+  margin-right: 6em;
+}
 
         /* set apart stuff that is in development */
 .unimplemented {

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Glen E. Ivey
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-22 00:00:00 -07:00
+date: 2010-03-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -70,6 +70,7 @@ files:
 - app/views/items/_content_examples.html.erb
 - app/views/items/_core_tasks.html.erb
 - app/views/items/_form_fields.html.erb
+- app/views/items/_inline_add_popopen.html.erb
 - app/views/items/_inline_item_add_form.html.erb
 - app/views/items/_inline_scalar_add_form.html.erb
 - app/views/items/_list_outbound_links.html.erb