X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=est-format.el;h=176cbcb36d55071fd06c21dea7c449f6884e87d5;hb=3c56888c31904cd575de6b35c4d3d5a9800f4973;hp=667f8167c6f3067cf24a0edce6d04ecd091f3d00;hpb=cc82080eeedc04ae0b0d6e13a047fa27b5d91328;p=chise%2Fest.git

diff --git a/est-format.el b/est-format.el
index 667f816..176cbcb 100644
--- a/est-format.el
+++ b/est-format.el
@@ -18,11 +18,10 @@
       (setq dest
 	    (format "%s %s=\"%s\""
 		    dest key
-		    (www-format-encode-string
-		     (format "%s"
-			     (est-format-unit val 'without-tags
-					      'without-edit 'as-property))
-		     'without-tags))))
+		    (format "%s"
+			    (est-format-unit val 'without-tags
+					     'without-edit 'as-property))
+		    )))
     dest))
 
 (defun est-format-unit (format-unit
@@ -145,7 +144,9 @@
 		 (list* 'a
 			(list :href
 			      (concat (www-uri-make-object-url object)
-				      "&feature="
+				      (if est-hide-cgi-mode
+					  "/feature="
+					"&feature=")
 				      (www-uri-encode-feature-name feature)))
 			children)))
 	  ))
@@ -157,13 +158,15 @@
 		     (setq feature (plist-get props :feature)))
 	    (setq children
 		  (list
-		   (list* 'a
-			  (list :href
-				(www-uri-make-feature-name-url
-				 (est-object-genre object)
-				 (www-uri-encode-feature-name feature)
-				 (www-uri-encode-object object)))
-			  children)))))
+		   (list 'span
+			 '(:class "feature-name")
+			 (list* 'a
+				(list :href
+				      (www-uri-make-feature-name-url
+				       (est-object-genre object)
+				       (www-uri-encode-feature-name feature)
+				       (www-uri-encode-object object)))
+				children))))))
 	)
        ((eq name 'value)
 	(cond