Graphiclious 0.1.2 → 0.1.3

data/CHANGES.txt

@@ -1,3 +1,5 @@
+Changes in 0.1.3
+- Javascript changes urls
 Changes in 0.1.2
 - Support FXRuby 1.6 (or: 1.4, 1.2)
 - Support Rubilicious 0.2 (or: 1.5.0)

data/doc/install.html

@@ -5,7 +5,7 @@
 <meta name="author" content="Sascha D�rdelmann">
 <meta name="generator" content="Ulli Meybohms HTML EDITOR">
 <meta name="keywords" lang="en"
-	content="Graphiclious,del.icio.us,static webpage generator">
+  content="Graphiclious,del.icio.us,static webpage generator">
 <link rel="stylesheet" type="text/css" href="style.css">
 <title>Graphiclious Installation</title>
 </head>
@@ -13,26 +13,26 @@
 <h1>Graphiclious Installation</h1>
 <div class="main">
 <ul class="menu">
-	<li class="menuitem"><a href="index.html">Homepage</a></li>
-	<li class="menuitem"><a href="screenshots/thumb.html">Screenshots</a></li>
-	<li class="menuselected">Installation</li>
-	<li class="menuitem"><a href="help.html">Documentation</a></li>
+  <li class="menuitem"><a href="index.html">Homepage</a></li>
+  <li class="menuitem"><a href="screenshots/thumb.html">Screenshots</a></li>
+  <li class="menuselected">Installation</li>
+  <li class="menuitem"><a href="help.html">Documentation</a></li>
 </ul>
 <h2>Requirements &amp; Installation</h2>
 <p>Do you have an account at <a class="extern"
-	href="http://del.icio.us/">del.icio.us</a>? If not, there is nothing,
+  href="http://del.icio.us/">del.icio.us</a>? If not, there is nothing,
 Graphiclious can do for you at current state of development. File a
 feature request or better: join the development team and add new
 features yourself.</p>
 <p>Graphiclious is written in the <a class="extern"
-	href="http://www.ruby-lang.org/en/">Ruby programming language <a>
+  href="http://www.ruby-lang.org/en/">Ruby programming language <a>
 and needs the Ruby interpreter and <a class="extern"
-	href="http://www.rubygems.org/">Rubygems</a> to be installed on your
+  href="http://www.rubygems.org/">Rubygems</a> to be installed on your
 computer. </p>
 <p>Graphiclious has a simple user interface that is written in <a
-	class="extern" href="http://www.fxruby.org/">FXRuby</a>. On Windows,
+  class="extern" href="http://www.fxruby.org/">FXRuby</a>. On Windows,
 the <a class="extern"
-	href="http://rubyforge.org/projects/rubyinstaller/">Ruby installer</a>
+  href="http://rubyforge.org/projects/rubyinstaller/">Ruby installer</a>
 has an option to install Rubygems and FXRuby for you, too.</p>
 <p>Once, Rubygems is installed, things become easy: Just run each of
 the following commands</p>
@@ -40,29 +40,29 @@ the following commands</p>
 gem install RGL<br>
 gem install Graphiclious</p>
 <p>on the commandline to install <a class="extern"
-	href="http://pablotron.org/software/rubilicious/">Rubilicious</a>, <a
-	class="extern" href="http://rubyforge.org/projects/rgl/">RGL</a> and
+  href="http://pablotron.org/software/rubilicious/">Rubilicious</a>, <a
+  class="extern" href="http://rubyforge.org/projects/rgl/">RGL</a> and
 Graphiclious. Choose Version 0.2.0 for Rubilicious and latest version of
 Stream, RGL and Graphiclious when asked.</p>
 <p>(Note: If your do not acess the internet directly but over a
 proxy server, please set up the proxy configuration as described in the
 <a class="extern"
-	href="http://wiki.rubyonrails.com/rails/pages/GemRails">Ruby on
+  href="http://wiki.rubyonrails.com/rails/pages/GemRails">Ruby on
 Rails wiki</a>.)
 <p>
 <h2>Additional features</h2>
 <p>Some features require additional software.</p>
 <ul>
-	<li>To generate html image maps showing tag relations you'll need
-	<a class="extern" href="http://www.graphviz.org/">Graphviz</a>.</li>
-	<li>To show thumbnail images of these maps in the generated web
-	pages you'll need <a class="extern"
-		href="http://rmagick.rubyforge.org/">RMagick</a>.</li>
-	<li>To conveniently upload the generated web-pages to your
-	homepage directly from the Graphiclious user interface you should try <a
-		class="extern" href="http://sourceforge.net/projects/piggy/">Piggy
-	ftp browser</a>.</li>
+  <li>To generate html image maps showing tag relations you'll need
+  <a class="extern" href="http://www.graphviz.org/">Graphviz</a>.</li>
+  <li>To show thumbnail images of these maps in the generated web
+  pages you'll need <a class="extern"
+    href="http://rmagick.rubyforge.org/">RMagick</a>.</li>
+  <li>To conveniently upload the generated web-pages to your
+  homepage directly from the Graphiclious user interface you should try <a
+    class="extern" href="http://sourceforge.net/projects/piggy/">Piggy
+  ftp browser</a>.</li>
 </ul>
 </div>
 </body>
-</html>
+</html>

data/javascript/cloud.js

@@ -1,5 +1,5 @@
 // -*-javascript-*-
-// $Id: cloud.js 39 2007-01-27 13:36:53Z wsdng $
+// $Id: cloud.js 42 2007-10-08 19:09:22Z wsdng $
 //
 
 // Cloud constructor computes everything we need
@@ -18,6 +18,8 @@ function Cloud(links, varname, content_id)
  this.filtered_links = new Array();
  this.num_filtered_links = 0;
  this.visible_links = new Array();
+ this.search="";
+ this.change_url = true;
 
  // init hashes
  for(var i in links)
@@ -59,6 +61,16 @@ new Cloud(new Array());
 
 Cloud.prototype.MAX_STYLES = 10;
 
+// Unless you call this function after constructing the cloud object
+// the url will change by changing the tag-filter. This default
+// behaviour will make the back button of the browser work.
+// Call only if you prefer it a little bit faster and don't care about the url.
+function Cloud_dont_change_url()
+{
+  this.change_url = false;
+}
+Cloud.prototype.dont_change_url = Cloud_dont_change_url;
+
 // We use a logarithmic scale to compute a fixed
 // number of styles depending on link counts
 function Cloud_downscale(val)
@@ -119,7 +131,11 @@ function Cloud_get_cloud_node()
     span.className = this.get_style(this.num_links_for_tag[tag]);
     var tag_node = document.createTextNode(tag);
     var ankor = document.createElement('a');
-    ankor.href = 'javascript:' + this.varname + ".add_filter('" + tag + "')";
+    if(this.change_url){
+      ankor.href = "javascript:window.location.search='" + this.get_search_with(tag) + "'";
+    } else {
+      ankor.href = 'javascript:' + this.varname + ".add_filter('" + tag + "')";
+    }
     ankor.appendChild(tag_node);
     span.appendChild(ankor);
     div.appendChild(span);
@@ -147,7 +163,11 @@ function Cloud_get_filter_node()
     var span = document.createElement('span');
     var tag_node = document.createTextNode(tag);
     var ankor = document.createElement('a');
-    ankor.href = 'javascript:' + this.varname + ".remove_filter('" + tag + "')";
+    if(this.change_url){
+      ankor.href = "javascript:window.location.search='" + this.get_search_without(tag) + "'";
+    } else {
+      ankor.href = 'javascript:' + this.varname + ".remove_filter('" + tag + "')";
+    }
     ankor.appendChild(tag_node);
     span.appendChild(ankor);
     div.appendChild(span);
@@ -203,7 +223,7 @@ function Cloud_subst()
  }
  var ul = document.createElement("ul");
  ul.className = 'link_list';
- list_to_show = list_to_show.sort(Link_compare_desc)  
+ list_to_show = list_to_show.sort(Link_compare_desc)
  for(var l in list_to_show)
  {
   var link = list_to_show[l];
@@ -216,22 +236,77 @@ function Cloud_subst()
 }
 Cloud.prototype.subst = Cloud_subst;
 
-function Cloud_add_filter(tag)
+function Cloud_get_search_with(tag)
 {
- if(this.filter[tag] == false){
+  var new_search = '';
+  if(this.num_filtered > 0){
+    new_search = this.search + "+" + tag;
+  } else {
+    new_search = tag;
+  }
+  return new_search;
+}
+Cloud.prototype.get_search_with = Cloud_get_search_with;
+
+function Cloud_set_filtered(tag)
+{
+  if(this.filter[tag] == false){
+    this.search = this.get_search_with(tag);
     this.num_filtered++;
     this.filter[tag] = true;
- }
- this.subst();
+  }
+}
+Cloud.prototype.set_filtered = Cloud_set_filtered;
+
+function Cloud_add_filter(tag)
+{
+  this.set_filtered(tag);
+  this.subst();
 }
 Cloud.prototype.add_filter = Cloud_add_filter;
 
+function Cloud_get_search_without(tag)
+{
+  var new_search = '';
+  var search_tags = this.search.split("+");
+  var first = true;
+  for(var i in search_tags){
+    if(search_tags[i] != tag){
+      if(first){
+        new_search = search_tags[i];
+        first = false;
+      } else {
+        new_search += "+" + search_tags[i];
+      }
+    }
+  }
+  return new_search;
+}
+Cloud.prototype.get_search_without = Cloud_get_search_without;
+
 function Cloud_remove_filter(tag)
 {
- if(this.filter[tag] == true){
+  if(this.filter[tag] == true){
+    this.search = this.get_search_without(tag);
     this.num_filtered--;
     this.filter[tag] = false;
- }
- this.subst();
+  }
+  this.subst();
+}
+Cloud.prototype.remove_filter = Cloud_remove_filter;
+
+function Cloud_jump_to(location)
+{
+  var location_params = location.search;
+  var argstr = location_params.substring(1, location_params.length);
+  var args = argstr.split('+');
+  for(var i = 0; i < args.length; i++){
+    var possible_tag = unescape(args[i])
+    this.set_filtered(possible_tag);
+  }
+  this.subst();
 }
-Cloud.prototype.remove_filter = Cloud_remove_filter;
+Cloud.prototype.jump_to = Cloud_jump_to;
+
+
+

data/javascript/index.htm

@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<!-- $Id: index.htm 29 2006-08-25 14:41:24Z wsdng $ -->
+<!-- $Id: index.htm 42 2007-10-08 19:09:22Z wsdng $ -->
 <html>
 <head>
 <link rel="stylesheet" type="text/css" href="style.css">
@@ -19,6 +19,7 @@
 <script>
 <!--
 cloud = new Cloud(links, 'cloud', 'content');
-cloud.subst(links);
+//cloud.dont_change_url();
+cloud.jump_to(document.location);
 //-->
 </script>

data/lib/graphiclious/version.rb

@@ -3,6 +3,6 @@
 
 module Graphiclious
   def self.version
-    '0.1.2'
+    '0.1.3'
   end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: Graphiclious
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
-date: 2007-01-27 00:00:00 +01:00
+  version: 0.1.3
+date: 2007-10-08 00:00:00 +02:00
 summary: Create an html image map pointing to generated static html pages from your del.icio.us links.  Uses Rubilicious and Graphviz.  Interface done with FXRuby
 require_paths: 
 - lib
@@ -107,9 +107,9 @@ files:
 - bin/graphiclious
 - test/test_delicious2yaml.rb
 - javascript/style.css
-- javascript/index.htm
-- javascript/cloud.js
 - javascript/link.js
+- javascript/cloud.js
+- javascript/index.htm
 test_files: []
 
 rdoc_options: []