Author: brushed
Date: Sun Jun 15 11:32:42 2008
New Revision: 667986
URL: http://svn.apache.org/viewvc?rev=667986&view=rev
Log:
Increase IE6 and IE7 compatibility.
Added:
incubator/jspwiki/trunk/src/webdocs/images/attachment_small.gif (with
props)
incubator/jspwiki/trunk/src/webdocs/images/jspwiki-strip.gif (with props)
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/etc/i18n/templates/default.properties
incubator/jspwiki/trunk/etc/i18n/templates/default_nl.properties
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java
incubator/jspwiki/trunk/src/webdocs/images/favicon.ico
incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-common.js
incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-edit.js
incubator/jspwiki/trunk/src/webdocs/templates/default/editors/plain.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/jspwiki.css
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=667986&r1=667985&r2=667986&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sun Jun 15 11:32:42 2008
@@ -1,3 +1,19 @@
+2007-06-15 Dirk Frederickx <[EMAIL PROTECTED]>
+
+ * 2.7.0-svn-44
+
+ * Small fixes to plain.jsp to increase ie6 compatibilty.
+ Hide the 'tab-completion' and 'smart typing pairs' from IE browsers.
+
+ Added the i18n resource
+ editor.plain.toobar=Toolbar
+
+ * Several IE7 fixes of the category and suggestion popup css.
+
+ * Change the attachement icon to .gif (iso png), so it gets properly
rendered on ie6.
+ Added a transparent .ico file. (thanks Harry)
+
+
2008-06-14 Janne Jalkanen <[EMAIL PROTECTED]>
* 2.7.0-svn-43
Modified: incubator/jspwiki/trunk/etc/i18n/templates/default.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/templates/default.properties?rev=667986&r1=667985&r2=667986&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/templates/default.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/templates/default.properties Sun Jun 15
11:32:42 2008
@@ -541,6 +541,7 @@
editor.plain.changenote=Change Note
editor.commentsignature=Comment signature
+editor.plain.toolbar=Toolbar
editor.plain.find=Find
editor.plain.replace=Replace
editor.plain.matchcase=Match Case
Modified: incubator/jspwiki/trunk/etc/i18n/templates/default_nl.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/templates/default_nl.properties?rev=667986&r1=667985&r2=667986&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/templates/default_nl.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/templates/default_nl.properties Sun Jun 15
11:32:42 2008
@@ -534,6 +534,7 @@
editor.plain.changenote=Opmerking
editor.commentsignature=Commentaar signatuur
+editor.plain.toolbar=Toolbar
editor.plain.find=Zoek
editor.plain.replace=Vervang
editor.plain.matchcase=Match Case
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=667986&r1=667985&r2=667986&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java Sun Jun 15
11:32:42 2008
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "43";
+ public static final String BUILD = "44";
/**
* This is the generic version string you should use
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java?rev=667986&r1=667985&r2=667986&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java
(original)
+++
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java
Sun Jun 15 11:32:42 2008
@@ -598,7 +598,7 @@
link );
String imglink = m_context.getURL( WikiContext.NONE,
-
"images/attachment_small.png" );
+
"images/attachment_small.gif" );
el = createAnchor( ATTACHMENT, attlink, text, "" );
@@ -612,6 +612,7 @@
el.setAttribute("alt","(info)");
el = new
Element("a").setAttribute("href",infolink).addContent(el);
+ el.setAttribute("class","infolink");
}
else
{
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java?rev=667986&r1=667985&r2=667986&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java
(original)
+++
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java
Sun Jun 15 11:32:42 2008
@@ -148,7 +148,8 @@
if( pageref instanceof Attachment )
{
linkel = new
a().setHref(context.getURL(WikiContext.INFO,pageref.getName()));
- linkel.addElement( new
img().setSrc(context.getURL(WikiContext.NONE, "images/attachment_small.png")));
+ linkel.setClass("infolink");
+ linkel.addElement( new
img().setSrc(context.getURL(WikiContext.NONE, "images/attachment_small.gif")));
col.addElement( linkel );
}
Added: incubator/jspwiki/trunk/src/webdocs/images/attachment_small.gif
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/images/attachment_small.gif?rev=667986&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/src/webdocs/images/attachment_small.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/jspwiki/trunk/src/webdocs/images/favicon.ico
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/images/favicon.ico?rev=667986&r1=667985&r2=667986&view=diff
==============================================================================
Binary files - no diff available.
Added: incubator/jspwiki/trunk/src/webdocs/images/jspwiki-strip.gif
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/images/jspwiki-strip.gif?rev=667986&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/src/webdocs/images/jspwiki-strip.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-common.js
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-common.js?rev=667986&r1=667985&r2=667986&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-common.js (original)
+++ incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-common.js Sun Jun 15
11:32:42 2008
@@ -329,14 +329,13 @@
h = h.replace(/^#/,'');
var el = $(h);
-
while( $type(el) == 'element' ){
if( el.hasClass('hidetab') ){
- TabbedSection.clickTab.apply(el);
+ TabbedSection.click.apply($('menu-'+el.id));
} else if( el.hasClass('tab') ){
- /* accordion -- need to find accordion object */
+ /* accordion -- need to find accordion toggle
object */
} else if( el.hasClass('collapsebody') ){
- /* collapsible box */
+ /* collapsible box -- need to find the toggle
button */
} else if(!el.visible() ){
//alert('not visible'+el.id);
//fixme need to find the correct toggler
Modified: incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-edit.js
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-edit.js?rev=667986&r1=667985&r2=667986&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-edit.js (original)
+++ incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-edit.js Sun Jun 15
11:32:42 2008
@@ -329,6 +329,8 @@
*/
onPageLoadPostEditor: function(){
if(window.ie) return;
+
+ $('toolextra').show();
this.posteditor = new
postEditor.create(this.textarea,'changenote');
/* patch posteditor DF Jul 07 */
Modified:
incubator/jspwiki/trunk/src/webdocs/templates/default/editors/plain.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/editors/plain.jsp?rev=667986&r1=667985&r2=667986&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/editors/plain.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/editors/plain.jsp Sun
Jun 15 11:32:42 2008
@@ -78,9 +78,10 @@
Normal user should never see this field, nor type anything in it. --%>
<div style="display:none;">Authentication code: <input type="text"
name="<%=SpamFilter.getBotFieldName()%>" id="<%=SpamFilter.getBotFieldName()%>"
value=""/></div>
<table>
+<%--FIXME
<wiki:Permission permission="rename">
<tr>
- <td><label for="renameto">Page name<%--fmt:message
key='editor.renameto'/--%></label></td>
+ <td><label for="renameto"><fmt:message key='editor.renameto'/></label></td>
<td><input type="text" name="renameto" value="<wiki:Variable
var='pagename' />" size="40" />
<input type="checkbox" name="references" checked="checked" />
@@ -88,7 +89,7 @@
FIXME</td>
</tr>
</wiki:Permission>
-
+--%>
<tr>
<td><label for="changenote"><fmt:message
key='editor.plain.changenote'/></label></td>
<td><input type="text" name="changenote" id="changenote" size="80"
maxlength="80" value="<c:out value='${changenote}'/>"/></td>
@@ -96,7 +97,7 @@
</table>
<div id="tools">
- <h4>Toolbar</h4>
+ <h4><fmt:message key='editor.plain.toolbar'/></h4>
<div id="toolbuttons">
<span>
<a href="#" class="tool" rel="" id="tbLink" title="<fmt:message
key='editor.plain.tbLink.title'/>">link</a>
@@ -146,7 +147,7 @@
--%>
</div>
- <div id="toolextra" class="clearbox">
+ <div id="toolextra" class="clearbox" style="display:none;">
<span>
<input type="checkbox" name="tabcompletion" id="tabcompletion"
<%=TextUtil.isPositive((String)session.getAttribute("tabcompletion")) ?
"checked='checked'" : ""%>/>
<label for="tabcompletion" title="<fmt:message
key='editor.plain.tabcompletion.title'/>"><fmt:message
key="editor.plain.tabcompletion"/></label>
@@ -178,6 +179,7 @@
<label for="tbGLOBAL"><fmt:message
key="editor.plain.global"/></label>
</span>
</div>
+ <div class="clearbox" ></div>
</div>
<div>
<textarea id="editorarea" name="<%=EditorManager.REQ_EDITEDTEXT%>"
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/jspwiki.css
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/jspwiki.css?rev=667986&r1=667985&r2=667986&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/jspwiki.css (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/jspwiki.css Sun Jun
15 11:32:42 2008
@@ -293,6 +293,15 @@
.hover {
background-color:#eee;
}
+/* ie6 hack */
+* html .hover {
+ background-color:#eee;
+}
+/* ie7 hack */
+*:first-child+html .hover {
+ background-color:#eee;
+}
+
a:hover {
}
a:focus {
@@ -309,7 +318,7 @@
a.interwiki {
}
a.feed {
- background-image:url(../../images/jspwiki-icons.png);
+ background-image:url(../../images/jspwiki-strip.gif);
background-repeat:no-repeat;
background-position:0 0;
text-indent:16px;
@@ -321,7 +330,19 @@
display:block;
float:right;
}
-
+/* switch to gif for better ie rendering, but selectors nok in ie6 (fine in
ie7) */
+/*a.infolink {
+ background-image:url("../../images/jspwiki-strip.gif");
+ background-repeat:no-repeat;
+ background-position:right -16px;
+ padding-right:16px;
+ line-height:16px !important;
+ height:16px;
+ overflow:hidden;
+}
+a.infolink img {
+ display:none;
+}*/
/* +++ 260 Image styles +++ */
img {
@@ -724,6 +745,9 @@
* html #findSuggestionMenu {
background:url(images/tip.png) top left;
}
+*:first-child+html #findSuggestionMenu {
+ background:url(images/tip.png) top left;
+}
#findSuggestionMenu ul {
list-style:none;
@@ -742,6 +766,9 @@
* html #findSuggestionMenu .hover {
background-color:black;
}
+*:first-child+html #findSuggestionMenu .hover {
+ background-color:black;
+}
/* +++ 440 Favorites +++ */
@@ -1185,7 +1212,7 @@
font-size:1.4em;
display: block;
border-bottom: 2px solid silver;
- margin-top: 1.5ex;
+ margin-top:1.5ex;
}
/* +++ 625 Table of contents plugin +++ */
@@ -1701,9 +1728,14 @@
-webkit-border-radius:5px;
-webkit-box-shadow:0 0 5px rgba(0, 0, 0, 0.5);
}
+/* ie6 hack */
* html .categoryPopup {
width:240px;
}
+/* ie7 hack */
+*:first-child+html .categoryPopup {
+ width:240px;
+}
.categoryPopup a:link, .categoryPopup a:active,.categoryPopup a:visited {
color:white;
text-decoration:none;
@@ -1712,15 +1744,25 @@
padding:4px;
font-weight:bold;
}
+/* ie6 hack */
* html .categoryTitle {
background:url(images/tip.png) top left;
}
+/* ie7 hack */
+*:first-child+html .categoryTitle {
+ background:url(images/tip.png) top left;
+}
.categoryText {
padding:4px 0;
}
+/* ie6 hack */
* html .categoryText {
background:url(images/tip.png) bottom right;
}
+/* ie7 hack */
+*:first-child+html .categoryText {
+ background:url(images/tip.png) bottom right;
+}
.categoryText ul {
list-style:none;
margin:0 !important;
@@ -1735,9 +1777,15 @@
-moz-border-radius:10px;
-webkit-border-radius:5px;
}
+/* ie6 hack */
* html .categoryPopup .hover {
background-color:black;
}
+/* ie7 hack */
+*:first-child+html .categoryPopup .hover {
+ background-color:black;
+}
+
/* Pretty printing styles. Used with prettify.js. */
pre.prettyprint {
