Author: sshafroi
Date: 2008-10-06 14:30:47 +0200 (Mon, 06 Oct 2008)
New Revision: 6863

Modified:
   
branches/2.17/generic.sesam/velocity-directives/src/main/java/no/sesat/search/view/velocity/FaviconDirective.java
Log:
Use rel="shortcut icon" as default, not just "icon". The rel attribute is 
space-delimited, so shortcut is just added to the list. This seams to be the 
standard way of doing it.



Modified: 
branches/2.17/generic.sesam/velocity-directives/src/main/java/no/sesat/search/view/velocity/FaviconDirective.java
===================================================================
--- 
branches/2.17/generic.sesam/velocity-directives/src/main/java/no/sesat/search/view/velocity/FaviconDirective.java
   2008-10-06 09:45:03 UTC (rev 6862)
+++ 
branches/2.17/generic.sesam/velocity-directives/src/main/java/no/sesat/search/view/velocity/FaviconDirective.java
   2008-10-06 12:30:47 UTC (rev 6863)
@@ -36,10 +36,10 @@
  *
  *  Example:
  *    #favicon("/images/favicon.gif")
- *    <link href="/genericno.localhost//images/1223283733372/favicon.gif" 
rel="icon" type="image/gif" />
+ *    <link href="/genericno.localhost//images/1223283733372/favicon.gif" 
rel="shortcut icon" type="image/gif" />
  *
- *    #favicon("/images/favicon.gif" 'type="image/gif" rel="shortcut icon"')
- *    <link href="/genericno.localhost//images/1223284107022/favicon.gif" 
type="image/gif" rel="shortcut icon"/>
+ *    #favicon("/images/favicon.png" 'type="image/png" rel="icon"')
+ *    <link href="/genericno.localhost//images/1223284107022/favicon.gif" 
type="image/png" rel="icon"/>
  *
  */
 public final class FaviconDirective extends AbstractDirective {
@@ -72,7 +72,7 @@
         final String resolvedPath = 
FindResource.find(getDataModel(context).getSite().getSite(), 
getArgument(context, node, 0));
 
         if (argCount == 1) {
-            writer.write("<link href=\"" + resolvedPath + "\" rel=\"icon\" 
type=\"image/gif\" />");
+            writer.write("<link href=\"" + resolvedPath + "\" rel=\"shortcut 
icon\" type=\"image/gif\" />");
         }
         if (argCount == 2) {
             writer.write("<link href=\"" + resolvedPath + "\" " + 
getArgument(context, node, 1) + "/>");

_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits

Reply via email to