You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by id...@apache.org on 2007/05/10 18:45:31 UTC
svn commit: r536932 - in /myfaces/tobago/trunk:
core/src/main/java/org/apache/myfaces/tobago/component/
core/src/main/java/org/apache/myfaces/tobago/taglib/component/
example/addressbook/src/main/webapp/WEB-INF/tags/layout/
example/addressbook/src/main...
Author: idus
Date: Thu May 10 09:45:30 2007
New Revision: 536932
URL: http://svn.apache.org/viewvc?view=rev&rev=536932
Log:
TOBAGO-398: IE does not support non-ICO favicons
Added:
myfaces/tobago/trunk/example/addressbook/src/main/webapp/icon/favicon.ico (with props)
Modified:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIPage.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PageTag.java
myfaces/tobago/trunk/example/addressbook/src/main/webapp/WEB-INF/tags/layout/basic.tag
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIPage.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIPage.java?view=diff&rev=536932&r1=536931&r2=536932
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIPage.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIPage.java Thu May 10 09:45:30 2007
@@ -32,7 +32,6 @@
import org.apache.myfaces.tobago.model.PageState;
import org.apache.myfaces.tobago.model.PageStateImpl;
import org.apache.myfaces.tobago.webapp.TobagoMultipartFormdataRequest;
-import org.apache.myfaces.tobago.TobagoConstants;
import javax.faces.application.FacesMessage;
import javax.faces.component.UIComponent;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PageTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PageTag.java?view=diff&rev=536932&r1=536931&r2=536932
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PageTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PageTag.java Thu May 10 09:45:30 2007
@@ -28,7 +28,6 @@
import org.apache.myfaces.tobago.component.ComponentUtil;
import org.apache.myfaces.tobago.component.UIPage;
import org.apache.myfaces.tobago.component.UIPopup;
-import org.apache.myfaces.tobago.TobagoConstants;
import javax.faces.component.UIComponent;
import javax.servlet.jsp.JspException;
Modified: myfaces/tobago/trunk/example/addressbook/src/main/webapp/WEB-INF/tags/layout/basic.tag
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/addressbook/src/main/webapp/WEB-INF/tags/layout/basic.tag?view=diff&rev=536932&r1=536931&r2=536932
==============================================================================
--- myfaces/tobago/trunk/example/addressbook/src/main/webapp/WEB-INF/tags/layout/basic.tag (original)
+++ myfaces/tobago/trunk/example/addressbook/src/main/webapp/WEB-INF/tags/layout/basic.tag Thu May 10 09:45:30 2007
@@ -24,7 +24,7 @@
<f:view locale="#{controller.language}">
<tc:loadBundle basename="resource" var="bundle"/>
- <tc:page applicationIcon="image/org/tango-project/tango-icon-theme/16x16/mimetypes/x-office-address-book.png" label="${title}" state="#{layout}" width="#{layout.width}" height="#{layout.height}" id="page">
+ <tc:page applicationIcon="icon/favicon.ico" label="${title}" state="#{layout}" width="#{layout.width}" height="#{layout.height}" id="page">
<f:facet name="menuBar">
<tc:menuBar>
<tc:form>
Added: myfaces/tobago/trunk/example/addressbook/src/main/webapp/icon/favicon.ico
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/addressbook/src/main/webapp/icon/favicon.ico?view=auto&rev=536932
==============================================================================
Binary file - no diff available.
Propchange: myfaces/tobago/trunk/example/addressbook/src/main/webapp/icon/favicon.ico
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java?view=diff&rev=536932&r1=536931&r2=536932
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java Thu May 10 09:45:30 2007
@@ -214,6 +214,7 @@
writer.writeAttribute(HtmlAttributes.REL, "shortcut icon", null);
writer.writeAttribute(HtmlAttributes.HREF, icon, null);
} else {
+ // XXX IE only supports ICO files for favicons
writer.writeAttribute(HtmlAttributes.REL, "icon", null);
writer.writeAttribute(HtmlAttributes.TYPE, MimeTypeUtils.getMimeTypeForFile(icon), null);
writer.writeAttribute(HtmlAttributes.HREF, icon, null);