April 2009 - richfaces-svn-commits

JBoss Rich Faces SVN: r13734 - trunk/docs/realworld_app_guide/en/src/main/resources/images.

by richfaces-svn-commits＠lists.jboss.org

Author: atsebro Date: 2009-04-21 10:59:35 -0400 (Tue, 21 Apr 2009) New Revision: 13734 Added: trunk/docs/realworld_app_guide/en/src/main/resources/images/slide_show.png Log: RF-5768: Real World Demo Application Tutorial Update for 3.3.1 release Added: trunk/docs/realworld_app_guide/en/src/main/resources/images/slide_show.png =================================================================== (Binary files differ) Property changes on: trunk/docs/realworld_app_guide/en/src/main/resources/images/slide_show.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

15 years, 8 months

1
0
0 / 0

JBoss Rich Faces SVN: r13733 - trunk/docs/realworld_app_guide/en/src/main/resources/images.

by richfaces-svn-commits＠lists.jboss.org

Author: atsebro Date: 2009-04-21 10:59:03 -0400 (Tue, 21 Apr 2009) New Revision: 13733 Added: trunk/docs/realworld_app_guide/en/src/main/resources/images/image_size.png Log: RF-5768: Real World Demo Application Tutorial Update for 3.3.1 release Added: trunk/docs/realworld_app_guide/en/src/main/resources/images/image_size.png =================================================================== (Binary files differ) Property changes on: trunk/docs/realworld_app_guide/en/src/main/resources/images/image_size.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

15 years, 8 months

1
0
0 / 0

JBoss Rich Faces SVN: r13732 - trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html.

by richfaces-svn-commits＠lists.jboss.org

Author: konstantin.mishin Date: 2009-04-21 10:54:45 -0400 (Tue, 21 Apr 2009) New Revision: 13732 Modified: trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java Log: RF-5054 Modified: trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java =================================================================== --- trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java 2009-04-21 14:32:45 UTC (rev 13731) +++ trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java 2009-04-21 14:54:45 UTC (rev 13732) @@ -560,7 +560,7 @@ } state.setFake(false); } - state.setRowIndex(0); + state.setRowIndex(ScrollableDataTableUtils.getClientRowIndex(grid)); grid.setRowKey(null); } @@ -617,7 +617,8 @@ } public void setUpState(FacesContext context, UIScrollableDataTable grid) { - ScrollableDataTableRendererState.createState(context, grid); + ScrollableDataTableRendererState state = ScrollableDataTableRendererState.createState(context, grid); + state.setRowIndex(ScrollableDataTableUtils.getClientRowIndex(grid)); } public void tearDownState(FacesContext context, UIScrollableDataTable grid){

15 years, 8 months

1
0
0 / 0

JBoss Rich Faces SVN: r13731 - in trunk/ui/editor/src: test/java/org/richfaces/seamparser and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: Alex.Kolonitsky Date: 2009-04-21 10:32:45 -0400 (Tue, 21 Apr 2009) New Revision: 13731 Modified: trunk/ui/editor/src/main/java/org/richfaces/convert/seamtext/tags/LineTag.java trunk/ui/editor/src/main/java/org/richfaces/convert/seamtext/tags/TagFactory.java trunk/ui/editor/src/main/java/org/richfaces/convert/seamtext/tags/UnorderedListTag.java trunk/ui/editor/src/test/java/org/richfaces/seamparser/HtmlSeamParserTest.java Log: Editor: exception in seamText mode if empty element presents in ordered or unsorted list. https://jira.jboss.org/jira/browse/RF-6770 Modified: trunk/ui/editor/src/main/java/org/richfaces/convert/seamtext/tags/LineTag.java =================================================================== --- trunk/ui/editor/src/main/java/org/richfaces/convert/seamtext/tags/LineTag.java 2009-04-21 14:28:51 UTC (rev 13730) +++ trunk/ui/editor/src/main/java/org/richfaces/convert/seamtext/tags/LineTag.java 2009-04-21 14:32:45 UTC (rev 13731) @@ -4,7 +4,12 @@ private static final long serialVersionUID = 6972613670825989225L; private String startTag; + protected boolean isHtml = false; + protected LineTag(String name) { + super(name); + } + public LineTag(String name, String startTag) { super(name); setStartTag(startTag); @@ -16,6 +21,12 @@ } @Override + public String printPlain() { + isHtml = true; + return super.printPlain(); + } + + @Override protected void appendChildTag(StringBuilder res, HtmlTag child) { if (child instanceof LineTag) { res.append(((LineTag)child).printPlain()); Modified: trunk/ui/editor/src/main/java/org/richfaces/convert/seamtext/tags/TagFactory.java =================================================================== --- trunk/ui/editor/src/main/java/org/richfaces/convert/seamtext/tags/TagFactory.java 2009-04-21 14:28:51 UTC (rev 13730) +++ trunk/ui/editor/src/main/java/org/richfaces/convert/seamtext/tags/TagFactory.java 2009-04-21 14:32:45 UTC (rev 13731) @@ -37,10 +37,14 @@ @Override public String printBody() { - if (isBodyEmpty()) { + if (isBodyEmpty() && !isHtml) { return " "; } + if (!body.isEmpty() && body.get(0) instanceof HtmlTag) { + body.add(0, " "); + } + return super.printBody(); } }, Modified: trunk/ui/editor/src/main/java/org/richfaces/convert/seamtext/tags/UnorderedListTag.java =================================================================== --- trunk/ui/editor/src/main/java/org/richfaces/convert/seamtext/tags/UnorderedListTag.java 2009-04-21 14:28:51 UTC (rev 13730) +++ trunk/ui/editor/src/main/java/org/richfaces/convert/seamtext/tags/UnorderedListTag.java 2009-04-21 14:32:45 UTC (rev 13731) @@ -1,6 +1,6 @@ package org.richfaces.convert.seamtext.tags; -class UnorderedListTag extends HtmlTag { +class UnorderedListTag extends LineTag { private static final long serialVersionUID = 1L; public UnorderedListTag() { @@ -23,10 +23,10 @@ @Override protected void appendChildTag(StringBuilder res, HtmlTag child) { - if (LI.equals(child.getName())) { + if (LI.equals(child.getName()) && !isHtml) { res.append(TagFactory.SEAM_EQ).append(child.print()); } else { - res.append(child); + super.appendChildTag(res, child); } } } Modified: trunk/ui/editor/src/test/java/org/richfaces/seamparser/HtmlSeamParserTest.java =================================================================== --- trunk/ui/editor/src/test/java/org/richfaces/seamparser/HtmlSeamParserTest.java 2009-04-21 14:28:51 UTC (rev 13730) +++ trunk/ui/editor/src/test/java/org/richfaces/seamparser/HtmlSeamParserTest.java 2009-04-21 14:32:45 UTC (rev 13731) @@ -10,750 +10,747 @@ import java.io.StringReader; /** - * @user: akolonitsky - * Date: Mar 25, 2009 + * @user: akolonitsky Date: Mar 25, 2009 */ public class HtmlSeamParserTest extends TestCase { - - + private final static String SEAM_TEXT_EXPRESSION_1 = "It's easy to make *emphasis* -1- *emphasis*, |monospace|, " + "~deleted text~, super^scripts^ or_underlines_."; - + private final static String SEAM_TEXT_EXPRESSION_2 = "+ This is a big heading\n" + "You /must/ have some text following a heading!\n\n" + "++ This is a smaller heading\n" + "This is the first paragraph. We can split it across multiple" + "lines, but we must end it with a blank line.\n\n" + "This is the second paragraph."; - + private final static String SEAM_TEXT_EXPRESSION_3 = "An ordered list:\n\n" + "# first item\n" + "# second item\n" + "# and even the /third/ item\n\n" + "An unordered list:\n\n" + "= an item\n" + "= another item"; - - private final static String SEAM_TEXT_EXPRESSION_4 = "The other guy said: " + "\"Nyeah nyeah-nee\""; - - private final static String SEAM_TEXT_EXPRESSION_5 = - "You can write down equations like 2\\*3\\+4-7\\=3 and HTML tagslike \\<body\\> using the escape character: \\\\. foo(a)tut.by, 100$ cash 100%"; - + + private final static String SEAM_TEXT_EXPRESSION_4 = "The other guy said: " + + "\"Nyeah nyeah-nee\""; + + private final static String SEAM_TEXT_EXPRESSION_5 = "You can write down equations like 2\\*3\\+4-7\\=3 and HTML tagslike \\<body\\> using the escape character: \\\\. foo(a)tut.by, 100$ cash 100%"; + private final static String SEAM_TEXT_EXPRESSION_6 = "My code doesn't work:" + "`for (int i=0; i<100; i--)\n" + "{\n" + "doSomething(){ String str = \"& >" \"; }; doSomething();\n" - + "doSomething() " + - "}`" + " Any ideas?"; - + + "doSomething() " + "}`" + " Any ideas?"; + private final static String SEAM_TEXT_EXPRESSION_7 = "+ test value<h1>test1<h2>test2</h2>test4</h1>\ntest"; - + private final static String SEAM_TEXT_EXPRESSION_8 = "++ test value<h1>test1<h2>test2</h2>test4</h1>\ntest"; - + private final static String SEAM_TEXT_EXPRESSION_9 = "+++ test value<h1>test1<h2>test2</h2>test4</h1>\ntest"; - + private final static String SEAM_TEXT_EXPRESSION_10 = "++++ test value<h1>test1<h2>test2</h2>test4</h1>\ntest"; - + private final static String SEAM_TEXT_EXPRESSION_11 = "+ test value<div>test5</div><h1>test1<div>test2</div>test4</h1>\ntest"; - + private final static String SEAM_TEXT_EXPRESSION_12 = "[test link=>http://test.com]"; - + private final static String SEAM_TEXT_EXPRESSION_13 = "[=>http://test.com]"; - + private final static String SEAM_TEXT_EXPRESSION_14 = "This is a |<tag attribute=\"value\"/>| example."; - + private final static String SEAM_TEXT_EXPRESSION_15 = "= <div class=\"testClass1 testClass2\"></div><h1> test value </h1>"; - + private final static String SEAM_TEXT_EXPRESSION_16 = "# <div class=\"testClass1 testClass2\"></div><h1> test value </h1>"; - + private final static String SEAM_TEXT_EXPRESSION_17 = "paragraph\n\n+ header\ntext after header\n\nanother paragraph"; - + private final static String SEAM_TEXT_EXPRESSION_18 = "paragraph\n\n++ header\ntext after header\n\nanother paragraph"; - + private final static String SEAM_TEXT_EXPRESSION_19 = "paragraph\n\n+++ header\ntext after header\n\nanother paragraph"; - + private final static String SEAM_TEXT_EXPRESSION_20 = "paragraph\n\n++++ header\ntext after header\n\nanother paragraph"; - + private final static String SEAM_TEXT_EXPRESSION_21 = "paragraph\n\n= item1\n= item2\n= item3\n\nanother paragraph"; - + private final static String SEAM_TEXT_EXPRESSION_22 = "paragraph\n\n# item1\n# item2\n# item3\n\nanother paragraph"; - + private final static String SEAM_TEXT_EXPRESSION_23 = "+ header text *emphasis*, |monospace|, " + "~deleted text~, super^scripts^ or_underlines_\n text after header *emphasis*, |monospace|, " + "~deleted text~, super^scripts^ or_underlines_"; - + private final static String SEAM_TEXT_EXPRESSION_24 = "++ header text *emphasis*, |monospace|, " + "~deleted text~, super^scripts^ or_underlines_\n text after header *emphasis*, |monospace|, " + "~deleted text~, super^scripts^ or_underlines_"; - + private final static String SEAM_TEXT_EXPRESSION_25 = "+++ header text *emphasis*, |monospace|, " + "~deleted text~, super^scripts^ or_underlines_\n text after header *emphasis*, |monospace|, " + "~deleted text~, super^scripts^ or_underlines_"; - + private final static String SEAM_TEXT_EXPRESSION_26 = "++++ header text *emphasis*, |monospace|, " + "~deleted text~, super^scripts^ or_underlines_\n text after header *emphasis*, |monospace|, " + "~deleted text~, super^scripts^ or_underlines_"; - - + private final static String SEAM_TEXT_EXPRESSION_27 = "= item1 *emphasis*, |monospace|, " + "~deleted text~, super^scripts^ or_underlines_\n= item2 *emphasis*, |monospace|, " + "~deleted text~, super^scripts^ or_underlines_"; - + private final static String SEAM_TEXT_EXPRESSION_28 = "# item1 *emphasis*, |monospace|, " + "~deleted text~, super^scripts^ or_underlines_\n# item2 *emphasis*, |monospace|, " + "~deleted text~, super^scripts^ or_underlines_"; - + private final static String SEAM_TEXT_EXPRESSION_29 = "A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9"; public HtmlSeamParserTest(String name) { super(name); } - + public void testSeamTextConverting1() throws Exception { assertSeamConverting(SEAM_TEXT_EXPRESSION_1); } - + public void testStandartSeamTextConverting2() throws Exception { assertSeamConverting(SEAM_TEXT_EXPRESSION_2); } - + public void testStandartSeamTextConverting3() throws Exception { assertSeamConverting(SEAM_TEXT_EXPRESSION_3); } - + public void testStandartSeamTextConverting4() throws Exception { assertSeamConverting(SEAM_TEXT_EXPRESSION_4); } - + public void testStandartSeamTextConverting5() throws Exception { assertSeamConverting(SEAM_TEXT_EXPRESSION_5); } - + public void testStandartSeamTextConverting6() throws Exception { assertSeamConverting(SEAM_TEXT_EXPRESSION_6); } - + public void testStandartSeamTextConverting7() throws Exception { assertSeamConverting(SEAM_TEXT_EXPRESSION_7); } - + public void testStandartSeamTextConverting8() throws Exception { assertSeamConverting(SEAM_TEXT_EXPRESSION_8); } - + public void testStandartSeamTextConverting9() throws Exception { assertSeamConverting(SEAM_TEXT_EXPRESSION_9); } - + public void testStandartSeamTextConverting10() throws Exception { assertSeamConverting(SEAM_TEXT_EXPRESSION_10); } - + public void testStandartSeamTextConverting11() throws Exception { assertSeamConverting(SEAM_TEXT_EXPRESSION_11); } - + public void testStandartSeamTextConverting12() throws Exception { assertSeamConverting(SEAM_TEXT_EXPRESSION_12); } - + public void testStandartSeamTextConverting13() throws Exception { assertSeamConverting(SEAM_TEXT_EXPRESSION_13); } - + public void testStandartSeamTextConverting14() throws Exception { assertSeamConverting(SEAM_TEXT_EXPRESSION_14); } - + public void testStandartSeamTextConverting15() throws Exception { assertSeamConverting(SEAM_TEXT_EXPRESSION_15); } - + public void testStandartSeamTextConverting16() throws Exception { assertSeamConverting(SEAM_TEXT_EXPRESSION_16); } - + public void testStandartSeamTextConverting17() throws Exception { assertSeamConverting(SEAM_TEXT_EXPRESSION_17); } - - + public void testStandartSeamTextConverting18() throws Exception { assertSeamConverting(SEAM_TEXT_EXPRESSION_18); } - + public void testStandartSeamTextConverting19() throws Exception { assertSeamConverting(SEAM_TEXT_EXPRESSION_19); } - + public void testStandartSeamTextConverting20() throws Exception { assertSeamConverting(SEAM_TEXT_EXPRESSION_20); } - + public void testStandartSeamTextConverting21() throws Exception { assertSeamConverting(SEAM_TEXT_EXPRESSION_21); } - + public void testStandartSeamTextConverting22() throws Exception { assertSeamConverting(SEAM_TEXT_EXPRESSION_22); } - + public void testStandartSeamTextConverting23() throws Exception { assertSeamConverting(SEAM_TEXT_EXPRESSION_23); } - + public void testStandartSeamTextConverting24() throws Exception { assertSeamConverting(SEAM_TEXT_EXPRESSION_24); } - + public void testStandartSeamTextConverting25() throws Exception { assertSeamConverting(SEAM_TEXT_EXPRESSION_25); } - + public void testStandartSeamTextConverting26() throws Exception { assertSeamConverting(SEAM_TEXT_EXPRESSION_26); } - + public void testStandartSeamTextConverting27() throws Exception { assertSeamConverting(SEAM_TEXT_EXPRESSION_27); } - + public void testStandartSeamTextConverting28() throws Exception { assertSeamConverting(SEAM_TEXT_EXPRESSION_28); } - + public void testStandartSeamTextConverting29() throws Exception { assertSeamConverting(SEAM_TEXT_EXPRESSION_29); } - + public void testRF5717() throws Exception { assertHtml2SeamConverting("<p>a<b a&b</p>"); } - + public void testRF6725() throws Exception { - assertHtml2SeamConverting("√ € ¢"); - } + assertHtml2SeamConverting("√ € ¢"); + } public void testNestingFormating() throws Exception { assertHtml2SeamConverting("<p><b>aaaaaaaaa <u><i class=\"seamTextEmphasis\">sssssssss</i> dddddddddddddddd</u></b></p>"); } - + public void testNestingFormating1() throws Exception { assertHtml2SeamConverting("<P><STRONG>aaaaaaaaad <U><B>ddddddddddddd</B> sssssssssssss</U></STRONG></P>"); } - + public void testSkipComment() throws Exception { assertHtml2SeamConverting(""); } - - public void testSkipComment_() throws Exception { + + public void testEmptyList() throws Exception { assertHtml2SeamConverting("<ul><li/></ul><ol><li/></ol><ul />"); } + public void testEmptyList02() throws Exception { + assertHtml2SeamConverting("<ul><li><ul><li /></ul></li></ul>"); + } + public void testUglyTextFromWord() throws Exception { - final String str = "<p><meta content=\"text/html; charset=utf-8\" http-equiv=\"Content-Type\"/><meta content=\"Word.Document\" name=\"ProgId\"/><meta content=\"Microsoft Word 12\" name=\"Generator\"/><meta content=\"Microsoft Word 12\" name=\"Originator\"/><link href=\"file:///E:\\TEMP~1\\msohtmlclip1\\01\\clip_filelist.xml\" rel=\"File-List\"/><link href=\"file:///E:\\TEMP~1\\msohtmlclip1\\01\\clip_themedata.thmx\" rel=\"themeData\"/><link href=\"file:///E:\\TEMP~1\\msohtmlclip1\\01\\clip_colorschememapping.xml\" rel=\"colorSchemeMapping\"/>" + - "" + - "" + - "<style>\n" + - "\n" + - "</style>" + - "\n" + - "\n" + - "<p align=\"center\" style=\"margin-bottom: 0.0001pt; text-align: center;\"><a name=\"OLE_LINK2\"/><a name=\"OLE_LINK1\"><span style=\"\"><b><span style='font-size: 20pt; font-family: \"Courier New\"; color: black;'>We where\n" + - "unsuccessful in reproducting this bug in our testing</span></b></span></a></p>\n" + - "\n" + - "<p align=\"center\" style=\"margin-bottom: 0.0001pt; text-align: center;\"><span style=\"\"><span style=\"\"><b><span style='font-size: 20pt; font-family: \"Courier New\"; color: black;'>environment.</span></b></span></span></p>\n" + - "\n" + - "<p style=\"margin-bottom: 0.0001pt;\"><span style=\"\"><span style=\"\"><o:p>A\u00a0</o:p></span></span></p>\n" + - "\n" + - "<p style=\"margin-bottom: 0.0001pt;\"><span style=\"\"><span style=\"\"><s><span style='font-size: 13pt; font-family: \"Courier New\"; color: black;'>Could you provide us with a example URL\n" + - "where this is happening?</span></s></span></span></p>\n" + - "\n" + - "<p style=\"margin-bottom: 0.0001pt;\"><span style=\"\"><span style=\"\"><span style='font-size: 13pt; font-family: \"Courier New\"; color: black;'>Do you have any odd browser\n" + - "extensions/plugins installed?</span></span></span></p>\n" + - "\n" + - "<p style=\"margin-bottom: 0.0001pt;\"><span style=\"\"><span style=\"\"><span style='font-size: 13pt; font-family: \"Courier New\"; color: black;'>Does it happen on our site aswell </span></span></span><a href=\"http://tinymce.moxiecode.com/\"><span style=\"\"><span style=\"\"><span style='font-size: 13pt; font-family: \"Courier New\";'>http://tinymce.moxiecode.com</span></span></span></a><span style=\"\"><span style=\"\"><span style='font-size: 13pt; font-family: \"Courier New\"; color: black;'>?</span></span></span></p>\n" + - "\n" + - "<p style=\"margin-bottom: 0.0001pt;\"><span style=\"\"><span style=\"\"><o:p>A\u00a0</o:p></span></span></p>\n" + - "\n" + - "<span style=\"\"/><span style=\"\"/>\n" + - "\n" + - "<p class=\"MsoNormal\"><o:p>A\u00a0</o:p></p>\n" + - "\n" + - "</p>"; + final String str = "<p><meta content=\"text/html; charset=utf-8\" http-equiv=\"Content-Type\"/><meta content=\"Word.Document\" name=\"ProgId\"/><meta content=\"Microsoft Word 12\" name=\"Generator\"/><meta content=\"Microsoft Word 12\" name=\"Originator\"/><link href=\"file:///E:\\TEMP~1\\msohtmlclip1\\01\\clip_filelist.xml\" rel=\"File-List\"/><link href=\"file:///E:\\TEMP~1\\msohtmlclip1\\01\\clip_themedata.thmx\" rel=\"themeData\"/><link href=\"file:///E:\\TEMP~1\\msohtmlclip1\\01\\clip_colorschememapping.xml\" rel=\"colorSchemeMapping\"/>" + + "" + + "" + + "<style>\n" + + "\n" + + "</style>" + + "\n" + + "\n" + + "<p align=\"center\" style=\"margin-bottom: 0.0001pt; text-align: center;\"><a name=\"OLE_LINK2\"/><a name=\"OLE_LINK1\"><span style=\"\"><b><span style='font-size: 20pt; font-family: \"Courier New\"; color: black;'>We where\n" + + "unsuccessful in reproducting this bug in our testing</span></b></span></a></p>\n" + + "\n" + + "<p align=\"center\" style=\"margin-bottom: 0.0001pt; text-align: center;\"><span style=\"\"><span style=\"\"><b><span style='font-size: 20pt; font-family: \"Courier New\"; color: black;'>environment.</span></b></span></span></p>\n" + + "\n" + + "<p style=\"margin-bottom: 0.0001pt;\"><span style=\"\"><span style=\"\"><o:p>A\u00a0</o:p></span></span></p>\n" + + "\n" + + "<p style=\"margin-bottom: 0.0001pt;\"><span style=\"\"><span style=\"\"><s><span style='font-size: 13pt; font-family: \"Courier New\"; color: black;'>Could you provide us with a example URL\n" + + "where this is happening?</span></s></span></span></p>\n" + + "\n" + + "<p style=\"margin-bottom: 0.0001pt;\"><span style=\"\"><span style=\"\"><span style='font-size: 13pt; font-family: \"Courier New\"; color: black;'>Do you have any odd browser\n" + + "extensions/plugins installed?</span></span></span></p>\n" + + "\n" + + "<p style=\"margin-bottom: 0.0001pt;\"><span style=\"\"><span style=\"\"><span style='font-size: 13pt; font-family: \"Courier New\"; color: black;'>Does it happen on our site aswell </span></span></span><a href=\"http://tinymce.moxiecode.com/\"><span style=\"\"><span style=\"\"><span style='font-size: 13pt; font-family: \"Courier New\";'>http://tinymce.moxiecode.com</span></span></span></a><span style=\"\"><span style=\"\"><span style='font-size: 13pt; font-family: \"Courier New\"; color: black;'>?</span></span></span></p>\n" + + "\n" + + "<p style=\"margin-bottom: 0.0001pt;\"><span style=\"\"><span style=\"\"><o:p>A\u00a0</o:p></span></span></p>\n" + + "\n" + + "<span style=\"\"/><span style=\"\"/>\n" + + "\n" + + "<p class=\"MsoNormal\"><o:p>A\u00a0</o:p></p>\n" + + "\n" + + "</p>"; assertHtml2SeamConverting(str); } - + public void testTextFromOpenOffice() throws Exception { - assertHtml2SeamConverting( - "<p style=\"margin-bottom: 0in; line-height: 100%;\" >" + - " <meta http-equiv=\"CONTENT-TYPE\" content=\"text/html;\" charset=\"utf-8\" />" + - " <title></title>" + - " <meta name=\"GENERATOR\" content=\"OpenOffice.org 3.0 (Win32)\" />" + - " <style type=\"text/css\"></style>" + - "</p>" + - "<p style=\"margin-bottom: 0in; line-height: 100%;\" " + - " align=\"center\" " + - " lang=\"en-US\">" + - " <font color=\"#000000\">" + - " <font color=\"#000001\">" + - " <font color=\"#000002\" style=\"font-size: 20pt;\" size=\"5\">" + - " <b>We where unsuccessful in reproducting this bug in our testing</b>" + - " </font>" + - " </font>" + - " </font>" + - "</p>" + - "<p style=\"margin-bottom: 0in; line-height: 100%;\" " + - " align=\"center\" " + - " lang=\"en-US\">" + - " <font color=\"#000000\">" + - " <font>" + - " <font style=\"font-size: 20pt;\" size=\"5\">" + - " <b>environment.</b>" + - " </font>" + - " </font>" + - " </font>" + - "</p>"); + assertHtml2SeamConverting("<p style=\"margin-bottom: 0in; line-height: 100%;\" >" + + " <meta http-equiv=\"CONTENT-TYPE\" content=\"text/html;\" charset=\"utf-8\" />" + + " <title></title>" + + " <meta name=\"GENERATOR\" content=\"OpenOffice.org 3.0 (Win32)\" />" + + " <style type=\"text/css\"></style>" + + "</p>" + + "<p style=\"margin-bottom: 0in; line-height: 100%;\" " + + " align=\"center\" " + + " lang=\"en-US\">" + + " <font color=\"#000000\">" + + " <font color=\"#000001\">" + + " <font color=\"#000002\" style=\"font-size: 20pt;\" size=\"5\">" + + " <b>We where unsuccessful in reproducting this bug in our testing</b>" + + " </font>" + + " </font>" + + " </font>" + + "</p>" + + "<p style=\"margin-bottom: 0in; line-height: 100%;\" " + + " align=\"center\" " + + " lang=\"en-US\">" + + " <font color=\"#000000\">" + + " <font>" + + " <font style=\"font-size: 20pt;\" size=\"5\">" + + " <b>environment.</b>" + + " </font>" + + " </font>" + " </font>" + "</p>"); } - - private String assertHtml2SeamConverting(String htmlText) - throws Exception { - + + private String assertHtml2SeamConverting(String htmlText) throws Exception { + final String seamText = convertHtmlToSeamText(htmlText); System.out.println("seamText = \n'" + seamText + "'"); - final SeamTextParser seamParser = new SeamTextParser( - new SeamTextLexer(new StringReader(seamText))); + final SeamTextParser seamParser = new SeamTextParser(new SeamTextLexer( + new StringReader(seamText))); seamParser.startRule(); - + return seamParser.toString(); } - - private void assertSeamConverting(String seamTextExpression) throws TokenStreamException, RecognitionException { - - final SeamTextParser seamParser = new SeamTextParser(new SeamTextLexer(new StringReader(seamTextExpression))); + + private void assertSeamConverting(String seamTextExpression) + throws TokenStreamException, RecognitionException { + + final SeamTextParser seamParser = new SeamTextParser(new SeamTextLexer( + new StringReader(seamTextExpression))); seamParser.startRule(); final String html = seamParser.toString(); System.out.println("html = " + html); - + final String seamtext = convertHtmlToSeamText(html); - - assertEquals(seamTextExpression,seamtext.trim()); + + assertEquals(seamTextExpression, seamtext.trim()); } - + private String convertHtmlToSeamText(final String html) { try { return HtmlToSeamSAXParser.convertHtmlToSeamText(html); @@ -761,7 +758,7 @@ e.printStackTrace(); assertTrue(false); } - + return null; } }

15 years, 8 months

1
0
0 / 0

JBoss Rich Faces SVN: r13730 - trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html.

by richfaces-svn-commits＠lists.jboss.org

Author: pyaschenko Date: 2009-04-21 10:28:51 -0400 (Tue, 21 Apr 2009) New Revision: 13730 Modified: trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java Log: https://jira.jboss.org/jira/browse/RF-6804 Modified: trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java =================================================================== --- trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java 2009-04-21 14:13:21 UTC (rev 13729) +++ trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java 2009-04-21 14:28:51 UTC (rev 13730) @@ -260,6 +260,7 @@ scriptValue.append("RichFaces.Menu.submitForm(event,this"); String params = encodeParamsAsObject(context, menuItem); if (null!=params) { + scriptValue.append(","); scriptValue.append(params); } String target = (String) menuItem.getAttributes().get("target");

15 years, 8 months

1
0
0 / 0

JBoss Rich Faces SVN: r13729 - in trunk/ui/progressBAR/src/main: java/org/richfaces/renderkit and 1 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: pyaschenko Date: 2009-04-21 10:13:21 -0400 (Tue, 21 Apr 2009) New Revision: 13729 Modified: trunk/ui/progressBAR/src/main/config/component/progressBar.xml trunk/ui/progressBAR/src/main/java/org/richfaces/renderkit/AbstractProgressBarRenderer.java trunk/ui/progressBAR/src/main/resources/org/richfaces/renderkit/html/js/progressBar.js Log: https://jira.jboss.org/jira/browse/RF-6744 Modified: trunk/ui/progressBAR/src/main/config/component/progressBar.xml =================================================================== --- trunk/ui/progressBAR/src/main/config/component/progressBar.xml 2009-04-21 13:51:19 UTC (rev 13728) +++ trunk/ui/progressBAR/src/main/config/component/progressBar.xml 2009-04-21 14:13:21 UTC (rev 13729) @@ -174,6 +174,18 @@ but just allows to avoid unnecessary updates on the client side if the response isn't actual now </description> </property> + <property hidden="true" > + <name>onkeydown</name> + <classname>java.lang.String</classname> + </property> + <property hidden="true"> + <name>onkeypress</name> + <classname>java.lang.String</classname> + </property> + <property hidden="true"> + <name>onkeyup</name> + <classname>java.lang.String</classname> + </property> </component> </components> Modified: trunk/ui/progressBAR/src/main/java/org/richfaces/renderkit/AbstractProgressBarRenderer.java =================================================================== --- trunk/ui/progressBAR/src/main/java/org/richfaces/renderkit/AbstractProgressBarRenderer.java 2009-04-21 13:51:19 UTC (rev 13728) +++ trunk/ui/progressBAR/src/main/java/org/richfaces/renderkit/AbstractProgressBarRenderer.java 2009-04-21 14:13:21 UTC (rev 13729) @@ -46,6 +46,7 @@ import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.event.AjaxEvent; import org.ajax4jsf.javascript.JSFunction; +import org.ajax4jsf.javascript.JSFunctionDefinition; import org.ajax4jsf.javascript.JSLiteral; import org.ajax4jsf.javascript.JSReference; import org.ajax4jsf.javascript.ScriptUtils; @@ -320,6 +321,10 @@ Integer interval = new Integer(progressBar.getInterval()); options.put("pollId", clientId); options.put("pollinterval", interval); + JSFunctionDefinition onsubmit = getUtils().getAsEventHandler(context, progressBar, "onsubmit", ""); + if (onsubmit != null) { + options.put("onsubmit", onsubmit); + } if (progressBar.getAttributes().containsKey("ignoreDupResponses")) { options.put("ignoreDupResponses", progressBar.getAttributes().get( "ignoreDupResponses")); @@ -441,7 +446,7 @@ "style", variables.getVariable("style") + (!isAjaxMode ? "display: none" : "")); - getUtils().encodePassThru(context, component); + getUtils().encodePassThruWithExclusions(context, component, "onsubmit"); encodeProgressBar(context, component, isSimple); if (isAjaxMode) { startScript(writer, component); Modified: trunk/ui/progressBAR/src/main/resources/org/richfaces/renderkit/html/js/progressBar.js =================================================================== --- trunk/ui/progressBAR/src/main/resources/org/richfaces/renderkit/html/js/progressBar.js 2009-04-21 13:51:19 UTC (rev 13728) +++ trunk/ui/progressBAR/src/main/resources/org/richfaces/renderkit/html/js/progressBar.js 2009-04-21 14:13:21 UTC (rev 13729) @@ -22,7 +22,10 @@ this.markup = markup; this.options = options || {}; + this.onbeforedomupdate = this.options.onbeforedomupdate; + this.options.onbeforedomupdate = function(request, event, data) { + if (this.onbeforedomupdate) this.onbeforedomupdate(request, event, data); this.onComplete(data); }.bind(this);

15 years, 8 months

1
0
0 / 0

JBoss Rich Faces SVN: r13728 - in trunk/examples/photoalbum/web/src/main: webapp/WEB-INF/tags/templates and 1 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: Alex.Kolonitsky Date: 2009-04-21 09:51:19 -0400 (Tue, 21 Apr 2009) New Revision: 13728 Modified: trunk/examples/photoalbum/web/src/main/resources/messages_en.properties trunk/examples/photoalbum/web/src/main/webapp/WEB-INF/tags/templates/button.xhtml trunk/examples/photoalbum/web/src/main/webapp/layout/template.xhtml Log: fix button Modified: trunk/examples/photoalbum/web/src/main/resources/messages_en.properties =================================================================== --- trunk/examples/photoalbum/web/src/main/resources/messages_en.properties 2009-04-21 13:37:44 UTC (rev 13727) +++ trunk/examples/photoalbum/web/src/main/resources/messages_en.properties 2009-04-21 13:51:19 UTC (rev 13728) @@ -167,7 +167,7 @@ user.confirm.error=Confirm Password not equals password user.sex=Sex user.dontshowmail=Do not show to others -user.informaboutnews=Inform me about news in RealWorld Demo +user.informaboutnews=Inform me about news in PhotoAlbum Demo user.changeavatar=Change avatar menu.welcome=Welcome, Modified: trunk/examples/photoalbum/web/src/main/webapp/WEB-INF/tags/templates/button.xhtml =================================================================== --- trunk/examples/photoalbum/web/src/main/webapp/WEB-INF/tags/templates/button.xhtml 2009-04-21 13:37:44 UTC (rev 13727) +++ trunk/examples/photoalbum/web/src/main/webapp/WEB-INF/tags/templates/button.xhtml 2009-04-21 13:51:19 UTC (rev 13728) @@ -11,7 +11,7 @@ <a4j:loadScript src="/scripts/buttons.js" /> <richx:actionMapper> - <a4j:outputPanel layout="block" style="#{style}" styleClass="realworldButton #{styleClass}" lang="#{lang}" dir="#{dir}" title="#{title}" + <a4j:outputPanel layout="block" style="#{style}" styleClass="photoalbumButton #{styleClass}" lang="#{lang}" dir="#{dir}" title="#{title}" rendered="#{empty rendered or rendered}" onmousedown="RF_RW_DEMO.toPressed(this)" onmouseup="RF_RW_DEMO.toReleased(this)" onmouseout="RF_RW_DEMO.toReleased(this)"> Modified: trunk/examples/photoalbum/web/src/main/webapp/layout/template.xhtml =================================================================== (Binary files differ)

15 years, 8 months

1
0
0 / 0

JBoss Rich Faces SVN: r13727 - in trunk/docs: common-resources/en/src/main/xslt and 4 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: artdaw Date: 2009-04-21 09:37:44 -0400 (Tue, 21 Apr 2009) New Revision: 13727 Modified: trunk/docs/cdkguide/pom.xml trunk/docs/common-resources/en/src/main/xslt/xhtml-common.xsl trunk/docs/common-resources/en/src/main/xslt/xhtml-release.xsl trunk/docs/common-resources/en/src/main/xslt/xhtml-single-release.xsl trunk/docs/common-resources/en/src/main/xslt/xhtml-single.xsl trunk/docs/common-resources/en/src/main/xslt/xhtml.xsl trunk/docs/faq/pom.xml trunk/docs/migrationguide/pom.xml trunk/docs/realworld_app_guide/pom.xml trunk/docs/userguide/pom.xml Log: https://jira.jboss.org/jira/browse/RF-5655 - XSL files were fixed. pdf-common.xsl was added as the stylesheet for PDF generation Modified: trunk/docs/cdkguide/pom.xml =================================================================== --- trunk/docs/cdkguide/pom.xml 2009-04-21 13:37:36 UTC (rev 13726) +++ trunk/docs/cdkguide/pom.xml 2009-04-21 13:37:44 UTC (rev 13727) @@ -119,7 +119,12 @@ <groupId>org.apache.xmlgraphics</groupId> <artifactId>fop</artifactId> <version>0.95</version> - </dependency> + </dependency> + <dependency> + <groupId>org.apache.servicemix.bundles</groupId> + <artifactId>org.apache.servicemix.bundles.saxon</artifactId> + <version>9.1.0.1_1</version> +</dependency> </dependencies> <configuration> <sourceDirectory> @@ -142,7 +147,7 @@ <format> <formatName>pdf</formatName> <stylesheetResource> - classpath:/xslt/org/jboss/pdf.xsl + classpath:/common-resources/xslt/pdf-common.xsl </stylesheetResource> <finalName> CDK_Developer_Guide.pdf @@ -229,4 +234,4 @@ <module>en</module> </modules> -</project> \ No newline at end of file +</project> Modified: trunk/docs/common-resources/en/src/main/xslt/xhtml-common.xsl =================================================================== --- trunk/docs/common-resources/en/src/main/xslt/xhtml-common.xsl 2009-04-21 13:37:36 UTC (rev 13726) +++ trunk/docs/common-resources/en/src/main/xslt/xhtml-common.xsl 2009-04-21 13:37:44 UTC (rev 13727) @@ -62,8 +62,14 @@ </meta> </xsl:if> </xsl:if> + <link rel="shortcut icon" type="image/vnd.microsoft.icon" href="images/favicon.ico" /> + <xsl:apply-templates select="." mode="head.keywords.content"/> +  + </xsl:template> <xsl:template match="abstract" mode="titlepage.mode"> @@ -79,7 +85,6 @@ <xsl:apply-templates mode="titlepage.mode"/> </div> </xsl:template> - <xsl:template name="feedback">  <div class="time_out_div" id="timeOutDiv"><xsl:text> </xsl:text></div> @@ -94,7 +99,7 @@ <form onsubmit="return validate_form()" id="feedback-mailform" method="post" action="https://jira.jboss.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310..." target="feedback-iFrame"> <input type="hidden" id="priority" name="priority" value="3" /> <input type="hidden" id="components" name="components" value="12311170" /> - <input type="hidden" id="versions" name="versions" value="12313100" /> + <input type="hidden" id="versions" name="versions" value="12312451" /> <input type="hidden" id="customfield_12310031" name="customfield_12310031" value="Documentation (Ref Guide, User Guide, etc.)" /> <label for="summary">Summary</label> @@ -155,65 +160,23 @@ <img src="images/feedback_logo.png" class="feedback-images" width="100px"/> </a> </div--> - </xsl:template> - -<xsl:template name="navig.content"> - <xsl:param name="direction" select="next"/> - <xsl:variable name="navtext"> - <xsl:choose> - <xsl:when test="$direction = 'prev'"> - <xsl:call-template name="gentext.nav.prev"/> - </xsl:when> - <xsl:when test="$direction = 'next'"> - <xsl:call-template name="gentext.nav.next"/> - </xsl:when> - <xsl:when test="$direction = 'up'"> - <xsl:call-template name="gentext.nav.up"/> - </xsl:when> - <xsl:when test="$direction = 'home'"> - <xsl:call-template name="gentext.nav.home"/> - </xsl:when> - <xsl:otherwise> - <xsl:text>xxx</xsl:text> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:choose> - <xsl:when test="$navig.graphics != 0"> - <img> - <xsl:attribute name="src"> - <xsl:value-of select="$navig.graphics.path"/> - <xsl:value-of select="$direction"/> - <xsl:value-of select="$navig.graphics.extension"/> - </xsl:attribute> - <xsl:attribute name="alt"> - <xsl:value-of select="$navtext"/> - </xsl:attribute> - </img> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$navtext"/> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<xsl:template name="header.navigation"> + </xsl:template> + + <xsl:template name="header.navigation"> <xsl:param name="prev" select="/foo"/> <xsl:param name="next" select="/foo"/> <xsl:param name="nav.context"/> - <xsl:variable name="home" select="/*[1]"/> <xsl:variable name="up" select="parent::*"/> <xsl:variable name="row1" select="$navig.showtitles != 0"/> <xsl:variable name="row2" select="count($prev) > 0 or (count($up) > 0 and generate-id($up) != generate-id($home) and $navig.showtitles != 0) or count($next) > 0"/> <xsl:if test="$suppress.navigation = '0' and $suppress.header.navigation = '0'"> <xsl:if test="$row1 or $row2"> - <xsl:if test="$row1"> + <xsl:if test="$row1"> <xsl:if test="$nightly > 0"> - <div id="overlay"> - <xsl:text> </xsl:text> - </div> + <div id="overlay"> + <xsl:text> </xsl:text> + </div> </xsl:if>  <xsl:call-template name="feedback" /> @@ -289,90 +252,7 @@ </xsl:if> </xsl:template> - <xsl:template name="book.titlepage.recto"> - <xsl:if test="$nightly > 0"> - <div id="overlay"> - <xsl:text> </xsl:text> - </div> - </xsl:if> -  - <xsl:call-template name="feedback" /> - <p xmlns="http://www.w3.org/1999/xhtml"> - <xsl:attribute name="id"> - <xsl:text>title</xsl:text> - </xsl:attribute> - <a> - <xsl:attribute name="href"> - <xsl:value-of select="$siteHref" /> - </xsl:attribute> - <xsl:attribute name="class"> - <xsl:text>site_href</xsl:text> - </xsl:attribute> - <strong> - <xsl:value-of select="$siteLinkText"/> - </strong> - </a> - <a> - <xsl:attribute name="href"> - <xsl:value-of select="$docHref" /> - </xsl:attribute> - <xsl:attribute name="class"> - <xsl:text>doc_href</xsl:text> - </xsl:attribute> - <strong> - <xsl:value-of select="$docLinkText"/> - </strong> - </a> - </p> - <xsl:choose> - <xsl:when test="bookinfo/title"> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/title"/> - </xsl:when> - <xsl:when test="info/title"> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/title"/> - </xsl:when> - <xsl:when test="title"> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="title"/> - </xsl:when> - </xsl:choose> - - <xsl:choose> - <xsl:when test="bookinfo/subtitle"> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/subtitle"/> - </xsl:when> - <xsl:when test="info/subtitle"> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/subtitle"/> - </xsl:when> - <xsl:when test="subtitle"> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="subtitle"/> - </xsl:when> - </xsl:choose> - - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/corpauthor"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/corpauthor"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/authorgroup"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/authorgroup"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/author"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/author"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/othercredit"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/othercredit"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/releaseinfo"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/releaseinfo"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/copyright"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/copyright"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/legalnotice"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/legalnotice"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/pubdate"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/pubdate"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/revision"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/revision"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/revhistory"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/revhistory"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/abstract"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/abstract"/> - - </xsl:template> - <xsl:template name="chunkerdoc"> +<xsl:template name="chunk"> <xsl:param name="node" select="."/> <xsl:choose> @@ -455,6 +335,52 @@ and $generate.legalnotice.link != 0">1</xsl:when> <xsl:otherwise>0</xsl:otherwise> </xsl:choose> -</xsl:template> - +</xsl:template> + + + + + +<xsl:template name="navig.content"> + <xsl:param name="direction" select="next"/> + <xsl:variable name="navtext"> + <xsl:choose> + <xsl:when test="$direction = 'prev'"> + <xsl:call-template name="gentext.nav.prev"/> + </xsl:when> + <xsl:when test="$direction = 'next'"> + <xsl:call-template name="gentext.nav.next"/> + </xsl:when> + <xsl:when test="$direction = 'up'"> + <xsl:call-template name="gentext.nav.up"/> + </xsl:when> + <xsl:when test="$direction = 'home'"> + <xsl:call-template name="gentext.nav.home"/> + </xsl:when> + <xsl:otherwise> + <xsl:text>xxx</xsl:text> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <xsl:choose> + <xsl:when test="$navig.graphics != 0"> + <img> + <xsl:attribute name="src"> + <xsl:value-of select="$navig.graphics.path"/> + <xsl:value-of select="$direction"/> + <xsl:value-of select="$navig.graphics.extension"/> + </xsl:attribute> + <xsl:attribute name="alt"> + <xsl:value-of select="$navtext"/> + </xsl:attribute> + </img> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$navtext"/> + </xsl:otherwise> + </xsl:choose> +</xsl:template> + + </xsl:stylesheet> Modified: trunk/docs/common-resources/en/src/main/xslt/xhtml-release.xsl =================================================================== --- trunk/docs/common-resources/en/src/main/xslt/xhtml-release.xsl 2009-04-21 13:37:36 UTC (rev 13726) +++ trunk/docs/common-resources/en/src/main/xslt/xhtml-release.xsl 2009-04-21 13:37:44 UTC (rev 13727) @@ -7,16 +7,9 @@ --> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> - <xsl:import href="classpath:/xslt/org/jboss/xhtml.xsl"/> - <xsl:import href="xhtml-common-reldiffmk.xsl"/> - + <xsl:import href="xhtml-common-reldiffmk.xsl"/> <xsl:param name="chunk.fast" select="1"/> <xsl:param name="html.stylesheet" select="'css/html-release.css'"/> <xsl:variable name="nightly" select="0" /> - - <xsl:template name="chunk"> - <xsl:call-template name="chunkerdoc" /> - </xsl:template> - </xsl:stylesheet> Modified: trunk/docs/common-resources/en/src/main/xslt/xhtml-single-release.xsl =================================================================== --- trunk/docs/common-resources/en/src/main/xslt/xhtml-single-release.xsl 2009-04-21 13:37:36 UTC (rev 13726) +++ trunk/docs/common-resources/en/src/main/xslt/xhtml-single-release.xsl 2009-04-21 13:37:44 UTC (rev 13727) @@ -7,11 +7,84 @@ --> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> - <xsl:import href="classpath:/xslt/org/jboss/xhtml-single.xsl"/> <xsl:import href="xhtml-common-reldiffmk.xsl"/> - <xsl:param name="html.stylesheet" select="'css/html-release.css'"/> <xsl:variable name="nightly" select="0" /> + <xsl:template name="book.titlepage.recto"> +  + <xsl:call-template name="feedback" /> + <p xmlns="http://www.w3.org/1999/xhtml"> + <xsl:attribute name="id"> + <xsl:text>title</xsl:text> + </xsl:attribute> + <a> + <xsl:attribute name="href"> + <xsl:value-of select="$siteHref" /> + </xsl:attribute> + <xsl:attribute name="class"> + <xsl:text>site_href</xsl:text> + </xsl:attribute> + <strong> + <xsl:value-of select="$siteLinkText"/> + </strong> + </a> + <a> + <xsl:attribute name="href"> + <xsl:value-of select="$docHref" /> + </xsl:attribute> + <xsl:attribute name="class"> + <xsl:text>doc_href</xsl:text> + </xsl:attribute> + <strong> + <xsl:value-of select="$docLinkText"/> + </strong> + </a> + </p> + <xsl:choose> + <xsl:when test="bookinfo/title"> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/title"/> + </xsl:when> + <xsl:when test="info/title"> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/title"/> + </xsl:when> + <xsl:when test="title"> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="title"/> + </xsl:when> + </xsl:choose> + <xsl:choose> + <xsl:when test="bookinfo/subtitle"> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/subtitle"/> + </xsl:when> + <xsl:when test="info/subtitle"> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/subtitle"/> + </xsl:when> + <xsl:when test="subtitle"> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="subtitle"/> + </xsl:when> + </xsl:choose> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/corpauthor"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/corpauthor"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/authorgroup"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/authorgroup"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/author"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/author"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/othercredit"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/othercredit"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/releaseinfo"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/releaseinfo"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/copyright"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/copyright"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/legalnotice"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/legalnotice"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/pubdate"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/pubdate"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/revision"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/revision"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/revhistory"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/revhistory"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/abstract"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/abstract"/> +</xsl:template> +</xsl:stylesheet> -</xsl:stylesheet> Modified: trunk/docs/common-resources/en/src/main/xslt/xhtml-single.xsl =================================================================== --- trunk/docs/common-resources/en/src/main/xslt/xhtml-single.xsl 2009-04-21 13:37:36 UTC (rev 13726) +++ trunk/docs/common-resources/en/src/main/xslt/xhtml-single.xsl 2009-04-21 13:37:44 UTC (rev 13727) @@ -12,5 +12,82 @@ <xsl:import href="xhtml-common.xsl"/> <xsl:param name="html.stylesheet" select="'css/html.css'"/> <xsl:variable name="nightly" select="1" /> - +<xsl:template name="book.titlepage.recto"> + <div id="overlay"> + <xsl:text> </xsl:text> + </div> +  + <xsl:call-template name="feedback" /> + <p xmlns="http://www.w3.org/1999/xhtml"> + <xsl:attribute name="id"> + <xsl:text>title</xsl:text> + </xsl:attribute> + <a> + <xsl:attribute name="href"> + <xsl:value-of select="$siteHref" /> + </xsl:attribute> + <xsl:attribute name="class"> + <xsl:text>site_href</xsl:text> + </xsl:attribute> + <strong> + <xsl:value-of select="$siteLinkText"/> + </strong> + </a> + <a> + <xsl:attribute name="href"> + <xsl:value-of select="$docHref" /> + </xsl:attribute> + <xsl:attribute name="class"> + <xsl:text>doc_href</xsl:text> + </xsl:attribute> + <strong> + <xsl:value-of select="$docLinkText"/> + </strong> + </a> + </p> + <xsl:choose> + <xsl:when test="bookinfo/title"> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/title"/> + </xsl:when> + <xsl:when test="info/title"> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/title"/> + </xsl:when> + <xsl:when test="title"> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="title"/> + </xsl:when> + </xsl:choose> + <xsl:choose> + <xsl:when test="bookinfo/subtitle"> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/subtitle"/> + </xsl:when> + <xsl:when test="info/subtitle"> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/subtitle"/> + </xsl:when> + <xsl:when test="subtitle"> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="subtitle"/> + </xsl:when> + </xsl:choose> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/corpauthor"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/corpauthor"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/authorgroup"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/authorgroup"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/author"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/author"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/othercredit"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/othercredit"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/releaseinfo"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/releaseinfo"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/copyright"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/copyright"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/legalnotice"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/legalnotice"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/pubdate"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/pubdate"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/revision"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/revision"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/revhistory"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/revhistory"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/abstract"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/abstract"/> +</xsl:template> </xsl:stylesheet> Modified: trunk/docs/common-resources/en/src/main/xslt/xhtml.xsl =================================================================== --- trunk/docs/common-resources/en/src/main/xslt/xhtml.xsl 2009-04-21 13:37:36 UTC (rev 13726) +++ trunk/docs/common-resources/en/src/main/xslt/xhtml.xsl 2009-04-21 13:37:44 UTC (rev 13727) @@ -8,15 +8,11 @@ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> - <xsl:import href="classpath:/xslt/org/jboss/xhtml.xsl"/> - <xsl:import href="xhtml-common.xsl"/> - - <xsl:param name="chunk.fast" select="1"/> - <xsl:param name="html.stylesheet" select="'css/html.css'"/> - <xsl:variable name="nightly" select="1" /> - - <xsl:template name="chunk"> - <xsl:call-template name="chunkerdoc" /> - </xsl:template> + <xsl:import href="classpath:/xslt/org/jboss/xhtml.xsl"/> + <xsl:import href="xhtml-common.xsl"/> + +<xsl:param name="chunk.fast" select="1"/> +<xsl:param name="html.stylesheet" select="'css/html.css'"/> +<xsl:variable name="nightly" select="1" /> </xsl:stylesheet> Modified: trunk/docs/faq/pom.xml =================================================================== --- trunk/docs/faq/pom.xml 2009-04-21 13:37:36 UTC (rev 13726) +++ trunk/docs/faq/pom.xml 2009-04-21 13:37:44 UTC (rev 13727) @@ -86,7 +86,7 @@ <reportFileName>log.txt</reportFileName> <dirForScan>${basedir}</dirForScan> <fileForValidation>${basedir}/src/main/docbook/master.xml</fileForValidation> - <wellformdnessOnly>false</wellformdnessOnly> + <wellformdnessOnly>true</wellformdnessOnly> <xmlSchema>http://www.docbook.org/xsd/4.3/docbook.xsd</xmlSchema-->  <!--format> <formatName>html</formatName> <stylesheetResource> Modified: trunk/docs/migrationguide/pom.xml =================================================================== --- trunk/docs/migrationguide/pom.xml 2009-04-21 13:37:36 UTC (rev 13726) +++ trunk/docs/migrationguide/pom.xml 2009-04-21 13:37:44 UTC (rev 13727) @@ -137,7 +137,7 @@ <formats> <format> <formatName>pdf</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource> + <stylesheetResource>classpath:/common-resources/xslt/pdf-common.xsl</stylesheetResource> <finalName>richfaces_migration_guide.pdf</finalName> <imagePathSettingRequired>true</imagePathSettingRequired> </format> @@ -184,4 +184,4 @@ <module>en</module> </modules> -</project> \ No newline at end of file +</project> Modified: trunk/docs/realworld_app_guide/pom.xml =================================================================== --- trunk/docs/realworld_app_guide/pom.xml 2009-04-21 13:37:36 UTC (rev 13726) +++ trunk/docs/realworld_app_guide/pom.xml 2009-04-21 13:37:44 UTC (rev 13727) @@ -139,7 +139,7 @@ <formats> <format> <formatName>pdf</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource> + <stylesheetResource>classpath:/common-resources/xslt/pdf-common.xsl</stylesheetResource> <finalName>realworld_app_guide.pdf</finalName> <imagePathSettingRequired>true</imagePathSettingRequired> </format> @@ -186,4 +186,4 @@ <module>en</module> </modules> -</project> \ No newline at end of file +</project> Modified: trunk/docs/userguide/pom.xml =================================================================== --- trunk/docs/userguide/pom.xml 2009-04-21 13:37:36 UTC (rev 13726) +++ trunk/docs/userguide/pom.xml 2009-04-21 13:37:44 UTC (rev 13727) @@ -891,7 +891,7 @@ <format> <formatName>pdf</formatName> <stylesheetResource> - classpath:/xslt/org/jboss/pdf.xsl + classpath:/common-resources/xslt/pdf-common.xsl </stylesheetResource> <finalName> richfaces_reference.pdf

15 years, 8 months

1
0
0 / 0

JBoss Rich Faces SVN: r13726 - trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts.

by richfaces-svn-commits＠lists.jboss.org

Author: pyaschenko Date: 2009-04-21 09:37:36 -0400 (Tue, 21 Apr 2009) New Revision: 13726 Modified: trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js Log: https://jira.jboss.org/jira/browse/RF-6866 Modified: trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js =================================================================== --- trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2009-04-21 13:12:36 UTC (rev 13725) +++ trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2009-04-21 13:37:36 UTC (rev 13726) @@ -1380,7 +1380,7 @@ this.doCollapse(); } - } else { + } else if (daydata._month!=0){ if (this.params.boundaryDatesMode == "scroll") if (daydata._month==-1) this.prevMonth(); else this.nextMonth(); else if (this.params.boundaryDatesMode == "select")

15 years, 8 months

1
0
0 / 0

JBoss Rich Faces SVN: r13725 - in trunk/examples/photoalbum/web/src/main: webapp/WEB-INF and 4 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: Alex.Kolonitsky Date: 2009-04-21 09:12:36 -0400 (Tue, 21 Apr 2009) New Revision: 13725 Added: trunk/examples/photoalbum/web/src/main/webapp/WEB-INF/tags/photoalbum-taglib.xml trunk/examples/photoalbum/web/src/main/webapp/scripts/photoalbum.js trunk/examples/photoalbum/web/src/main/webapp/stylesheet/photoalbum.css Modified: trunk/examples/photoalbum/web/src/main/java/org/richfaces/photoalbum/util/CopyImageStuff.java trunk/examples/photoalbum/web/src/main/webapp/WEB-INF/components.xml trunk/examples/photoalbum/web/src/main/webapp/WEB-INF/web.xml trunk/examples/photoalbum/web/src/main/webapp/layout/template.xhtml Log: fix for photoalbum Modified: trunk/examples/photoalbum/web/src/main/java/org/richfaces/photoalbum/util/CopyImageStuff.java =================================================================== --- trunk/examples/photoalbum/web/src/main/java/org/richfaces/photoalbum/util/CopyImageStuff.java 2009-04-21 12:32:52 UTC (rev 13724) +++ trunk/examples/photoalbum/web/src/main/java/org/richfaces/photoalbum/util/CopyImageStuff.java 2009-04-21 13:12:36 UTC (rev 13725) @@ -12,7 +12,7 @@ import org.jboss.seam.annotations.Startup; import org.jboss.seam.contexts.ServletLifecycle; import static org.richfaces.photoalbum.service.Constants.IMAGE_FOLDER; -import static org.richfaces.photoalbum.service.Constants.REALWORLD_FOLDER; +import static org.richfaces.photoalbum.service.Constants.PHOTOALBUM_FOLDER; import static org.richfaces.photoalbum.service.Constants.TEMP_DIR; import static org.richfaces.photoalbum.service.Constants.UPLOAD_FOLDER_PATH_ERROR; import static org.richfaces.photoalbum.util.FileUtils.copyDirectory; @@ -69,7 +69,7 @@ private void resolveUploadRoot() throws IOException { uploadRoot = new File(joinFiles( - System.getProperty(TEMP_DIR), REALWORLD_FOLDER)); + System.getProperty(TEMP_DIR), PHOTOALBUM_FOLDER)); if (uploadRoot.exists()) { deleteDirectory(uploadRoot, true); Modified: trunk/examples/photoalbum/web/src/main/webapp/WEB-INF/components.xml =================================================================== --- trunk/examples/photoalbum/web/src/main/webapp/WEB-INF/components.xml 2009-04-21 12:32:52 UTC (rev 13724) +++ trunk/examples/photoalbum/web/src/main/webapp/WEB-INF/components.xml 2009-04-21 13:12:36 UTC (rev 13725) @@ -27,7 +27,7 @@ default-flush-mode="MANUAL"/> <persistence:managed-persistence-context name="entityManager" auto-create="true" - persistence-unit-jndi-name="java:/realWorldEntityManager"/> + persistence-unit-jndi-name="java:/photoalbumEntityManager"/> <transaction:ejb-transaction/> <security:identity authenticate-method="#{authenticator.authenticate}"/> <component name="authenticator" digestAlgorithm="SHA-1" charset="UTF-8"/> Added: trunk/examples/photoalbum/web/src/main/webapp/WEB-INF/tags/photoalbum-taglib.xml =================================================================== --- trunk/examples/photoalbum/web/src/main/webapp/WEB-INF/tags/photoalbum-taglib.xml (rev 0) +++ trunk/examples/photoalbum/web/src/main/webapp/WEB-INF/tags/photoalbum-taglib.xml 2009-04-21 13:12:36 UTC (rev 13725) @@ -0,0 +1,15 @@ +<?xml version="1.0"?> +<!DOCTYPE facelet-taglib PUBLIC + "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" + "facelet-taglib_1_0.dtd"> +<facelet-taglib> + <namespace>http://richfaces.org/richx</namespace> + <tag> + <tag-name>commandButton</tag-name> + <source>templates/button.xhtml</source> + </tag> + <tag> + <tag-name>actionMapper</tag-name> + <handler-class>org.richfaces.photoalbum.util.ActionMapperTagHandler</handler-class> + </tag> +</facelet-taglib> \ No newline at end of file Modified: trunk/examples/photoalbum/web/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/examples/photoalbum/web/src/main/webapp/WEB-INF/web.xml 2009-04-21 12:32:52 UTC (rev 13724) +++ trunk/examples/photoalbum/web/src/main/webapp/WEB-INF/web.xml 2009-04-21 13:12:36 UTC (rev 13725) @@ -86,7 +86,7 @@ <context-param> <param-name>facelets.LIBRARIES</param-name> - <param-value>/WEB-INF/tags/realWorld-taglib.xml</param-value> + <param-value>/WEB-INF/tags/photoalbum-taglib.xml</param-value> </context-param> <!-- <context-param> Modified: trunk/examples/photoalbum/web/src/main/webapp/layout/template.xhtml =================================================================== (Binary files differ) Added: trunk/examples/photoalbum/web/src/main/webapp/scripts/photoalbum.js =================================================================== --- trunk/examples/photoalbum/web/src/main/webapp/scripts/photoalbum.js (rev 0) +++ trunk/examples/photoalbum/web/src/main/webapp/scripts/photoalbum.js 2009-04-21 13:12:36 UTC (rev 13725) @@ -0,0 +1,25 @@ +function selectPopularTag(tag, target) { + if(target) { + var value = target.value.strip(); + if(value.indexOf(tag) == -1) { + target.value = value.length != 0 ? value + ", " + tag : tag; + } + } +} + +function applyModalPanelEffect(panelId, effectFunc, params) { + if (panelId && effectFunc) { + + var modalPanel = $(panelId); + + if (modalPanel && modalPanel.component) { + var component = modalPanel.component; + var div = component.getSizedElement(); + + Element.hide(div); + + effectFunc.call(this, Object.extend({targetId: div.id}, params || {})); + } + + } +} \ No newline at end of file Added: trunk/examples/photoalbum/web/src/main/webapp/stylesheet/photoalbum.css =================================================================== --- trunk/examples/photoalbum/web/src/main/webapp/stylesheet/photoalbum.css (rev 0) +++ trunk/examples/photoalbum/web/src/main/webapp/stylesheet/photoalbum.css 2009-04-21 13:12:36 UTC (rev 13725) @@ -0,0 +1,972 @@ +.main-body { + margin: 0px; + background: url(../img/shell/page_bg.gif) repeat-x #D7D7D7; + height: 100%; +} + +.header-panel { + height: 116px; + border: none; + padding: 0px; + background: none; +} + +.header-panel-body { + padding: 0px; +} + +.header-content-div { + height: 79px; + position: relative; +} + +.user-info-div { + position: absolute; + font-weight: bold; + color: #ffffff; + right: 20px; + top: 45px; +} + +.top-right-menu { + position: absolute; + right: 8px; + top: 14px; +} + +.top-right-menu-toolbar { + background: none; + border: none; +} + +.top-right-menu-item { + vertical-align: top; + padding: 0px; +} + + + +.top-right-menu-item a{ + font-size: 11px; + color: #ffffff; + text-decoration: none; + font-weight: normal; + +} + +.top-right-menu-item-padding { + padding: 0px 8px 0px 15px; +} +.main-menu-panel { + height: 37px; + position: relative; + border: none; + padding: 0px; + background: url(../img/shell/general_panelbar_bg.gif) repeat-x #A84807; +} + +.main-menu-panel-body { + border: none; + padding: 0px; +} + +.body-main-bg { + background: url(../img/shell/general_panel_bg.gif) right top repeat-y; +} + +.body-main-panel { + + height: 100%; + padding: 0px; + border: none; + background-color: transparent; +} + +.body-main-panel-header { + height: 15px; + background: url(../img/shell/general_panel_header_bg.gif) right top; + font-size: 1px; + padding: 0px; + border: none; +} + +.avatarUpload .file-upload-stop-button{ + display:none; +} + +.file-upload-button{ + background:#B34801; + color: #FFFFFF; + border:1px solid #888888; +} + + +.avatarUpload .rich-fileupload-ico { +padding-left:7px; +} +.avatarUpload .rich-fileupload-toolbar-decor { +width:100%; +background-color:#D7D7D7; +border-bottom:0px; +border-left:0px; +border-top:0px; +padding:0px; +} + +.avatarUpload .rich-fileupload-ico-add { +background-image:none; +} + +.avatarUpload .rich-fileupload-button-border{ +border:0px ; +margin:0px; +} + +.avatarUpload .rich-fileupload-list-decor { +width:100%; +background-color:D7D7D7; +border-bottom:0px; +border-left:0px; +border-top:0px; +padding:0px; +} +.avatarUpload .rich-fileupload-button-light{ + padding:0px; + background:#B34801; + cursor:pointer; + border:1px solid #B34801; + } + + .avatarUpload .rich-fileupload-button{ + padding:0px; + background:#B34801; + border:1px solid #888888; + } + +.footer-panel { + height: 82px; + position: relative; + background: url(../img/shell/footer_bg.gif) repeat-x #000000; + border: none; + padding: 0px; +} + +.footer-panel-content { + position: absolute; + left: 8px; + top: 51px; +} + +.body-main-panel-body{ + padding: 15px 35px 15px 15px; +} + +.bottom-right-menu-item { + vertical-align: top; + padding: 0px 15px 0px 8px; +} + +.bottom-right-menu-item-content { + font-size: 11px; + color: #ffffff; + text-decoration: none; +} + +.logged-user { + color: #FF7D2A; + padding:0 8px 0 0; +} + +.main-menu-toolbar { + background: none; + border: none; +} + +.main-menu-toolbar-content a { + color: #FFFFFF; + font-size: 11px; + font-weight: bold; + text-decoration: none; +} + +.main-menu-toolbar-content{ + width: 100%; +} + +.table-boby-column1{ + vertical-align: top; +} + +.table-boby-column2{ + vertical-align: top; +} + +.main-menu-table{ + width: 100%; +} + +.menu-cloumn1{ + width: 90% +} +.menu-cloumn2{ + width: 10% +} + +.login-panel{ + width: 400px; +} + +input[type='submit'], input[type='button'], button { + background: #414141; + color: white; + margin: 5px; + border-color: black; +} + +.login-table-col{ + text-align: center; +} + +.login-table-col2{ + text-align: left; +} + +.login-body-table-col{ + align: middle; + vertical-align: middle; + height: 100%; +} + +.main-image{ + border: none; +} + +.slider-image { + opacity: 0.1; + filter: opacity=10; +} + +.all-images{ + border: none; +} + +.message { + border: 1px solid #FFCC00; + padding: 5px; + margin-top: 5px; + margin-bottom: 5px; + background-color: #F0F8FF; + font-size: 12px; + color: red; +} + +.name { + font-weight: bold; + width: 115px; + padding: 5px; + margin-top: 3px; +} +.value { + padding: 5px; +} + +.error { + padding: 5px; + color: red; +} +.errors { + color: red; + vertical-align: middle; +} +img.errors { + padding-right: 5px; +} +.errors input { + border: 1px solid red; +} +.errors textarea { + border: 1px solid red; +} + +.required { + color: red; + padding-left: 2px; +} + +.rich-stglpanel-body { + overflow: auto; +} +.top { + vertical-align: top; +} +.info { + height: 202px; + overflow: auto; +} + +.a4j-status { + border: 1px solid white; + padding: 5px; + position: absolute; + z-index: 3; + left: 50%; + top: 40px; +} + +a{color : #DF6400;} +h1{font-size : 175%; font-weight : normal; margin : 0px;} +.h1-style{ + font-size : 175%; font-weight : normal; margin : 0px; +} + +.content_box {padding : 15px 35px 15px 35px;} +.content_box p {margin : 0px 0px 5px 0px; FONT-SIZE : 12PX} + +.preview_box_album_80 {width : 100px; position : relative; float : left; margin : 0px 10px 10px 0px;} +.preview_box_album_80 img.pr_album_bg {width : 100px; height : 100px; position : absolute; border: 0px;} +.preview_box_album_80 table{position : relative; width : 100px; height : 100px; text-align : center; vertical-align : middle; border-collapse : collapse;} +.preview_box_album_80 table img{margin: 0px 0px 2px 0px;} +.preview_box_album_80 div.album_name {text-align : center; overflow : hidden; width : 100px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;} +.preview_box_album_80 div.album_data {text-align : center; overflow : hidden; width : 100px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px; height : 14px} + +.preview_box_album_120 {width : 140px; position : relative; float : left; margin : 0px 10px 10px 0px;} +.preview_box_album_120 img.pr_album_bg {width : 140px; height : 140px; position : absolute; border: 0px;} +.preview_box_album_120 table{position : relative; width : 140px; height : 140px; text-align : center; vertical-align : middle; border-collapse : collapse;} +.preview_box_album_120 table img{margin: 0px 0px 2px 0px;} +.preview_box_album_120 div.album_name {text-align : center; overflow : hidden; width : 140px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;} +.preview_box_album_120 div.album_data {text-align : center; overflow : hidden; width : 140px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px; height : 14px} + +.preview_box_album_160 {width : 180px; position : relative; float : left; margin : 0px 10px 10px 0px;} +.preview_box_album_160 img.pr_album_bg {width : 180px; height : 180px; position : absolute; border: 0px;} +.preview_box_album_160 table{position : relative; width : 180px; height : 180px; text-align : center; vertical-align : middle; border-collapse : collapse;} +.preview_box_album_160 table img{margin: 0px 0px 1px 1px;} +.preview_box_album_160 div.album_name {text-align : center; overflow : hidden; width : 180px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;} +.preview_box_album_160 div.album_data {text-align : center; overflow : hidden; width : 180px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px; height : 14px} + + + +.preview_box_photo_80 {width : 100px; position : relative; float : left; margin : 0px 10px 10px 0px;} +.preview_box_photo_80 img.pr_photo_bg {width : 100px; height : 100px; position : absolute; border: 0px;} +.preview_box_photo_80 table{position : relative; width : 100px; height : 100px; text-align : center; vertical-align : middle; border-collapse : collapse;} +.preview_box_photo_80 table img{margin: 0px 0px 0px 0px;} +.preview_box_photo_80 div.photo_name {text-align : center; overflow : hidden; width : 100px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;} +.preview_box_photo_80 div.photo_data {text-align : center; overflow : hidden; width : 100px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px; height : 14px} + +.preview_box_photo_120 {width : 140px; position : relative; float : left; margin : 0px 10px 10px 0px;} +.preview_box_photo_120 img.pr_photo_bg {width : 140px; height : 140px; position : absolute; border: 0px;} +.preview_box_photo_120 table{position : relative; width : 140px; height : 140px; text-align : center; vertical-align : middle; border-collapse : collapse;} +.preview_box_photo_120 table img{margin: 0px 0px 0px 0px;} +.preview_box_photo_120 div.photo_name {text-align : center; overflow : hidden; width : 140px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;} +.preview_box_photo_120 div.photo_data {text-align : center; overflow : hidden; width : 140px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px; height : 14px} + +.preview_box_photo_160 {width : 180px; position : relative; float : left; margin : 0px 10px 10px 0px;} +.preview_box_photo_160 img.pr_photo_bg {width : 180px; height : 180px; position : absolute; border: 0px;} +.preview_box_photo_160 table{position : relative; width : 180px; height : 180px; text-align : center; vertical-align : middle; border-collapse : collapse;} +.preview_box_photo_160 table img{margin: 0px 0px 0px 0px;} +.preview_box_photo_160 div.photo_name {text-align : center; overflow : hidden; width : 180px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;} +.preview_box_photo_160 div.photo_data {text-align : center; overflow : hidden; width : 180px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px; height : 14px} + +.preview_box_photo_200 {width : 220px; position : relative; float : left; margin : 0px 10px 10px 0px;} +.preview_box_photo_200 img.pr_photo_bg {width : 220px; height : 220px; position : absolute; border: 0px;} +.preview_box_photo_200 table{position : relative; width : 220px; height : 220px; text-align : center; vertical-align : middle; border-collapse : collapse;} +.preview_box_photo_200 table img{margin: 0px 0px 0px 0px;} +.preview_box_photo_200 div.photo_name {text-align : center; overflow : hidden; width : 220px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;} +.preview_box_photo_200 div.photo_data {text-align : center; overflow : hidden; width : 220px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px; height : 14px} + + +.preview_box_photo_nav {width : 100px; height : 100px; position : relative; float : left; margin : 0px 2px 0px 0px;} +.preview_box_photo_nav img.pr_photo_bg {width : 100px; height : 100px; position : absolute; border: 0px;} +.preview_box_photo_nav table{position : relative; width : 100px; height : 100px; text-align : center; vertical-align : middle; border-collapse : collapse;} +.preview_box_photo_nav table img{margin: 0px 0px 0px 0px; border : 1px solid #FFFFFF;} +.preview_box_photo_current table img{margin: 0px 0px 0px 0px; border : 3px solid #DF6400;} + +.preview_box_photo_default table { + cursor: pointer; +} + +.image-scroller { + position: relative; + left: 0px; + top: 0px; +} + +.image-scroller table { + position: absolute; + left: 0px; + top: 0px; + width: 100%; +} + +.image-scroller, .image-scroller * { + border-style: none; + background-color: transparent; +} + +.image-scroller-left-arrow { + position: absolute; + top: 80px; + left: -35px; + z-index: 2; +} + +.image-scroller-right-arrow { + position: absolute; + top: 80px; + right: -33px; + z-index: 2; +} + +.search-div { + height: 65px; + width: 339px; + position: absolute; + top: 64px; + right: 0px; + margin-right: 0px; +} + +.search-img-bg { + position: absolute; + top: 0px; + left: 0px; +} + +.search-label { + position: absolute; + color: rgb(255, 255, 255); + font-weight: bold; + top: 22px; + left: 20px; +} + +.search-find-button { + position: absolute; + color: rgb(255, 255, 255); + font-weight: bold; + top: 21px; + left: 277px; + text-decoration: none; +} + +.search-input { + border: 0px none ; + background: transparent none repeat scroll 0% 0%; + width: 176px; + height: 17px; + position: absolute; + top: 20px; + left: 73px; + -moz-background-clip: -moz-initial; + -moz-background-origin: -moz-initial; + -moz-background-inline-policy: -moz-initial; + font-weight: bold; +} + +.search-img { + width: 61px; + height: 18px; + position: absolute; + top: 20px; + left: 261px; +} + +.search-option-div { + position: absolute; + top: 41px; + left: 197px; +} + +.search-option-link { + color: rgb(255, 255, 255); + text-decoration: none; +} + +.search-options { + background: transparent none repeat scroll 0% 0%; + overflow: hidden; + height: 110px; + width: 327px; + position: absolute; + top: 107px; + right: 5px; + -moz-background-clip: -moz-initial; + -moz-background-origin: -moz-initial; + -moz-background-inline-policy: -moz-initial; +} + +.search-option-img { + position: absolute; + bottom: 0px; + left: 0px; +} + +.search-options-div1 { + position: absolute; + color: white; + top: 7px; + left: 45px; +} + +.search-options-div2 { + border-top: 1px solid rgb(56, 56, 56); + position: absolute; + color: white; + top: 32px; + padding-top: 3px; + left: 38px; +} + +.search-hide-options-div { + position: absolute; + bottom: 5px; + left: 163px; +} + +.search-hide-options-link { + color: rgb(255, 255, 255); + text-decoration: none; +} + +.dr-tree-h-text { + white-space: normal; +} + +.tree-selected-node{ + font-weight: bold; + background: #F1F1F1; + border: #FFFFFF 1px solid; +} + +.dr-tree-h-ic-div { + margin: 0px; + padding-left: 0px; + padding-bottom: 5px; +} + +.avatar { + width: 100px; +} + +.rich-tree-node rich-cm-attached { + padding-top: 3px; +} + +.dr-tree-h-ic-img{ + width: 25px; +} + +.dr-insldr-vert-spacer { + padding: 0px; +} + +.shelf-header-table{ + border-collapse : collapse; + margin-bottom : 15px; +} + +.shelf-header-table h1{ + margin-bottom : 4px; +} + +.shelf-header-table-col2{ + padding : 8px 0px 0px 20px; + vertical-align : top; + white-space : nowrap; +} + +.additional-info-text{ + color : #666666; +} + +.additional-info-avatar { + width: 80px; + height: 80px; + border:0px; +} + +.additional-info-comment-del { + float : right; + cursor : pointer +} + +.album-header-table{ + border-collapse : collapse; + margin-bottom : 15px; +} + +.album-header-table h1{ + margin-bottom : 4px; +} + +.album-header-table-col2{ + padding : 8px 0px 0px 20px; + vertical-align : top; + white-space : nowrap; +} + +.album-cover-image{ + border : 1px solid #FFFFFF; +} + +.image-header-table{ + border-collapse : collapse; + margin-bottom : 15px; +} + +.image-header-table h1{ + margin-bottom : 4px; +} + +.image-header-table-col2{ + padding : 8px 0px 0px 20px; + vertical-align : top; + white-space : nowrap; +} + +.image-cover-image{ + border : 2px solid #FFFFFF; +} + +.mainImage-div{ + padding-top : 10px; +} + +.mainImage-table{ + border-collapse : collapse; + margin-bottom : 5px; +} + +.mainImage-table-col1{ + padding-right : 10px; + padding-left : 30px; + text-align : right; +} + +.mainImage-table-col3{ + padding-bottom : 5px +} + +.buttons-body{ + cursor : pointer; + margin : 0px 0px 0px 0px; + position : relative; + width : 103px; + height : 28px; +} + +.buttons-body-image{ + position : absolute; + top : 0px; + left : 0px; + border: 0px; +} +.buttons-body-text-div{ + position : absolute; + color : #ffffff; + top : 7px; + left : 8px; +} +.buttons-body-spacer-image{ + position : absolute; + top : 0px; + left : 0px; + border: 0px; +} + +.slideshow-outerdiv{ + cursor : pointer; + margin-bottom : 7px +} + +.comment-table{ + border-collapse : collapse; + margin-bottom : 20px; +} +.comment-deleteLink{ + margin : 1px 0px 7px 0px; + background : #f1f1f1; + padding : 3px 4px 4px 4px; +} +.comment-text{ + margin : 0px 0px 10px 0px; + padding : 0px 4px 0px 4px; +} + +.image-edit-div{ + margin : 10px 0px 30px 30px; + width : 504px; + background : #f1f1f1; +} +.image-edit-div-table{ + border-collapse : collapse; +} + +.image-edit-label { + padding-top : 8px; +} + +.image-edit-photo-input { + border : 1px solid #999999; + width : 350px; +} + +.image-edit-calendar { + border : 1px solid #999999; + width : 80px; +} + +.image-edit-description-input { + border : 1px solid #999999; + width : 350px; + height : 150px; +} + +.image-edit-tags-input { + border : 1px solid #999999; + width : 150px; + margin-bottom : 4px; +} + +.image-edit-direct-link { + border : 0px; + background : none; + width : 350px +} + +.main-menu-icons-outer-div { + cursor: pointer; + float: left; + padding: 4px 2px 0px 2px; +} + +.main-menu-icons-left-div { + height: 23px; + float: left; +} + +.main-menu-icons-middle-div { + height: 23px; + float: left; + background: url(../img/shell/informer_bg.png) top left no-repeat; + color: #FFFFFF; + padding: 4px 0px 0px 0px; +} + +.main-menu-icons-right-div { + height : 23px; + float : left; + width : 10px; + overflow : hidden; + position : relative; +} +.main-menu-icons-backgroung-img { + position : absolute; + top : 0px; + right : 0px; + border: 0px; +} +.main-menu-separator-img{ + float:left; + margin : 8px 15px 0px 15px; + border : 0px; +} +.main-menu-add-icons-img{ + padding : 4px 0px 0px 5px; + border : 0px; +} + +.rich-tabpanel-content{ + border: none; + background: none; +} +.rich-tabhdr-side-cell{ + border: none; +} +.rich-tabhdr-side-border{ + border: none; + background: none; +} +.rich-tab-bottom-line{ + border: none; + background: none; +} + +.rich-tab-active{ + border-right: 1px solid; + border-right-color: black; + border-left: 0px; + border-top: 0px; + font-size : 175%; + background: none; + font-weight : normal; + margin : 4px; +} + +.rich-tab-inactive{ + border-right: 1px solid; + border-right-color: black; + border-left: 0px; + border-top: 0px; + background: none; + color : #DF6400; + text-decoration: underline; + cursor: pointer; +} + +.top-right-bottom-menu-item { + vertical-align: top; + padding: 0px; +} + +.top-right-bottom-menu-item-link a{ + font-size: 11px; + color: #ffffff; + text-decoration: none; + font-weight: normal; + padding: 0px 0px 0px 15px; +} +.slideshow-link{ + color:black; + text-decoration:none; +} + + +.photoalbumButton { + margin: 0px 0px 0px 0px; + position: relative; + width: 103px; + height: 28px; + cursor: pointer; +} + +.photoalbumButton input, .photoalbumButton img { + position: absolute; + top: 0px; + left: 0px; + width: 103px; + height: 28px; +} + +.photoalbumButton img { + border-width: 0px; +} + +.photoalbumButton input { + outline-style: none; +} + +.photoalbumButton div { + position: absolute; + color: #ffffff; + top: 7px; + left: 0px; + width: 103px; + text-align: center; +} + +.album-edit-field { + padding-top : 8px +} + +.album-edit-calendar { + border : 1px solid #999999; + width : 80px +} + +.album-edit-input { + border : 1px solid #999999; + width : 350px +} + +.album-edit-area { + border : 1px solid #999999; + width : 350px; + height : 150px; +} + +.search-criteria { + color: #666666; +} + +.shelf-edit { + margin : 10px 0px 30px 30px; + width : 504px; + background : #f1f1f1; +} + +.shelf-edit-calendar { + border : 1px solid #999999; + width : 80px; +} + +.shelf-edit-input { + border : 1px solid #999999; + width : 350px; +} + +.shelf-edit-area { + border : 1px solid #999999; + width : 350px; + height : 150px +} + +.tag-panel { + border: 0px; + background: none; + overflow: auto; +} + +.tag-table { + float: left; + margin: 0px 10px 10px 0px; +} + +.tag-table-td { + text-align: center; + vertical-align: middle; + background: white; + border: 1px solid #909090; +} + +.reg-table{ + padding : 0px 10px 10px 0px; +} + +.reg-table-col1{ + vertical-align : top; +} +.reg-table-col3{ + vertical-align : top; +} +.reg-table-input{ + border : 1px solid #909090; + height : 19px; + width : 155px +} +.reg-table-output{ + height : 19px; + width : 155px; + padding: 5px; + font-weight: bold; +} + +.slideshow-table{ + width: 100%; + height: 100%; +} + +.slideshow-table-col{ + text-align: center; +} + +.slideshow-table-row{ + vertical-align: middle; +} + +.rich-menu-item-icon img{ + border:0px; +} + +.rich-inplace { + font-size: inherit; +} \ No newline at end of file

15 years, 8 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits April 2009