Author: ajaquith
Date: Tue Dec 9 21:12:58 2008
New Revision: 724977
URL: http://svn.apache.org/viewvc?rev=724977&view=rev
Log:
TabTag gains a much-needed 'titleKey' property, making the need to embed
i18n-related scriptlets in JSPs unnecessary. Please use this in preference to
the 'title' property.
Modified:
incubator/jspwiki/trunk/etc/jspwiki.tld
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/i18n/InternationalizationManager.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/TabTag.java
incubator/jspwiki/trunk/src/webdocs/templates/default/CommentContent.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/ConflictContent.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/EditContent.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/EditGroupContent.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/FindContent.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/GroupContent.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/InfoContent.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/LoginContent.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/NewGroupContent.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/PageContent.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesContent.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/PreviewContent.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/UploadTemplate.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/WorkflowContent.jsp
Modified: incubator/jspwiki/trunk/etc/jspwiki.tld
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/jspwiki.tld?rev=724977&r1=724976&r2=724977&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/jspwiki.tld (original)
+++ incubator/jspwiki/trunk/etc/jspwiki.tld Tue Dec 9 21:12:58 2008
@@ -730,7 +730,12 @@
</attribute>
<attribute>
<name>title</name>
- <required>true</required>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>titleKey</name>
+ <required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/i18n/InternationalizationManager.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/i18n/InternationalizationManager.java?rev=724977&r1=724976&r2=724977&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/i18n/InternationalizationManager.java
(original)
+++
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/i18n/InternationalizationManager.java
Tue Dec 9 21:12:58 2008
@@ -37,6 +37,7 @@
* resource strings. It's value is [EMAIL PROTECTED]
*/
public static final String CORE_BUNDLE = "CoreResources";
+ public static final String TEMPLATES_BUNDLE = "templates.default";
// public static final String JSPWIKI_BUNDLE = "jspwiki";
// public static final String PLUGINS_BUNDLE = "plugins";
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/TabTag.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/TabTag.java?rev=724977&r1=724976&r2=724977&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/TabTag.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/TabTag.java Tue Dec 9
21:12:58 2008
@@ -21,90 +21,126 @@
package com.ecyrd.jspwiki.tags;
-import javax.servlet.jsp.*;
+import java.util.Locale;
+import javax.servlet.jsp.JspTagException;
+
+import com.ecyrd.jspwiki.i18n.InternationalizationManager;
import com.ecyrd.jspwiki.util.TextUtil;
/**
- * Generates single tabbed page layout.
- * Works together with the tabbedSection javascript. Note that if you do not
- * specify an url, the body contents of the tag are loaded by the tag itself.
- *
- * <P><B>Attributes</B></P>
- * <UL>
- * <LI>id - ID for this tab. (mandatory)
- * <LI>title - Title of this tab. (mandatory)
- * <LI>accesskey - Single char usable as quick accesskey (alt- or ctrl-)
(optional)
- * <li>url - If you <i>don't</i> want to create a Javascript-enabled tag,
you can use this
- * to make the tab look just the usual tag, but instead, it will
actually link
- * to that page. This can be useful in certain cases where you
have something
- * that you want to look like a part of a tag, but for example,
due to it being
- * very big in size, don't want to include it as a part of the
page content
- * every time.
- * </UL>
- *
- * @author Dirk Frederickx
- * @since v2.3.63
+ * <p>
+ * Generates single tabbed page layout. Works together with the tabbedSection
+ * javascript. Note that if you do not specify an url, the body contents of the
+ * tag are loaded by the tag itself.
+ * </p>
+ * <p>
+ * <b>Attributes</b>
+ * </p>
+ * <ul>
+ * <li><b>id</b> - ID for this tab. <em>Mandatory.</em></li>
+ * <li><b>title</b> - Title of this tab.
+ * <em>Mandatory, if <code>titleKey</code> is not supplied</em></li>
+ * <li><b>titleKey</b> - Message key in <code>default.properties</code> that
+ * contains the title for this tab. The
+ * <em>Mandatory, it <code>title</code> is not supplied</em>. If both
+ * <code>title</code> and <code>titleKey</code> are supplied,
+ * <code>titleKey</code> wins.</li>
+ * <li><b>accesskey</b> - Single char usable as quick accesskey (alt- or
+ * ctrl-) (optional</em></li>
+ * <li><b>url</b> - If you <i>don't</i> want to create a Javascript-enabled
+ * tag, you can use this to make the tab look just the usual tag, but instead,
+ * it will actually link to that page. This can be useful in certain cases
where
+ * you have something that you want to look like a part of a tag, but for
+ * example, due to it being very big in size, don't want to include it as a
part
+ * of the page content every time. <em>Optional.</em></li>
+ * </ul>
+ *
+ * @author Dirk Frederickx
+ * @since v2.3.63
*/
-
public class TabTag extends WikiTagBase
{
private static final long serialVersionUID = -8534125226484616489L;
+
private String m_accesskey;
+
+ private String m_outputTitle;
+
private String m_tabTitle;
+
+ private String m_tabTitleKey;
+
private String m_url;
/**
* [EMAIL PROTECTED]
*/
- public void doFinally()
+ public int doEndTag() throws javax.servlet.jsp.JspTagException
{
- super.doFinally();
+ TabbedSectionTag parent = getParentTag( TabbedSectionTag.class );
- m_accesskey = null;
- m_tabTitle = null;
- m_url = null;
- }
+ StringBuilder sb = new StringBuilder();
- /**
- * Sets the tab title.
- * @param aTabTitle the tab title
- */
- public void setTitle(String aTabTitle)
- {
- m_tabTitle = TextUtil.replaceEntities( aTabTitle );
- }
+ if( parent.isStateFindDefaultTab() )
+ {
+ // inform the parent of each tab
+ parent.validateDefaultTab( getId() );
+ }
+ else if( parent.isStateGenerateTabBody() )
+ {
+ sb.append( "</div>\n" );
+ }
+ else if( parent.isStateGenerateTabMenu() )
+ {
+ sb.append( "<a" );
- /**
- * Sets the tab access key.
- * @param anAccesskey the access key
- */
- public void setAccesskey(String anAccesskey)
- {
- m_accesskey = TextUtil.replaceEntities( anAccesskey ); //take only the
first char
+ if( parent.validateDefaultTab( getId() ) )
+ {
+ sb.append( " class=\"activetab\"" );
+ }
+
+ sb.append( " id=\"menu-" + getId() + "\"" );
+
+ if( m_url != null )
+ {
+ sb.append( " href='" + m_url + "'" );
+ }
+
+ if( handleAccesskey() )
+ {
+ sb.append( " accesskey=\"" + m_accesskey + "\"" );
+ }
+
+ sb.append( " >" );
+ sb.append( m_outputTitle );
+ sb.append( "</a>" );
+ }
+
+ try
+ {
+ pageContext.getOut().write( sb.toString() );
+ }
+ catch( java.io.IOException e )
+ {
+ throw new JspTagException( "IO Error: " + e.getMessage() );
+ }
+
+ return EVAL_PAGE;
}
/**
- * Sets the tab URL.
- * @param url the URL
+ * [EMAIL PROTECTED]
*/
- public void setUrl( String url )
- {
- m_url = TextUtil.replaceEntities( url );
- }
-
- // insert <u> ..accesskey.. </u> in title
- private boolean handleAccesskey()
+ public void doFinally()
{
- if( (m_tabTitle == null) || (m_accesskey == null) ) return false;
+ super.doFinally();
- int pos = m_tabTitle.toLowerCase().indexOf( m_accesskey.toLowerCase()
);
- if( pos > -1 )
- {
- m_tabTitle = m_tabTitle.substring( 0, pos ) + "<span
class='accesskey'>"
- + m_tabTitle.charAt( pos ) + "</span>" +
m_tabTitle.substring( pos+1 );
- }
- return true;
+ m_accesskey = null;
+ m_outputTitle = null;
+ m_tabTitle = null;
+ m_tabTitleKey = null;
+ m_url = null;
}
/**
@@ -112,31 +148,44 @@
*/
public int doWikiStartTag() throws JspTagException
{
- TabbedSectionTag parent=getParentTag(TabbedSectionTag.class );
+ TabbedSectionTag parent = getParentTag( TabbedSectionTag.class );
//
- // Sanity checks
+ // Sanity checks
//
if( getId() == null )
{
- throw new JspTagException("Tab Tag without \"id\" attribute");
+ throw new JspTagException( "Tab Tag without \"id\" attribute" );
}
- if( m_tabTitle == null )
+ if( m_tabTitle == null && m_tabTitleKey == null )
{
- throw new JspTagException("Tab Tag without \"tabTitle\"
attribute");
+ throw new JspTagException( "Tab Tag without \"tabTitle\" or
\"tabTitleKey\" attribute" );
}
if( parent == null )
{
- throw new JspTagException("Tab Tag without parent
\"TabbedSection\" Tag");
+ throw new JspTagException( "Tab Tag without parent
\"TabbedSection\" Tag" );
+ }
+
+ // Generate the actual title
+ if( m_tabTitleKey != null )
+ {
+ Locale locale = m_wikiContext.getHttpRequest().getLocale();
+ InternationalizationManager i18n =
m_wikiContext.getEngine().getInternationalizationManager();
+ m_outputTitle = i18n.get(
InternationalizationManager.TEMPLATES_BUNDLE, locale, m_tabTitleKey );
+ }
+ if ( m_outputTitle == null )
+ {
+ m_outputTitle = m_tabTitle;
}
- if( !parent.isStateGenerateTabBody() ) return SKIP_BODY;
+ if( !parent.isStateGenerateTabBody() )
+ return SKIP_BODY;
- StringBuilder sb = new StringBuilder(32);
+ StringBuilder sb = new StringBuilder( 32 );
- sb.append( "<div id=\""+ getId() + "\"" );
+ sb.append( "<div id=\"" + getId() + "\"" );
- if( !parent.validateDefaultTab( getId()) )
+ if( !parent.validateDefaultTab( getId() ) )
{
sb.append( " class=\"hidetab\"" );
}
@@ -155,58 +204,58 @@
}
/**
- * [EMAIL PROTECTED]
+ * Sets the tab access key.
+ *
+ * @param accessKey the access key
*/
- public int doEndTag() throws javax.servlet.jsp.JspTagException
+ public void setAccesskey( String accessKey )
{
- TabbedSectionTag parent=getParentTag( TabbedSectionTag.class );
-
- StringBuilder sb = new StringBuilder();
-
- if( parent.isStateFindDefaultTab() )
- {
- //inform the parent of each tab
- parent.validateDefaultTab( getId() );
- }
- else if( parent.isStateGenerateTabBody() )
- {
- sb.append( "</div>\n" );
- }
- else if( parent.isStateGenerateTabMenu() )
- {
- sb.append( "<a" );
-
- if( parent.validateDefaultTab( getId() ) )
- {
- sb.append( " class=\"activetab\"" );
- }
+ m_accesskey = TextUtil.replaceEntities( accessKey ); // take only the
+ // first char
+ }
- sb.append( " id=\"menu-" + getId() + "\"" );
+ /**
+ * Sets the tab title.
+ *
+ * @param title the tab title
+ */
+ public void setTitle( String title )
+ {
+ m_tabTitle = TextUtil.replaceEntities( title );
+ }
- if( m_url != null )
- {
- sb.append( " href='"+m_url+"'" );
- }
+ /**
+ * Sets the tab title key.
+ *
+ * @param key the tab title key
+ */
+ public void setTitleKey( String key )
+ {
+ m_tabTitleKey = TextUtil.replaceEntities( key );
+ }
- if( handleAccesskey() )
- {
- sb.append( " accesskey=\"" + m_accesskey + "\"" );
- }
+ /**
+ * Sets the tab URL.
+ *
+ * @param url the URL
+ */
+ public void setUrl( String url )
+ {
+ m_url = TextUtil.replaceEntities( url );
+ }
- sb.append( " >" );
- sb.append( m_tabTitle );
- sb.append( "</a>" );
- }
+ // insert <u> ..accesskey.. </u> in title
+ private boolean handleAccesskey()
+ {
+ if( (m_outputTitle == null) || (m_accesskey == null) )
+ return false;
- try
+ int pos = m_outputTitle.toLowerCase().indexOf(
m_accesskey.toLowerCase() );
+ if( pos > -1 )
{
- pageContext.getOut().write( sb.toString() );
+ m_outputTitle = m_outputTitle.substring( 0, pos ) + "<span
class='accesskey'>" + m_outputTitle.charAt( pos )
+ + "</span>" + m_outputTitle.substring( pos + 1 );
}
- catch( java.io.IOException e )
- {
- throw new JspTagException( "IO Error: " + e.getMessage() );
- }
-
- return EVAL_PAGE;
+ return true;
}
}
Modified:
incubator/jspwiki/trunk/src/webdocs/templates/default/CommentContent.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/CommentContent.jsp?rev=724977&r1=724976&r2=724977&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/CommentContent.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/CommentContent.jsp
Tue Dec 9 21:12:58 2008
@@ -11,11 +11,11 @@
%>
<wiki:TabbedSection defaultTab="commentcontent">
- <wiki:Tab id="pagecontent"
title='<%=LocaleSupport.getLocalizedMessage(pageContext,"comment.tab.discussionpage")%>'>
+ <wiki:Tab id="pagecontent" titleKey="comment.tab.discussionpage">
<wiki:InsertPage/>
</wiki:Tab>
- <wiki:Tab id="commentcontent"
title='<%=LocaleSupport.getLocalizedMessage(pageContext,"comment.tab.addcomment")%>'>
+ <wiki:Tab id="commentcontent" titleKey="comment.tab.addcomment">
<wiki:Editor/>
</wiki:Tab>
@@ -24,12 +24,12 @@
<wiki:Include page="AttachmentTab.jsp" />
</wiki:Tab>
- <wiki:Tab id="info" title='<%=LocaleSupport.getLocalizedMessage(pageContext,
"info.tab")%>'
+ <wiki:Tab id="info" titleKey="info.tab"
url="<%=c.getURL(WikiContext.INFO, c.getPage().getName())%>"
accesskey="i" >
</wiki:Tab>
- <wiki:Tab id="edithelp"
title='<%=LocaleSupport.getLocalizedMessage(pageContext,"edit.tab.help")%>'>
+ <wiki:Tab id="edithelp" titleKey="edit.tab.help">
<wiki:NoSuchPage page="EditPageHelp">
<div class="error">
<fmt:message key="comment.edithelpmissing">
Modified:
incubator/jspwiki/trunk/src/webdocs/templates/default/ConflictContent.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/ConflictContent.jsp?rev=724977&r1=724976&r2=724977&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/ConflictContent.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/ConflictContent.jsp
Tue Dec 9 21:12:58 2008
@@ -3,18 +3,18 @@
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
<wiki:TabbedSection>
-<wiki:Tab id="conflict"
title='<%=LocaleSupport.getLocalizedMessage(pageContext,
"conflict.oops.title")%>'>
+<wiki:Tab id="conflict" titleKey="conflict.oops.title">
<div class="error"><fmt:message key="conflict.oops" /></div>
<fmt:message key="conflict.goedit">
<fmt:param><wiki:EditLink><wiki:PageName/></wiki:EditLink></fmt:param>
</fmt:message>
</wiki:Tab>
-<wiki:Tab id="conflictOther"
title='<%=LocaleSupport.getLocalizedMessage(pageContext,
"conflict.modified")%>'>
+<wiki:Tab id="conflictOther" titleKey="conflict.modified">
<tt><%=pageContext.getAttribute("conflicttext",PageContext.REQUEST_SCOPE)%></tt>
</wiki:Tab>
-<wiki:Tab id="conflictOwn"
title='<%=LocaleSupport.getLocalizedMessage(pageContext,
"conflict.yourtext")%>'>
+<wiki:Tab id="conflictOwn" titleKey="conflict.yourtext">
<tt><%=pageContext.getAttribute("usertext",PageContext.REQUEST_SCOPE)%></tt>
</wiki:Tab>
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/EditContent.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/EditContent.jsp?rev=724977&r1=724976&r2=724977&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/EditContent.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/EditContent.jsp Tue
Dec 9 21:12:58 2008
@@ -12,7 +12,7 @@
%>
<wiki:TabbedSection defaultTab="editcontent">
- <wiki:Tab id="editcontent"
title='<%=LocaleSupport.getLocalizedMessage(pageContext,"edit.tab.edit")%>'
accesskey="e">
+ <wiki:Tab id="editcontent" titleKey="edit.tab.edit" accesskey="e">
<wiki:CheckLock mode="locked" id="lock">
<div class="error">
<fmt:message key="edit.locked">
@@ -40,14 +40,14 @@
<wiki:Include page="AttachmentTab.jsp" />
</wiki:Tab>
- <wiki:Tab id="info" title='<%=LocaleSupport.getLocalizedMessage(pageContext,
"info.tab")%>'
+ <wiki:Tab id="info" titleKey="info.tab"
url="<%=c.getURL(WikiContext.INFO, c.getPage().getName())%>"
accesskey="i" >
</wiki:Tab>
</wiki:PageExists>
- <wiki:Tab id="edithelp"
title='<%=LocaleSupport.getLocalizedMessage(pageContext,"edit.tab.help")%>'
accesskey="h">
+ <wiki:Tab id="edithelp" titleKey="edit.tab.help" accesskey="h">
<wiki:InsertPage page="EditPageHelp" />
<wiki:NoSuchPage page="EditPageHelp">
<div class="error">
Modified:
incubator/jspwiki/trunk/src/webdocs/templates/default/EditGroupContent.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/EditGroupContent.jsp?rev=724977&r1=724976&r2=724977&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/EditGroupContent.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/EditGroupContent.jsp
Tue Dec 9 21:12:58 2008
@@ -36,13 +36,13 @@
<wiki:TabbedSection defaultTab="editgroup">
<wiki:Permission permission="viewGroup">
- <wiki:Tab id="viewgroup"
title='<%=LocaleSupport.getLocalizedMessage(pageContext, "actions.viewgroup")%>'
+ <wiki:Tab id="viewgroup" titleKey="actions.viewgroup"
url='<%=c.getURL(WikiContext.NONE, "Group.jsp",
"group="+request.getParameter("group") ) %>'
accesskey="v" >
</wiki:Tab>
</wiki:Permission>
- <wiki:Tab id="editgroup"
title='<%=LocaleSupport.getLocalizedMessage(pageContext, "editgroup.tab")%>'>
+ <wiki:Tab id="editgroup" titleKey="editgroup.tab">
<h3><%=name%></h3>
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/FindContent.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/FindContent.jsp?rev=724977&r1=724976&r2=724977&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/FindContent.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/FindContent.jsp Tue
Dec 9 21:12:58 2008
@@ -10,7 +10,7 @@
<%@ taglib uri="/WEB-INF/stripes.tld" prefix="stripes" %>
<wiki:TabbedSection>
-<wiki:Tab id="findcontent"
title='<%=LocaleSupport.getLocalizedMessage(pageContext, "find.tab")%>'
accesskey="s">
+<wiki:Tab id="findcontent" titleKey="find.tab" accesskey="s">
<form action="<wiki:Link format='url' jsp='Search.jsp'/>"
class="wikiform"
@@ -49,7 +49,7 @@
</wiki:Tab>
<wiki:PageExists page="SearchPageHelp">
-<wiki:Tab id="findhelp"
title='<%=LocaleSupport.getLocalizedMessage(pageContext, "find.tab.help")%>'
accesskey="h">
+<wiki:Tab id="findhelp" titleKey="find.tab.help" accesskey="h">
<wiki:InsertPage page="SearchPageHelp" />
</wiki:Tab>
</wiki:PageExists>
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/GroupContent.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/GroupContent.jsp?rev=724977&r1=724976&r2=724977&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/GroupContent.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/GroupContent.jsp Tue
Dec 9 21:12:58 2008
@@ -50,7 +50,7 @@
%>
<wiki:TabbedSection defaultTab="${param.tab}">
- <wiki:Tab id="viewgroup"
title='<%=LocaleSupport.getLocalizedMessage(pageContext, "group.tab")%>'>
+ <wiki:Tab id="viewgroup" titleKey="group.tab">
<h3><%=name%></h3>
<%
@@ -143,7 +143,7 @@
</wiki:Tab>
<wiki:Permission permission="editGroup">
- <wiki:Tab id="editgroup"
title='<%=LocaleSupport.getLocalizedMessage(pageContext, "actions.editgroup")%>'
+ <wiki:Tab id="editgroup" titleKey="actions.editgroup"
url='<%=c.getURL(WikiContext.NONE, "EditGroup.jsp",
"group="+request.getParameter("group") ) %>'
accesskey="e" >
</wiki:Tab>
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=724977&r1=724976&r2=724977&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/InfoContent.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/InfoContent.jsp Tue
Dec 9 21:12:58 2008
@@ -66,8 +66,7 @@
<wiki:TabbedSection defaultTab="info">
<wiki:Tab id="pagecontent"
- title='<%=LocaleSupport.getLocalizedMessage(pageContext,
"actions.view")%>'
- accesskey="v"
+ titleKey="actions.view" accesskey="v"
url="<%=c.getURL(WikiContext.VIEW, c.getPage().getName())%>">
<%--<wiki:Include page="PageTab.jsp"/> --%>
</wiki:Tab>
@@ -77,7 +76,7 @@
</wiki:Tab>
<%-- actual infopage content --%>
- <wiki:Tab id="info" title='<%=LocaleSupport.getLocalizedMessage(pageContext,
"info.tab")%>' accesskey="i">
+ <wiki:Tab id="info" titleKey="info.tab" accesskey="i">
<p>
<fmt:message key='info.lastmodified'>
<fmt:param><wiki:PageVersion>1</wiki:PageVersion></fmt:param>
@@ -245,13 +244,11 @@
%>
<wiki:TabbedSection defaultTab="info">
- <wiki:Tab id="pagecontent"
- title='<%=LocaleSupport.getLocalizedMessage(pageContext,
"info.parent")%>'
- accesskey="v"
- url="<%=c.getURL(WikiContext.VIEW,
((Attachment)wikiPage).getParentName()) %>">
+ <wiki:Tab id="pagecontent" titleKey="info.parent" accesskey="v"
+ url="<%=c.getURL(WikiContext.VIEW,
((Attachment)wikiPage).getParentName()) %>">
</wiki:Tab>
- <wiki:Tab id="info" title='<%=LocaleSupport.getLocalizedMessage(pageContext,
"info.attachment.tab")%>' accesskey="i">
+ <wiki:Tab id="info" titleKey="info.attachment.tab" accesskey="i">
<h3><fmt:message key="info.uploadnew" /></h3>
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/LoginContent.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/LoginContent.jsp?rev=724977&r1=724976&r2=724977&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/LoginContent.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/LoginContent.jsp Tue
Dec 9 21:12:58 2008
@@ -27,7 +27,7 @@
<%-- Login functionality --%>
<wiki:UserCheck status="notauthenticated">
-<wiki:Tab id="logincontent"
title='<%=LocaleSupport.getLocalizedMessage(pageContext, "login.tab")%>'>
+<wiki:Tab id="logincontent" titleKey="login.tab">
<%--<wiki:Include page='LoginTab.jsp'/>--%>
<stripes:form action="<%=postURL%>" id="login" class="wikiform" method="post"
acceptcharset="UTF-8">
@@ -89,7 +89,7 @@
</wiki:Tab>
<%-- Lost pasword functionality --%>
-<wiki:Tab id="lostpassword"
title='<%=LocaleSupport.getLocalizedMessage(pageContext, "login.lostpw.tab")%>'>
+<wiki:Tab id="lostpassword" titleKey="login.lostpw.tab">
<div class="center">
<stripes:form action="/LostPassword.jsp" id="lostpw" class="wikiform"
method="post" acceptcharset="UTF-8">
@@ -157,12 +157,12 @@
<%-- Register new user profile --%>
<wiki:Permission permission='editProfile'>
-<wiki:Tab id="profile"
title='<%=LocaleSupport.getLocalizedMessage(pageContext,
"login.register.tab")%>'>
+<wiki:Tab id="profile" titleKey="login.register.tab">
<wiki:Include page='ProfileTab.jsp' />
</wiki:Tab>
</wiki:Permission>
-<wiki:Tab id="loginhelp"
title='<%=LocaleSupport.getLocalizedMessage(pageContext,"login.tab.help")%>'>
+<wiki:Tab id="loginhelp" titleKey="login.tab.help">
<wiki:InsertPage page="LoginHelp" />
<wiki:NoSuchPage page="LoginHelp">
Modified:
incubator/jspwiki/trunk/src/webdocs/templates/default/NewGroupContent.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/NewGroupContent.jsp?rev=724977&r1=724976&r2=724977&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/NewGroupContent.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/NewGroupContent.jsp
Tue Dec 9 21:12:58 2008
@@ -35,7 +35,7 @@
%>
<wiki:TabbedSection defaultTab="${param.tab}">
- <wiki:Tab id="logincontent"
title='<%=LocaleSupport.getLocalizedMessage(pageContext,
"newgroup.heading.create")%>'>
+ <wiki:Tab id="logincontent" titleKey="newgroup.heading.create">
<h3><fmt:message key="newgroup.heading.create" /></h3>
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/PageContent.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/PageContent.jsp?rev=724977&r1=724976&r2=724977&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/PageContent.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/PageContent.jsp Tue
Dec 9 21:12:58 2008
@@ -13,7 +13,7 @@
<wiki:TabbedSection defaultTab='${param.tab}'>
- <wiki:Tab id="pagecontent"
title='<%=LocaleSupport.getLocalizedMessage(pageContext, "view.tab")%>'
accesskey="v">
+ <wiki:Tab id="pagecontent" titleKey="view.tab" accesskey="v">
<wiki:Include page="PageTab.jsp" />
<wiki:PageType type="attachment">
<div class="information">
@@ -35,7 +35,7 @@
</wiki:Tab>
</wiki:PageType>
- <wiki:Tab id="info" title='<%=LocaleSupport.getLocalizedMessage(pageContext,
"info.tab")%>'
+ <wiki:Tab id="info" titleKey="info.tab"
url="<%=c.getURL(WikiContext.INFO, c.getPage().getName())%>"
accesskey="i" >
</wiki:Tab>
Modified:
incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesContent.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesContent.jsp?rev=724977&r1=724976&r2=724977&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesContent.jsp
(original)
+++
incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesContent.jsp
Tue Dec 9 21:12:58 2008
@@ -11,20 +11,20 @@
<wiki:TabbedSection defaultTab="${param.tab}">
- <wiki:Tab id="prefs"
title='<%=LocaleSupport.getLocalizedMessage(pageContext, "prefs.tab.prefs")%>'
accesskey="p">
+ <wiki:Tab id="prefs" titleKey="prefs.tab.prefs" accesskey="p">
<wiki:Include page="PreferencesTab.jsp" />
</wiki:Tab>
<wiki:UserCheck status="authenticated">
<wiki:Permission permission="editProfile">
- <wiki:Tab id="profile"
title='<%=LocaleSupport.getLocalizedMessage(pageContext,
"prefs.tab.profile")%>' accesskey="o">
+ <wiki:Tab id="profile" titleKey="prefs.tab.profile" accesskey="o">
<wiki:Include page="ProfileTab.jsp" />
</wiki:Tab>
</wiki:Permission>
</wiki:UserCheck>
<wiki:Permission permission="createGroups"> <!-- FIXME check right
permissions -->
- <wiki:Tab id="group"
title='<%=LocaleSupport.getLocalizedMessage(pageContext, "group.tab")%>'
accesskey="g">
+ <wiki:Tab id="group" titleKey="group.tab" accesskey="g">
<wiki:Include page="GroupTab.jsp" />
</wiki:Tab>
</wiki:Permission>
Modified:
incubator/jspwiki/trunk/src/webdocs/templates/default/PreviewContent.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/PreviewContent.jsp?rev=724977&r1=724976&r2=724977&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/PreviewContent.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/PreviewContent.jsp
Tue Dec 9 21:12:58 2008
@@ -5,7 +5,7 @@
<%-- Inserts page content for preview. --%>
<wiki:TabbedSection>
-<wiki:Tab id="previewcontent"
title='<%=LocaleSupport.getLocalizedMessage(pageContext, "preview.tab")%>'>
+<wiki:Tab id="previewcontent" titleKey="preview.tab">
<div class="information">
<fmt:message key="preview.info" />
Modified:
incubator/jspwiki/trunk/src/webdocs/templates/default/UploadTemplate.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/UploadTemplate.jsp?rev=724977&r1=724976&r2=724977&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/UploadTemplate.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/UploadTemplate.jsp
Tue Dec 9 21:12:58 2008
@@ -32,8 +32,8 @@
<wiki:Include page="PageActionsTop.jsp" />
<wiki:TabbedSection defaultTab="attachments" >
- <wiki:Tab id="pagecontent"
title='<%=LocaleSupport.getLocalizedMessage(pageContext, "view.tab")%>'
- url="<%=c.getURL(WikiContext.VIEW,
c.getPage().getName())%>"
+ <wiki:Tab id="pagecontent" titleKey="view.tab"
+ url="<%=c.getURL(WikiContext.VIEW,
c.getPage().getName())%>"
accesskey="v" >
</wiki:Tab>
@@ -41,9 +41,9 @@
<wiki:Tab id="attachments" title="<%= attTitle %>">
<wiki:Include page="AttachmentTab.jsp" />
</wiki:Tab>
- <wiki:Tab id="info"
title='<%=LocaleSupport.getLocalizedMessage(pageContext, "info.tab")%>'
- url="<%=c.getURL(WikiContext.INFO, c.getPage().getName())%>"
- accesskey="i" >
+ <wiki:Tab id="info" titleKey="info.tab"
+ url="<%=c.getURL(WikiContext.INFO, c.getPage().getName())%>"
+ accesskey="i" >
</wiki:Tab>
</wiki:PageExists>
Modified:
incubator/jspwiki/trunk/src/webdocs/templates/default/WorkflowContent.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/WorkflowContent.jsp?rev=724977&r1=724976&r2=724977&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/WorkflowContent.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/WorkflowContent.jsp
Tue Dec 9 21:12:58 2008
@@ -21,7 +21,7 @@
%>
<wiki:TabbedSection defaultTab='${param.tab} %>'>
-<wiki:Tab id="pagecontent"
title='<%=LocaleSupport.getLocalizedMessage(pageContext, "workflow.tab")%>'>
+<wiki:Tab id="pagecontent" titleKey="workflow.tab">
<h3><fmt:message key="workflow.heading" /></h3>
<p><fmt:message key="workflow.instructions" /></p>
