wontomedia 0.1.1 → 0.2.0

data/app/views/connections/_spo_select_controls.html.erb

@@ -18,27 +18,32 @@
 %>
 
 
-<script type="text/javascript">
-  function sizeDescDiv(name){
-    var h = document.viewport.getHeight() / 6;
-    $(name + "_desc").style.height = h + "px";
-    var w = $("connection_" + name + "_id").getWidth();
-    $(name + "_desc").style.width  = w + "px";
-  }
-</script>
-<style>
-  div {
-    overflow: auto;
-  }
-  div.desc {
-    display: table-cell;
-    text-align: center;
-    vertical-align: middle;
-  }
-  div p {
-    margin-top: 0.5ex;
-  }
-</style>
+<% content_for :head do %>
+  <style>
+    div {
+      overflow: auto;
+    }
+    div.desc {
+      display: table-cell;
+      text-align: center;
+      vertical-align: middle;
+    }
+    div p {
+      margin-top: 0.5ex;
+    }
+  </style>
+  <script type="text/javascript">
+    // <![CDATA[
+    function setDescDivsHeights(names){
+      for (var c=0; c < names.length; c++){
+        var descDiv = document.getElementById(names[c] + "_desc");
+        var h = document.viewport.getHeight() / 8;
+        descDiv.style.height = h + "px";
+      }
+    }
+    // ]]>
+  </script>
+<% end %>
 
 
 <p class="directions">
@@ -49,7 +54,7 @@
 </p>
 
 <table>
-  <tr><td style="text-align: right">
+  <tr><td style="text-align: right; font-weight: bold;">
     <%= f.label :subject_id %>
   </td><td>
     <%= select_tag "connection[subject_id]",
@@ -82,9 +87,9 @@
           <p><%= h connection.subject.description %></p>
       <% end %>
     </div>
-    <script type="text/javascript">sizeDescDiv('subject');</script>
+    <script type="text/javascript">setDescDivsHeights(['subject']);</script>
   </td></tr>
-  <tr><td style="text-align: right">
+  <tr><td style="text-align: right; font-weight: bold;">
     <%= f.label :predicate_id,"Relates to" %>
   </td><td>
     <%= select_tag "connection[predicate_id]",
@@ -114,11 +119,40 @@
           <p><%= h connection.predicate.description %></p>
       <% end %>
     </div>
-    <script type="text/javascript">sizeDescDiv('predicate');</script>
+    <script type="text/javascript">setDescDivsHeights(['predicate']);</script>
   </td></tr>
-  <tr><td style="text-align: right">
-    <%= f.label :obj_id, "Object" %>
+  <tr><td style="text-align: right;">
+    <%= popup_help_icon "Help for connection's subject selection",
+                        "Help:Popup/ConnectionObjectSelection" %>
+    <span style="font-weight: bold;"><%= f.label :obj_id, "Object" %></span>
+    <div style="text-aight: right; overflow: visible;">
+      <%= image_tag "blank_error_icon.png", :id=>"kind_of_obj_error_icon",
+            :alt=>"", :size=>"16x16",
+            :style=>"position: relative; left: 0.75em;" %>
+    </div>
+
   </td><td>
+    <!-- first radio button and text field for object-is-scalar -->
+    <%=
+        radio_button "connection", "kind_of_obj", 'scalar', :tabindex => '30'
+    -%><span style="font-size: 75%;"><%=
+        f.label :kind_of_obj, "Value", :value => 'scalar'
+    -%></span>
+    <%= text_field :connection, :scalar_obj, :size => 30, :tabindex => '34' %>
+    <%= popup_help_icon "Help for connection's object selection",
+                        "Help:Popup/ConnectionObjectScalar" %>
+    <span style="padding-left: 4em; font-weight: bold; font-style: italic;"
+      >or</span>
+
+    <br />
+
+    <!-- then radio button and select control for object-is-item -->
+    <%=
+        radio_button "connection", "kind_of_obj", 'item', :tabindex => '30'
+    -%><span style="font-size: 75%;"><%=
+        f.label :kind_of_obj, "Item", :value => 'item'
+    -%></span>
+    <br />
     <%= select_tag "connection[obj_id]",
           options_for_select(
             [[ "- to this object -", "" ],
@@ -129,12 +163,12 @@
               end,
             connection.obj.nil? ? "" : connection.obj.id
           ),
-          :tabindex=>'30', :style=>'width: 90%;'
+          :tabindex=>'35', :style=>'width: 90%;'
      %>
     <%= popup_help_icon "Help for connection's object selection",
-                        "Help:Popup/ConnectionObject" %>
+                        "Help:Popup/ConnectionObjectItem" %>
     <%= image_tag "blank_error_icon.png", :id=>"obj_error_icon", :alt=>"",
-                  :size=>"16x16" %>
+          :size=>"16x16", :style=>"position: relative; bottom: 3.2ex;" %>
 
     <!-- start 'div' differently depending on 'if' -->
       <% if connection.obj.nil? %>
@@ -146,6 +180,6 @@
           <p><%= h connection.obj.description %></p>
       <% end %>
     </div>
-    <script type="text/javascript">sizeDescDiv('obj');</script>
+    <script type="text/javascript">setDescDivsHeights(['obj']);</script>
   </td></tr>
 </table>

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

@@ -25,8 +25,13 @@
 
 <%
   @title_text = (h @connection.subject.name) + " : " +
-                (h @connection.predicate.name) + " : " +
-                (h @connection.obj.name)
+                (h @connection.predicate.name) + " : "
+  if @connection.kind_of_obj == Connection::OBJECT_KIND_ITEM
+    @title_text += (h @connection.obj.name)
+  else
+    @title_text += "'#{h @connection.scalar_obj}'"
+  end
+  @window_title_addendum = " (Edit)"
 
   # initialize array to define "Glossary Help" box of links:
   @glossary_help_entries = [

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

@@ -65,10 +65,17 @@
           h( connection.predicate.name ),
           item_by_name_path(connection.predicate.name) )
       -%></td>
-      <td class='firstrow secondrow'><%=
-        link_with_tooltip "#{h filter_parenthetical connection.obj.title}",
-          h( connection.obj.name ), item_by_name_path(connection.obj.name)
-       -%></td>
+      <td class='firstrow secondrow'>
+        <% if connection.kind_of_obj == Connection::OBJECT_KIND_ITEM %>
+          <%= link_with_tooltip(
+                "#{h filter_parenthetical connection.obj.title}",
+                h( connection.obj.name ),
+                item_by_name_path(connection.obj.name)  )
+          -%>
+        <% else %>
+          <%= h connection.scalar_obj %>
+        <% end %>
+      </td>
       <td class='firstrow secondrow' style="font-size: 80%">
         <% generate_connection_links(connection) %></td>
 <!--

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

@@ -20,8 +20,12 @@
 
 <%
   @title_text = (h @subject.name) + " : " +
-                (h @predicate.name) + " : " +
-                (h @obj.name)
+                (h @predicate.name) + " : "
+  if @connection.kind_of_obj == Connection::OBJECT_KIND_ITEM
+    @title_text += (h @obj.name)
+  else
+    @title_text += "'#{h @connection.scalar_obj}'"
+  end
 
   # initialize array to define "Glossary Help" box of links:
   @glossary_help_entries = [
@@ -65,11 +69,15 @@
   <tr><td>
     <b>Object:</b>
   </td><td>
+    <% if @connection.kind_of_obj == Connection::OBJECT_KIND_ITEM %>
       <%= link_to "<b>#{h @obj.title}</b>", item_by_name_path(@obj.name) %>
       &mdash; (<b><%= h @obj.name %></b>)
-    <p>
-      <%= h @obj.description %>
-    </p>
+      <p>
+        <%= h @obj.description %>
+      </p>
+    <% else %>
+      <%= h @connection.scalar_obj %>
+    <% end %>
   </td></tr>
 </table>
 

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

@@ -0,0 +1,41 @@
+<%
+# 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/".
+%>
+
+<%
+  # there ought to be a more idiomatic Rails way to get the right
+  # name/id on this, but I haven't been able to find it....
+  child_class_prefix = (@item.class == Item) ? '' :
+    ItemHelper::ITEM_CLASSNAME_TO_SUBTYPE_SHORT[@item.class.to_s] + "_"
+%>
+
+<% if show_class_control %>
+  <p class="inputpara">
+    <%= f.label :class_item_id, "Class" %>
+    <%= popup_help_icon "Help for class", "Help:Popup/ItemClass" %>
+    <%=
+        select_tag "#{child_class_prefix}item[class_item_id]",
+          class_options_list_for( @item ),
+          :tabindex=>'105'
+     %>
+  </p><p class="directions">Optional.</p>
+<% else %>
+  <%= hidden_field_tag child_class_prefix+'item_class_item_id',
+        @item.class_item_id.to_s,
+        :name => child_class_prefix+'item[class_item_id]' %>
+<% end %>

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

@@ -23,7 +23,7 @@
     displaying the complete set of non-Property items.]</p>
 <% end %>
 
-<div class="subheading">Recently Added Items</div>
+<h2 class="subheading">Recently Added</h2>
 <style>
   .item-title {
     font-size: 120%;
@@ -37,20 +37,23 @@
   }
 </style>
 
-<% nouns_listed = 0
-   @nouns.each do |item| %>
-     <p class="item-title">
-       <%= link_to "#{h filter_parenthetical item.title}",
-             item_by_name_path(item.name) %>
-     </p>
-     <p class="item-desc">
-       <% desc = h item.description
-          if desc.length > 180
-            desc = desc[0,180] + '&hellip;'
-          end
-       %>
-       <%= desc %>
-     </p>
-
-<%   break if (nouns_listed += 1) >= 20
-   end %>
+<%  # TODO: if the controller made another list just for this, then it
+    # could have the database apply the filter/sort/limit, but I don't
+    # know if doing this here is slower or faster, so here for now:
+  @nouns.reject {|item| (item.flags & Item::DATA_IS_UNALTERABLE) != 0}.
+      sort {|a,b|
+        (b.updated_at or b.created_at) <=> (a.updated_at or a.created_at) }.
+      first(20).each do |item| %>
+    <p class="item-title">
+      <%= link_to "#{h filter_parenthetical item.title}",
+            item_by_name_path(item.name) %>
+    </p>
+    <p class="item-desc">
+      <% desc = h item.description
+         if desc.length > 180
+           desc = desc[0,180] + '&hellip;'
+         end
+      %>
+      <%= desc %>
+    </p><%
+  end %>

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

@@ -16,8 +16,43 @@
 # along with this program in the file COPYING and/or LICENSE.  If not,
 # see "http://www.gnu.org/licenses/".
 %>
-<% if @display_unimplemented %>
-  <hr />
-  <p class="unimplemented">[area to list/"invite users to" core
-    wontology tasks: browsing, searching, contributing]</p>
-<% end -%>
+
+<hr />
+<style>
+  #add-class-instances-list ul {
+    font-size: 115%;
+    text-align: center;
+    padding: 0;
+    margin-bottom: 3.5ex;
+  }
+  #add-class-instances-list li {
+    display: inline;
+    line-height: 3.5ex;
+    margin: 0 1em;
+  }
+  #add-class-instances-list span {
+    white-space: nowrap;
+  }
+</style>
+
+<div style="padding-left: 10%;">
+  <div id="add-class-instances-list" style="width: 88.9%;">
+    <ul><%
+      spo_item_id = Item.find_by_name('sub_property_of').id
+      @class_list.select do |class_item|
+            Connection.first( :conditions => [
+              "subject_id = ? AND predicate_id = ?",
+              class_item.id, spo_item_id
+            ] ).nil?
+          end.each do |item| %>
+        <li><span><%=
+          link_to "Add a new <b>#{h item.name}</b>",
+            new_item_path + "?class_item=" + item.id.to_s %>
+          <span style="font-size: 80%">(<%=
+            link_to "show current", item_by_name_path(item.name)
+          -%>)</span>
+        </span></li><%
+      end %>
+    </ul>
+  </div>
+</div>

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

@@ -24,7 +24,7 @@
   <%= image_tag "blank_error_icon.png", :id=>"title_error_icon", :alt=>"",
         :size=>"16x16" -%>
   <br />
-  <%= f.text_field :title, :tabindex => "2", :style => "width: 95%;" %>
+  <%= f.text_field :title, :tabindex => "120", :style => "width: 75%;" %>
 </p><p class="directions">
   <span id="title_required">Required.</span>
   <span id="title_multi_line">One line only</span>
@@ -42,7 +42,7 @@
   <%= image_tag "blank_status_icon.png", :id=>"name_status_icon", :alt=>"",
         :size=>"32x16" %>
   <br />
-  <%= f.text_field :name, :tabindex => "3", :style => "width: 95%;" %>
+  <%= f.text_field :name, :tabindex => "130", :style => "width: 55%;" %>
 </p><p class="directions">
   <span id="name_required">Required.</span>
   <span id="name_start_char">Start with a letter.</span>
@@ -59,8 +59,8 @@
   <%= image_tag "blank_error_icon.png", :id=>"description_error_icon", :alt=>"",
         :size=>"16x16" %>
   <br />
-  <%= f.text_area :description, :style => "width: 95%; height: 7em",
-        :tabindex => "4" %>
+  <%= f.text_area :description, :style => "width: 95%; height: 15em",
+        :tabindex => "140" %>
 </p><p class="directions">
   Describe what this item represents.
   <span id="description_recommended">Recommended.</span>

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

@@ -0,0 +1,48 @@
+<%
+# 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/".
+%>
+
+
+
+<% form_for( con, :url => connections_path+"?goto=#{@item.name}" ) do |f|
+     @connection = con  # yes, fibbing to Rails, so shoot me....
+     %>
+     <%= hidden_field :connection, :subject_id %>
+     <%= hidden_field :connection, :predicate_id %>
+     <%= hidden_field :connection, :kind_of_obj %>
+
+    <%= select_tag "connection[obj_id]",
+          options_for_select(
+            [[ "- to this item -", "" ],
+             [ "- create a new item -", "-1" ],
+            ] +
+              items.map do |item|
+                [ h("#{item.name} : #{item.title}"), item.id ]
+              end, "" ),
+          :style => 'width: 62%;', :onfocus => 'selectOnfocusHandler(this);',
+          :onchange => "selectOnchangeHandler(this, '#{con.type_item.id}');"
+     %>
+
+     <%= f.submit "Add", :style => 'width: 3em;' %>
+     <% unless @add_item_help_icon_used %>
+       <%= popup_help_icon "Help for item-value add",
+             "Help:Popup/InlineAddItem" %>
+     <% end
+        @add_item_help_icon_used = true
+      %>
+<% end %>

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

@@ -0,0 +1,36 @@
+<%
+# 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/".
+%>
+
+
+<% form_for( con, :url => connections_path+"?goto=#{@item.name}" ) do |f|
+     @connection = con  # yes, fibbing to Rails, so shoot me....
+     %>
+     <%= hidden_field :connection, :subject_id %>
+     <%= hidden_field :connection, :predicate_id %>
+     <%= hidden_field :connection, :kind_of_obj %>
+     <%= text_field :connection, :scalar_obj, :size => 40 %>
+     <%= f.submit "Add", :style => 'width: 3em;' %>
+     <% unless @add_scalar_help_icon_used %>
+       <%= popup_help_icon "Help for scalar-value add",
+             "Help:Popup/InlineAddScalar" %>
+     <% end
+        @add_scalar_help_icon_used = true
+      %>
+     <%= h filter_parenthetical con.type_item.title %>
+<% end %>