Author: ajaquith
Date: Tue Aug 12 08:47:28 2008
New Revision: 685201
URL: http://svn.apache.org/viewvc?rev=685201&view=rev
Log:
Merged STRIPES_BRANCH with trunk revision 685086.
Added:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/images/attachment_small.gif
(with props)
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/images/favicon.ico
(with props)
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/images/jspwiki-icons.png
(with props)
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/images/jspwiki-strip.gif
(with props)
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/scripts/jspwiki-commonstyles.js
Removed:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Vote.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/applets/
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/scripts/fckeditor/
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/scripts/json-rpc/
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/scripts/wikiwizard-jspwiki.js
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Captcha.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Comment.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Install.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/LostPassword.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/UserPreferences.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/fckconfig.js
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/scripts/fckstyles.xml
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/scripts/fcktemplates.xml
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/scripts/jspwiki-common.js
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/scripts/jspwiki-edit.js
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/scripts/jspwiki-prefs.js
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/scripts/prettify.js
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Captcha.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Captcha.jsp?rev=685201&r1=685200&r2=685201&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Captcha.jsp
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Captcha.jsp
Tue Aug 12 08:47:28 2008
@@ -6,14 +6,13 @@
<%@ page import="com.ecyrd.jspwiki.ui.EditorManager" %>
<%@ page import="org.apache.commons.lang.time.StopWatch" %>
<%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
-<fmt:setBundle basename="CoreResources"/>
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
+<fmt:setBundle basename="CoreResources"/>
<%!
Logger log = Logger.getLogger("JSPWiki");
%>
-
<%
WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
// Create wiki context and check for authorization
@@ -67,22 +66,22 @@
alert('<fmt:message key="captcha.js.humancheckcomplete.alert" />');
return false;
}
- }
-
- function i18nAsirra() {
- document.getElementById("asirra_InstructionsTextId").innerHTML =
"<fmt:message key="captcha.asirra.please.select" />";
- for ( var i = 0; i < 12; i++)
- {
- document.getElementById("asirra_AdoptMeDiv" +
i).getElementsByTagName("a")[0].innerHTML= '<font size="-1">' + '<fmt:message
key="captcha.asirra.adopt.me" />' + '</font>' ;
- }
-
document.getElementById("asirra_KnobsTable").getElementsByTagName("a")[0].title="<fmt:message
key="captcha.asirra.a.get.challenge" />";
-
document.getElementById("asirra_KnobsTable").getElementsByTagName("a")[1].title="<fmt:message
key="captcha.asirra.a.whatsthis" />";
- document.getElementById("mainForm").style.display="block"; // show form
when i18n is done
+ }
+
+ function i18nAsirra() {
+ document.getElementById("asirra_InstructionsTextId").innerHTML =
"<fmt:message key="captcha.asirra.please.select" />";
+ for ( var i = 0; i < 12; i++)
+ {
+ document.getElementById("asirra_AdoptMeDiv" +
i).getElementsByTagName("a")[0].innerHTML= '<font size="-1">' + '<fmt:message
key="captcha.asirra.adopt.me" />' + '</font>' ;
+ }
+
document.getElementById("asirra_KnobsTable").getElementsByTagName("a")[0].title="<fmt:message
key="captcha.asirra.a.get.challenge" />";
+
document.getElementById("asirra_KnobsTable").getElementsByTagName("a")[1].title="<fmt:message
key="captcha.asirra.a.whatsthis" />";
+ document.getElementById("mainForm").style.display="block"; // show form
when i18n is done
}
</script>
</head>
<body onload="i18nAsirra()">
-<div style="margin:8px">
+<div style="margin: 8px">
<p><fmt:message key="captcha.description" /></p>
<form action="<wiki:Link jsp='Captcha.jsp' format='url'/>" method="post"
id="mainForm" style="display: none;">
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Comment.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Comment.jsp?rev=685201&r1=685200&r2=685201&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Comment.jsp
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Comment.jsp
Tue Aug 12 08:47:28 2008
@@ -6,8 +6,10 @@
<%@ page import="com.ecyrd.jspwiki.htmltowiki.HtmlStringToWikiTranslator" %>
<%@ page import="com.ecyrd.jspwiki.ui.EditorManager" %>
<%@ page import="com.ecyrd.jspwiki.util.HttpUtil" %>
+<%@ page import="com.ecyrd.jspwiki.preferences.Preferences" %>
<%@ page import="com.ecyrd.jspwiki.auth.login.CookieAssertionLoginModule" %>
<%@ page import="com.ecyrd.jspwiki.workflow.DecisionRequiredException" %>
+<%@ page import="com.ecyrd.jspwiki.preferences.Preferences.TimeFormat" %>
<%@ page errorPage="/Error.jsp" %>
<%@ page import="javax.servlet.http.Cookie" %>
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
@@ -178,9 +180,12 @@
}
Calendar cal = Calendar.getInstance();
- SimpleDateFormat fmt = new SimpleDateFormat("dd-MMM-yyyy");
+ SimpleDateFormat fmt = Preferences.getDateFormat( wikiContext ,
TimeFormat.DATETIME);
pageText.append("\n\n--"+signature+", "+fmt.format(cal.getTime()));
+
+ //SimpleDateFormat fmt = new SimpleDateFormat( "YYYY-MM-DDThh:mm"
); //ISO-8601 format
+ //pageText.append("\n\n--"+signature+", [{Date
value='"+fmt.format(cal.getTime())+"' }]");
}
if( TextUtil.isPositive(remember) )
@@ -223,19 +228,7 @@
else if( preview != null )
{
log.debug("Previewing "+pagereq);
-
- String commentText = EditorManager.getEditedText(pageContext);
-
- //
- // WYSIWYG editor sends us its greetings
- //
- String htmlText = findParam( pageContext, "htmlPageText" );
- if( htmlText != null && cancel == null )
- {
- commentText = new
HtmlStringToWikiTranslator().translate(htmlText,wikiContext);
- }
-
- session.setAttribute(EditorManager.REQ_EDITEDTEXT, commentText);
+ session.setAttribute(EditorManager.REQ_EDITEDTEXT,
EditorManager.getEditedText(pageContext));
response.sendRedirect( TextUtil.replaceString(
wiki.getURL(WikiContext.PREVIEW, pagereq, "action=comment", false),"&","&")
);
return;
}
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Install.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Install.jsp?rev=685201&r1=685200&r2=685201&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Install.jsp
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Install.jsp
Tue Aug 12 08:47:28 2008
@@ -3,10 +3,10 @@
<%@ page import="com.ecyrd.jspwiki.*" %>
<%@ page import="com.ecyrd.jspwiki.auth.AuthenticationManager" %>
<%@ page import="com.ecyrd.jspwiki.ui.Installer" %>
-<%@ page import="org.apache.log4j.*" %>
-<%@ page import="java.util.ResourceBundle" %>
-<%@ page import="java.text.MessageFormat" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
+<%@ page import="org.apache.log4j.*" %>
+<%@ page import="java.util.ResourceBundle" %>
+<%@ page import="java.text.MessageFormat" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<fmt:setBundle basename="CoreResources"/>
<%!
@@ -25,7 +25,7 @@
// Parse the existing properties
installer.parseProperties();
boolean validated = false;
-String password = null;
+String password = null;
ResourceBundle rb = wikiContext.getBundle("CoreResources");
// If user hit "submit" button, validate and install them
@@ -38,8 +38,8 @@
password = installer.createAdministrator();
if ( password != null )
{
- Object[] args = { Installer.ADMIN_ID, password,
Installer.ADMIN_GROUP };
- wikiSession.addMessage( Installer.INSTALL_INFO,
+ Object[] args = { Installer.ADMIN_ID, password,
Installer.ADMIN_GROUP };
+ wikiSession.addMessage( Installer.INSTALL_INFO,
MessageFormat.format( rb.getString(
"install.jsp.install.msg.rnd.pwd" ), args ) );
}
}
@@ -165,11 +165,12 @@
<fmt:message key="install.jsp.adv.settings.workdir.desc" />
</div>
</div>
-
+
+ <br /><br />
<div class="block">
<div class="instructions">
- <fmt:message key="install.jsp.instr.desc" >
- <fmt:param><%=installer.getPropertiesPath()%></fmt:param>
+ <fmt:message key="install.jsp.instr.desc" >
+ <fmt:param><%=installer.getPropertiesPath()%></fmt:param>
</fmt:message>
</div>
<input type="submit" name="submit" value="<fmt:message
key="install.jsp.instr.submit" />" />
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/LostPassword.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/LostPassword.jsp?rev=685201&r1=685200&r2=685201&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/LostPassword.jsp
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/LostPassword.jsp
Tue Aug 12 08:47:28 2008
@@ -1,142 +1,135 @@
-<%@ page import="org.apache.log4j.*" %>
-<%@ page import="com.ecyrd.jspwiki.*" %>
-<%@ page import="java.util.*" %>
-<%@ page import="java.text.*" %>
-<%@ page import="javax.mail.*" %>
-<%@ page import="com.ecyrd.jspwiki.auth.user.*" %>
-<%@ page import="com.ecyrd.jspwiki.auth.*" %>
-<%@ page import="com.ecyrd.jspwiki.util.*" %>
-<%@ page import="com.ecyrd.jspwiki.i18n.*" %>
-<%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
-<%@ page import="com.ecyrd.jspwiki.tags.WikiTagBase" %>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
-<%!
- Logger log = Logger.getLogger("JSPWiki");
+<%@ page import="org.apache.log4j.*"%>
+<%@ page import="com.ecyrd.jspwiki.*"%>
+<%@ page import="java.util.*"%>
+<%@ page import="java.text.*"%>
+<%@ page import="javax.mail.*"%>
+<%@ page import="com.ecyrd.jspwiki.auth.user.*"%>
+<%@ page import="com.ecyrd.jspwiki.auth.*"%>
+<%@ page import="com.ecyrd.jspwiki.util.*"%>
+<%@ page import="com.ecyrd.jspwiki.i18n.*"%>
+<%@ page errorPage="/Error.jsp"%>
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki"%>
+<%@ page import="com.ecyrd.jspwiki.tags.WikiTagBase"%>
+<%@ page import="javax.servlet.jsp.jstl.fmt.*"%>
+<%!Logger log = Logger.getLogger( "JSPWiki" );
String message = null;
- public boolean resetPassword(WikiEngine wiki, HttpServletRequest request,
ResourceBundle rb )
+
+ public boolean resetPassword( WikiEngine wiki, HttpServletRequest request,
ResourceBundle rb )
{
// Reset pw for account name
- String name = request.getParameter("name");
+ String name = request.getParameter( "name" );
UserDatabase userDatabase = wiki.getUserManager().getUserDatabase();
boolean success = false;
try
{
UserProfile profile = null;
-/*
-// This is disabled because it would otherwise be possible to DOS JSPWiki
instances
-// by requesting new passwords for all users. See
https://issues.apache.org/jira/browse/JSPWIKI-78
- try
- {
- profile = userDatabase.find(name);
- }
- catch (NoSuchPrincipalException e)
- {
- // Try email as well
- }
- */
+ /*
+ // This is disabled because it would otherwise be possible to DOS
JSPWiki instances
+ // by requesting new passwords for all users. See
https://issues.apache.org/jira/browse/JSPWIKI-78
+ try
+ {
+ profile = userDatabase.find(name);
+ }
+ catch (NoSuchPrincipalException e)
+ {
+ // Try email as well
+ }
+ */
if( profile == null )
{
- profile = userDatabase.findByEmail(name);
+ profile = userDatabase.findByEmail( name );
}
-
- String email = profile.getEmail();
- String randomPassword =
TextUtil.generateRandomPassword();
+ String email = profile.getEmail();
- // Try sending email first, as that is more likely to
fail.
+ String randomPassword = TextUtil.generateRandomPassword();
- Object[] args = { profile.getLoginName(),
- randomPassword,
-
wiki.getURLConstructor().makeURL(WikiContext.NONE, "Login.jsp", true, ""),
- wiki.getApplicationName()
- };
+ // Try sending email first, as that is more likely to fail.
- String mailMessage = MessageFormat.format(
rb.getString("lostpwd.newpassword.email"), args );
+ Object[] args = { profile.getLoginName(), randomPassword,
+ wiki.getURLConstructor().makeURL(
WikiContext.NONE, "Login.jsp", true, "" ), wiki.getApplicationName() };
+
+ String mailMessage = MessageFormat.format( rb.getString(
"lostpwd.newpassword.email" ), args );
Object[] args2 = { wiki.getApplicationName() };
- MailUtil.sendMessage( wiki,
- email,
- MessageFormat.format(
rb.getString("lostpwd.newpassword.subject"), args2),
- mailMessage );
-
- log.info("User "+email+" requested and received a new password.");
-
- // Mail succeeded. Now reset the password.
- // If this fails, we're kind of screwed, because we
already emailed.
- profile.setPassword(randomPassword);
- userDatabase.save(profile);
- userDatabase.commit();
- success = true;
+ MailUtil.sendMessage( wiki, email, MessageFormat.format(
rb.getString( "lostpwd.newpassword.subject" ), args2 ),
+ mailMessage );
+
+ log.info( "User " + email + " requested and received a new
password." );
+
+ // Mail succeeded. Now reset the password.
+ // If this fails, we're kind of screwed, because we already
emailed.
+ profile.setPassword( randomPassword );
+ userDatabase.save( profile );
+ userDatabase.commit();
+ success = true;
}
- catch (NoSuchPrincipalException e)
+ catch( NoSuchPrincipalException e )
{
Object[] args = { name };
- message = MessageFormat.format( rb.getString("lostpwd.nouser"),
args );
- log.info("Tried to reset password for non-existent user '" + name
+ "'");
+ message = MessageFormat.format( rb.getString( "lostpwd.nouser" ),
args );
+ log.info( "Tried to reset password for non-existent user '" + name
+ "'" );
}
- catch (SendFailedException e)
+ catch( SendFailedException e )
{
- message = rb.getString("lostpwd.nomail");
- log.error("Tried to reset password and got SendFailedException: "
+ e);
+ message = rb.getString( "lostpwd.nomail" );
+ log.error( "Tried to reset password and got SendFailedException: "
+ e );
}
- catch (AuthenticationFailedException e)
+ catch( AuthenticationFailedException e )
{
- message = rb.getString("lostpwd.nomail");
- log.error("Tried to reset password and got
AuthenticationFailedException: " + e);
+ message = rb.getString( "lostpwd.nomail" );
+ log.error( "Tried to reset password and got
AuthenticationFailedException: " + e );
}
- catch (Exception e)
+ catch( Exception e )
{
- message = rb.getString("lostpwd.nomail");
- log.error("Tried to reset password and got another exception: " +
e);
+ message = rb.getString( "lostpwd.nomail" );
+ log.error( "Tried to reset password and got another exception: " +
e );
}
return success;
- }
-%>
+ }%>
<%
WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
- //Create wiki context like in Login.jsp:
+ //Create wiki context like in Login.jsp:
//don't check for access permissions: if you have lost your password you
cannot login!
- WikiContext wikiContext = (WikiContext) pageContext.getAttribute(
WikiTagBase.ATTR_CONTEXT, PageContext.REQUEST_SCOPE );
+ WikiContext wikiContext = (WikiContext) pageContext.getAttribute(
WikiTagBase.ATTR_CONTEXT, PageContext.REQUEST_SCOPE );
- // If no context, it means we're using container auth. So, create one
anyway
- if( wikiContext == null )
- {
- wikiContext = wiki.createContext( request, WikiContext.LOGIN ); /*
reuse login context ! */
- pageContext.setAttribute( WikiTagBase.ATTR_CONTEXT,
- wikiContext,
- PageContext.REQUEST_SCOPE );
- }
+ // If no context, it means we're using container auth. So, create one
anyway
+ if( wikiContext == null )
+ {
+ wikiContext = wiki.createContext( request, WikiContext.LOGIN ); /*
reuse login context ! */
+ pageContext.setAttribute( WikiTagBase.ATTR_CONTEXT, wikiContext,
PageContext.REQUEST_SCOPE );
+ }
- ResourceBundle rb = wikiContext.getBundle("CoreResources");
+ ResourceBundle rb = wikiContext.getBundle( "CoreResources" );
WikiSession wikiSession = wikiContext.getWikiSession();
- String action = request.getParameter("action");
+ String action = request.getParameter( "action" );
boolean done = false;
- if ((action != null) && (action.equals("resetPassword"))) {
- if ( resetPassword( wiki, request, rb ) ) {
- done = true;
- wikiSession.addMessage( "resetpw",
rb.getString("lostpwd.emailed") );
- pageContext.setAttribute("passwordreset","done");
- }
- else // Error
- {
- wikiSession.addMessage( "resetpw", message);
- }
+ if( (action != null) && (action.equals( "resetPassword" )) )
+ {
+ if( resetPassword( wiki, request, rb ) )
+ {
+ done = true;
+ wikiSession.addMessage( "resetpwok", rb.getString(
"lostpwd.emailed" ) );
+ pageContext.setAttribute( "passwordreset", "done" );
+ }
+ else
+ // Error
+ {
+ wikiSession.addMessage( "resetpw", message );
+ }
}
- response.setContentType("text/html; charset="+wiki.getContentEncoding() );
+ response.setContentType( "text/html; charset=" + wiki.getContentEncoding()
);
response.setHeader( "Cache-control", "max-age=0" );
response.setDateHeader( "Expires", new Date().getTime() );
response.setDateHeader( "Last-Modified", new Date().getTime() );
- String contentPage = wiki.getTemplateManager().findJSP( pageContext,
-
wikiContext.getTemplate(),
- "ViewTemplate.jsp"
);
+ String contentPage = wiki.getTemplateManager().findJSP( pageContext,
wikiContext.getTemplate(), "ViewTemplate.jsp" );
%>
<wiki:Include page="<%=contentPage%>" />
\ No newline at end of file
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/UserPreferences.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/UserPreferences.jsp?rev=685201&r1=685200&r2=685201&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/UserPreferences.jsp
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/UserPreferences.jsp
Tue Aug 12 08:47:28 2008
@@ -10,6 +10,7 @@
<%@ page import="com.ecyrd.jspwiki.auth.user.UserProfile" %>
<%@ page import="com.ecyrd.jspwiki.workflow.DecisionRequiredException" %>
<%@ page import="com.ecyrd.jspwiki.ui.EditorManager" %>
+<%@ page import="com.ecyrd.jspwiki.ui.TemplateManager" %>
<%@ page import="com.ecyrd.jspwiki.preferences.*" %>
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
@@ -28,11 +29,14 @@
UserManager userMgr = wiki.getUserManager();
WikiSession wikiSession = wikiContext.getWikiSession();
+/* FIXME: Obsoslete
if( request.getParameter(EditorManager.PARA_EDITOR) != null )
{
String editor = request.getParameter(EditorManager.PARA_EDITOR);
session.setAttribute(EditorManager.PARA_EDITOR,editor);
}
+*/
+
// Are we saving the profile?
if( "saveProfile".equals(request.getParameter("action")) )
{
@@ -76,6 +80,7 @@
if( "setAssertedName".equals(request.getParameter("action")) )
{
Preferences.reloadPreferences(pageContext);
+
String assertedName = request.getParameter("assertedName");
CookieAssertionLoginModule.setUserCookie( response, assertedName );
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=685201&r1=685200&r2=685201&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
Tue Aug 12 08:47:28 2008
@@ -32,7 +32,7 @@
<link rel="stylesheet" media="screen, projection" type="text/css"
href="<wiki:Link format="url" templatefile="jspwiki.css"/>"/>
<wiki:IncludeResources type="stylesheet"/>
</head>
- <body class="view"><div id="wikibody">
+ <body><div id="wikibody">
<h1>Disabled</h1>
<p>JSPWiki SecurityConfig UI has been disabled. This page could
reveal important security
details about your configuration to a potential attacker, so it has
been turned off by
@@ -60,7 +60,7 @@
<link rel="stylesheet" media="screen, projection" type="text/css"
href="<wiki:Link format="url" templatefile="jspwiki.css"/>"/>
<wiki:IncludeResources type="stylesheet"/>
</head>
-<body class="view">
+<body>
<div id="wikibody">
<div id="page">
<div id="pagecontent">
@@ -123,42 +123,19 @@
<h3>JAAS Login Configuration</h3>
<!-- Notify users which JAAS configs we need to find -->
-<p>JSPWiki uses JAAS to define the authentication process. We need to be able
to locate a JAAS configuration file. The default location is
<code>WEB-INF/jspwiki.jaas</code>), and its location is specified by the
<code>java.security.auth.login.config</code> system property.</p>
+<p>JSPWiki wires up its own JAAS to define the authentication process, and
does not rely on the JRE configuration. By default, JSPWiki configures its JAAS
login stack to use the UserDatabaseLoginModule. You can specify a custom login
module by setting the <code>jspwiki.loginModule.class</code> property in
<code>jspwiki.properties</code>.</p>
<wiki:Messages div="information"
topic="<%=SecurityVerifier.INFO+"java.security.auth.login.config"%>"
prefix="Good news: "/>
<wiki:Messages div="warning"
topic="<%=SecurityVerifier.WARNING+"java.security.auth.login.config"%>"
prefix="We found some potential problems with your configuration: "/>
<wiki:Messages div="error"
topic="<%=SecurityVerifier.ERROR+"java.security.auth.login.config"%>"
prefix="We found some errors with your configuration: " />
-<!-- Let the admin know if something other than JSPWiki set the config
property first -->
-<%
- if ( verifier.isJaasConfiguredAtStartup() )
- {
-%>
- <div class="warning">Note: some other application set the JAAS
<code>java.security.auth.login.config</code> system property before JSPWiki
started up. It could have been done by a prior installation of JSPWiki, or
possibly by your web container's startup script. This is not necessary a bad
thing, but we thought you should be aware of it in case you are seeing behavior
you don't expect. You can ignore this message if we find the JAAS login
configurations (below).</div>
-<%
- }
- else
- {
-%>
- <div class="information">Note: this instance of JSPWiki set the system
property at startup.</div>
-<%
- }
-%>
-
<!-- Print JAAS configuration status -->
-<p>Inside the JAAS config file, we must be able to find two login
configurations: <code>JSPWiki-container</code> and
<code>JSPWiki-custom</code>.</p>
+<p>The JAAS login configuration is correctly configured if the
<code>jspwiki.loginModule.class</code> property specifies
+a class we can find on the classpath. This class must also be a LoginModule
implementation. We will check for both conditions.</p>
<wiki:Messages div="information" topic="<%=SecurityVerifier.INFO_JAAS%>"
prefix="Good news: "/>
<wiki:Messages div="warning" topic="<%=SecurityVerifier.WARNING_JAAS%>"
prefix="We found some potential problems with your configuration: "/>
<wiki:Messages div="error" topic="<%=SecurityVerifier.ERROR_JAAS%>" prefix="We
found some errors with your configuration: " />
-<%
- if ( !verifier.isJaasConfigured() )
- {
-%>
- <div class="error">The JAAS configuration looks broken. Users may not be
able to log in. You should be able to fix this by locating the JAAS
configuration file and appending the contents of
<code>WEB-INF/jspwiki.jaas</code>.</div>
-<%
- }
-%>
<!--
*********************************************
Added:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/images/attachment_small.gif
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/images/attachment_small.gif?rev=685201&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/images/attachment_small.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/images/favicon.ico
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/images/favicon.ico?rev=685201&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/images/favicon.ico
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/images/jspwiki-icons.png
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/images/jspwiki-icons.png?rev=685201&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/images/jspwiki-icons.png
------------------------------------------------------------------------------
svn:executable = *
Propchange:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/images/jspwiki-icons.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/images/jspwiki-strip.gif
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/images/jspwiki-strip.gif?rev=685201&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/images/jspwiki-strip.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/scripts/fckconfig.js
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/scripts/fckconfig.js?rev=685201&r1=685200&r2=685201&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/scripts/fckconfig.js
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/scripts/fckconfig.js
Tue Aug 12 08:47:28 2008
@@ -1,37 +1,29 @@
/*
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
- *
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
* == BEGIN LICENSE ==
- *
+ *
* Licensed under the terms of any of the following licenses at your
* choice:
- *
+ *
* - GNU General Public License Version 2 or later (the "GPL")
* http://www.gnu.org/licenses/gpl.html
- *
+ *
* - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
* http://www.gnu.org/licenses/lgpl.html
- *
+ *
* - Mozilla Public License Version 1.1 or later (the "MPL")
* http://www.mozilla.org/MPL/MPL-1.1.html
- *
+ *
* == END LICENSE ==
- *
- * File Name: fckconfig.js
- * Editor configuration settings.
- *
- * Follow this link for more information:
- *
http://wiki.fckeditor.net/Developer%27s_Guide/Configuration/Configurations_Settings
- *
- * File Authors:
- * Frederico Caldeira Knabben (www.fckeditor.net)
+ *
+ * Editor configuration settings.
+ *
+ * Follow this link for more information:
+ *
http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options
*/
-// Disable the custom Enter Key Handler (this configuration will be removed in
-// version 2.5).
-FCKConfig.DisableEnterKeyHandler = false ;
-
// JSPWiki: this option is dynamically configured in the 'FCK.jsp' file
// to point to this very 'fckconfig.js' file that you are viewing right now.
//FCKConfig.CustomConfigurationsPath = '' ;
@@ -40,7 +32,7 @@
// The 'jspwiki.css' file for the active jspwiki template will be used.
//FCKConfig.EditorAreaCSS = FCKConfig.BasePath + 'css/fck_editorarea.css' ;
-
+FCKConfig.EditorAreaStyles = '' ;
FCKConfig.ToolbarComboPreviewCSS = '' ;
FCKConfig.DocType = '' ;
@@ -51,15 +43,22 @@
FCKConfig.FullPage = false ;
+// The following option determines whether the "Show Blocks" feature is
enabled or not at startup.
+FCKConfig.StartupShowBlocks = false ;
+
FCKConfig.Debug = false ;
FCKConfig.AllowQueryStringDebug = true ;
FCKConfig.SkinPath = FCKConfig.BasePath + 'skins/default/' ;
+FCKConfig.SkinEditorCSS = '' ; // FCKConfig.SkinPath + "|<minified css>" ;
+FCKConfig.SkinDialogCSS = '' ; // FCKConfig.SkinPath + "|<minified css>" ;
+
FCKConfig.PreloadImages = [ FCKConfig.SkinPath + 'images/toolbar.start.gif',
FCKConfig.SkinPath + 'images/toolbar.buttonarrow.gif' ] ;
FCKConfig.PluginsPath = FCKConfig.BasePath + 'plugins/' ;
// FCKConfig.Plugins.Add( 'autogrow' ) ;
+// FCKConfig.Plugins.Add( 'dragresizetable' );
FCKConfig.AutoGrowMax = 400 ;
// FCKConfig.ProtectedSource.Add( /<%[\s\S]*?%>/g ) ; // ASP style server
side code <%...%>
@@ -87,16 +86,13 @@
FCKConfig.FormatOutput = true ;
FCKConfig.FormatIndentator = ' ' ;
-FCKConfig.ForceStrongEm = true ;
-
-// JSPWiki: enabled this option so that Gecko-based browsers would work with
span tags.
-FCKConfig.GeckoUseSPAN = true ;
// JSPWiki: changed StartupFocus from false to true.
FCKConfig.StartupFocus = true ;
FCKConfig.ForcePasteAsPlainText = false ;
FCKConfig.AutoDetectPasteFromWord = true ; // IE only.
+FCKConfig.ShowDropDialog = true ;
FCKConfig.ForceSimpleAmpersand = false ;
FCKConfig.TabSpaces = 0 ;
FCKConfig.ShowBorders = true ;
@@ -104,8 +100,8 @@
FCKConfig.ToolbarStartExpanded = true ;
FCKConfig.ToolbarCanCollapse = true ;
FCKConfig.IgnoreEmptyParagraphValue = true ;
-FCKConfig.PreserveSessionOnFileBrowser = false ;
FCKConfig.FloatingPanelsZIndex = 10000 ;
+FCKConfig.HtmlEncodeOutput = false ;
// JSPWiki: set to false so that we don't replace the entire page when
inserting plugins
@@ -125,10 +121,16 @@
['Cut','Copy','Paste','PasteText','PasteWord','-','Print','SpellCheck'],
['Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'],
-
['Form','Checkbox','Radio','TextField','Textarea','Select','Button','ImageButton','HiddenField'],
+
+ // JSPWiki: hide the form buttons since the typical user for this
editor isn't likely to utilize the WikiForm plugins.
+
//['Form','Checkbox','Radio','TextField','Textarea','Select','Button','ImageButton','HiddenField'],
'/',
['Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript'],
- ['OrderedList','UnorderedList','-','Outdent','Indent'],
+
+ // JSPWiki: disabled the Blockquote button
+ ['OrderedList','UnorderedList','-','Outdent','Indent'],
+ //['OrderedList','UnorderedList','-','Outdent','Indent','Blockquote'],
+
['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'],
['Link','Unlink','Anchor'],
@@ -138,7 +140,7 @@
'/',
['Style','FontFormat','FontName','FontSize'],
['TextColor','BGColor'],
- ['FitWindow','-','About']
+ ['FitWindow','ShowBlocks','-','About'] // No comma for the
last row.
] ;
FCKConfig.ToolbarSets["Basic"] = [
@@ -153,9 +155,13 @@
[ CTRL + 67 /*C*/, true ],
[ CTRL + 70 /*F*/, true ],
[ CTRL + 83 /*S*/, true ],
+ [ CTRL + 84 /*T*/, true ],
[ CTRL + 88 /*X*/, true ],
[ CTRL + 86 /*V*/, 'Paste' ],
+ [ CTRL + 45 /*INS*/, true ],
[ SHIFT + 45 /*INS*/, 'Paste' ],
+ [ CTRL + 88 /*X*/, 'Cut' ],
+ [ SHIFT + 46 /*DEL*/, 'Cut' ],
[ CTRL + 90 /*Z*/, 'Undo' ],
[ CTRL + 89 /*Y*/, 'Redo' ],
[ CTRL + SHIFT + 90 /*Z*/, 'Redo' ],
@@ -164,26 +170,26 @@
[ CTRL + 73 /*I*/, 'Italic' ],
[ CTRL + 85 /*U*/, 'Underline' ],
[ CTRL + SHIFT + 83 /*S*/, 'Save' ],
- [ CTRL + ALT + 13 /*ENTER*/, 'FitWindow' ],
- [ CTRL + 9 /*TAB*/, 'Source' ]
+ [ CTRL + ALT + 13 /*ENTER*/, 'FitWindow' ]
] ;
// JSPWiki: disabled the context menu items that won't work.
FCKConfig.ContextMenu =
['Generic','Link','Anchor','Image','Flash','Select','Textarea','Checkbox','Radio','TextField','HiddenField','ImageButton','Button','Table','Form']
;
//FCKConfig.ContextMenu =
['Generic','Link','Anchor','Image','Flash','Select','Textarea','Checkbox','Radio','TextField','HiddenField','ImageButton','Button','BulletedList','NumberedList','Table','Form']
;
+FCKConfig.BrowserContextMenuOnCtrl = false ;
+FCKConfig.EnableMoreFontColors = true ;
FCKConfig.FontColors =
'000000,993300,333300,003300,003366,000080,333399,333333,800000,FF6600,808000,808080,008080,0000FF,666699,808080,FF0000,FF9900,99CC00,339966,33CCCC,3366FF,800080,999999,FF00FF,FFCC00,FFFF00,00FF00,00FFFF,00CCFF,993366,C0C0C0,FF99CC,FFCC99,FFFF99,CCFFCC,CCFFFF,99CCFF,CC99FF,FFFFFF'
;
-// JSPWiki: added additional fonts.
-FCKConfig.FontNames = 'Arial;Comic Sans MS;Courier
New;Georgia;Impact;Tahoma;Times New Roman;Verdana' ;
-//FCKConfig.FontNames = 'Arial;Comic Sans MS;Courier New;Tahoma;Times
New Roman;Verdana' ;
-
-FCKConfig.FontSizes =
'1/xx-small;2/x-small;3/small;4/medium;5/large;6/x-large;7/xx-large' ;
-
// JSPWiki: disabled h1, h5, h6 since jspwiki does not support them.
FCKConfig.FontFormats = 'p;div;h2;h3;h4;pre;address' ;
//FCKConfig.FontFormats = 'p;div;pre;address;h1;h2;h3;h4;h5;h6' ;
+// JSPWiki: added additional fonts.
+FCKConfig.FontNames = 'Arial;Comic Sans MS;Courier
New;Georgia;Impact;Tahoma;Times New Roman;Verdana' ;
+//FCKConfig.FontNames = 'Arial;Comic Sans MS;Courier New;Tahoma;Times
New Roman;Verdana' ;
+
+FCKConfig.FontSizes =
'smaller;larger;xx-small;x-small;small;medium;large;x-large;xx-large' ;
// JSPWiki: these options are dynamically configured in the 'FCK.jsp' file.
//FCKConfig.StylesXmlPath = FCKConfig.EditorPath +
'fckstyles.xml' ;
@@ -192,6 +198,7 @@
FCKConfig.SpellChecker = 'ieSpell' ; // 'ieSpell' |
'SpellerPages'
FCKConfig.IeSpellDownloadUrl = 'http://www.iespell.com/download.php' ;
FCKConfig.SpellerPagesServerScript = 'server-scripts/spellchecker.php' ;
// Available extension: .php .cfm .pl
+FCKConfig.FirefoxSpellChecker = false ;
FCKConfig.MaxUndoLevels = 15 ;
@@ -214,50 +221,144 @@
FCKConfig.BodyId = '' ;
FCKConfig.BodyClass = '' ;
+FCKConfig.DefaultStyleLabel = '' ;
+FCKConfig.DefaultFontFormatLabel = '' ;
+FCKConfig.DefaultFontLabel = '' ;
+FCKConfig.DefaultFontSizeLabel = '' ;
+
+FCKConfig.DefaultLinkTarget = '' ;
+
// The option switches between trying to keep the html structure or do the
changes so the content looks like it was in Word
FCKConfig.CleanWordKeepsStructure = false ;
-// The following value defines which File Browser connector and Quick Upload
+// Only inline elements are valid.
+FCKConfig.RemoveFormatTags =
'b,big,code,del,dfn,em,font,i,ins,kbd,q,samp,small,span,strike,strong,sub,sup,tt,u,var'
;
+
+// Attributes that will be removed
+FCKConfig.RemoveAttributes =
'class,style,lang,width,height,align,hspace,valign' ;
+
+
+FCKConfig.CustomStyles =
+{
+// JSPWiki: the CustomStyles for JSPWiki are defined using the fckstyles.xml
file instead.
+// 'Red Title' : { Element : 'h3', Styles : { 'color' : 'Red' } },
+};
+
+
+
+// Do not add, rename or remove styles here. Only apply definition changes.
+FCKConfig.CoreStyles =
+{
+ // Basic Inline Styles.
+ 'Bold' : { Element : 'strong', Overrides : 'b' },
+ 'Italic' : { Element : 'em', Overrides : 'i' },
+
+ // JSPWiki: use the JSPWiki styles for underline, strikethrough,
subscript, and superscript instead of the html tags.
+ 'Underline' : { Element : 'span', Styles : { 'text-decoration' :
'underline' }, Overrides: 'u' },
+ //'Underline' : { Element : 'u' },
+
+ 'StrikeThrough' : { Element : 'span', Attributes : { 'class' : 'strike'
}, Overrides: 'strike' },
+ //'StrikeThrough' : { Element : 'strike' },
+
+ 'Subscript' : { Element : 'span', Attributes : { 'class' : 'sub' },
Overrides: 'sub' },
+ //'Subscript' : { Element : 'sub' },
+
+ 'Superscript' : { Element : 'span', Attributes : { 'class' : 'sup' },
Overrides: 'sup' },
+ //'Superscript' : { Element : 'sup' },
+
+
+ // Basic Block Styles (Font Format Combo).
+ 'p' : { Element : 'p' },
+ 'div' : { Element : 'div' },
+ 'pre' : { Element : 'pre' },
+ 'address' : { Element : 'address' },
+ 'h1' : { Element : 'h1' },
+ 'h2' : { Element : 'h2' },
+ 'h3' : { Element : 'h3' },
+ 'h4' : { Element : 'h4' },
+ 'h5' : { Element : 'h5' },
+ 'h6' : { Element : 'h6' },
+
+ // Other formatting features.
+ 'FontFace' :
+ {
+ Element : 'span',
+ Styles : { 'font-family' : '#("Font")' },
+ Overrides : [ { Element : 'font', Attributes : { 'face' :
null } } ]
+ },
+
+ 'Size' :
+ {
+ Element : 'span',
+ Styles : { 'font-size' : '#("Size","fontSize")' },
+ Overrides : [ { Element : 'font', Attributes : { 'size' :
null } } ]
+ },
+
+ 'Color' :
+ {
+ Element : 'span',
+ Styles : { 'color' : '#("Color","color")' },
+ Overrides : [ { Element : 'font', Attributes : { 'color'
: null } } ]
+ },
+
+ 'BackColor' : { Element : 'span', Styles : {
'background-color' : '#("Color","color")' } },
+
+ 'SelectionHighlight' : { Element : 'span', Styles : {
'background-color' : 'navy', 'color' : 'white' } }
+};
+
+// The distance of an indentation step.
+FCKConfig.IndentLength = 40 ;
+FCKConfig.IndentUnit = 'px' ;
+
+// Alternatively, FCKeditor allows the use of CSS classes for block
indentation.
+// This overrides the IndentLength/IndentUnit settings.
+FCKConfig.IndentClasses = [] ;
+
+// [ Left, Center, Right, Justified ]
+FCKConfig.JustifyClasses = [] ;
+
+// The following value defines which File Browser connector and Quick Upload
// "uploader" to use. It is valid for the default implementaion and it is here
-// just to make this configuration file cleaner.
-// It is not possible to change this value using an external file or even
-// inline when creating the editor instance. In that cases you must set the
+// just to make this configuration file cleaner.
+// It is not possible to change this value using an external file or even
+// inline when creating the editor instance. In that cases you must set the
// values of LinkBrowserURL, ImageBrowserURL and so on.
// Custom implementations should just ignore it.
-var _FileBrowserLanguage = 'asp' ; // asp | aspx | cfm | lasso |
perl | php | py
-var _QuickUploadLanguage = 'asp' ; // asp | aspx | cfm | lasso |
php
+var _FileBrowserLanguage = 'php' ; // asp | aspx | cfm | lasso |
perl | php | py
+var _QuickUploadLanguage = 'php' ; // asp | aspx | cfm | lasso |
perl | php | py
-// Don't care about the following line. It just calculates the correct
connector
+// Don't care about the following two lines. It just calculates the correct
connector
// extension to use for the default File Browser (Perl uses "cgi").
var _FileBrowserExtension = _FileBrowserLanguage == 'perl' ? 'cgi' :
_FileBrowserLanguage ;
+var _QuickUploadExtension = _QuickUploadLanguage == 'perl' ? 'cgi' :
_QuickUploadLanguage ;
// JSPWiki: disabled since the FCKeditor.Java package isn't used.
FCKConfig.LinkBrowser = false ;
-FCKConfig.LinkBrowserURL = FCKConfig.BasePath +
'filemanager/browser/default/browser.html?Connector=connectors/' +
_FileBrowserLanguage + '/connector.' + _FileBrowserExtension ;
+FCKConfig.LinkBrowserURL = FCKConfig.BasePath +
'filemanager/browser/default/browser.html?Connector=' + encodeURIComponent(
FCKConfig.BasePath + 'filemanager/connectors/' + _FileBrowserLanguage +
'/connector.' + _FileBrowserExtension ) ;
FCKConfig.LinkBrowserWindowWidth = FCKConfig.ScreenWidth * 0.7 ;
// 70%
FCKConfig.LinkBrowserWindowHeight = FCKConfig.ScreenHeight * 0.7 ;
// 70%
// JSPWiki: disabled since the FCKeditor.Java package isn't being used.
FCKConfig.ImageBrowser = false ;
-FCKConfig.ImageBrowserURL = FCKConfig.BasePath +
'filemanager/browser/default/browser.html?Type=Image&Connector=connectors/' +
_FileBrowserLanguage + '/connector.' + _FileBrowserExtension ;
+FCKConfig.ImageBrowserURL = FCKConfig.BasePath +
'filemanager/browser/default/browser.html?Type=Image&Connector=' +
encodeURIComponent( FCKConfig.BasePath + 'filemanager/connectors/' +
_FileBrowserLanguage + '/connector.' + _FileBrowserExtension ) ;
FCKConfig.ImageBrowserWindowWidth = FCKConfig.ScreenWidth * 0.7 ; // 70% ;
FCKConfig.ImageBrowserWindowHeight = FCKConfig.ScreenHeight * 0.7 ; // 70% ;
// JSPWiki: disabled since the FCKeditor.Java package isn't being used.
FCKConfig.FlashBrowser = false ;
-FCKConfig.FlashBrowserURL = FCKConfig.BasePath +
'filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/' +
_FileBrowserLanguage + '/connector.' + _FileBrowserExtension ;
+FCKConfig.FlashBrowserURL = FCKConfig.BasePath +
'filemanager/browser/default/browser.html?Type=Flash&Connector=' +
encodeURIComponent( FCKConfig.BasePath + 'filemanager/connectors/' +
_FileBrowserLanguage + '/connector.' + _FileBrowserExtension ) ;
FCKConfig.FlashBrowserWindowWidth = FCKConfig.ScreenWidth * 0.7 ; //70% ;
FCKConfig.FlashBrowserWindowHeight = FCKConfig.ScreenHeight * 0.7 ; //70% ;
// JSPWiki: disabled since the FCKeditor.Java package isn't being used.
FCKConfig.LinkUpload = false ;
-FCKConfig.LinkUploadURL = FCKConfig.BasePath + 'filemanager/upload/' +
_QuickUploadLanguage + '/upload.' + _QuickUploadLanguage ;
-FCKConfig.LinkUploadAllowedExtensions = "" ; // empty for all
-FCKConfig.LinkUploadDeniedExtensions =
".(html|htm|php|php2|php3|php4|php5|phtml|pwml|inc|asp|aspx|ascx|jsp|cfm|cfc|pl|bat|exe|com|dll|vbs|js|reg|cgi|htaccess|asis)$"
; // empty for no one
+FCKConfig.LinkUploadURL = FCKConfig.BasePath + 'filemanager/connectors/' +
_QuickUploadLanguage + '/upload.' + _QuickUploadExtension ;
+FCKConfig.LinkUploadAllowedExtensions =
".(7z|aiff|asf|avi|bmp|csv|doc|fla|flv|gif|gz|gzip|jpeg|jpg|mid|mov|mp3|mp4|mpc|mpeg|mpg|ods|odt|pdf|png|ppt|pxd|qt|ram|rar|rm|rmi|rmvb|rtf|sdc|sitd|swf|sxc|sxw|tar|tgz|tif|tiff|txt|vsd|wav|wma|wmv|xls|xml|zip)$"
; // empty for all
+FCKConfig.LinkUploadDeniedExtensions = "" ; // empty for no one
// JSPWiki: disabled since the FCKeditor.Java package isn't being used.
FCKConfig.ImageUpload = false ;
@@ -282,4 +383,7 @@
FCKConfig.SmileyImages =
['regular_smile.gif','sad_smile.gif','wink_smile.gif','teeth_smile.gif','confused_smile.gif','tounge_smile.gif','embaressed_smile.gif','omg_smile.gif','whatchutalkingabout_smile.gif','angry_smile.gif','angel_smile.gif','shades_smile.gif','devil_smile.gif','cry_smile.gif','lightbulb.gif','thumbs_down.gif','thumbs_up.gif','heart.gif','broken_heart.gif','kiss.gif','envelope.gif']
;
FCKConfig.SmileyColumns = 8 ;
FCKConfig.SmileyWindowWidth = 320 ;
-FCKConfig.SmileyWindowHeight = 240 ;
+FCKConfig.SmileyWindowHeight = 210 ;
+
+FCKConfig.BackgroundBlockerColor = '#ffffff' ;
+FCKConfig.BackgroundBlockerOpacity = 0.50 ;
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/scripts/fckstyles.xml
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/scripts/fckstyles.xml?rev=685201&r1=685200&r2=685201&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/scripts/fckstyles.xml
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/scripts/fckstyles.xml
Tue Aug 12 08:47:28 2008
@@ -17,31 +17,13 @@
<Style name="Comment Box" element="div" >
<Attribute name="class" value="commentbox" />
</Style>
+ <Style name="Quote" element="div" >
+ <Attribute name="class" value="quote" />
+ </Style>
<Style name="Left-to-right text" element="div" >
<Attribute name="class" value="ltr" />
</Style>
<Style name="Right-to-left text" element="div" >
<Attribute name="class" value="rtl" />
</Style>
- <Style name="Strikethrough" element="span" >
- <Attribute name="class" value="strike" />
- </Style>
- <Style name="Superscript" element="span" >
- <Attribute name="class" value="sup" />
- </Style>
- <Style name="Subscript" element="span" >
- <Attribute name="class" value="sub" />
- </Style>
- <Style name="Centered" element="div" >
- <Attribute name="style" value="text-align:center" />
- </Style>
- <Style name="Align Left" element="div" >
- <Attribute name="style" value="text-align:left" />
- </Style>
- <Style name="Align Right" element="div" >
- <Attribute name="style" value="text-align:right" />
- </Style>
- <Style name="Justify" element="div" >
- <Attribute name="style" value="text-align:justify" />
- </Style>
</Styles>
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/scripts/fcktemplates.xml
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/scripts/fcktemplates.xml?rev=685201&r1=685200&r2=685201&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/scripts/fcktemplates.xml
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/scripts/fcktemplates.xml
Tue Aug 12 08:47:28 2008
@@ -62,6 +62,47 @@
<td> </td>
<td> </td>
</tr>
+ <tr>
+ <td> </td>
+ <td> </td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td> </td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td> </td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td> </td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td> </td>
+ <td> </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ ]]>
+ </Html>
+ </Template>
+
+ <Template title="Zebra Table">
+ <Description>
+ Insert a new table that has alternating background colors for each row.
+ </Description>
+ <Html>
+ <
