Author: brushed
Date: Sat Jun 7 08:29:47 2008
New Revision: 664351
URL: http://svn.apache.org/viewvc?rev=664351&view=rev
Log:
(re)Added favicon.icon and updated the jspwiki.properties to support .ico
Added:
incubator/jspwiki/trunk/src/webdocs/images/favicon.ico (with props)
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/etc/i18n/CoreResources_nl.properties
incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
incubator/jspwiki/trunk/src/webdocs/templates/default/commonheader.jsp
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=664351&r1=664350&r2=664351&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sat Jun 7 08:29:47 2008
@@ -1,3 +1,10 @@
+2007-06-07 Dirk Frederickx <[EMAIL PROTECTED]>
+
+ * 2.7.0-svn-33
+
+ * Added favicon.ico, and updated the jspwiki.properties to support
*.ico
+
+
2008-06-01 Janne Jalkanen <[EMAIL PROTECTED]>
* 2.7.0-svn-32
Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources_nl.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResources_nl.properties?rev=664351&r1=664350&r2=664351&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/CoreResources_nl.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/CoreResources_nl.properties Sat Jun 7
08:29:47 2008
@@ -70,9 +70,9 @@
# TraditionalDiffProvider
-diff.traditional.added=Op lijn {0} werden {1} lijnen toegevoegd
-diff.traditional.changed=Op lijn {0} werden {1} lijnen gewijzigd
-diff.traditional.removed=Op lijn {0} werden {1} lijnen verwijderd
+diff.traditional.added=Op lijn {0} werden {1} toegevoegd
+diff.traditional.changed=Op lijn {0} werden {1} gewijzigd
+diff.traditional.removed=Op lijn {0} werden {1} verwijderd
diff.traditional.oneline=één lijn
diff.traditional.lines={2} lijnen
Modified: incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl?rev=664351&r1=664350&r2=664351&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl (original)
+++ incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl Sat Jun 7 08:29:47 2008
@@ -663,6 +663,7 @@
# jspwiki.translatorReader.inlinePattern.1 = *.jpg
# jspwiki.translatorReader.inlinePattern.2 = *.png
# jspwiki.translatorReader.inlinePattern.3 = http://images.com/*
+jspwiki.translatorReader.inlinePattern.1 = *.ico
###########################################################################
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java?rev=664351&r1=664350&r2=664351&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java Sat Jun 7
08:29:47 2008
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "32";
+ public static final String BUILD = "33";
/**
* This is the generic version string you should use
Added: incubator/jspwiki/trunk/src/webdocs/images/favicon.ico
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/images/favicon.ico?rev=664351&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/src/webdocs/images/favicon.ico
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/commonheader.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/commonheader.jsp?rev=664351&r1=664350&r2=664351&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/commonheader.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/commonheader.jsp Sat
Jun 7 08:29:47 2008
@@ -45,13 +45,14 @@
Preferences.setupPreferences(pageContext);
%>
+<meta name="wikiContext" content='<wiki:Variable var="requestcontext" />' />
<meta name="wikiBaseUrl" content='<wiki:BaseURL />' />
-<meta name="wikiPageUrl" content='<wiki:Link format="url" absolute="true"
page="#$%"/>' />
+<meta name="wikiPageUrl" content='<wiki:Link format="url" page="#$%"/>' />
<meta name="wikiEditUrl" content='<wiki:EditLink format="url" />' />
<meta name="wikiJsonUrl" content='<%=
WikiContext.findContext(pageContext).getURL( WikiContext.NONE, "JSON-RPC" ) %>'
/><%--unusual pagename--%>
<meta name="wikiPageName" content='<wiki:Variable var="pagename" />'
/><%--pagename without blanks--%>
<meta name="wikiUserName" content='<wiki:UserName />' />
-<meta name="wikiTemplateUrl" content='<wiki:Link format="url"
templatefile=""/>' />
+<meta name="wikiTemplateUrl" content='<wiki:Link format="url" templatefile=""
/>' />
<script type="text/javascript">//<![CDATA[
/* Localized javascript strings: LocalizedStrings[] */
@@ -75,6 +76,8 @@
<link rel="alternate stylesheet" type="text/css" href="<wiki:Link format='url'
templatefile='jspwiki.css'/>"
title="Standard" />
<link rel="shortcut icon" type="image/x-icon" href="<wiki:Link format='url'
jsp='images/favicon.ico'/>" />
+<%-- ie6 needs next line --%>
+<link rel="icon" type="image/x-icon" href="<wiki:Link format='url'
jsp='images/favicon.ico'/>" />
<wiki:FeedDiscovery />
