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 2008/08/23 21:19:45 UTC
svn commit: r688400 - in /incubator/jspwiki/trunk: ./ etc/i18n/ etc/ini/
src/com/ecyrd/jspwiki/ src/com/ecyrd/jspwiki/preferences/ src/webdocs/
src/webdocs/scripts/ src/webdocs/templates/default/
src/webdocs/templates/default/editors/ src/webdocs/templ...
Author: brushed
Date: Sat Aug 23 12:19:44 2008
New Revision: 688400
URL: http://svn.apache.org/viewvc?rev=688400&view=rev
Log:
2.7.0-alpha-25 Template fixes (mainly section editing)
* The Section-Editing user preference can now also be set via the
default_jspwiki.properties. By default the preference is turned off.
jspwiki.defaultprefs.template.sectionediting =on
* Small fix to avoid section-editing [edit] link on table of contents titles.
* [JSPWIKI-350] Section-Editing needs to be suppressed in a comment context.
* The change-note input field is suppressed in a comment context as JSPWiki
auto-generates the change-note for comments. Also added localization in Comment.jsp
Added new resource to CoreResources.properties.
comment.by=Comment by {0}
* [JSPWIKI-329] Pagination links on the version history were still not correct
when number of version equals a multiple of 20. Oops.
* [JSPWIKI-309] Various updates of the OrderedList skin, including section editing.
Added:
incubator/jspwiki/trunk/src/webdocs/templates/default/skins/OrderedList/images/arrdown.gif (with props)
incubator/jspwiki/trunk/src/webdocs/templates/default/skins/OrderedList/images/bulletDown.gif (with props)
incubator/jspwiki/trunk/src/webdocs/templates/default/skins/OrderedList/images/bulletUp.gif (with props)
incubator/jspwiki/trunk/src/webdocs/templates/default/skins/OrderedList/images/smart-logo.gif (with props)
incubator/jspwiki/trunk/src/webdocs/templates/default/skins/OrderedList/images/sortable.gif (with props)
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/etc/i18n/CoreResources.properties
incubator/jspwiki/trunk/etc/i18n/CoreResources_nl.properties
incubator/jspwiki/trunk/etc/ini/default_jspwiki.properties
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/preferences/Preferences.java
incubator/jspwiki/trunk/src/webdocs/Comment.jsp
incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-common.js
incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-commonstyles.js
incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-edit.js
incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-prefs.js
incubator/jspwiki/trunk/src/webdocs/templates/default/InfoContent.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesTab.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/commonheader.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/editors/plain.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/jspwiki.css
incubator/jspwiki/trunk/src/webdocs/templates/default/skins/OrderedList/skin.css
Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=688400&r1=688399&r2=688400&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sat Aug 23 12:19:44 2008
@@ -1,5 +1,30 @@
2008-08-23 Dirk Frederickx <di...@gmail.com>
+ * 2.7.0-alpha-25 Template fixes (mainly section editing)
+
+ * The Section-Editing user preference can now also be set via the
+ default_jspwiki.properties. By default the preference is turned off.
+
+ jspwiki.defaultprefs.template.sectionediting =on
+
+ * Small fix to avoid section-editing [edit] link on table of contents titles.
+
+ * [JSPWIKI-350] Section-Editing needs to be suppressed in a comment context.
+
+ * The change-note input field is suppressed in a comment context as JSPWiki
+ auto-generates the change-note for comments. Also added localization in Comment.jsp
+ Added new resource to CoreResources.properties.
+
+ comment.by=Comment by {0}
+
+ * [JSPWIKI-329] Pagination links on the version history were still not correct
+ when number of version equals a multiple of 20. Oops.
+
+ * [JSPWIKI-309] Various updates of the OrderedList skin, including section editing.
+
+
+2008-08-23 Dirk Frederickx <di...@gmail.com>
+
* 2.7.0-alpha-24
* [JSPWIKI-333] Language selection/deselection was not working correctly
Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResources.properties?rev=688400&r1=688399&r2=688400&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/CoreResources.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/CoreResources.properties Sat Aug 23 12:19:44 2008
@@ -7,6 +7,10 @@
# ' = ' Note that ' is NOT HTML, and does not necessarily work in all browsers.
+
+# Comment.jsp
+comment.by=Comment by {0}
+
#
# Time/date formatting. Some plugins might be using some specific formats,
# but you are free to use these times and dates.
Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources_nl.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResources_nl.properties?rev=688400&r1=688399&r2=688400&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/CoreResources_nl.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/CoreResources_nl.properties Sat Aug 23 12:19:44 2008
@@ -6,6 +6,9 @@
# " = "
# ' = ' Note that ' is NOT HTML, and does not necessarily work in all browsers.
+# Comment.jsp
+comment.by=Reactie van {0}
+
# Common things
# Date format used across JSPWiki. Please see "SimpleDateFormat" on information
Modified: incubator/jspwiki/trunk/etc/ini/default_jspwiki.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/ini/default_jspwiki.properties?rev=688400&r1=688399&r2=688400&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/ini/default_jspwiki.properties (original)
+++ incubator/jspwiki/trunk/etc/ini/default_jspwiki.properties Sat Aug 23 12:19:44 2008
@@ -4,18 +4,38 @@
#
#
-# Preferences for default template
+# User Preferences for default template
#
+
+# Set the name of the skin.
+# Default value is PlainVanilla
jspwiki.defaultprefs.template.skinname =PlainVanilla
+
+# Set the format of dates
jspwiki.defaultprefs.template.dateformat =dd-MMM-yyyy HH:mm
-# by default, the default timezone is read from the server
+
+# Set the timezone of the display date/times
+# By default, the timezone is read from the server
# jspwiki.defaultprefs.template.timezone =GMT+01:00
+
+# Set position of the favorites menu (aka left menu)
+# The value determines the css-class used to change the position of the #favorites block
+# Possible values: fav-left or fav-right
+# Default value is fav-left
jspwiki.defaultprefs.template.orientation =fav-left
+
+# Set editor type : plain, WikiWizard, FCK
jspwiki.defaultprefs.template.editor =plain
-# default language
-# by default, the default language is the one from the client browser
+
+# Set section editing on/off : allow editing of page sections
+# Note: currently this is only compatible with the plain editor
+#jspwiki.defaultprefs.template.sectionediting =on
+
+# Set the language
+# By default, the language is read from the client browser http request
# jspwiki.defaultprefs.template.language =en
+# List of selectable timeformats
jspwiki.defaultprefs.timeformat.01=d/MM
jspwiki.defaultprefs.timeformat.02=d/MM/yy
jspwiki.defaultprefs.timeformat.03=d/MM/yyyy
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=688400&r1=688399&r2=688400&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java Sat Aug 23 12:19:44 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/com/ecyrd/jspwiki/preferences/Preferences.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/preferences/Preferences.java?rev=688400&r1=688399&r2=688400&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/preferences/Preferences.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/preferences/Preferences.java Sat Aug 23 12:19:44 2008
@@ -112,6 +112,9 @@
prefs.put("Language", TextUtil.getStringProperty( props, "jspwiki.defaultprefs.template.language",
getLocale( ctx ).toString() ) );
+ prefs.put("SectionEditing", TextUtil.getStringProperty( props, "jspwiki.defaultprefs.template.sectionediting",
+ "" ) );
+
// FIXME: "editor" property does not get registered, may be related with http://bugs.jspwiki.org/show_bug.cgi?id=117
// disabling it until knowing why it's happening
// FIXME: editormanager reads jspwiki.editor -- which of both properties should continue
Modified: incubator/jspwiki/trunk/src/webdocs/Comment.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Comment.jsp?rev=688400&r1=688399&r2=688400&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Comment.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Comment.jsp Sat Aug 23 12:19:44 2008
@@ -132,11 +132,8 @@
modifiedPage.setAuthor( storedUser );
- if( changenote == null ) changenote = (String) session.getAttribute("changenote");
-
- session.removeAttribute("changenote");
-
- modifiedPage.setAttribute( WikiPage.CHANGENOTE, "Comment by "+storedUser );
+ Object[] args = { storedUser };
+ modifiedPage.setAttribute( WikiPage.CHANGENOTE, java.text.MessageFormat.format( rb.getString("comment.by"), args ) );
//
// Build comment part
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=688400&r1=688399&r2=688400&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-common.js (original)
+++ incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-common.js Sat Aug 23 12:19:44 2008
@@ -281,21 +281,6 @@
.replace(/[^A-Za-z0-9()&+,-=._$ ]/g, '');
},
- savePrefs: function(){
- var prefs = {
- 'prefSkin':'SkinName',
- 'prefTimeZone':'TimeZone',
- 'prefTimeFormat':'DateFormat',
- 'prefOrientation':'Orientation',
- 'editor':'editor',
- 'prefLanguage':'Language',
- 'prefSectionEditing':'SectionEditing'
- };
- for(var el in prefs){
- if($(el)) this.prefs.set(prefs[el],$(el).getValue());
- };
- },
-
changeOrientation: function(){
var fav = $('prefOrientation').getValue();
$('wikibody')
@@ -402,6 +387,7 @@
ee = new Element('span',{'class':'editsection'}).adopt(aa);
$$('#pagecontent *[id^=section]').each(function(el,i){
+ if(el.id=='section-TOC') return;
aa.set({'href':url+i});
el.adopt(ee.clone());
});
Modified: incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-commonstyles.js
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-commonstyles.js?rev=688400&r1=688399&r2=688400&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-commonstyles.js (original)
+++ incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-commonstyles.js Sat Aug 23 12:19:44 2008
@@ -131,15 +131,15 @@
$ES('.accordion, .tabbedAccordion, .leftAccordion, .rightAccordion',page).each( function(tt){
- var toggles=[], contents=[], togglemenu=false;
+ var toggles=[], contents=[], menu=false;
if(tt.hasClass('tabbedAccordion')){
- togglemenu = new Element('div',{'class':'togglemenu'}).injectBefore(tt);
+ menu = new Element('div',{'class':'menu'}).injectBefore(tt);
}
else if(tt.hasClass('leftAccordion')){
- togglemenu = new Element('div',{'class':'sidemenu left'}).injectBefore(tt);
+ menu = new Element('div',{'class':'sidemenu left'}).injectBefore(tt);
}
else if(tt.hasClass('rightAccordion')){
- togglemenu = new Element('div',{'class':'sidemenu right'}).injectBefore(tt);
+ menu = new Element('div',{'class':'sidemenu right'}).injectBefore(tt);
}
tt.getChildren().each(function(tab) {
@@ -150,17 +150,15 @@
var title = tab.className.substr(4).deCamelize(),
t = toggle.clone().appendText(title);
- if(togglemenu) {
- toggles.push(t.inject(togglemenu));
- } else {
- toggles.push(t.adopt(bullet.clone()).injectBefore(tab));
- }
+ menu ? t.inject(menu) : bullet.clone().injectTop(t.injectBefore(tab));
+
+ toggles.push(t);
contents.push(tab.addClass('tab'));
});
new Accordion(toggles, contents, {
height: true,
- alwaysHide: !togglemenu,
+ alwaysHide: !menu,
onComplete: function(){
var el = $(this.elements[this.previous]);
if (el.offsetHeight > 0) el.setStyle('height', 'auto');
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=688400&r1=688399&r2=688400&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-edit.js (original)
+++ incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-edit.js Sat Aug 23 12:19:44 2008
@@ -166,22 +166,6 @@
Wiki.onPageLoad(); //Wiki.onpageload should always run first, but seems not guaranteed on ie so let's do this for sure
- this.textarea = $('editorarea');
- if(!this.textarea || !this.textarea.visible) return;
-
- /* Duplicate the textarea into a main and work area.
- The workarea is used for actual editing.
- The mainarea reflects at all times the whole document
- */
- var m = this.mainarea = this.textarea;
- this.textarea = m.clone()
- .removeProperty('id')
- .removeProperty('name')
- .injectBefore( m.hide() );
-
- //this.ta = new TextArea( this.textarea );
- this.ta = TextArea.initialize( this.textarea );
-
window.onbeforeunload = (function(){
var ta = $('editorarea');
if(ta.value != ta.defaultValue) return "edit.areyousure".localize();
@@ -192,14 +176,32 @@
this.wikisnippets = WikiSnippets.getSnippets();
this.wikismartpairs = WikiSnippets.getSmartPairs();
- this.onPageLoadSectionToc();
+ this.textarea = $('editorarea');
+ if(!this.textarea || !this.textarea.visible) return;
+
+ /* section editing is only valid for edit context, not valid in the comment context */
+ if(Wiki.Context=='edit') {
+ /* Duplicate the textarea into a main and work area.
+ The workarea is used for actual editing.
+ The mainarea reflects at all times the whole document
+ */
+ var m = this.mainarea = this.textarea;
+ this.textarea = m.clone()
+ .removeProperty('id')
+ .removeProperty('name')
+ .injectBefore( m.hide() );
+
+ //this.ta = new TextArea( this.textarea );
+ this.ta = TextArea.initialize( this.textarea );
+ this.onPageLoadSectionToc();
+ }
+
this.onPageLoadResizeTextarea();
this.onPageLoadToolbar();
this.onPageLoadPostEditor();
this.onPageLoadPreview();
- /* add textarea suggestion events */
this.textarea
.addEvent('click',this.getSuggestions.bind(this))
.addEvent('keyup',this.getSuggestions.bind(this))
Modified: incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-prefs.js
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-prefs.js?rev=688400&r1=688399&r2=688400&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-prefs.js (original)
+++ incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-prefs.js Sat Aug 23 12:19:44 2008
@@ -36,7 +36,22 @@
}) ) return "prefs.areyousure".localize();
}).bind(this);
- }
+ },
+
+ savePrefs: function(){
+ var prefs = {
+ 'prefSkin':'SkinName',
+ 'prefTimeZone':'TimeZone',
+ 'prefTimeFormat':'DateFormat',
+ 'prefOrientation':'Orientation',
+ 'editor':'editor',
+ 'prefLanguage':'Language',
+ 'prefSectionEditing':'SectionEditing'
+ };
+ for(var el in prefs){
+ if($(el)) Wiki.prefs.set(prefs[el],$(el).getValue());
+ };
+ }
}
window.addEvent('load', WikiPreferences.onPageLoad.bind(WikiPreferences) );
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/InfoContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/InfoContent.jsp?rev=688400&r1=688399&r2=688400&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/InfoContent.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/InfoContent.jsp Sat Aug 23 12:19:44 2008
@@ -34,12 +34,11 @@
int pagesize = 20;
int startitem = itemcount;
- if( startitem == pagesize ) startitem = 0;
String parm_start = (String)request.getParameter( "start" );
- if( parm_start != null ) startitem = Integer.parseInt( parm_start ) ;
- /*round to start of a pagination block */
- if( startitem > -1 ) startitem = ( (startitem/pagesize) * pagesize );
+ if( parm_start != null ) startitem = Integer.parseInt( parm_start )+1 ;
+ /*round to start of a pagination block 1-20: startitem=0; block 21-30: startitem=20; ... */
+ if( startitem > -1 ) startitem = ((startitem-1)/pagesize) * pagesize;
%>
<wiki:PageExists>
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesTab.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesTab.jsp?rev=688400&r1=688399&r2=688400&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesTab.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesTab.jsp Sat Aug 23 12:19:44 2008
@@ -82,7 +82,7 @@
<td><label for="prefSectionEditing"><fmt:message key="prefs.user.sectionediting"/></label></td>
<td>
<input id="prefSectionEditing" name="prefSectionEditing"
- type="checkbox" <c:if test='${"on" == prefs["SectionEditing"]}'>checked="checked"</c:if> ></input>
+ type="checkbox" <c:if test='${"on" == prefs.SectionEditing}'>checked="checked"</c:if> ></input>
<fmt:message key="prefs.user.sectionediting.text"/>
</td>
</tr>
@@ -92,7 +92,7 @@
<td>
<select id="prefSkin" name="prefSkin">
<c:forEach items="${skins}" var="i">
- <option value='<c:out value='${i}'/>' <c:if test='${i == prefs["SkinName"]}'>selected="selected"</c:if> ><c:out value="${i}"/></option>
+ <option value='<c:out value='${i}'/>' <c:if test='${i == prefs.SkinName}'>selected="selected"</c:if> ><c:out value="${i}"/></option>
</c:forEach>
</select>
</td>
@@ -150,7 +150,7 @@
<td><label for="prefShowQuickLinks">Show Quick Links</label></td>
<td>
<input class='checkbox' type='checkbox' id='prefShowQuickLinks' name='prefShowQuickLinks'
- <c:if test='${"on" == prefs["SectionEdit"]}'>selected="selected"</c:if> />
+ <c:if test='${"on" == prefs.SectionEdit}'>selected="selected"</c:if> />
<span class="quicklinks"><span
class='quick2Top'><a href='#wikibody' title='Go to Top' >«</a></span><span
class='quick2Prev'><a href='#' title='Go to Previous Section'>‹</a></span><span
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/commonheader.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/commonheader.jsp?rev=688400&r1=688399&r2=688400&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/commonheader.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/commonheader.jsp Sat Aug 23 12:19:44 2008
@@ -95,15 +95,15 @@
<wiki:FeedDiscovery />
<%-- SKINS : extra stylesheets, extra javascript --%>
-<c:if test='${(!empty prefs["SkinName"]) && (prefs["SkinName"]!="PlainVanilla") }'>
+<c:if test='${(!empty prefs.SkinName) && (prefs.SkinName!="PlainVanilla") }'>
<link rel="stylesheet" type="text/css" media="screen, projection, print"
- href="<wiki:Link format='url' templatefile='skins/' /><c:out value='${prefs["SkinName"]}/skin.css' />" />
+ href="<wiki:Link format='url' templatefile='skins/' /><c:out value='${prefs.SkinName}/skin.css' />" />
<%--
<link rel="stylesheet" type="text/css" media="print"
- href="<wiki:Link format='url' templatefile='skins/' /><c:out value='${prefs["SkinName"]}/print_skin.css' />" />
+ href="<wiki:Link format='url' templatefile='skins/' /><c:out value='${prefs.SkinName}/print_skin.css' />" />
--%>
<script type="text/javascript"
- src="<wiki:Link format='url' templatefile='skins/' /><c:out value='${prefs["SkinName"]}/skin.js' />" ></script>
+ src="<wiki:Link format='url' templatefile='skins/' /><c:out value='${prefs.SkinName}/skin.js' />" ></script>
</c:if>
<wiki:Include page="localheader.jsp"/>
\ No newline at end of file
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=688400&r1=688399&r2=688400&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/editors/plain.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/editors/plain.jsp Sat Aug 23 12:19:44 2008
@@ -102,10 +102,12 @@
</tr>
</wiki:Permission>
--%>
+<wiki:CheckRequestContext context="edit">
<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>
</tr>
+</wiki:CheckRequestContext>
</table>
<div id="tools">
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=688400&r1=688399&r2=688400&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/jspwiki.css (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/jspwiki.css Sat Aug 23 12:19:44 2008
@@ -1081,12 +1081,6 @@
float:right;
background:url(images/arrup.gif) no-repeat 3px 3px;
}
-/* obsolete
-a.action.quick2bottom {
- background:url(images/arrdown.png) no-repeat 3px 3px;
- height:16px;
-}
-*/
/*********/
.popup ul {
Added: incubator/jspwiki/trunk/src/webdocs/templates/default/skins/OrderedList/images/arrdown.gif
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/skins/OrderedList/images/arrdown.gif?rev=688400&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/src/webdocs/templates/default/skins/OrderedList/images/arrdown.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/src/webdocs/templates/default/skins/OrderedList/images/bulletDown.gif
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/skins/OrderedList/images/bulletDown.gif?rev=688400&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/src/webdocs/templates/default/skins/OrderedList/images/bulletDown.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/src/webdocs/templates/default/skins/OrderedList/images/bulletUp.gif
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/skins/OrderedList/images/bulletUp.gif?rev=688400&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/src/webdocs/templates/default/skins/OrderedList/images/bulletUp.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/src/webdocs/templates/default/skins/OrderedList/images/smart-logo.gif
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/skins/OrderedList/images/smart-logo.gif?rev=688400&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/src/webdocs/templates/default/skins/OrderedList/images/smart-logo.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/src/webdocs/templates/default/skins/OrderedList/images/sortable.gif
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/skins/OrderedList/images/sortable.gif?rev=688400&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/src/webdocs/templates/default/skins/OrderedList/images/sortable.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/skins/OrderedList/skin.css
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/skins/OrderedList/skin.css?rev=688400&r1=688399&r2=688400&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/skins/OrderedList/skin.css (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/skins/OrderedList/skin.css Sat Aug 23 12:19:44 2008
@@ -101,6 +101,9 @@
a.feed {
border-bottom:none;
}
+a.toc:hover {
+ background:transparent;
+}
.calendar a, .breadcrumbs a, .applicationlogo a {
border-bottom:none !important;
}
@@ -114,11 +117,11 @@
height:43px;
width:110px;
margin:0;
- background-image:url(images/smart-logo.png) ;
+ background-image:url(images/smart-logo.gif) ;
background-position:0 0;
}
.applicationlogo a:hover {
- background-image:url(images/smart-logo.png) ;
+ background-image:url(images/smart-logo.gif) ;
}
/* +++ 270 Footnotes and small text +++ */
.small, .sub, .sup {
@@ -199,6 +202,19 @@
xxbackground-color:#ffff99;
xxcolor:#grey;
}
+#toctoc label {
+ color:#c7ff70;
+}
+#toctoc ul {
+ border-color:#fc3;
+ background:#ffff99;
+}
+#toctoc a {
+ color:black;
+}
+#toctoc a.action:hover, #toctoc .cursor {
+ background-color:#fc3 !important;
+}
/* +++ 440 Favorites +++ */
.userbox {
@@ -248,7 +264,10 @@
background:#3f464a;
color:#c7ff70;
}
-.pagination a:hover {
+.pagination a {
+ border:none;
+}
+.pagination .cursor, .pagination a:hover {
background-color:#c7ff70;
color:black;
}
@@ -276,14 +295,7 @@
border:none;
}
a.action.more, a.action.sectiontoc {
- background:#3f464a url(images/arrdown.png) 95% center no-repeat;*/
-}
-
-a.action.quick2top {
- background:url(images/arrup.png) no-repeat center;
-}
-a.action.quick2bottom {
- background:url(images/arrdown.png) no-repeat center;
+ background:#3f464a url(images/arrdown.gif) 95% center no-repeat;*/
}
a.tool {
@@ -357,9 +369,6 @@
.spin {
background:url(images/spin.gif) no-repeat;
}
-#searchSubmit {
- xxbackground:url(images/search.png) 0 center no-repeat;
-}
#header a:link, #header a:visited, #recentSearches div {
color:#c7ff70;
}
@@ -439,6 +448,14 @@
.tabmenu {
padding:2px 10px;
}
+/* ie6 and lower */
+* html .tabmenu {
+ border:none;
+}
+/*ie7 hack */
+*:first-child+html .tabmenu {
+ border:none;
+}
.tabmenu a {
padding:4px 8px;
border:1px solid #282c2f;
@@ -465,7 +482,7 @@
background:#303538;
color:#c7ff70;
}
-.accordion .toggle:hover, .togglemenu .toggle:hover {
+.accordion .toggle:hover, .togglemenu .toggle:hover, .sidemenu .toggle:hover {
background:#202326;
}
.togglemenu .toggle {
@@ -479,6 +496,18 @@
border-bottom:1px solid #3f464a;
color:white;
}
+.leftAccordion .tab, .rightAccordion .tab {
+ border-color:#3f464a !important;
+}
+.sidemenu .toggle {
+ background:#282c2f;
+ border:1px solid #3f464a;
+ color:#c7ff70;
+}
+.sidemenu .toggle.active {
+ color:#c7ff70;
+}
+
/* +++ 915 Tips +++ */
.tip-anchor {
border-bottom:2px solid #fc3;
@@ -540,14 +569,18 @@
.sortable .sortDescending {
padding:0 1.25em;
background-color:inherit;
- background-repeat:no-repeat;
background-position:0.25em 50%;
}
+.sortable .sort {
+ background-image:url(images/sortable.gif);
+}
.sortable .sortAscending {
- background-image:url(images/bulletDown.png);
+ background-image:url(images/bulletDown.gif);
+ background-position:0.25em 50%;
}
.sortable .sortDescending {
- background-image:url(images/bulletUp.png);
+ background-image:url(images/bulletUp.gif);
+ background-position:0.25em 50%;
}
/* +++ 940 Quick Section Links +++ */
a.slimbox {
@@ -565,7 +598,7 @@
background-color:#202326;
}
#lbImage, #lbBottom {
- border:10px solid #202326;
+ border-color:#202326;
}
.categoryLink:link, .categoryLink:active, .categoryLink:visited {
@@ -599,8 +632,3 @@
font-weight:bold;
border-bottom:2px solid #c7ff70;
}
-#xspin {
- background:url(images/throbber.gif) no-repeat;
- width:32px;
- height:32px;
-}
\ No newline at end of file