Author: brushed
Date: Wed Aug 19 06:25:00 2009
New Revision: 805673
URL: http://svn.apache.org/viewvc?rev=805673&view=rev
Log:
2.8.3-svn-12 :
* 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
such as the Search page, Workflow page.
Modified:
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/etc/jspwiki.properties.tmpl
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/webdocs/scripts/jspwiki-common.js
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/webdocs/templates/default/jspwiki.css
Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog?rev=805673&r1=805672&r2=805673&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog Wed Aug 19 06:25:00
2009
@@ -1,3 +1,15 @@
+2009-08-19 Dirk Frederickx <[email protected]>
+
+ * 2.8.3-svn-12
+
+ * 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.
+
+
2009-08-03 Dirk Frederickx <[email protected]>
* 2.8.3-svn-11
Modified:
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/etc/jspwiki.properties.tmpl
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/etc/jspwiki.properties.tmpl?rev=805673&r1=805672&r2=805673&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/etc/jspwiki.properties.tmpl
(original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/etc/jspwiki.properties.tmpl
Wed Aug 19 06:25:00 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/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java?rev=805673&r1=805672&r2=805673&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java
Wed Aug 19 06:25:00 2009
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "11";
+ public static final String BUILD = "12";
/**
* This is the generic version string you should use
Modified:
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/webdocs/scripts/jspwiki-common.js
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/webdocs/scripts/jspwiki-common.js?rev=805673&r1=805672&r2=805673&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/webdocs/scripts/jspwiki-common.js
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/webdocs/scripts/jspwiki-common.js
Wed Aug 19 06:25:00 2009
@@ -392,18 +392,26 @@
addEditLinks: function(){
if( $("previewcontent") || !this.PermissionEdit ||
this.prefs.get('SectionEditing') != 'on') return;
- var url = this.EditUrl;
+ var aa = new
Element('a',{'class':'editsection'}).setHTML('quick.edit'.localize()),
+ i = 0,
+ url = this.EditUrl;
+
url = url + (url.contains('?') ? '&' : '?') + 'section=';
- var aa = new Element('a').setHTML('quick.edit'.localize()),
- ee = new
Element('span',{'class':'editsection'}).adopt(aa),
- i = 0;
-
- $$('#pagecontent *[id^=section]').each(function(el){
- if(el.id=='section-TOC') return;
- aa.set({'href':url + i++ });
- el.adopt(ee.clone());
+ this.getSections().each( function(el){
+ el.adopt(aa.set({'href':url + i++ }).clone());
});
+
+ },
+ /*
+ Function: getSections
+ Returns the list of all section headers, excluding the header
of the
+ Table Of Contents.
+ */
+ getSections: function(){
+ return $$('#pagecontent *[id^=section]').filter(
+ function(item){ return(item.id != 'section-TOC') }
+ );
},
$jsonid : 10000,
Modified:
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/webdocs/templates/default/jspwiki.css
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/webdocs/templates/default/jspwiki.css?rev=805673&r1=805672&r2=805673&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/webdocs/templates/default/jspwiki.css
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/webdocs/templates/default/jspwiki.css
Wed Aug 19 06:25:00 2009
@@ -172,10 +172,25 @@
font-weight:bold;
margin-bottom:0.5em;
}
+/*
+Headings:
+ The headings h2, h3 and h4 get a {{clear:left}} so they can appear
+ side by side with .commentbox-es.
+
+ 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%; }
@@ -184,24 +199,24 @@
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;
padding:0.25em;
text-decoration:none;
- color:grey;
+ color:#ccc;
}
a.editsection:hover, a.hashlink:hover {
- background-color:#eee;
+ background-color:#ddd;
color:blue !important;
}
-h2:hover a.hashlink, h3:hover a.hashlink, h4:hover a.hashlink {
- color: #ccc;
-}
-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;
}
+
b, i {
color:inherit;
}
@@ -272,23 +287,18 @@
padding:0.5em;
background:#f9f9f9;
border:1px solid #ddd;
+ _width:100%;
+ _overflow-x:auto;
+ _padding-bottom:1.5em; /*take scrollbar into account on ie ugh*/
}
-/*ie6 hack*/
-* html pre {
- 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*/
- margin:1em auto; /* otherwise funny effect on more menu ugh */
- padding-bottom:1.5em; /*take scrollbar into account on ie*/
+
+#previewcontent, #info, #pagecontent, #attach, #findcontent {
+ overflow-y:hidden; /*safari only -- ?? */
+ _width:100%;
+ _overflow-x:auto;
+ _padding-bottom:1.5em !important; /*take scrollbar into account on ie
ugh*/
}
-
+
/* +++ 250 Hyperlinks +++ */
a {
color:blue;
@@ -1117,18 +1127,6 @@
#pagecontent {
padding:0.5em 0;
}
-html>body #previewcontent, html>body #info, html>body #pagecontent, html>body
#attach, html>body #findcontent {
- overflow:auto;
-}
-* html #previewcontent, * html #info, * html #pagecontent, * html #attach, *
html #findcontent {
- width:100%;
- overflow-x:auto;
-}
-/*ie7 hack */
-*:first-child+html #previewcontent, *:first-child+html #info,
*:first-child+html #pagecontent, *:first-child+html #attach, *:first-child+html
#findcontent {
- overflow-x:auto;
-}
-
/* +++ 475 PreviewContent - "This is a preview" comment +++ */
#sneakpreviewheader {
