wontomedia 0.1.1 → 0.2.0

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

@@ -0,0 +1,42 @@
+<%
+# 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/".
+%>
+
+<style>
+  #class-item-list {
+    padding-left: 1.3em;
+    font-size: 110%;
+  }
+  #class-item-list li {
+    color: yellow;
+    margin-bottom: 0.8ex;
+  }
+  #class-item-list li span {
+    color: black;
+  }
+</style>
+
+<h2 class="subheading">Most Used</h2>
+<ul id="class-item-list"><%
+  @class_list.each do |item| %>
+    <li><span>
+      <%= link_to "#{h filter_parenthetical item.title}",
+            item_by_name_path(item.name) %>
+    </span></li><%
+  end %>
+</ul>

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

@@ -18,30 +18,32 @@
 %>
 
 
-<p class="inputpara">
-  <%= f.label :sti_type, "Type" %>
-  <%= popup_help_icon "Help for type", "Help:Popup/ItemType" %>
-  <%= if @type == "verb"
-        selections = [ [ "Property",      "PropertyItem" ] ]
-        @item.sti_type = "PropertyItem"
-      else
-        selections = [
-          [ "- type of item -",          "" ],
-          [ "Category",      "CategoryItem" ],
-          [ "Individual",  "IndividualItem" ],
-          [ "Property",      "PropertyItem" ] ]
-      end
+<% if @item.sti_type.nil? %>
+  <p class="inputpara">
+    <%= f.label :sti_type, "Type" %>
+    <%= popup_help_icon "Help for type", "Help:Popup/ItemType" %>
+    <%= if @popup_type == "verb"
+          selections = [ [ "Property",      "PropertyItem" ] ]
+          @item.sti_type = "PropertyItem"
+        else
+          selections = [
+            [ "- type of item -",          "" ],
+            [ "Category",      "CategoryItem" ],
+            [ "Individual",  "IndividualItem" ],
+            [ "Property",      "PropertyItem" ] ]
+        end
 
-      select_tag "item[sti_type]",
-        options_for_select( selections,
-                            @item.sti_type.nil? ? "" : @item.sti_type ),
-        :tabindex => "1"
-   %>
-  <%= image_tag "blank_error_icon.png", :id=>"sti_type_error_icon",
-        :alt=>"", :size=>"16x16" %>
-</p><p class="directions">
-  <span id="sti_type_required">Selection of a type is required.</span>
-</p>
-<script type="text/javascript">
-  $('item_sti_type').focus();
-</script>
+        select_tag "item[sti_type]",
+          options_for_select( selections,
+                              @item.sti_type.nil? ? "" : @item.sti_type ),
+          :tabindex => "110"
+     %>
+    <%= image_tag "blank_error_icon.png", :id=>"sti_type_error_icon",
+          :alt=>"", :size=>"16x16" %>
+  </p><p class="directions">
+    <span id="sti_type_required">Selection of a type is required.</span>
+  </p>
+<% else %>
+  <%= hidden_field_tag 'item_sti_type', @item.sti_type,
+        :name => 'item[sti_type]' %>
+<% end %>

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

@@ -24,6 +24,7 @@
 <% end
 
    @title_text = filter_parenthetical h @item.title
+   @window_title_addendum = " (Edit)"
 
   # initialize array to define "Glossary Help" box of links:
   @glossary_help_entries = [
@@ -38,8 +39,10 @@
 
 <% form_for(@item, :url => item_path(@item)) do |f| %>
   <%= f.error_messages %>
-  <%= render :partial => "form_fields", :locals => { :f => f } %>
-  <p><%= f.submit "Update", :tabindex => "10" %></p>
+  <%= render :partial => "class_select",
+        :locals => { :f => f, :show_class_control => true } %>
+  <%= render :partial => "form_fields",  :locals => { :f => f } %>
+  <p><%= f.submit "Update", :tabindex => "150" %></p>
 <% end %>
 
 <div class="horizontal-link-list"><ul>
@@ -49,6 +52,9 @@
             :rel => 'nofollow' -%></li>
 </ul></div>
 
+
+<%= ruby_hash_to_javascript 'class_to_type', @class_to_item_map %>
+
 <% content_for :first_bottom_page_js do %>
   <script type="text/javascript">
     inAnItemsForm = true;

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

@@ -62,7 +62,11 @@
     <tr>
       <td colspan="3" class="secondrow" style="padding-left: 2.2em;">
         <span style="font-size: 70%">
-          <%=h ItemHelper::ITEM_SUBTYPES_TO_HUMAN[item.sti_type] %>:</span>
+          <%= ItemHelper::ITEM_SUBTYPES_TO_HUMAN[item.sti_type] %>:
+          <% if item.class_item %>
+            <%=h item.class_item.name %>:
+          <% end %>
+        </span>
         <%=h item.description %></td>
     </tr>
   <% end %>

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

@@ -25,7 +25,12 @@
 
 <%
   require Rails.root.join( 'lib', 'helpers', 'item_helper')
-  @title_text = 'Make a new item'
+  show_class_control = @item.class_item_id.nil?
+  if show_class_control
+    @title_text = 'Make a new item'
+  else
+    @title_text = 'Enter a new ' + @item.class_item.name
+  end
 
   # initialize array to define "Glossary Help" box of links:
   @glossary_help_entries = [
@@ -41,15 +46,22 @@
    form_for(@item, options) do |f|
  %>
   <%= f.error_messages %>
-  <div style="width: 36%; float: left;">
+  <% if @item.sti_type.nil? %><div style="width: 36%; float: left;"><% end %>
+    <%= render :partial => "class_select",
+          :locals => { :f => f, :show_class_control => show_class_control } %>
     <%= render :partial => "type_select", :locals => { :f => f } %>
     <%= render :partial => "form_fields", :locals => { :f => f } %>
     <script type="text/javascript">
+      <% if @item.sti_type.nil? %>
+        $('item_sti_type').focus();
+      <% else %>
+        $('item_title').focus();
+      <% end %>
       genNameFromTitleOk = true;
     </script>
 
     <p id="create_button_container" style="text-align: center">
-      <%= f.submit "Create", :tabindex => "10" %>
+      <%= f.submit "Create", :tabindex => "150" %>
     </p>
 
     <div class="horizontal-link-list"><ul>
@@ -58,58 +70,61 @@
       <li><%= link_to 'Cancel,&nbsp;show&nbsp;connection&nbsp;list',
                 connections_path, :rel => 'nofollow' -%></li>
     </ul></div>
-  </div>
-
-  <div class="noncontent" style="width: 60%; float: right; margin-left: 0;">
-    <dl><dt id="category_title">Category</dt><dd id="category_desc">
-
-      "Category" is for groups of things, for concepts, and for the
-      upper levels of <%=
-        popup_help_icon 'Definition of hierarchies in a wontology',
-          'Help:GlossaryAtoO#anchor_Hierarchy', 'hierarchies' -%>.
-      (Though a hierarchy made up entirely of concepts could be all
-      Categories.)  Categories can "contain" other categories and/or
-      individuals.
-
-    </dd><dt id="individual_title">Individual</dt><dd id="individual_desc">
-
-      "Individual" is for specific, concrete things.  Individuals can
-      "contain" other individuals, but cannot contain categories.
-      ("Ford Model-T" might be an individual, but could still contain
-      parts that are also individuals, like "Windshield" and "Tire".)
-
-    </dd><dt id="property_title">Property</dt><dd id="property_desc">
-
-      "Property" is used to define <%=
-        popup_help_icon 'Definition of relationships in a wontology',
-          'Help:GlossaryPtoZ#anchor_Relationship', 'relationships' -%>
-      between other items.  Once you create a new Property <%=
-        popup_help_icon 'Definition of Item',
-          'Help:GlossaryAtoO#anchor_Item', 'item' -%>,
-      you should create one or more <%=
-        popup_help_icon 'Definition of Connection',
-          'Help:GlossaryAtoO#anchor_Connection', 'connections' -%>
-      that relate that property to other existing properties.  In
-      general, you will use the "sub_property_of" property in order to
-      create these connections.  For example, if you were creating a
-      description of famillial relations between people, you might
-      create a new property named "spouseOf".  To define what the
-      creation of connections using this new property <em>means</em>, you
-      can create the connection "<code>spouseOf sub_property_of
-      symmetric_relationship</code>".  This example will cause
-      "spouseOf" to be treated as a "peer" <%=
-        popup_help_icon 'Peer relationships in a wontology',
-          'Help:GlossaryPtoZ#anchor_Peer', 'relationship' -%>
-      (rather than a hierarchical one), and as a symmetric <%=
-        popup_help_icon 'Symmetric relationships in a wontology',
-          'Help:GlossaryPtoZ#anchor_Symmetric', 'relationship' -%>,
-      so that creating a "spouseOf" connection from one item to another
-      implies an connection going the other direction even if it is not
-      defined explicitly.
-
-    </dd></dl>
-  </div>
+  <% if @item.sti_type.nil? %>
+    </div>
+
+    <div class="noncontent" style="width: 60%; float: right; margin-left: 0;">
+      <dl><dt id="category_title">Category</dt><dd id="category_desc">
+
+        "Category" is for groups of things, for concepts, and for the
+        upper levels of <%=
+          popup_help_icon 'Definition of hierarchies in a wontology',
+            'Help:GlossaryAtoO#anchor_Hierarchy', 'hierarchies' -%>.
+        (Though a hierarchy made up entirely of concepts could be all
+        Categories.)  Categories can "contain" other categories and/or
+        individuals.
+
+      </dd><dt id="individual_title">Individual</dt><dd id="individual_desc">
+
+        "Individual" is for specific, concrete things.  Individuals can
+        "contain" other individuals, but cannot contain categories.
+        ("Ford Model-T" might be an individual, but could still contain
+        parts that are also individuals, like "Windshield" and "Tire".)
+
+      </dd><dt id="property_title">Property</dt><dd id="property_desc">
+
+        "Property" is used to define <%=
+          popup_help_icon 'Definition of relationships in a wontology',
+            'Help:GlossaryPtoZ#anchor_Relationship', 'relationships' -%>
+        between other items.  Once you create a new Property <%=
+          popup_help_icon 'Definition of Item',
+            'Help:GlossaryAtoO#anchor_Item', 'item' -%>,
+        you should create one or more <%=
+          popup_help_icon 'Definition of Connection',
+            'Help:GlossaryAtoO#anchor_Connection', 'connections' -%>
+        that relate that property to other existing properties.  In
+        general, you will use the "sub_property_of" property in order to
+        create these connections.  For example, if you were creating a
+        description of famillial relations between people, you might
+        create a new property named "spouseOf".  To define what the
+        creation of connections using this new property <em>means</em>, you
+        can create the connection "<code>spouseOf sub_property_of
+        symmetric_relationship</code>".  This example will cause
+        "spouseOf" to be treated as a "peer" <%=
+          popup_help_icon 'Peer relationships in a wontology',
+            'Help:GlossaryPtoZ#anchor_Peer', 'relationship' -%>
+        (rather than a hierarchical one), and as a symmetric <%=
+          popup_help_icon 'Symmetric relationships in a wontology',
+            'Help:GlossaryPtoZ#anchor_Symmetric', 'relationship' -%>,
+        so that creating a "spouseOf" connection from one item to another
+        implies an connection going the other direction even if it is not
+        defined explicitly.
+
+      </dd></dl>
+    </div>
+  <% end %>  <!-- instructions only if no .sti_type yet -->
 <% end %>  <!-- of form_for -->
+<%= ruby_hash_to_javascript 'class_to_type', @class_to_item_map %>
 
 <% content_for :first_bottom_page_js do %>
   <script type="text/javascript">

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

@@ -23,15 +23,24 @@
   <meta name="googlebot" content="noindex" />
 <% end %>
 
-<% require Rails.root.join( 'lib', 'helpers', 'item_helper') %>
+<%
+  require Rails.root.join( 'lib', 'helpers', 'item_helper')
 
+  show_class_control = @item.class_item_id.nil?
+  if show_class_control %>
+    <h1>Make a new item</h1>
+  <% else %>
+    <h1>Enter a new <%= @item.class_item.name -%></h1>
+  <% end
+ %>
 
-<h1>Make a new item</h1>
 
 <% options = @item.sti_type.nil? ? {} : { :url => items_path() }
    form_for(@item, options) do |f|
  %>
   <%= f.error_messages %>
+  <%= render :partial => "class_select",
+        :locals => { :f => f, :show_class_control => show_class_control } %>
   <%= render :partial => "type_select", :locals => { :f => f } %>
   <%= render :partial => "form_fields", :locals => { :f => f } %>
   <%= hidden_field_tag 'popup_flag', 'yes' %>
@@ -39,7 +48,7 @@
   <p id="create_button_container" style="text-align: center">
     <%= button_to_function "Create",
           "if (okToSubmitItemForm()) itemCreatePopup_Submit(this)",
-          :id => "item_submit", :tabindex => "10" %>
+          :id => "item_submit", :tabindex => "150" %>
   </p>
 
   <p style="text-align: center">
@@ -47,12 +56,18 @@
                          'itemCreatePopup_Cancel()' %>
   </p>
 <% end %>  <!-- of form_for -->
+<%= ruby_hash_to_javascript 'class_to_type', @class_to_item_map %>
 
 
 <!-- forItemsForms.js should have already been loaded by page that
      popped us up.  Call function to wire library functions to the form
      elements we've just loaded. -->
 <script type="text/javascript">
+  <% if @item.sti_type.nil? %>
+    $('item_sti_type').focus();
+  <% else %>
+    $('item_title').focus();
+  <% end %>
   genNameFromTitleOk = true;
   plumbEventHandlersToItemCreationElements("submitViaModalbox");
 </script>

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

@@ -19,6 +19,7 @@
 
 
 <%
+  require Rails.root.join( 'lib', 'helpers', 'item_helper')
   @title_text = h( filter_parenthetical( @item.title ) )
 
   # initialize array to define "Glossary Help" box of links:
@@ -49,6 +50,9 @@
 
 <% # populate top (title/name/desc) section of page
  %>
+<div id="div-for-type-class"
+  style="float:right; text-align: right; font-size: 80%; font-weight: bold;">
+</div>
 <p style="margin-bottom: 0; font-weight: bold;">
   <%= text_with_tooltip h( @item.title ),
         '&nbsp;<b>Title</b> of this <b>Item</b>&nbsp;', 'item_title' %>
@@ -71,6 +75,14 @@
 
 
 
+<% if @item.is_class? %>
+  <div style="text-align: center;">
+    <%= link_to "Add a new <b>#{h @item.name}</b>",
+          new_item_path + "?class_item=" + @item.id.to_s %>
+  </div>
+<% end %>
+
+
 <% # links to global pages/actions
  %>
 <p style="clear: right">
@@ -79,10 +91,58 @@
   <% end %>
 </p>
 
+
+<style>
+.instance-list {
+  padding-left: 0;
+}
+.instance-list li {
+  color: #ffff60;
+  margin-right: 1.5em;
+  display: inline;
+}
+.instance-list li:before {
+  display: marker;
+  content: ">>";
+}
+.instance-list li span {
+  color: black;
+}
+</style>
+
+<% if @item.is_class? %>
+  <h2 class="subheading"><%= h filter_parenthetical @item.title -%></h2>
+  <ul class='instance-list'>
+    <%
+      # 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
+          end
+        end
+
+        if iio_item_id == maybe_iio_connection.predicate_id %>
+          <li><span>
+            <%= item = @item_hash[maybe_iio_connection.subject_id]
+                link_to (h item.name), item_by_name_path(item.name) %>
+          </span></li>
+        <% end %>
+    <% end %>
+  </ul>
+<% end %>
+
+
+<h3 class="subheading">This Class' Relationships</h3>
+
 <% # populate bottom (connections referencing this item) section of page
    unless @connection_list.empty? %>
 
-
   <% # track things to do only once:
      list_open_output = false
      last_predicate_id = nil
@@ -91,6 +151,8 @@
      @show_help_icon_used = false
      @edit_help_icon_used = false
      @delete_help_icon_used = false
+     @add_scalar_help_icon_used = false
+     @add_item_help_icon_used = false
 
      array_of_arrays_of_connections = @connection_list.to_enum
 
@@ -116,7 +178,7 @@
                </div>
 <%           end  %>
 
-             <ul>
+             <ul style="padding-left: 0;">
                <%= text_with_tooltip (h filter_parenthetical @item.title),
                      (h @item.name) %>
                <ul style="list-style-type: none;">
@@ -138,13 +200,31 @@
              <div style="float: right; font-size: 80%; margin-right: 6em;">
                <% if connection.id
                     generate_connection_links(connection)
-                  else
+                  elsif connection.obj_id
                     generate_inverse_link(@inverses_map[connection])
                   end %>
              </div>
-             <%= item = @item_hash[connection.obj_id]
-                 link_with_tooltip (h filter_parenthetical item.title ),
-                   h( item.name ), item_by_name_path(item.name) %>
+
+             <% if connection.kind_of_obj == Connection::OBJECT_KIND_SCALAR &&
+                    connection.scalar_obj.nil? %>
+               <%= render :partial => "inline_scalar_add_form",
+                     :locals => { :con => connection } %>
+
+             <% 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 } %>
+
+             <% elsif connection.kind_of_obj == Connection::OBJECT_KIND_ITEM %>
+               <%= item = @item_hash[connection.obj_id]
+                   link_with_tooltip (h filter_parenthetical item.title ),
+                     h( item.name ), item_by_name_path(item.name) %>
+
+             <% else %>
+               <%= h connection.scalar_obj %>
+             <% end %>
            </li>
 
 <%         last_predicate_id = connection.predicate_id
@@ -190,7 +270,11 @@
                </td><td class="connectioncolumn">
                  <%= self_string_or_other_link(connection.predicate_id) %>
                </td><td>
-                 <%= self_string_or_other_link(connection.obj_id) %>
+                 <% if connection.kind_of_obj == Connection::OBJECT_KIND_ITEM %>
+                   <%= self_string_or_other_link(connection.obj_id) %>
+                 <% else %>
+                   <%= h connection.scalar_obj %>
+                 <% end %>
                </td><td style="font-size: 80%">
                  <% if connection.id
                       generate_connection_links(connection)
@@ -212,3 +296,22 @@
      end
    end                          # unless @connection_list.empty?
  %>
+
+<script type="text/javascript">
+  content = "<%= ItemHelper::ITEM_SUBTYPES_TO_HUMAN[@item.sti_type] -%>";
+  <% if @item.class_item %>
+    content += "<br /><%=h @item.class_item.name %>";
+  <% elsif superclass_item = @item.superclass_of %>
+    content += "<br />(<%=h superclass_item.name %>)";
+  <% elsif @item.is_class? %>
+    content += "<br />(is a class)";
+  <% end %>
+  $('div-for-type-class').innerHTML = content;
+</script>
+
+<% content_for :first_bottom_page_js do %>
+  <script type="text/javascript">
+    inAnItemsForm = false;        // meant to indicate items/new or items/edit
+    creatingNewItem = true;
+  </script>
+<% end %>