Author: ajaquith
Date: Sun Nov 30 13:32:46 2008
New Revision: 721901
URL: http://svn.apache.org/viewvc?rev=721901&view=rev
Log:
Partial merge with trunk...
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/admin/Admin.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/admin/SecurityConfig.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/scripts/jspwiki-common.js
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/AJAXPreview.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/AJAXSearch.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/EditGroupContent.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/GroupContent.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/GroupTab.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/jspwiki.css
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/admin/Admin.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/admin/Admin.jsp?rev=721901&r1=721900&r2=721901&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/admin/Admin.jsp
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/admin/Admin.jsp
Sun Nov 30 13:32:46 2008
@@ -1,4 +1,5 @@
-<%@ page import="org.apache.log4j.*" %>
+<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
+<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
<%@ page import="com.ecyrd.jspwiki.*" %>
<%@ page import="com.ecyrd.jspwiki.ui.admin.*" %>
<[EMAIL PROTECTED] import="com.ecyrd.jspwiki.ui.TemplateManager"%>
@@ -6,7 +7,7 @@
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
<%!
- Logger log = Logger.getLogger("JSPWiki");
+ Logger log = LoggerFactory.getLogger("JSPWiki");
%>
<%
String bean = request.getParameter("bean");
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/admin/SecurityConfig.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/admin/SecurityConfig.jsp?rev=721901&r1=721900&r2=721901&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/admin/SecurityConfig.jsp
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/admin/SecurityConfig.jsp
Sun Nov 30 13:32:46 2008
@@ -1,6 +1,7 @@
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
<%@ page import="java.security.Principal" %>
-<%@ page import="org.apache.log4j.*" %>
+<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
+<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
<%@ page import="com.ecyrd.jspwiki.*" %>
<%@ page import="com.ecyrd.jspwiki.auth.*" %>
<%@ page errorPage="/Error.jsp" %>
@@ -9,7 +10,7 @@
{
wiki = WikiEngine.getInstance( getServletConfig() );
}
- Logger log = Logger.getLogger("JSPWiki");
+ Logger log = LoggerFactory.getLogger("JSPWiki");
WikiEngine wiki;
SecurityVerifier verifier;
%>
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/scripts/jspwiki-common.js
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/scripts/jspwiki-common.js?rev=721901&r1=721900&r2=721901&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/scripts/jspwiki-common.js
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/scripts/jspwiki-common.js
Sun Nov 30 13:32:46 2008
@@ -250,9 +250,16 @@
this.makeMenuFx('morebutton', 'morepopup');
this.addEditLinks();
- var p = $('page'); if(p) this.renderPage(p, Wiki.PageName);
- var f = $('favorites'); if(f) this.renderPage(f, "Favorites");
+ var p = $('page'),
+ f = $('favorites');
+
+ if(p) this.renderPage(p, Wiki.PageName);
+ if(f) this.renderPage(f, "Favorites");
+
+ this.addCollapsableFavs();
},
+
+
/* show popup alert, which allows any html msg to be displayed */
alert: function(msg){
return alert(msg); //standard js
@@ -307,7 +314,6 @@
$('wikibody')
.removeClass('fav-left').removeClass('fav-right')
.addClass(fav);
- //$('collapseFavs').fireEvent('click').fireEvent('click');
//refresh sliding favorites
},
/* make hover menu with fade effect */
@@ -354,6 +360,8 @@
TabbedSection.click.apply($('menu-'+el.id));
} else if( el.hasClass('tab') ){
/* accordion -- need to find accordion toggle
object */
+ el.fireEvent('onShow');
+
} else if( el.hasClass('collapsebody') ){
/* collapsible box -- need to find the toggle
button */
} else if(!el.visible() ){
@@ -389,20 +397,51 @@
return Wiki.submitOnce(form);
},
+ addCollapsableFavs: function(){
+
+ var body = $('wikibody'),
+ $pref = 'fav-slide',
+ pref = Wiki.prefs.get('ToggleFav'),
+ renderBullet = function(el){
+ if(el.hasClass('collapseOpen')){
+
el.setProperty('title','favorites.show'.localize()).setHTML('-'); /* » */
+ } else {
+
el.setProperty('title','favorites.hide'.localize()).setHTML('+'); /* « */
+ }
+ };
+
+ //FIXME: cookie is not loaded into server Preferences
automatically, so body class not yet set
+ //Should better move server side, for faster rendering.
wf-stripes
+ (pref==$pref) ? body.addClass($pref) : body.removeClass($pref);
+
+ renderBullet( new Element('a', {
+ 'id':'favoriteToggle',
+ 'class': (pref==$pref) ? 'collapseOpen':'collapseClose',
+ 'events': {
+ 'click': function(){
+
this.toggleClass('collapseOpen').toggleClass('collapseClose');
+ body.toggleClass($pref);
+ renderBullet(this);
+ Wiki.prefs.set('ToggleFav',
body.hasClass($pref) ? $pref:'' );
+
+ }
+ }
+ }).injectTop('page') );
+
+ },
+
addEditLinks: function(){
if( $("previewcontent") || !this.PermissionEdit ||
this.prefs.get('SectionEditing') != 'on') return;
var 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),
+ var aa = new
Element('a',{'class':'editsection'}).setHTML('quick.edit'.localize()),
i = 0;
$$('#pagecontent *[id^=section]').each(function(el){
if(el.id=='section-TOC') return;
- aa.set({'href':url + i++ });
- el.adopt(ee.clone());
+ el.adopt(aa.set({'href':url + i++ }).clone());
});
},
@@ -452,7 +491,7 @@
'href':href,
'rel':group+' '+rel,
'title':el.alt||el.getText()
- }).injectBefore(el);
+ }).injectAfter(el);//.injectBefore(el);
if(el.src) el.replaceWith(new Element('a',{
'class':'attachment',
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/AJAXPreview.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/AJAXPreview.jsp?rev=721901&r1=721900&r2=721901&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/AJAXPreview.jsp
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/AJAXPreview.jsp
Sun Nov 30 13:32:46 2008
@@ -1,6 +1,7 @@
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
<%@ page language="java" pageEncoding="UTF-8"%>
-<%@ page import="org.apache.log4j.*" %>
+<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
+<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
<%@ page import="com.ecyrd.jspwiki.*" %>
<%@ page import="com.ecyrd.jspwiki.auth.*" %>
<%@ page import="com.ecyrd.jspwiki.auth.permissions.*" %>
@@ -11,7 +12,7 @@
{
wiki = WikiEngine.getInstance( getServletConfig() );
}
- Logger log = Logger.getLogger("JSPWikiSearch");
+ Logger log = LoggerFactory.getLogger("JSPWikiSearch");
WikiEngine wiki;
%>
<%
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/AJAXSearch.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/AJAXSearch.jsp?rev=721901&r1=721900&r2=721901&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/AJAXSearch.jsp
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/AJAXSearch.jsp
Sun Nov 30 13:32:46 2008
@@ -1,6 +1,7 @@
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
<%@ page language="java" pageEncoding="UTF-8"%>
-<%@ page import="org.apache.log4j.*" %>
+<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
+<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
<%@ page import="com.ecyrd.jspwiki.*" %>
<%@ page import="com.ecyrd.jspwiki.ui.*" %>
<%@ page import="java.util.*" %>
@@ -19,7 +20,7 @@
{
wiki = WikiEngine.getInstance( getServletConfig() );
}
- Logger log = Logger.getLogger("JSPWikiSearch");
+ Logger log = LoggerFactory.getLogger("JSPWikiSearch");
WikiEngine wiki;
%>
<%
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/EditGroupContent.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/EditGroupContent.jsp?rev=721901&r1=721900&r2=721901&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/EditGroupContent.jsp
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/EditGroupContent.jsp
Sun Nov 30 13:32:46 2008
@@ -5,13 +5,14 @@
<%@ page import="com.ecyrd.jspwiki.auth.PrincipalComparator" %>
<%@ page import="com.ecyrd.jspwiki.auth.authorize.Group" %>
<%@ page import="com.ecyrd.jspwiki.*" %>
-<%@ page import="org.apache.log4j.*" %>
+<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
+<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
<%@ page errorPage="/Error.jsp" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%!
- Logger log = Logger.getLogger("JSPWiki");
+ Logger log = LoggerFactory.getLogger("JSPWiki");
%>
<%
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/GroupContent.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/GroupContent.jsp?rev=721901&r1=721900&r2=721901&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/GroupContent.jsp
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/GroupContent.jsp
Sun Nov 30 13:32:46 2008
@@ -7,13 +7,14 @@
<%@ page import="com.ecyrd.jspwiki.auth.authorize.Group" %>
<%@ page import="com.ecyrd.jspwiki.auth.authorize.GroupManager" %>
<%@ page import="com.ecyrd.jspwiki.preferences.Preferences" %>
-<%@ page import="org.apache.log4j.*" %>
+<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
+<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
<%@ page errorPage="/Error.jsp" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%!
- Logger log = Logger.getLogger("JSPWiki");
+ Logger log = LoggerFactory.getLogger("JSPWiki");
%>
<%
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/GroupTab.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/GroupTab.jsp?rev=721901&r1=721900&r2=721901&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/GroupTab.jsp
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/GroupTab.jsp
Sun Nov 30 13:32:46 2008
@@ -8,7 +8,8 @@
<%@ page import="com.ecyrd.jspwiki.auth.authorize.Group" %>
<%@ page import="com.ecyrd.jspwiki.auth.authorize.GroupManager" %>
<%@ page import="com.ecyrd.jspwiki.preferences.Preferences" %>
-<%@ page import="org.apache.log4j.*" %>
+<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
+<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
<%@ page errorPage="/Error.jsp" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/jspwiki.css
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/jspwiki.css?rev=721901&r1=721900&r2=721901&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/jspwiki.css
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/jspwiki.css
Sun Nov 30 13:32:46 2008
@@ -179,25 +179,29 @@
line-height:1.2;
}
h2 { font-size: 150%; }
-h2 .editsection, h2 .hashlink { font-size: 67%; padding-left:1em;}
+h2 .editsection, h2 .hashlink { font-size: 67%; }
h3 { font-size: 132%; }
-h3 .editsection, h3 .hashlink { font-size: 76%; padding-left:1em;}
+h3 .editsection, h3 .hashlink { font-size: 76%; }
h4 { font-size: 116%; }
-h4 .editsection, h4 .hashlink { font-size: 86%; padding-left:1em;}
-.editsection {
+h4 .editsection, h4 .hashlink { font-size: 86%; }
+a.editsection, a.hashlink {
font-weight:normal;
line-height:1.2;
-}
-.editsection a {
padding:0.25em;
text-decoration:none;
- color:grey; /*transparent*/
- /*background:url('images/pencil.png') no-repeat center;*/
+ color:grey;
}
-.editsection a:hover {
+a.editsection:hover, a.hashlink:hover {
background-color:#eee;
- color:blue;
+ 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 */
}
+
b, i {
color:inherit;
}
@@ -348,17 +352,7 @@
a.infolink img {
display:none;
}*/
-/* hashlink */
-a.hashlink {
- color:transparent;
- line-height:1.2;
- padding:0.25em;
- text-decoration:none;
-}
-a.hashlink:hover {
- background-color:#eee;
- color:blue;
-}
+
/* +++ 260 Image styles +++ */
img {
border:none;
@@ -818,6 +812,44 @@
/* +++ 440 Favorites +++ */
+#favoriteToggle {
+ float:left;
+ margin-bottom:-1px;
+ padding:0.25em 0.5em;
+ font:inherit;
+ font-weight:bold;
+ height:auto; /* undo collapseOpen font settings */
+ overflow:hidden;
+ width:16px;
+ text-indent:2em;
+}
+#favoriteToggle.collapseOpen {
+ background:url(images/favopen.gif) no-repeat center;
+}
+#favoriteToggle.collapseClose {
+ background:url(images/favclose.gif) no-repeat center;
+}
+/*
+#favoriteToggle.collapseOpen {
+ background:url(images/layout_none.gif) no-repeat center;
+}
+#wikibody.fav-right #favoriteToggle.collapseClose {
+ background:url(images/layout_right.gif) no-repeat center;
+}
+#wikibody.fav-left #favoriteToggle.collapseClose {
+ background:url(images/layout_left.gif) no-repeat center;
+}
+#wikibody.fav-left #favoriteToggle.collapseOpen:hover {
+ background:#eee url(images/layout_left.gif) no-repeat center;
+}
+#wikibody.fav-right #favoriteToggle.collapseOpen:hover {
+ background:#eee url(images/layout_right.gif) no-repeat center;
+}
+#favoriteToggle.collapseClose:hover {
+ background:#eee url(images/layout_none.gif) no-repeat center !important;
+}
+*/
+
/* fixme
#collapseFavs {
position:absolute;
@@ -1710,14 +1742,16 @@
a.slimbox {
font-weight:bold;
font-size:1.3em;
- padding:0 0.2em;
+ padding:0 0.25em;
+ color:transparent;
+ background: url(images/slimbox.gif) no-repeat center;
}
a.slimbox:visited, a.slimbox:active, a.slimbox:link {
text-decoration:none;
border:none;
}
a.slimbox:hover {
- background:#eee;
+ background-color:#eee;
}
#lbOverlay {
