Changeset 1242

Timestamp:

2008-10-24 09:11:45 (3 months ago)

Author:

gaspard

Message:

commit 48317208d4fff498af29c68c9383f882f25aac26
Author: Gaspard Bucher <gaspard@teti.ch>

Popup option for images (id starts with '0') should open image in new window.

Files:

• trunk/app/helpers/application_helper.rb (modified) (2 diffs)
• trunk/lib/parser/lib/rules/zena.rb (modified) (1 diff)
• trunk/test/helpers/zazen_test.rb (modified) (1 diff)

trunk/app/helpers/application_helper.rb

@@ -505 +505 @@
-        # if the id starts with '0' or it is not an Image, link to data
-        link = zen_path(img, :format => img.c_ext)
+        link_tag = "<a class='popup' href='#{link}' target='_blank'>"
-      end
-    end
@@ -534 +535 @@
-    else
-      link = "http://#{link}" unless link =~ %r{(^/|.+://.+)}
-
+
+
-    end
-  end

trunk/lib/parser/lib/rules/zena.rb

@@ -1652 +1652 @@
-    
-    def r_javascripts
- == 'all' || @params[:list]
+
-        list = %w{ prototype effects tablekit zena }
+      elsif @params[:list] == 'all'
+        list = %w{ prototype effects dragdrop tablekit zena }
-      else
-        list = @params[:list].split(',').map{|e| e.strip}

trunk/test/helpers/zazen_test.rb

@@ -45 +45 @@
-    assert_equal "<p><img src='/en/projects/cleanWater/image24_std.jpg' width='545' height='400' alt='it&apos;s a lake' class='std'/></p>", zazen('!24!')
-    # ** [!024!] inline image, default format, link to full image.
-href='/oo/projects/cleanWater/image24.jpg
+class='popup' href='/oo/projects/cleanWater/image24.jpg' target='_blank
-  end
-