You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by br...@apache.org on 2009/08/19 08:49:45 UTC
svn commit: r805679 - in /incubator/jspwiki/trunk: ChangeLog
etc/jspwiki.properties.tmpl src/WebContent/scripts/jspwiki-common.js
src/WebContent/templates/default/jspwiki.css
src/java/org/apache/wiki/Release.java
Author: brushed
Date: Wed Aug 19 06:49:45 2009
New Revision: 805679
URL: http://svn.apache.org/viewvc?rev=805679&view=rev
Log:
3.0.0-svn-133 (align wih v2.8.3.xx)
* JSPWIKI-576. Styles of section [Edit] links fixed for IE.
* JSPWIKI-585: Scrollbars on wide-pages fixed for FF and Safari (overflow-y:hidden) and IE.
* JSPWIKI-383, JSPWIKI-481: Support redirecting back to special pages suchs as the Search page, Workflow page.
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl
incubator/jspwiki/trunk/src/WebContent/scripts/jspwiki-common.js
incubator/jspwiki/trunk/src/WebContent/templates/default/jspwiki.css
incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=805679&r1=805678&r2=805679&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Wed Aug 19 06:49:45 2009
@@ -1,101 +1,15 @@
-2009-08-16 Harry Metske <me...@apache.org>
+2009-08-19 Dirk Frederickx <br...@apache.org>
- * 3.0.0-svn-141
-
- * got rid of a bunch of Javadoc and compile warnings
-
- * added an extra error(String, Throwable) method to the Logger interface.
- When we switched to the varargs interfaces we lost the (log4j)
- option to automagically dump the stacktrace with the exception.
- WikiEngine's initialize method now uses this new method, so we
- can better diagnose problems with new features and things like
- JackRabbit.
-
-2009-08-15 Andrew Jaquith <ajaquith AT apache DOT org>
-
- * 3.0.0-svn-140
-
- * Checked in LdapUserDatabase, and refactorings to other LDAP
- classes. The LdapUserDatabase is read-only. ProfileTab will
- respect this and will print, rather than allow edits to, user
- profile information as a result. Any UserDatabase can now be
- flagged as "read-only" (via jspwiki.properties) to achieve
- the same effect.
-
-2009-08-08 Andrew Jaquith <ajaquith AT apache DOT org>
-
- * 3.0.0-svn-139
-
- * Checked in revised LdapLoginModule and LdapAuthorizer. Notable new
- features include provisional support for Active Directory, which
- "mostly" works. I also added the ability to bind to LDAP with a
- specified identity. To to this, we use a new feature of
- freshcookies-security called a "keychain" that stores the binding
- DN in an password-locked, triple-DES encrypted file. The keychain
- is available via AuthenticationManager.getKeychain() and can be
- used for storage of anything sensitive. The keychain is NOT required
- to be unlocked at startup time (although obviously LDAP binds will
- fail). We will provide the ability for the admin to unlock the
- keychain via the web UI in a future build.
-
-2009-07-29 Harry Metske <me...@apache.org>
-
- * 3.0.0-svn-138
-
- * fixed two minor JUnit tests (DenouncePlugin and CommentedProperties)
- the last one by removing the license from test.properties (should be OK)
-
- * removed OSCache reference from SisterSites.jsp
-
-2009-07-23 Janne Jalkanen <ja...@apache.org>
-
- * 3.0.0-svn-137
-
- * Switched from OSCache to EhCache to provide better performance
- (and remove one extra JAR from the distro). RenderingManagerTest
- performance goes up 50%...
-
-2009-07-23 Janne Jalkanen <ja...@apache.org>
+ * 3.0.0-svn-133
- * 3.0.0-svn-136
-
- * Improved LoggerFactory not to fail horribly when the SLF4J
- bridge classes were missing.
-
- * Installed default priha and log4j config files to WEB-INF/classes
-
-2009-07-23 Janne Jalkanen <ja...@apache.org>
+ * JSPWIKI-576. Styles of section [Edit] links fixed for IE.
- * 3.0.0-svn-135
-
- * Moved some classes from the top-level package to better places.
- For example, JCRWikiPage => org.apache.wiki.content.jcr;
- ReferenceManager => org.apache.wiki.content.
-
- * PageNameResolvers now have their own package under .content.
-
- * Also moved around some test classes to their proper packages.
+ * JSPWIKI-585: Scrollbars on wide-pages fixed for FF and Safari (overflow-y:hidden) and IE.
-2009-07-23 Andrew Jaquith <ajaquith AT apache DOT org>
-
- * 3.0.0-svn-134
-
- * First LDAP support classes checked in. We support an LdapLoginModule
- and LdapAuthorizer. Both are configured via jspwiki.properties
- and should be considered experimental. Significant limitations at the
- moment include the assumption that role searches are done ONLY via
- anonymous bind. We support OpenLDAP, but not Active Directory (yet).
- The LdapUserDatabase implementation won't come for a while, either.
-
-2009-07-22 Janne Jalkanen <ja...@apache.org>
+ * JSPWIKI-383, JSPWIKI-481: Support redirecting back to special pages suchs as
+ the Search page, Workflow page.
+
- * 3.0.0-svn-133
-
- * First implementation of versioning implemented. Almost all
- of the WikiEngine unit tests now run, though some of the old ones
- were removed. Please see doc/README - JCR Changes.txt for details
- about the versioning implementation.
-
2009-06-07 Janne Jalkanen <ja...@apache.org>
* 3.0.0-svn-132
Modified: incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl?rev=805679&r1=805678&r2=805679&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl (original)
+++ incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl Wed Aug 19 06:49:45 2009
@@ -329,10 +329,12 @@
# an existing one by redefining it here.
#
jspwiki.specialPage.CreateGroup = NewGroup.jsp
-jspwiki.specialPage.FindPage = Search.jsp
+#jspwiki.specialPage.FindPage = Search.jsp
+jspwiki.specialPage.Search = Search.jsp
jspwiki.specialPage.Login = Login.jsp
jspwiki.specialPage.NewGroup = NewGroup.jsp
jspwiki.specialPage.UserPreferences = UserPreferences.jsp
+jspwiki.specialPage.Workflow = Workflow.jsp
#############################################################################
#
Modified: incubator/jspwiki/trunk/src/WebContent/scripts/jspwiki-common.js
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/scripts/jspwiki-common.js?rev=805679&r1=805678&r2=805679&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/scripts/jspwiki-common.js (original)
+++ incubator/jspwiki/trunk/src/WebContent/scripts/jspwiki-common.js Wed Aug 19 06:49:45 2009
@@ -284,7 +284,7 @@
top += el.offsetTop || 0;
//if( el.getStyle('position')=='relative') alert( 'found relative\n'+el.innerHTML.slice(0,40) );
el = el.offsetParent;
- } while( el && (el.getStyle('position')=='static') );
+ } while( el && ($(el).getStyle('position')=='static') );
overflown.each(function(element){
left -= element.scrollLeft || 0;
@@ -2802,7 +2802,7 @@
//modal: false,
//resize: false, //true or {x:[min,max],y:[min,max]}
showNow: true,
- draggable: true,
+ draggable: true
//buttons: { 'button-label': callbackfn-when-clicked }
//onShow: Class.empty,
//onHide: Class.empty,
Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/jspwiki.css
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/jspwiki.css?rev=805679&r1=805678&r2=805679&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/jspwiki.css (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/jspwiki.css Wed Aug 19 06:49:45 2009
@@ -273,11 +273,18 @@
The {{.editsection}} and {{hashlink}} define the styling of the
[[Edit] and # hash-hover link on each heading.
+
+DOM structure:
+> <h2 id="section-...">Header-Title
+> <a class="hashlink" href="...">#</a>
+> <a class="editsection href="...§ion=0">[Edit]</a>
+> </h2>
+
*/
h2, h3, h4 {
clear:left;
margin:1em 0 0.5em 0;
- padding:0.25em 0;
+ padding:0.25em;
line-height:1.2;
}
h2 { font-size: 150%; }
@@ -286,6 +293,7 @@
h3 .editsection, h3 .hashlink { font-size: 76%; }
h4 { font-size: 116%; }
h4 .editsection, h4 .hashlink { font-size: 86%; }
+
a.editsection, a.hashlink {
font-weight:normal;
line-height:1.2;
@@ -297,11 +305,9 @@
background-color:#ddd/*#HOVER#*/;
color:blue !important;
}
-h2:hover a, h3:hover a, h4:hover a {
- color:grey;
-}
-a.editsection, a.hashlink {
- *color:white; /* tranparent nok in ie -- use background color */
+h2:hover .editsection, h3:hover .editsection, h4:hover .editsection,
+h2:hover .hashlink, h3:hover .hashlink, h4:hover .hashlink {
+ color:#999;/*#SOFTFONT#*/
}
@@ -343,13 +349,7 @@
font-style:italic;
margin:0.5em 0;
}
-/*
-textarea, input[type=text] {
- padding: 1px 0 1px 3px;
- border: 1px solid #ddd/.#BORDER#//;
-}
-*/
-textarea, input[type=text] {
+textarea, input[type=text], input[type=password] {
-moz-border-radius:3px;
-webkit-border-radius:3px;
padding:1px 3px;
@@ -404,17 +404,13 @@
code, tt, .pre, pre {
font:110% Monaco, "Courier New", Courier, monospace;
line-height:1.1;
-}
-.pre, pre {
- white-space:pre;
- _margin:1em auto; /*FIXME: otherwise funny effect on more menu ugh */
+ border:1px solid #ddd/*#BORDER#*/;
}
pre {
clear:both;
margin:1em 1.5em;
padding:0.5em;
background:#f9f9f9/*#COMMENT#*/;
- border:1px solid #ddd/*#BORDER#*/;
/*
border:1px dashed #0000aa;
color:#000077;
@@ -422,15 +418,16 @@
margin:1em 0;
*/
}
-#previewcontent, #info, #pagecontent, #attach, #findcontent,
+.pre, pre {
+ white-space:pre;
+ _margin:1em auto; /*FIXME: otherwise funny effect on more menu ugh */
+}
+
+#previewcontent, #info, #pagecontent, #attach, #findcontent,.fragment,
.pre, pre,
.xflow {
overflow-y:hidden; /*safari only ??*/
_width:100%;
- /*ie hacks CHECKME*/
- _xxoverflow:visible;
- _overflow-x:auto;
- _xxzoom:1; /*width:95%; hasLayout=true */
_padding-bottom:1.5em; /*take scrollbar into account on ie ugh*/
}
@@ -923,6 +920,7 @@
font:110% Monaco, "Courier New", Courier, monospace;
padding:4px 4px 4px 8px;
width:100%;
+ resize:none; /*resizing done through js*/
}
.resize-bar {
background:#ddd/*#BORDER#*/ url(images/resize-horizontal.gif) top center;
@@ -1565,16 +1563,39 @@
DOM structure:
(start code)
+<form id="searchForm">
+
+ <input id="query" />
+ <button type="submit" id="searchSubmit" value=".."></button>
+
+ <div id="searchboxMenu" style='visibility:hidden;'>
+ <div id="searchTools">
+ <a id='quickView' class='btn'><span><span>...</span></span></a>
+ <a id='quickEdit' class='btn'><span><span>...</span></span></a>
+ <a id='quickClone' class='btn'><span><span>...</span></span></a>
+ <a id="advancedSearch" class='btn'><span><span>...</span></span></a>
+ </div>
+ <div id="searchResult">
+ <fmt:message key='sbox.search.result' />
+ <span id="searchTarget">...</span>
+ <span id="searchSpin" class="spin" style="position:absolute;display:none;"></span>
+ <div id="searchOutput"></div>
+ </div>
+ <div id="recentSearches" style="display:none;">
+ <fmt:message key="sbox.recentsearches" />
+ <span><a id="recentClear">...</a></span>
+ </div>
+ </div>
+</form>
(end)
*/
-.searchbox {
-}
-#searchForm #query {
+#query {
width:164px;
padding:2px 22px 2px 2px;
vertical-align: middle;
color:#555;
+ float:left;/* ensure the searchSubmit button appear on the same horizontal line */
}
#searchSubmit {
position:absolute;
@@ -1587,8 +1608,7 @@
height:16px;
border:none;
background: url(images/search.gif) no-repeat center;
- overflow:hidden;
- cursor:pointer;
+ /*overflow:hidden;*/
}
#searchboxMenu {
position:absolute;
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java?rev=805679&r1=805678&r2=805679&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java Wed Aug 19 06:49:45 2009
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "141";
+ public static final String BUILD = "133";
/**
* This is the generic version string you should use