Author: artdaw Date: 2009-03-17 17:44:47 -0400 (Tue, 17 Mar 2009) New Revision: 12995 Added: trunk/docs/common-resources/en/src/main/images/close_org.png Modified: trunk/docs/cdkguide/pom.xml trunk/docs/common-resources/en/src/main/css/html-common.css trunk/docs/common-resources/en/src/main/script/toggle.js trunk/docs/common-resources/en/src/main/xslt/xhtml-common.xsl trunk/docs/faq/pom.xml trunk/docs/migrationguide/pom.xml trunk/docs/realworld_app_guide/pom.xml Log: https://jira.jboss.org/jira/browse/RF-6428 - FeedBack was added to all Guides Modified: trunk/docs/cdkguide/pom.xml =================================================================== --- trunk/docs/cdkguide/pom.xml 2009-03-17 18:18:11 UTC (rev 12994) +++ trunk/docs/cdkguide/pom.xml 2009-03-17 21:44:47 UTC (rev 12995) @@ -101,12 +101,12 @@ <dependency> <groupId>org.jboss</groupId> <artifactId>jbossorg-docbook-xslt</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.0</version> </dependency> <dependency> <groupId>org.jboss</groupId> <artifactId>jbossorg-jdocbook-style</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.0</version> <type>jdocbook-style</type> </dependency> <dependency> Modified: trunk/docs/common-resources/en/src/main/css/html-common.css =================================================================== --- trunk/docs/common-resources/en/src/main/css/html-common.css 2009-03-17 18:18:11 UTC (rev 12994) +++ trunk/docs/common-resources/en/src/main/css/html-common.css 2009-03-17 21:44:47 UTC (rev 12995) @@ -132,135 +132,181 @@ /* Feedback styles */ -* html div#feedback-wrapper {position: absolute; -top:expression(eval(document.compatMode && -document.compatMode=='CSS1Compat') ? -documentElement.scrollTop -+(documentElement.clientHeight-this.clientHeight) -: document.body.scrollTop -+(document.body.clientHeight-this.clientHeight));} +.problemLayer { + position: absolute; + left: 34%; + top: 20%; + width: 400px; + height: 110px; + z-index: 2; + background: #fff; + display: none; +} -* html #feedback-maincontainer {position: absolute; +.time_out_div { + height: 100%; + width: 100%; + min-height: 100%; + background-color: #5781AF; + filter:alpha(opacity=50); + opacity: 0.5; + -moz-opacity: 0.5; + -khtml-opacity: 0.5; + z-index: 99; + position: fixed; + top: 0; + left: 0; + display: none; +} + +* html div#feedback-wrapper, * html div#feedback-maincontainer, * html div#time_out_div { +position: absolute; top:expression(eval(document.compatMode && document.compatMode=='CSS1Compat') ? documentElement.scrollTop +(documentElement.clientHeight-this.clientHeight) : document.body.scrollTop -+(document.body.clientHeight-this.clientHeight));} - -#feedback-wrapper{ - margin: 0px; - padding: 0px; - position:fixed; - bottom:0px; - right:0px; - height:322px; - width: 100px; - overflow: hidden; ++(document.body.clientHeight-this.clientHeight)); } -#feedback-link{ - float: left; - display: block; +#feedback-maincontainer{ + font-family: Arial; + font-size: 14px; + display:none; + background: #F5F5F5; + border: 8px solid #7F9DB9; + height:420px; + left:30%; + position:fixed; + text-align:left; + top:20%; + bottom:20%; + width:500px; + z-index:100; } - - -#feedback-header{ - background-color: #AAB3BD; - text-align: center; - color: white; +* html #feedback-maincontainer { + width:480px; +} +#feedback-maincontainer div#guide_words{ + margin: 0px 20px 0px 20px !important; + font-size: 12px; +} +.feedback-helper, #summary-helper-left{ + color: #ff3333; + font-size: 10px; + float:left; + +} +#summary-helper-left{ + float:right; + color: #5781AF; + padding-right:5px; +} + +.clear{ + clear:both; +} +*html #feedback-maincontainer{ + width: 500px; +} +*html #feedback-header{ width: 100%; - font-weight: bold; - position: relative; - height: 20px; - padding: 0px; - margin:0px; } +#feedback-header{ + background-color:#5781AF; + border-bottom: 2px solid #ccc; + color:white; + font-weight:bold; + font-size: 16px; + height:20px; + margin:0; + padding:10px 0 10px 20px; + position:relative; + text-align:left; +} #feedback-close{ display:block; position:absolute; - right:2px; - top:2px; + right:9px; + top:6px; width:12px; border: 0px; } -#feedback-state{ - font-weight: bold; - height: 20px; - width: 508px; - line-height: 20px; - overflow: hidden; -} - -#feedback-maincontainer{ - z-index:2000; - text-align: center; - background: #F5F5F5; - border: 1px solid #CCC; - position: fixed; - bottom: 0px; - right: 120px; -} -*html #feedback-maincontainer{ - width: 520px; -} - #feedback-mailform{ - margin: 0px 20px 0px 20px; + margin: 0px 20px 0px 20px !important; padding-bottom:5px; + text-align:left; } *html #feedback-mailform{ margin: 0px 20px 0px 0px; padding-bottom:5px; } - -.feedback-textbox-div{ - font-weight: bold; - margin-bottom:5px; - text-align: right; - color: #415973; +#feedback-mailform textarea, #feedback-mailform input, #feedback-mailform label{ + font-family: Arial,Helvetica,sans-serif; + width:450px; } - -#feedback-emailContent{ - width: 200px; - height: 150px; - padding: 2px; +#feedback-mailform input, #feedback-mailform label{ + display:block; } +#feedback-mailform label{ + margin-top: 10px; +} +#feedback-mailform label span{ + color: #ff0000 +} +#feedback-mailform textarea{ + font-size: 14px; + height: 100px; + padding: 2px; +} +#feedback-mailform textarea#feedback-environment{ + height: 50px; +} .feedback-formbutton{ font-size: 12px; font-family: Arial, Helvetica, sans-serif; - color: #415973; + color: #999; + margin: 15px 20px; } -.feedback-textbox, #feedback-emailContent{ - background-color:#FFFFFF; - border:1px solid #A5ACB2; - padding:2px 1px 3px 5px; - width: 400px; - font-size: 12px; - font-family: Arial, Helvetica, sans-serif; - color: #000; -} -.feedback-button-container{ - margin: 0px 5px 0px 0px; -} - .feedback-images{ border:0; margin:0; display: inline; } #feedback-iFrame { - height: 20px; - width: 508px; - line-height: 20px; - overflow: hidden; - border: none; - background-color: #F5F5F5; + background-color:#F5F5F5; + border:medium none; + height:90%; + line-height:20px; + overflow:visible; + width:100%; + display:none; } +#feedback-wrapper{ + margin: 0px; + padding: 0px; + position:fixed; + bottom:0px; + right:0px; + height:322px; + width: 100px; + overflow: hidden; + cursor:pointer; +} + +#feedback-link{ + float: left; + display: block; +} + +#feedback-link img{ + width: 100px; +} + Added: trunk/docs/common-resources/en/src/main/images/close_org.png =================================================================== (Binary files differ) Property changes on: trunk/docs/common-resources/en/src/main/images/close_org.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/docs/common-resources/en/src/main/script/toggle.js =================================================================== --- trunk/docs/common-resources/en/src/main/script/toggle.js 2009-03-17 18:18:11 UTC (rev 12994) +++ trunk/docs/common-resources/en/src/main/script/toggle.js 2009-03-17 21:44:47 UTC (rev 12995) @@ -1,41 +1,112 @@ -/* -// attach handler to window object - Event.observe(window,'load',initializeEmailClient,false); +var inputCorrect = false; +var textCorrect = false; -// initialize email application -function initializeEmailClient(){ - Event.observe('feedback-mailform', 'submit', sendEmail); +function getPlace(){ + if(navigator.appName=="Microsoft Internet Explorer" && parseFloat(navigator.appVersion) < 7){ + document.getElementById('place').style.display = "block"; + } } + +function showPopup(_popupId) { + document.getElementById(_popupId).style.display = "block"; + document.getElementById('timeOutDiv').style.display = "block"; + document.getElementById("feedback-maincontainer").style.display = "block"; + getPlace(); +} - // send http request -function sendEmail(e){ +function hidePopup(_popupId, form, iFrame, but, container) { + document.getElementById(_popupId).style.display = "none"; + document.getElementById('timeOutDiv').style.display = "none"; + document.getElementById(iFrame).style.display = "none"; + document.getElementById(form).style.display = "block"; + document.getElementById(but).style.display = "inline"; + document.getElementById(container).style.left="30%"; + document.getElementById(container).style.top="20%"; + document.getElementById(container).style.width="500px"; + getPlace(); +} - // prevent form from submitting - Event.stop(e); - var params='subject='+$F('subject')+'&emailContent='+escape($F('emailContent'))+'&senderName='+$F('senderName')+'&from='+$F('from')+'&path='+window.location; - var xmlobj=new Ajax.Updater('feedback-state','http://192.168.0.194:8090/feedback/FeedbackRF',{method:'get',parameters: params}); +function showIFrame(form, iFrame, but, container){ + document.getElementById(form).style.display = "none"; + document.getElementById(but).style.display = "none"; + document.getElementById(iFrame).style.display = "block"; + document.getElementById(container).style.height="99%"; + document.getElementById(container).style.left="10%"; + document.getElementById(container).style.top="0"; + document.getElementById(container).style.width="80%"; + document.getElementById("guide_words").style.display = "none"; + } -*/ -function feedbackAppear(){ - document.getElementById('feedback-maincontainer').style.display = "block"; - } - function feedbackClose(){ - document.getElementById('feedback-maincontainer').style.display = "none"; - } - - window.onload = function(){ - var array = new Array(); - for(i=2; i<=6; i++){ - array[i]=document.getElementsByTagName('h'+i).item('a'); - } - for (var i in array){ - if(array[i] != null && array[i].className == 'title'){ - array[i].childNodes[0].setAttribute("href",window.location.toString().replace(/#[0-9A-Za-z_\-]*/, "")+"#"+array[i].childNodes[0].id); - } - } - } - +function fillForm(form){ + document.getElementById(form).attributes['action'].value = + document.getElementById(form).attributes['action'].value + +'&priority='+document.getElementById('priority').value + +'&summary='+document.getElementById('feedback-summary').value + +'&description='+document.getElementById('feedback-description').value + +'&environment='+document.getElementById('feedback-environment').value + +'&components='+document.getElementById('components').value + +'&versions='+document.getElementById('versions').value + +'&customfield_12310031='+document.getElementById('customfield_12310031').value; +} +function submitForm(form, iFrame, but, container){ + document.getElementById(form).submit(); + showIFrame(form, iFrame, but, container); +} + +function setFieldFlag(type, flag){ + if(type=="textarea"){ + textCorrect = flag; + }else if(type=="text"){ + inputCorrect = flag; + } +} +function countLeft(fieldToCheck, count, max) { + var field = document.getElementById(fieldToCheck); + var left = 'none'; + var char_count = field.value.length; + var fullStr = field.value + " "; + var initial_whitespace_rExp = /^[^A-Za-z0-9]+/gi; + var left_trimmedStr = fullStr.replace(initial_whitespace_rExp, ""); + var non_alphanumerics_rExp = rExp = /[^A-Za-z0-9]+/gi; + var cleanedStr = left_trimmedStr.replace(non_alphanumerics_rExp, " "); + var splitString = cleanedStr.split(" "); + var word_count = splitString.length -1; + if (fullStr.length <2) { + word_count = 0; + } + if (field.value.length > max){ + field.value = field.value.substring(0, max); + }else if(count != "none"){ + left = document.getElementById(count); + if(navigator.appName=="Microsoft Internet Explorer"){ + left.innerText = max - field.value.length; + }else{ + left.textContent = max - field.value.length; + } + + } + if (word_count >= 1){ + setFieldFlag(field.type, true); + }else{ + setFieldFlag(field.type, false); + } + if(inputCorrect && textCorrect){ + document.getElementById("feedback-submit").disabled=false; + document.getElementById("feedback-submit").style.color="#415973"; + }else{ + document.getElementById("feedback-submit").disabled=true; + document.getElementById("feedback-submit").style.color="#999"; + } +} + + +function init(input, textarea){ + document.getElementById("feedback-submit").disabled=true; + countLeft(input, "left", 255); + countLeft(textarea, "none", 500); +} + function dbToggle(node, expandText, collapseText) { var dt = node.parentNode; if (dt.nodeName.toLowerCase() == 'dt') { @@ -78,4 +149,4 @@ show: function(node) { node.style.display = ""; } -}; +}; \ No newline at end of file Modified: trunk/docs/common-resources/en/src/main/xslt/xhtml-common.xsl =================================================================== --- trunk/docs/common-resources/en/src/main/xslt/xhtml-common.xsl 2009-03-17 18:18:11 UTC (rev 12994) +++ trunk/docs/common-resources/en/src/main/xslt/xhtml-common.xsl 2009-03-17 21:44:47 UTC (rev 12995) @@ -10,8 +10,8 @@ <xsl:import href="collapsing-navigation.xsl"/> <!--xsl:param name="generate.toc" select="'book toc'"/--> - <xsl:param name="toc.section.depth" select="5"/> - + <xsl:param name="toc.section.depth" select="5"/> + <!-- From: xhtml/docbook.xsl @@ -82,17 +82,54 @@ <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates mode="titlepage.mode"/> </div> -</xsl:template> - - <xsl:template name="feedback"> - <div id="feedback-maincontainer" style="display:none"> +</xsl:template> +<xsl:template name="feedback"> + <!--[if IE 6]><iframe frameborder="0" class="problemLayer" id="place"><xsl:text> </xsl:text></iframe><![endif]--> + <div class="time_out_div" id="timeOutDiv"><xsl:text> </xsl:text></div> + <div id="feedback-maincontainer"> + <h3 id="feedback-header"> + Create new RichFaces Documentation Jira issue + <a href="#" onclick="hidePopup('feedback-maincontainer', 'feedback-mailform', 'feedback-iFrame','feedback-submit', 'feedback-maincontainer');" id="feedback-close"> + <img src="images/close_org.png" class="feedback-images" /> + </a> + </h3> + <iframe id='feedback-iFrame' name="feedback-iFrame"><xsl:text> </xsl:text></iframe> + <form onsubmit="return validate_form()" id="feedback-mailform" method="post" action="https://jira.jboss.org/jira/secure/CreateIssueDetails!init.j... 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="12312451" /> + <input type="hidden" id="customfield_12310031" name="customfield_12310031" value="Documentation (Ref Guide, User Guide, etc.)" /> + + <label for="summary">Summary</label> + <input type="text" id="feedback-summary" name="feedback-summary" title="Summarize the subject of the issue in a few words" maxlength="255" onKeyDown="countLeft('feedback-summary', 'left', 255);" + onKeyUp="countLeft('feedback-summary', 'left', 255);"/> + <div id="summary-helper-left" class="feedback-helper"> + <span id="left">255</span> characters left + </div> + <div class="clear"><xsl:text> </xsl:text></div> + <label for="feedback-description">Description</label> + <textarea id="feedback-description" name="feedback-description" title="Provide more details about the issue" onKeyDown="countLeft('feedback-description', 'none', 500);" + onKeyUp="countLeft('feedback-description', 'none', 500);"><xsl:text> </xsl:text></textarea> + <div class="clear"><xsl:text> </xsl:text></div> + <label for="feedback-environment">Environment</label> + <textarea id="feedback-environment" name="feedback-environment" title="Describe your environment"><xsl:text> </xsl:text></textarea> + </form> + <div id="guide_words">This will launch the RichFaces Jira page - to complete your feedback please login if needed, and submit the Jira.</div> + <input type="button" id="feedback-submit" value="Proceed to Jira" name="submit" class="feedback-formbutton" title="Proceed to create new issue" onclick="fillForm('feedback-mailform'); submitForm('feedback-mailform', 'feedback-iFrame', 'feedback-submit', 'feedback-maincontainer');"/> + </div> + <div id="feedback-wrapper"> + <a id="feedback-link" onclick="showPopup('feedback-maincontainer');"> + <img src="images/feedback_logo.png" class="feedback-images" onload="init('feedback-summary', 'feedback-description');"/> + </a> + </div> + <!--div id="feedback-maincontainer" style="display:none"> <div id="feedback-header"> Send your remarks, comments or wishes to doc team </div> - <a href="#" onclick="feedbackClose();" id="feedback-close"> - <img src="images/close.png" class="feedback-images" /> + <a href="#" onclick="feedbackClose();" id="feedback-close"> + <img src="images/close.png" class="feedback-images" /> </a> - <!--div id="feedback-state"><xsl:text> </xsl:text></div--> + <div id="feedback-state"><xsl:text> </xsl:text></div> <iframe id='feedback-iFrame' name="feedback-iFrame"><xsl:text> </xsl:text></iframe> <form id="feedback-mailform" method="post" action="http://192.168.0.194:8090/feedbackRF/FeedbackRF" target="feedback-iFrame"> <div class="feedback-textbox-div"> @@ -117,9 +154,9 @@ </form> </div> <div id="feedback-wrapper"> - <a id="feedback-link" onclick="feedbackAppear();"> - <img src="images/feedback_logo.png" class="feedback-images" width="100px"/> - </a> - </div> + <a id="feedback-link" onclick="feedbackAppear();"> + <img src="images/feedback_logo.png" class="feedback-images" width="100px"/> + </a> + </div--> </xsl:template> </xsl:stylesheet> Modified: trunk/docs/faq/pom.xml =================================================================== --- trunk/docs/faq/pom.xml 2009-03-17 18:18:11 UTC (rev 12994) +++ trunk/docs/faq/pom.xml 2009-03-17 21:44:47 UTC (rev 12995) @@ -155,12 +155,12 @@ <dependency> <groupId>org.jboss</groupId> <artifactId>jbossorg-docbook-xslt</artifactId> - <version>1.1.0-200803311754</version> + <version>1.1.0</version> </dependency> <dependency> <groupId>org.jboss</groupId> <artifactId>jbossorg-jdocbook-style</artifactId> - <version>1.1.0-200803311754</version> + <version>1.1.0</version> <type>jdocbook-style</type> </dependency> <dependency> Modified: trunk/docs/migrationguide/pom.xml =================================================================== --- trunk/docs/migrationguide/pom.xml 2009-03-17 18:18:11 UTC (rev 12994) +++ trunk/docs/migrationguide/pom.xml 2009-03-17 21:44:47 UTC (rev 12995) @@ -99,12 +99,12 @@ <dependency> <groupId>org.jboss</groupId> <artifactId>jbossorg-docbook-xslt</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.0</version> </dependency> <dependency> <groupId>org.jboss</groupId> <artifactId>jbossorg-jdocbook-style</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.0</version> <type>jdocbook-style</type> </dependency> <dependency> Modified: trunk/docs/realworld_app_guide/pom.xml =================================================================== --- trunk/docs/realworld_app_guide/pom.xml 2009-03-17 18:18:11 UTC (rev 12994) +++ trunk/docs/realworld_app_guide/pom.xml 2009-03-17 21:44:47 UTC (rev 12995) @@ -101,12 +101,12 @@ <dependency> <groupId>org.jboss</groupId> <artifactId>jbossorg-docbook-xslt</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.0</version> </dependency> <dependency> <groupId>org.jboss</groupId> <artifactId>jbossorg-jdocbook-style</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.0</version> <type>jdocbook-style</type> </dependency> <dependency>