Author: brushed
Date: Tue Jun 17 10:40:06 2008
New Revision: 668766
URL: http://svn.apache.org/viewvc?rev=668766&view=rev
Log:
2.7.0-svn-46: i18n fixes and ie7 fixes:[JSPWIKI-293],[JSPWIKI-294],[JSPWIKI-280]
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/webdocs/templates/default/jspwiki.css
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=668766&r1=668765&r2=668766&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Tue Jun 17 10:40:06 2008
@@ -1,3 +1,13 @@
+2007-06-17 Dirk Frederickx <[EMAIL PROTECTED]>
+
+ * 2.7.0-svn-46
+
+ * [JSPWIKI-293] added editor.plain.sneakpreview.title resource
+
+ * [JSPWIKI-294] Faulty i18n in editor toolbar
+
+ * [JSPWIKI-280] Scroll bar problem in IE7
+
2008-06-15 Janne Jalkanen <[EMAIL PROTECTED]>
* 2.7.0-svn-45
Modified: incubator/jspwiki/trunk/etc/i18n/templates/default.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/templates/default.properties?rev=668766&r1=668765&r2=668766&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/templates/default.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/templates/default.properties Tue Jun 17
10:40:06 2008
@@ -564,6 +564,7 @@
#editor.plain.editassist=Edit Assist
#editor.plain.editassist.title=Toggle Edit Assist buttons
editor.plain.sneakpreview=Sneak Preview
+editor.plain.sneakpreview=Click outside the textarea to get a preview of the
rendered page
editor.plain.tbLink.title=link - Insert wiki link
editor.plain.tbH1.title=h1 - Insert heading1
editor.plain.tbH2.title=h2 - Insert heading2
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=668766&r1=668765&r2=668766&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/templates/default_nl.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/templates/default_nl.properties Tue Jun 17
10:40:06 2008
@@ -558,6 +558,7 @@
#editor.plain.editassist=Assistentie knoppen
#editor.plain.editassist.title=Toon/verberg assistentie knoppen
editor.plain.sneakpreview=Sneak Preview
+editor.plain.sneakpreview=Klik buiten het tekstveld om een preview te krijgen
van de pagina
editor.plain.tbLink.title=link - Voeg wiki link in
editor.plain.tbH1.title=h1 - Voeg paragraaf niveau 1 in
editor.plain.tbH2.title=h2 - Voeg paragraaf niveau 2 in
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=668766&r1=668765&r2=668766&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java Tue Jun 17
10:40:06 2008
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "44";
+ public static final String BUILD = "46";
/**
* This is the generic version string you should use
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=668766&r1=668765&r2=668766&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/jspwiki.css (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/jspwiki.css Tue Jun
17 10:40:06 2008
@@ -267,15 +267,16 @@
}
/*ie6 hack*/
* html pre {
- overflow:visible; overflow-x:auto; /*proprieatary ie*/
+ overflow:visible;
+ overflow-x:auto; /*proprieatary ie*/
width:95%; /* hasLayout=true */
margin:1em auto; /* otherwise funny effect on more menu ugh */
padding-bottom:1.5em; /*take scrollbar into account on ie*/
}
/*ie7 hack */
*:first-child+html pre {
- overflow:visible; overflow-x:auto; /*proprieatary ie*/
- width:95%; /* hasLayout=true */
+ overflow:visible;
+ overflow-x:auto; /*proprieatary ie*/
margin:1em auto; /* otherwise funny effect on more menu ugh */
padding-bottom:1.5em; /*take scrollbar into account on ie*/
}
@@ -742,9 +743,11 @@
font-size:85%;
overflow:hidden;
}
+/* ie6 hack */
* html #findSuggestionMenu {
background:url(images/tip.png) top left;
}
+/* ie7 hack */
*:first-child+html #findSuggestionMenu {
background:url(images/tip.png) top left;
}
@@ -763,9 +766,11 @@
-moz-border-radius:10px;
-webkit-border-radius:5px;
}
+/* ie6 hack */
* html #findSuggestionMenu .hover {
background-color:black;
}
+/* ie7 hack */
*:first-child+html #findSuggestionMenu .hover {
background-color:black;
}
@@ -1088,7 +1093,6 @@
}
/*ie7 hack */
*:first-child+html #previewcontent, *:first-child+html #info,
*:first-child+html #pagecontent, *:first-child+html #attach, *:first-child+html
#findcontent {
- width:100%;
overflow-x:auto;
}
