svn commit: r657547 - in /incubator/jspwiki/trunk: ChangeLog src/com/ecyrd/jspwiki/Release.java src/webdocs/scripts/jspwiki-common.js src/webdocs/templates/default/jspwiki.css

[brushed]

Author: brushed
Date: Sun May 18 04:53:19 2008
New Revision: 657547

URL: http://svn.apache.org/viewvc?rev=657547&view=rev
Log:
Deactivate hideable Fav.menu (js) to support FCK-Editor [JSPWIKI-209]; Various 
IE7 css fixes.
        

Modified:
    incubator/jspwiki/trunk/ChangeLog
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
    incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-common.js
    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=657547&r1=657546&r2=657547&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sun May 18 04:53:19 2008
@@ -1,3 +1,15 @@
+2007-05-18  Dirk Frederickx <[EMAIL PROTECTED]>
+
+        * 2.7.0-svn-25
+        
+        * Temporary remove hideable favorites menu as it is incompatible with 
FCK.
+        Final fix to commit later.  The FCK-Editor is now again fully working.
+        (Reported by Florian Holeczek)  JSPWIKI-209
+        
+        * Fixing various IE7 incompatibilities (jspwiki.css)
+        Reported by Gavin Goldsmith. 
+        
+
 2008-05-14  Andrew Jaquith <ajaquith AT apache DOT org>
 
         * 2.7.0-svn-24

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=657547&r1=657546&r2=657547&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java Sun May 18 
04:53:19 2008
@@ -77,7 +77,7 @@
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "24";
+    public static final String     BUILD         = "25";
     
     /**
      *  This is the generic version string you should use

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=657547&r1=657546&r2=657547&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-common.js (original)
+++ incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-common.js Sun May 18 
04:53:19 2008
@@ -371,6 +371,9 @@
 var WikiSlidingFavs = 
 {
        onPageLoad: function(){
+
+               return; //not compatible with FCK editor => find a better less 
obtrusive solution
+
                var tabs = $E('#page .tabs'); if( !tabs ) return;
 
                /* inject a wrapper div cause relative can not be set directly 
on the .tabs */
@@ -1338,8 +1341,9 @@
        onPageLoad: function(){
                this.bullet = new 
Element('div',{'class':'collapseBullet'}).setHTML('&bull;');
                this.initialise( "favorites",   "JSPWikiCollapseFavorites" );
-               this.initialise( "pagecontent", "JSPWikiCollapse" + 
Wiki.PageName );
-               this.initialise( "previewcontent", "JSPWikiCollapse" + 
Wiki.PageName );
+               this.initialise( "page", "JSPWikiCollapse" + Wiki.PageName );
+               //CHECKME
+               //this.initialise( "previewcontent", "JSPWikiCollapse" + 
Wiki.PageName );
                this.initialise( "info" );
        },
 

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=657547&r1=657546&r2=657547&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/jspwiki.css (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/jspwiki.css Sun May 
18 04:53:19 2008
@@ -622,7 +622,7 @@
        margin-top:2.5em;
 }
 
-/* ie6 hack ensure moremenu remains properly alighned */
+/* ie6 hack ensure moremenu remains properly aligned */
 * html #editorarea {
        padding:4px 0;
 }
@@ -1237,10 +1237,15 @@
        clear:both;
 }
 
-/* IE only */
+/* ie6 and lower */
 * html .tabmenu {
        border:1px solid white;
 }
+/*ie7 hack */
+*:first-child+html .tabmenu {
+       border:1px solid white;
+}
+
 .tabmenu a {
        float:left;
        margin:0 0 -1px -1px;
@@ -1327,10 +1332,14 @@
 */
 
 /* +++ 912 wiki columns +++ */
-/*ie hack */
+/*ie6 and lower hack */
 * html .columns {
        width:100%;
 }
+/*ie7 hack */
+*:first-child+html .columns {
+       width:100%;
+}
 .columns .col {
        float:left;
        padding:0 0.25em;
@@ -1377,6 +1386,12 @@
 .collapse .collapsebody, .collapsebox .collapse .collapsebody {
        padding-left:1.5em;
 }
+/* ie7 hack */
+*:first-child+html .collapse .collapsebody, 
+*:first-child+html .collapsebox .collapse .collapsebody {
+       float:left;
+       padding-left:0.5em;
+}
 /* ie6 hack */
 * html .collapse .collapsebody, * html .collapsebox .collapse .collapsebody {
        float:left;