You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@community.apache.org by hu...@apache.org on 2019/08/01 21:54:42 UTC
svn commit: r1864180 - in /comdev/reporter.apache.org/trunk/site/wizard:
css/wizard.css js/source/generators.js js/wizard.js
Author: humbedooh
Date: Thu Aug 1 21:54:42 2019
New Revision: 1864180
URL: http://svn.apache.org/viewvc?rev=1864180&view=rev
Log:
reflow comments and allow for scrolling right side panel
Modified:
comdev/reporter.apache.org/trunk/site/wizard/css/wizard.css
comdev/reporter.apache.org/trunk/site/wizard/js/source/generators.js
comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js
Modified: comdev/reporter.apache.org/trunk/site/wizard/css/wizard.css
URL: http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/css/wizard.css?rev=1864180&r1=1864179&r2=1864180&view=diff
==============================================================================
--- comdev/reporter.apache.org/trunk/site/wizard/css/wizard.css (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/css/wizard.css Thu Aug 1 21:54:42 2019
@@ -271,6 +271,7 @@
border-radius: 10px;
font-size: 0.8rem;
padding: 4px;
+ overflow-y: auto;
}
#unified-report {
Modified: comdev/reporter.apache.org/trunk/site/wizard/js/source/generators.js
URL: http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/js/source/generators.js?rev=1864180&r1=1864179&r2=1864180&view=diff
==============================================================================
--- comdev/reporter.apache.org/trunk/site/wizard/js/source/generators.js (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/source/generators.js Thu Aug 1 21:54:42 2019
@@ -120,8 +120,21 @@ function generate_meta(data) {
let cdates = Object.keys(comments.comments);
cdates.sort();
if (comments && cdates.length > 0) {
+ let date = cdates[cdates.length-1];
+ let comment = comments.comments[date];
+
+ // split and rejoin comments
+ let ntxt = "";
+ let a = comment.match(/([a-z0-9]+: [\s\S\r\n]+?)(?=([a-z0-9]+:|$))/gi);
+ if (a) {
+ for (var i = 0; i < a.length; i++) {
+ let cmt = a[i];
+ cmt = cmt.replace(/[\r\n]+/g, ' ').replace(/([a-z0-9]+:)/, (a) => "<kbd>"+a+"</kbd><br/>");
+ ntxt += cmt + "<hr/>";
+ }
+ }
txt += "<hr/><h6>Last report comments from the board: </h6>";
- txt += "<b>%s:</b><br/><pre>%s</pre>".format(cdates[cdates.length-1], comments.comments[cdates[cdates.length-1]]);
+ txt += "<b style='color: #369;'>%s:</b><br/><span style='white-space: wrap; font-size: 0.8rem;'>%s</span>".format(date, ntxt);
}
return txt;
}
Modified: comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js
URL: http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js?rev=1864180&r1=1864179&r2=1864180&view=diff
==============================================================================
--- comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js Thu Aug 1 21:54:42 2019
@@ -1267,8 +1267,21 @@ function generate_meta(data) {
let cdates = Object.keys(comments.comments);
cdates.sort();
if (comments && cdates.length > 0) {
+ let date = cdates[cdates.length-1];
+ let comment = comments.comments[date];
+
+ // split and rejoin comments
+ let ntxt = "";
+ let a = comment.match(/([a-z0-9]+: [\s\S\r\n]+?)(?=([a-z0-9]+:|$))/gi);
+ if (a) {
+ for (var i = 0; i < a.length; i++) {
+ let cmt = a[i];
+ cmt = cmt.replace(/[\r\n]+/g, ' ').replace(/([a-z0-9]+:)/, (a) => "<kbd>"+a+"</kbd><br/>");
+ ntxt += cmt + "<hr/>";
+ }
+ }
txt += "<hr/><h6>Last report comments from the board: </h6>";
- txt += "<b>%s:</b><br/><pre>%s</pre>".format(cdates[cdates.length-1], comments.comments[cdates[cdates.length-1]]);
+ txt += "<b style='color: #369;'>%s:</b><br/><span style='white-space: wrap; font-size: 0.8rem;'>%s</span>".format(date, ntxt);
}
return txt;
}