iqvoc 3.2.7 → 3.2.8

data/app/helpers/concepts_helper.rb

@@ -18,6 +18,7 @@ module ConceptsHelper
 
   # if `broader` is supplied, the tree's direction is reversed (descendants represent broader relations)
   def treeview(concepts, broader = false)
+    concepts = concepts.sort { |a, b| a.pref_label.to_s <=> b.pref_label.to_s }
     render :partial => "concepts/hierarchical/treeview",
       :locals => { :concepts => concepts, :broader => broader }
   end

data/config/database.yml

@@ -1,9 +1,16 @@
+# development:
+#   adapter: postgresql
+#   encoding: unicode
+#   database: iqvoc_development
+#   username: iqvoc
+#   password:
+#   pool: 5
+
 development:
   adapter: mysql2
   encoding: utf8
   reconnect: false
   database: iqvoc_development
-  pool: 5
   username: root
   password:
   hostname: 127.0.0.1
@@ -13,7 +20,6 @@ test:
   encoding: utf8
   reconnect: false
   database: iqvoc_test
-  pool: 5
   username: root
   password:
   hostname: 127.0.0.1
@@ -23,7 +29,6 @@ production:
   encoding: utf8
   reconnect: false
   database: iqvoc_development
-  pool: 5
   username: root
   password:
   hostname: 127.0.0.1

data/config/initializers/secret_token.rb

@@ -25,6 +25,6 @@ if Iqvoc.const_defined?(:Application)
 
   # Run `rake secret` and uncomment the following line
   # Replace the secret-placeholder with your generated token
-  Iqvoc::Application.config.secret_token = '17d06ea2c1b5aceb4274a466a83d3b063094ecb22826c82af3572740bf2d61b30f756f1aea5e6c845ad5c078265065c8748760e655da7f6425a11bbf22ec8007'
+  Iqvoc::Application.config.secret_token = 'ef1f801c911b45ded2944aad3121244bfabf231631d102e6e120da8639c47eb6aa4ae7df733f0d539951cbc4e399e6050f46bc279d6a85d57135688394b87c5a'
 
 end

data/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20120201120736) do
+ActiveRecord::Schema.define(:version => 20120601094501) do
 
   create_table "collection_members", :force => true do |t|
     t.integer "collection_id"
@@ -27,6 +27,7 @@ ActiveRecord::Schema.define(:version => 20120201120736) do
     t.integer  "target_id"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.integer  "rank",       :default => 100
   end
 
   add_index "concept_relations", ["owner_id", "target_id"], :name => "ix_concept_relations_fk"
@@ -116,6 +117,15 @@ ActiveRecord::Schema.define(:version => 20120201120736) do
   add_index "notes", ["owner_id", "owner_type", "type"], :name => "ix_notes_fk_type"
   add_index "notes", ["type"], :name => "ix_notes_on_type"
 
+  create_table "page_requests", :force => true do |t|
+    t.string   "path"
+    t.float    "page_duration"
+    t.float    "view_duration"
+    t.float    "db_duration"
+    t.datetime "created_at",    :null => false
+    t.datetime "updated_at",    :null => false
+  end
+
   create_table "users", :force => true do |t|
     t.string   "forename"
     t.string   "surname"

data/lib/iqvoc/version.rb

@@ -15,5 +15,5 @@
 # limitations under the License.
 
 module Iqvoc
-  VERSION = "3.2.7"
+  VERSION = "3.2.8"
 end

data/public/javascripts/iqvoc/application.js

@@ -2,132 +2,144 @@
 /*global jQuery, IQVOC */
 
 jQuery(document).ready(function($) {
-	"use strict";
+  "use strict";
 
-	var locale = $("head meta[name=i18n-locale]").attr("content");
+  var locale = $("head meta[name=i18n-locale]").attr("content");
 
-	IQVOC.enhancedDropdown(".menu");
-	IQVOC.dynamicAuth("#auth_controls");
+  IQVOC.enhancedDropdown(".menu");
+  IQVOC.dynamicAuth("#auth_controls");
 
-	if(IQVOC.visualization) {
-		IQVOC.visualization.init("infovis", function(container) {
-			if(IQVOC.Storage.getItem("visualization") === "enlarged") {
-				container.data("widget").toggleSize(true);
-			}
-		});
-	}
+  if(IQVOC.visualization) {
+    IQVOC.visualization.init("infovis", function(container) {
+      if(IQVOC.Storage.getItem("visualization") === "enlarged") {
+        container.data("widget").toggleSize(true);
+      }
+    });
+  }
 
-	// language selection
-	var langWidget = $("ul.lang-widget")[0];
-	// primary language (converting links to radio buttons)
-	$("a", langWidget).each(function(i, node) {
-		var link = $(node),
-			el = link.closest("li"),
-			btn = $('<input type="radio" name="primary_language">');
-		if(link.hasClass("current")) {
-			btn[0].checked = true;
-		}
-		var label = $("<label />").append(btn).append(link);
-		el.append(label);
-		return label[0];
-	});
-	$("input:radio", langWidget).live("change", function(ev) {
-		window.location = $(this).closest("label").find("a").attr("href");
-	});
-	// secondary language
-	var toggleSections = function(langSelected) {
-		$(".translation[lang]").each(function(i, node) {
-			var el = $(node),
-				lang = el.attr("lang");
-			if(lang !== locale && $.inArray(lang, langSelected) === -1) {
-				el.addClass("hidden");
-			} else {
-				el.removeClass("hidden");
-			}
-		});
-	};
-	var updateNoteLangs = function(langSelected) {
-		$(".inline_note.new select").each(function(i, sel) { // NB: new notes only!
-			$(sel).find("option").each(function(i, opt) {
-				var el = $(opt),
-					lang = el.val();
-				if(lang !== locale && $.inArray(lang, langSelected) === -1) {
-					el.remove();
-				}
-			});
-		});
-	};
-	$(document).bind("lang_selected", function(ev, data) {
-		toggleSections(data.langs);
-		updateNoteLangs(data.langs);
-	});
-	var langSelector = new IQVOC.LanguageSelector(langWidget, "lang_selected");
-	if($("#concept_new, #concept_edit").length) { // edit mode
-		// disable secondary language selection to avoid excessive state complexity
-		$(":checkbox", langSelector.container).prop("disabled", true);
-	}
+  // language selection
+  var langWidget = $("ul.lang-widget")[0];
+  // primary language (converting links to radio buttons)
+  $("a", langWidget).each(function(i, node) {
+    var link = $(node),
+      el = link.closest("li"),
+      btn = $('<input type="radio" name="primary_language">');
+    if(link.hasClass("current")) {
+      btn[0].checked = true;
+    }
+    var label = $("<label />").append(btn).append(link);
+    el.append(label);
+    return label[0];
+  });
+  $("input:radio", langWidget).live("change", function(ev) {
+    window.location = $(this).closest("label").find("a").attr("href");
+  });
+  // secondary language
+  var toggleSections = function(langSelected) {
+    $(".translation[lang]").each(function(i, node) {
+      var el = $(node),
+        lang = el.attr("lang");
+      if(lang !== locale && $.inArray(lang, langSelected) === -1) {
+        el.addClass("hidden");
+      } else {
+        el.removeClass("hidden");
+      }
+    });
+  };
+  var updateNoteLangs = function(langSelected) {
+    $(".inline_note.new select").each(function(i, sel) { // NB: new notes only!
+      $(sel).find("option").each(function(i, opt) {
+        var el = $(opt),
+          lang = el.val();
+        if(lang !== locale && $.inArray(lang, langSelected) === -1) {
+          el.remove();
+        }
+      });
+    });
+  };
+  $(document).bind("lang_selected", function(ev, data) {
+    toggleSections(data.langs);
+    updateNoteLangs(data.langs);
+  });
+  var langSelector = new IQVOC.LanguageSelector(langWidget, "lang_selected");
+  if($("#concept_new, #concept_edit").length) { // edit mode
+    // disable secondary language selection to avoid excessive state complexity
+    $(":checkbox", langSelector.container).prop("disabled", true);
+  }
 
-	// entity selection (edit mode)
-	$("input.entity_select").each(function(i, node) {
-		IQVOC.EntitySelector(node);
-	});
+  // entity selection (edit mode)
+  $("input.entity_select").each(function(i, node) {
+    IQVOC.EntitySelector(node);
+  });
 
-	// Label editing (inline notes)
-	$("fieldset.note_relation ol li.inline_note.new").hide();
-	$("fieldset.note_relation input[type=button]").click(function(ev) {
-		IQVOC.createNote.apply(this, arguments);
-		langSelector.notify(); // trigger updateNoteLangs -- XXX: hacky!?
-	});
-	$("li.inline_note input:checkbox").change(function(ev) {
-		var action = this.checked ? "addClass" : "removeClass";
-		$(this).closest("li")[action]("deleted");
-	});
+  // Label editing (inline notes)
+  $("fieldset.note_relation ol li.inline_note.new").hide();
+  $("fieldset.note_relation input[type=button]").click(function(ev) {
+    IQVOC.createNote.apply(this, arguments);
+    langSelector.notify(); // trigger updateNoteLangs -- XXX: hacky!?
+  });
+  $("li.inline_note input:checkbox").change(function(ev) {
+    var action = this.checked ? "addClass" : "removeClass";
+    $(this).closest("li")[action]("deleted");
+  });
 
-	// Datepicker
-	$.datepicker.setDefaults($.datepicker.regional[locale]);
-	$("input.datepicker").datepicker({ dateFormat: "yy-mm-dd" });
+  // Datepicker
+  $.datepicker.setDefaults($.datepicker.regional[locale]);
+  $("input.datepicker").datepicker({ dateFormat: "yy-mm-dd" });
 
-	// Dashboard table row highlighting and click handling
-	$("tr.highlightable")
-		.hover(function(ev) {
-			var action = ev.type === "mouseenter" ? "addClass" : "removeClass";
-			$(this)[action]("hover");
-		})
-		.click(function(ev) {
-			window.location = $(this).attr("data-url");
-		});
+  // Dashboard table row highlighting and click handling
+  $("tr.highlightable")
+    .hover(function(ev) {
+      var action = ev.type === "mouseenter" ? "addClass" : "removeClass";
+      $(this)[action]("hover");
+    })
+    .click(function(ev) {
+      window.location = $(this).attr("data-url");
+    });
 
-	// Search
-	$("button#language_select_all").click(function() {
-		$("input[type=checkbox].lang_check").attr("checked", true);
-	});
-	$("button#language_select_none").click(function() {
-		$("input[type=checkbox].lang_check").attr("checked", false);
-	});
-	$("select.search_type").change(function() {
-		var result_type_filter = $("li.result_type_filter");
-		if($(this).val().match(/labeling/)) {
-			result_type_filter.show();
-		}
-		else {
-			result_type_filter.hide();
-		}
-	});
-	$("select.search_type").change();
+  // Search
+  $("button#language_select_all").click(function() {
+    $("input[type=checkbox].lang_check").attr("checked", true);
+  });
+  $("button#language_select_none").click(function() {
+    $("input[type=checkbox].lang_check").attr("checked", false);
+  });
+  $("select.search_type").change(function() {
+    var result_type_filter = $("li.result_type_filter");
+    if($(this).val().match(/labeling/)) {
+      result_type_filter.show();
+    }
+    else {
+      result_type_filter.hide();
+    }
+  });
+  $("select.search_type").change();
 
-	// hierarchical tree view
-	$("ul.hybrid-treeview").each(function() {
-		var url = $(this).attr("data-url"),
-			container = this;
-		$(this).treeview({
-			collapsed: true,
-			toggle: function() {
-				var el = $(this);
-				if(el.hasClass("hasChildren")) {
-					var childList = el.removeClass("hasChildren").find("ul");
-					$.fn.treeviewLoad({ url: url }, this.id, childList, container);
-				}
-			}
-		});
-	});
+  // hierarchical tree view
+  $("ul.hybrid-treeview").each(function() {
+    var url = $(this).attr("data-url"),
+      container = this;
+    $(this).treeview({
+      collapsed: true,
+      toggle: function() {
+        var el = $(this);
+        if(el.hasClass("hasChildren")) {
+          var childList = el.removeClass("hasChildren").find("ul");
+
+          var sortedItems = $(childList).children();
+          sortedItems.sort(function(a, b) {
+             var nameA = a.find("a").text(), nameB = b.find("a").text();
+             if (nameA < nameB) // sort string ascending
+              return -1
+             if (nameA > nameB)
+              return 1
+             return 0 // default return value (no sorting)
+          })
+          $(childList).empty().append(sortedItems);
+
+          $.fn.treeviewLoad({ url: url }, this.id, childList, container);
+        }
+      }
+    });
+  });
 });

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iqvoc
 version: !ruby/object:Gem::Version
-  version: 3.2.7
+  version: 3.2.8
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-07 00:00:00.000000000 Z
+date: 2012-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70182803396680 !ruby/object:Gem::Requirement
+  requirement: &70201195576640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: 3.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *70182803396680
+  version_requirements: *70201195576640
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70182803396020 !ruby/object:Gem::Requirement
+  requirement: &70201195576240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70182803396020
+  version_requirements: *70201195576240
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70182803394520 !ruby/object:Gem::Requirement
+  requirement: &70201195575780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70182803394520
+  version_requirements: *70201195575780
 - !ruby/object:Gem::Dependency
   name: authlogic
-  requirement: &70182803391860 !ruby/object:Gem::Requirement
+  requirement: &70201195605560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70182803391860
+  version_requirements: *70201195605560
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &70182803390640 !ruby/object:Gem::Requirement
+  requirement: &70201195605140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70182803390640
+  version_requirements: *70201195605140
 - !ruby/object:Gem::Dependency
   name: iq_rdf
-  requirement: &70182803390040 !ruby/object:Gem::Requirement
+  requirement: &70201195604640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,10 +78,10 @@ dependencies:
         version: 0.0.14
   type: :runtime
   prerelease: false
-  version_requirements: *70182803390040
+  version_requirements: *70201195604640
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70182803389140 !ruby/object:Gem::Requirement
+  requirement: &70201195604220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,7 +89,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70182803389140
+  version_requirements: *70201195604220
 description: iQvoc - a SKOS(-XL) vocabulary management system built on the Semantic
   Web
 email:
@@ -242,7 +242,6 @@ files:
 - config/database.yml
 - config/database.yml.mysql
 - config/database.yml.sqlite
-- config/deploy.rb
 - config/engine.rb
 - config/environment.rb
 - config/environments/development.rb
@@ -481,7 +480,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: iQvoc

data/config/deploy.rb

@@ -1,72 +0,0 @@
-# encoding: UTF-8
-
-# Copyright 2011 innoQ Deutschland GmbH
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require "#{File.dirname(__FILE__)}/deploy/history"
-load_history
-
-load "#{File.dirname(__FILE__)}/deploy/common.rb"
-
-set :default_stage, "innoq"
-set :stages, %w(ec2 innoq bian)
-require 'capistrano/ext/multistage'
-
-# RVM bootstrap
-$:.unshift(File.expand_path('./lib', ENV['rvm_path']))
-require 'rvm/capistrano'
-set :rvm_ruby_string, '1.9.3'
-# set :rvm_type, :user
-
-# bundler bootstrap
-require 'bundler/capistrano'
-
-# main details
-set :application, "iqvoc"
-
-# repo details
-set :scm, :git
-set :git_enable_submodules, 1
-# set :scm_username, "passenger"
-set :repository, "git@github.com:innoq/iqvoc.git"
-@capistrano_history['last_branch'] = "master" if @capistrano_history['last_branch'].nil? || @capistrano_history['last_branch'] == ""
-set :branch, Capistrano::CLI.ui.ask("Please enter the branch or tag we should use [#{@capistrano_history['last_branch']}]: ")
-set :branch, @capistrano_history['last_branch'] if fetch(:branch) == ""
-@capistrano_history['last_branch'] = fetch(:branch)
-
-save_history
-
-# tasks
-namespace :deploy do
-  task :start, :roles => :app do
-    run "touch #{current_path}/tmp/restart.txt"
-  end
-
-  task :stop, :roles => :app do
-    # Do nothing.
-  end
-
-  desc "Restart Application"
-  task :restart, :roles => :app do
-    run "touch #{current_path}/tmp/restart.txt"
-  end
-
-  desc "Symlink shared resources on each release"
-  task :symlink_shared, :roles => :app do
-    run "ln -nfs #{shared_path}/config/database.yml #{release_path}/config/database.yml"
-    run "ln -nfs #{shared_path}/config/initializers/secret_token.rb #{release_path}/config/initializers/secret_token.rb"
-  end
-end
-
-after 'deploy:update_code', 'deploy:symlink_shared'