wontomedia 0.2.1 → 1.0.0

data/VERSION.yml

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

data/app/controllers/admin_controller.rb

@@ -165,4 +165,57 @@ class AdminController < ApplicationController
     end
     redirect_to :action => 'index'
   end
+
+  def search
+    @title_text = 'Search Results'
+    @search_query = params[:q].sub( /\+/, ' ')
+    render :layout => "search"
+  end
+
+  def sitemap
+    result_text = <<PLAIN_XML
+<?xml version="1.0" encoding="UTF-8"?>
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+  <url>
+    <loc>#{root_url}</loc>
+    <changefreq>monthly</changefreq>
+    <priority>0.25</priority>
+  </url>
+  <url>
+    <loc>#{items_url}</loc>
+    <changefreq>monthly</changefreq>
+    <priority>0.4</priority>
+  </url>
+  <url>
+    <loc>#{connections_url}</loc>
+    <changefreq>monthly</changefreq>
+    <priority>0.35</priority>
+  </url>
+PLAIN_XML
+
+    Item.all.each do |item|
+      result_text += "  <url>\n"
+      result_text += "    <loc>#{item_by_name_url(item.name)}</loc>\n"
+      result_text += "    <lastmod>#{item.updated_at.to_s(:db)}</lastmod>\n"
+      result_text += "    <changefreq>monthly</changefreq>\n"
+      priority = (item.flags & Item::DATA_IS_UNALTERABLE)==0 ? '1.0' : '0.1'
+      result_text += "    <priority>#{priority}</priority>\n"
+      result_text += "  </url>\n"
+    end
+
+    Connection.all.each do |connection|
+      result_text += "  <url>\n"
+      result_text += "    <loc>#{connection_url(connection)}</loc>\n"
+      result_text += "    <lastmod>" +
+        "#{connection.updated_at.to_s(:db)}</lastmod>\n"
+      result_text += "    <changefreq>monthly</changefreq>\n"
+      priority = (connection.flags & Connection::DATA_IS_UNALTERABLE)==0 ?
+        '0.5' : '0.1'
+      result_text += "    <priority>#{priority}</priority>\n"
+      result_text += "  </url>\n"
+    end
+
+    result_text += "</urlset>\n"
+    render :text => result_text
+  end
 end

data/app/views/admin/search.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/".
+%>
+
+
+<% content_for :head do %>
+  <meta name="robots" content="noindex" />
+  <meta name="googlebot" content="noindex" />
+<% end %>
+
+<div id="cse-search-results"></div>
+<script type="text/javascript">
+  var googleSearchIframeName = "cse-search-results";
+  var googleSearchFormName = "cse-search-box";
+  var googleSearchFrameWidth = 800;
+  var googleSearchDomain = "www.google.com";
+  var googleSearchPath = "/cse";
+</script>
+<script type="text/javascript" src="http://www.google.com/afsonline/show_afs_search.js"></script>

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

@@ -143,7 +143,7 @@
 </div><% end %>
 
 
-<h3 class="subheading">This Class' Relationships</h3>
+<h3 class="subheading">This Item's Relationships</h3>
 
 <% # populate bottom (connections referencing this item) section of page
    unless @connection_list.empty? %>

data/app/views/layouts/_footer.html.erb

@@ -0,0 +1,32 @@
+<%
+# 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="block-footer" style="width: 100%; clear: both">
+  <p class="fine-print">
+    Copyright &copy; 2010, Glen E. Ivey &mdash;
+    Powered by <%= link_to 'WontoMedia',
+      'http://wontomedia.rubyforge.org/' %>
+    &mdash; Software and page templates licensed under
+    <%= link_to 'GNU AGPL v3',
+      'http://www.gnu.org/licenses/agpl-3.0.html' %>
+    &mdash; Page content licensed under <%= link_to 'GNU FDL v1.3',
+      'http://www.gnu.org/licenses/fdl-1.3.html' %>
+  </p>
+</div>

data/app/views/layouts/_search_box.html.erb

@@ -17,11 +17,25 @@
 # see "http://www.gnu.org/licenses/".
 %>
 
-<% if @display_unimplemented %>
-<div>
-  <p class="unimplemented" style="text-align: right;">
-    [search box] <br />
-    [controls]
-  </p>
-</div>
+
+<% if WontoMedia.search.google_site_search  and
+      WontoMedia.search.publisher_id        and
+      WontoMedia.search.search_engine           %>
+  <div id="block-search">
+    <form action="/w/search" id="cse-search-box">
+      <div>
+        <input type="hidden" name="cx"
+          value="<%=
+            WontoMedia.search.publisher_id + ':' +
+            WontoMedia.search.search_engine -%>" />
+        <input type="hidden" name="cof" value="FORID:10" />
+        <input type="hidden" name="ie" value="ISO-8859-1" />
+        <input type="text" name="q" size="20" />
+        <input type="submit" name="sa" value="Search" />
+      </div>
+    </form>
+    <script type="text/javascript"
+      src="http://www.google.com/cse/brand?form=cse-search-box&amp;lang=en"
+    ></script>
+  </div>
 <% end %>

data/app/views/layouts/application.html.erb

@@ -44,8 +44,8 @@
 
   <div id="float-left" style="float: left; width: 14.4%;">
     <div id="container-absolutes">
-      <div id="block-search"
-           style="width: 19%; position: absolute; top: 0; right: 0;">
+      <div id="block-search-container"
+           style="width: 15%; position: absolute; top: 0; right: 0;">
         <%= render :partial => "layouts/search_box" %>
       </div>
       <div id="page-top-controls"
@@ -55,8 +55,10 @@
         <%= render :partial => "layouts/login_controls" %>
       </div>
     </div>
-    <div id="column-left">
-      <%= link_to( logo_image, root_url ) %>
+    <div id="column-left" style="text-align: center;">
+      <%= link_to logo_image, root_url %>
+      <%= link_to 'Home', root_url,
+            :style => 'position: relative; bottom: 1.2ex;' %>
       <%= allpages_alert %>
       <%= render :partial => "layouts/amazon_ads" %>
     </div>

data/app/views/layouts/base.html.erb

@@ -57,19 +57,7 @@
   <body style="margin-top: 0">
     <div id="whole-page">
       <%= yield(:page_body) or yield %>
-
-      <div id="block-footer" style="width: 100%; clear: both">
-        <p class="fine-print">
-          Copyright &copy; 2010, Glen E. Ivey &mdash;
-          Powered by <%= link_to 'WontoMedia',
-            'http://wontomedia.rubyforge.org/' %>
-          &mdash; Software and page templates licensed under
-          <%= link_to 'GNU AGPL v3',
-            'http://www.gnu.org/licenses/agpl-3.0.html' %>
-          &mdash; Page content licensed under <%= link_to 'GNU FDL v1.3',
-            'http://www.gnu.org/licenses/fdl-1.3.html' %>
-        </p>
-      </div>
+      <%= render :partial => "layouts/footer" %>
     </div>
     <%= yield(:first_bottom_page_js) %>
     <%= javascript_include_merged :bottomJS %>

data/app/views/layouts/home.html.erb

@@ -45,8 +45,8 @@
 
   <div id="float-left" style="float: left; width: 14.4%;">
     <div id="container-absolutes">
-      <div id="block-search"
-           style="width: 19%; position: absolute; top: 0; right: 0;">
+      <div id="block-search-container"
+           style="width: 15%; position: absolute; top: 0; right: 0;">
         <%= render :partial => "layouts/search_box" %>
       </div>
       <div id="page-top-controls"

data/app/views/layouts/search.html.erb

@@ -0,0 +1,79 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<%
+# 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/".
+%>
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
+    <% if @title_text %>
+      <title><%= @title_text +
+                   (@window_title_addendum.nil? ? '' : @window_title_addendum) +
+                   " &mdash; " + WontoMedia.site_title -%></title>
+    <% else %>
+      <title><%= WontoMedia.site_title -%></title>
+    <% end %>
+    <%= stylesheet_link_merged :base %>
+    <%= yield :head %>
+  </head>
+  <body style="margin-top: 0">
+    <div id="tag-line" class="page-title-text">
+      <h1>
+        Search Results:
+        <span style="font-size: 80%; text-decoration: underline;">
+          <%= @search_query -%></span>
+      </h1>
+    </div>
+
+    <div id="float-center-right"
+         style="float: right; width: 85%; margin-top: 8ex;">
+      <div id="column-content">
+
+        <%= render :partial => "layouts/status_msgs" %>
+        <%= yield(:page_body) or yield %>
+
+      </div>
+    </div>
+
+    <div id="float-left" style="float: left; width: 14.4%;">
+      <div id="container-absolutes">
+        <div id="block-search-container"
+             style="width: 15%; position: absolute; top: 0; right: 0;">
+          <%= render :partial => "layouts/search_box" %>
+        </div>
+        <div id="page-top-controls"
+             style="position: absolute; top: 0; right: 15.6%;">
+          <%= render :partial => "layouts/master_help" %>
+          <%= render :partial => "layouts/language_select" %>
+          <%= render :partial => "layouts/login_controls" %>
+        </div>
+      </div>
+      <div id="column-left">
+        <%= link_to( logo_image, root_url ) %>
+        <%= link_to 'Home', root_url,
+              :style => 'position: relative; bottom: 1.2ex;' %>
+        <%= allpages_alert %>
+        <%= yield( :left_column ) %>
+      </div>
+    </div>
+
+    <%= render :partial => "layouts/footer" %>
+  </body>
+</html>

data/assets/wontomedia-sample.rb

@@ -31,6 +31,12 @@ WontoMedia = OpenStruct.new({
     "http://wiki.wontology.org/wiki/help.php?title=Wontology:",
   :site_content_url_postfix => '',
 
+  :search => OpenStruct.new({
+#    :google_site_search => true,              # flag indicating kind of search
+#    :publisher_id => "partner-pub-2447626445162341",
+#    :search_engine => "pcrhs4-9v0t",
+  }),
+
   :ads => OpenStruct.new({
 #    :amazon => OpenStruct.new({
 #              # the color scheme of Amazon ads is controlled from JS constants

data/config/routes.rb

@@ -23,6 +23,7 @@ ActionController::Routing::Routes.draw do |map|
     :permanent => true
 
   # more specific routes that override...
+  map.sitemap '/sitemap.xml', :controller => :admin, :action => :sitemap
   map.items_lookup '/items/lookup', :controller => :items, :action => :lookup,
     :path_prefix => '/w'
   map.itemCreatePopup '/items/new-pop', :controller => :items,
@@ -39,6 +40,7 @@ ActionController::Routing::Routes.draw do |map|
     :action => 'item_up'
   map.admin_connection_up '/w/admin/connection_up', :controller => 'admin',
     :action => 'connection_up'
+  map.search        '/w/search', :controller => 'admin', :action => 'search'
 
   # pretty URLs for items (match against all the "/w/" paths first)
   map.item_by_name '/:name', :controller => :items, :action => 'show',

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

@@ -69,7 +69,7 @@ div#fancybox-outer {
   top: 0;
   left: 15.5%;
   height: 8ex;
-  width: 69.7%;
+  width: 84.5%
   overflow: hidden;
 }
 .content {
@@ -232,6 +232,27 @@ p + table {   margin-bottom: 1.5em;  }
   letter-spacing: -0.3em;
 }
 
+#block-search {
+  border-width: 2px;
+  border-color: #e8e8ff;
+  border-style: none none solid solid;
+  background: url("/images/transparent_ltblue_background.png") repeat;
+  height: 5.8ex;
+}
+
+#block-search input[type=text] {
+  width: 98.5%;
+  border: solid 1px #b0b0ff;
+}
+#block-search input[type=submit] {
+  border: solid 1px #b0b0ff;
+  background: #e8e8ff;
+  font-size: 10px;
+  font-weight: bold;
+  padding: 0;
+  margin: 2px 0 0 3px;
+}
+
 #block-help {
   float: right;
   border-width: 2px;

data/public/javascripts/forItemsForms.js

@@ -67,7 +67,7 @@ function plumbEventHandlersToItemCreationElements(customizationSelector){
     var newItemId;
     for (var c=0; c < arrayOfForms.length; c++){
       newItemId = arrayOfForms[c].id;
-      var mtch = newItemId.match(/item$/);
+      var mtch = newItemId.match(/item/);
       if (mtch != null)
         break;
     }

metadata

@@ -3,10 +3,10 @@ name: wontomedia
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
-  - 0
-  - 2
   - 1
-  version: 0.2.1
+  - 0
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Glen E. Ivey
@@ -59,6 +59,7 @@ files:
 - app/models/property_item.rb
 - app/models/qualified_item.rb
 - app/views/admin/index.html.erb
+- app/views/admin/search.html.erb
 - app/views/connections/_index_outbound_links.html.erb
 - app/views/connections/_spo_select_controls.html.erb
 - app/views/connections/edit.html.erb
@@ -86,6 +87,7 @@ files:
 - app/views/items/show.html.erb
 - app/views/layouts/_amazon_ads.html.erb
 - app/views/layouts/_dynamic_alert_framework.html.erb
+- app/views/layouts/_footer.html.erb
 - app/views/layouts/_glossary_help_box.html.erb
 - app/views/layouts/_google_ads.html.erb
 - app/views/layouts/_language_select.html.erb
@@ -98,6 +100,7 @@ files:
 - app/views/layouts/base.html.erb
 - app/views/layouts/home.html.erb
 - app/views/layouts/popup.html.erb
+- app/views/layouts/search.html.erb
 - assets/wontomedia-sample.rb
 - config/asset_packages.yml
 - config/boot.rb