jamwiki-commit Mailing List for JAMWiki (Page 141)
Brought to you by:
wrh2
This list is closed, nobody may subscribe to it.
2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(86) |
Oct
(168) |
Nov
(115) |
Dec
(87) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2007 |
Jan
(59) |
Feb
(36) |
Mar
(27) |
Apr
(24) |
May
(37) |
Jun
(16) |
Jul
(200) |
Aug
(114) |
Sep
(41) |
Oct
(36) |
Nov
(43) |
Dec
(29) |
2008 |
Jan
(63) |
Feb
(49) |
Mar
(62) |
Apr
(66) |
May
(25) |
Jun
(20) |
Jul
(4) |
Aug
(27) |
Sep
(51) |
Oct
(48) |
Nov
(12) |
Dec
(9) |
2009 |
Jan
(54) |
Feb
(33) |
Mar
(59) |
Apr
(35) |
May
(20) |
Jun
(18) |
Jul
(31) |
Aug
(44) |
Sep
(24) |
Oct
(32) |
Nov
(28) |
Dec
(35) |
2010 |
Jan
(51) |
Feb
(34) |
Mar
(93) |
Apr
(48) |
May
(30) |
Jun
(43) |
Jul
(29) |
Aug
(39) |
Sep
(61) |
Oct
(14) |
Nov
(30) |
Dec
(96) |
2011 |
Jan
(82) |
Feb
(18) |
Mar
(21) |
Apr
(18) |
May
(33) |
Jun
(45) |
Jul
(70) |
Aug
(36) |
Sep
(63) |
Oct
(28) |
Nov
(55) |
Dec
(47) |
2012 |
Jan
(82) |
Feb
(39) |
Mar
(21) |
Apr
(9) |
May
(15) |
Jun
(32) |
Jul
(36) |
Aug
(36) |
Sep
(22) |
Oct
(12) |
Nov
(4) |
Dec
(30) |
2013 |
Jan
(38) |
Feb
(25) |
Mar
(18) |
Apr
(15) |
May
(10) |
Jun
(6) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <wr...@us...> - 2006-09-10 16:33:04
|
Revision: 822 http://svn.sourceforge.net/jamwiki/?rev=822&view=rev Author: wrh2 Date: 2006-09-10 09:32:56 -0700 (Sun, 10 Sep 2006) Log Message: ----------- Redirects: * Do not display redirect syntax as an ordered list. Modified Paths: -------------- wiki/trunk/CHANGELOG.txt wiki/trunk/src/java/org/jamwiki/parser/JAMWikiParser.java wiki/trunk/src/resources/classes/pages/StyleSheet.txt Added Paths: ----------- wiki/trunk/src/resources/images/redirect-arrow.png Modified: wiki/trunk/CHANGELOG.txt =================================================================== --- wiki/trunk/CHANGELOG.txt 2006-09-08 18:58:45 UTC (rev 821) +++ wiki/trunk/CHANGELOG.txt 2006-09-10 16:32:56 UTC (rev 822) @@ -2,6 +2,7 @@ 0.3.4 ===== +* FEATURE: Do not display redirect syntax as an ordered list. * FEATURE: Updated Hungarian translations from bDaneE. * FEATURE: Updated Chinese translations from ewen0930. * FEATURE: Updated German translations from Axel Kramer (axelclk). Modified: wiki/trunk/src/java/org/jamwiki/parser/JAMWikiParser.java =================================================================== --- wiki/trunk/src/java/org/jamwiki/parser/JAMWikiParser.java 2006-09-08 18:58:45 UTC (rev 821) +++ wiki/trunk/src/java/org/jamwiki/parser/JAMWikiParser.java 2006-09-10 16:32:56 UTC (rev 822) @@ -21,6 +21,8 @@ import java.util.regex.Pattern; import org.apache.log4j.Logger; import org.jamwiki.Environment; +import org.jamwiki.WikiBase; +import org.jamwiki.utils.LinkUtil; import org.jamwiki.utils.Utilities; import org.springframework.util.StringUtils; @@ -69,12 +71,12 @@ /** * Parse text for online display. */ - public ParserOutput parseHTML(String rawtext, String topicName) throws Exception { + public ParserOutput parseHTML(String rawText, String topicName) throws Exception { long start = System.currentTimeMillis(); // some parser expressions require that lines end in a newline, so add a newline // to the end of the content for good measure - rawtext += '\n'; - StringReader raw = new StringReader(rawtext); + rawText += '\n'; + StringReader raw = new StringReader(rawText); // maintain the original output, which has all of the category and link info ParserOutput original = this.parsePreProcess(raw); if (this.parserInput.getMode() != ParserInput.MODE_NORMAL) { @@ -85,6 +87,11 @@ raw = new StringReader(original.getContent()); ParserOutput parserOutput = this.parsePostProcess(raw); original.setContent(parserOutput.getContent()); + if (StringUtils.hasText(this.isRedirect(rawText))) { + // redirects are parsed differently + parserOutput = this.parseRedirect(rawText); + original.setContent(parserOutput.getContent()); + } logger.info("Parse time (parseHTML) for " + topicName + "(" + ((System.currentTimeMillis() - start) / 1000.000) + " s.)"); return original; } @@ -138,6 +145,26 @@ } /** + * Parse a topic that is a redirect. Ordinarily the contents of the redirected + * topic would be displayed, but in some cases (such as when explicitly viewing + * a redirect) the redirect page contents need to be displayed. + * + * @param rawText The raw Wiki syntax to be converted into HTML. + * @return A ParserOutput object containing results of the parsing process. + */ + public ParserOutput parseRedirect(String rawText) throws Exception { + String redirect = this.isRedirect(rawText); + ParserOutput parserOutput = new ParserOutput(); + String style = "redirect"; + if (!WikiBase.exists(this.parserInput.getVirtualWiki(), redirect.trim())) { + style = "edit redirect"; + } + String content = LinkUtil.buildInternalLinkHtml(this.parserInput.getContext(), this.parserInput.getVirtualWiki(), redirect, null, null, null, style, false); + parserOutput.setContent(content); + return parserOutput; + } + + /** * This method provides the capability for retrieving a section of Wiki markup * from an existing document. It is used primarily when editing a section of * a topic. This method will return all content from the specified section, up @@ -146,15 +173,15 @@ * up to the next <h1>, <h2>, <h3> or the end of the document * will be returned. * - * @param rawtext The raw Wiki syntax from which a section is to be retrieved. + * @param rawText The raw Wiki syntax from which a section is to be retrieved. * @param topicName The name of the topic that is being parsed. * @param targetSection The section of the document to be replaced (first section is 1). * @return All markup from the target section, contained within a ParserOutput * object. */ - public ParserOutput parseSlice(String rawtext, String topicName, int targetSection) throws Exception { + public ParserOutput parseSlice(String rawText, String topicName, int targetSection) throws Exception { long start = System.currentTimeMillis(); - StringReader raw = new StringReader(rawtext); + StringReader raw = new StringReader(rawText); JAMWikiSpliceProcessor lexer = new JAMWikiSpliceProcessor(raw); lexer.setParserInput(this.parserInput); lexer.setTargetSection(targetSection); @@ -172,15 +199,15 @@ * <h2>, <h3> or the end of the document will be replaced with the * specified text. * - * @param rawtext The raw Wiki syntax from which a section is to be replaced. + * @param rawText The raw Wiki syntax from which a section is to be replaced. * @param topicName The name of the topic that is being parsed. * @param targetSection The section of the document to be replaced (first section is 1). * @param replacementText The text to replace the specified section text with. * @return The new topic markup, contained within a ParserOutput object. */ - public ParserOutput parseSplice(String rawtext, String topicName, int targetSection, String replacementText) throws Exception { + public ParserOutput parseSplice(String rawText, String topicName, int targetSection, String replacementText) throws Exception { long start = System.currentTimeMillis(); - StringReader raw = new StringReader(rawtext); + StringReader raw = new StringReader(rawText); JAMWikiSpliceProcessor lexer = new JAMWikiSpliceProcessor(raw); lexer.setParserInput(this.parserInput); lexer.setReplacementText(replacementText); Modified: wiki/trunk/src/resources/classes/pages/StyleSheet.txt =================================================================== --- wiki/trunk/src/resources/classes/pages/StyleSheet.txt 2006-09-08 18:58:45 UTC (rev 821) +++ wiki/trunk/src/resources/classes/pages/StyleSheet.txt 2006-09-10 16:32:56 UTC (rev 822) @@ -43,6 +43,16 @@ border-bottom: 1px solid #aa1111; } +a.redirect { + font-size: 150%; + text-decoration: none; + margin-left: 20px; +} + +a.redirect:before { + content:url("../images/redirect-arrow.png"); +} + table { font-size: 100%; color: black; Added: wiki/trunk/src/resources/images/redirect-arrow.png =================================================================== (Binary files differ) Property changes on: wiki/trunk/src/resources/images/redirect-arrow.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |