Author: humbedooh
Date: Sat Aug 17 08:17:48 2019
New Revision: 1865338
URL: http://svn.apache.org/viewvc?rev=1865338&view=rev
Log:
fix highlighting for tags
Modified:
comdev/reporter.apache.org/trunk/site/wizard/highlighter/highlighter.css
comdev/reporter.apache.org/trunk/site/wizard/index.html
comdev/reporter.apache.org/trunk/site/wizard/js/source/unified.js
comdev/reporter.apache.org/trunk/site/wizard/js/wizard-beta.js
Modified:
comdev/reporter.apache.org/trunk/site/wizard/highlighter/highlighter.css
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/highlighter/highlighter.css?rev=1865338&r1=1865337&r2=1865338&view=diff
==============================================================================
--- comdev/reporter.apache.org/trunk/site/wizard/highlighter/highlighter.css
(original)
+++ comdev/reporter.apache.org/trunk/site/wizard/highlighter/highlighter.css
Sat Aug 17 08:17:48 2019
@@ -61,16 +61,22 @@
background-color: #ffec99;
}
-.hwt-content mark.orange {
- background-color: #ffac99;
+.hwt-content div.green {
+ background-color: #afa3;
+ width: 100%;
+ display: inline-block;
}
-.hwt-content div.green {
- background-color: #efe;
+
+.hwt-content mark.classified {
+ background-color: #3335 !important;
width: 100%;
+ font-weight: bold;
display: inline-block;
+ visibility: visible;
}
+
mark.green {
visibility: hidden;
}
Modified: comdev/reporter.apache.org/trunk/site/wizard/index.html
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/index.html?rev=1865338&r1=1865337&r2=1865338&view=diff
==============================================================================
--- comdev/reporter.apache.org/trunk/site/wizard/index.html (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/index.html Sat Aug 17 08:17:48
2019
@@ -13,8 +13,8 @@
<title>ASF Board Report Wizard</title>
<link rel="stylesheet" media="screen"
href="https://fontlibrary.org/face/selawik"; type="text/css"/>
-<link rel="stylesheet" href="css/wizard.css?unified-1.1"/>
-<link rel="stylesheet" href="highlighter/highlighter.css?unified-1.1"/>
+<link rel="stylesheet" href="css/wizard.css?unified-1.3"/>
+<link rel="stylesheet" href="highlighter/highlighter.css?unified-1.3"/>
<link rel="stylesheet"
href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css";
integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T"
crossorigin="anonymous">
</head>
<body onload="init_wizard(false);">
@@ -62,7 +62,7 @@
<script
src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js";
integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM"
crossorigin="anonymous"></script>
<script
src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.24.0/moment.min.js";></script>
<script src="highlighter/highlighter.js" type="text/javascript"></script>
-<script src="js/wizard-beta.js?unified-1.2" type="text/javascript"></script>
+<script src="js/wizard-beta.js?unified-1.3" type="text/javascript"></script>
</body>
</html>
Modified: comdev/reporter.apache.org/trunk/site/wizard/js/source/unified.js
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/js/source/unified.js?rev=1865338&r1=1865337&r2=1865338&view=diff
==============================================================================
--- comdev/reporter.apache.org/trunk/site/wizard/js/source/unified.js (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/source/unified.js Sat Aug
17 08:17:48 2019
@@ -9,10 +9,11 @@ function UnifiedEditor_highlight_section
let hilites = [];
// Headers are blue
hilites.push({highlight: /^## [^\r\n]+:/mg, className: 'blue' });
- hilites.push({highlight: /^<private>.+?<\/private>/g, className: 'orange'
});
// Placeholders are grey with red border
hilites.push({highlight: PLACEHOLDER, className: 'none' });
-
+ // <private> sections
+ hilites.push({highlight: /<private>[\s\S]+?<\/private>/i, className:
'classified' });
+
// Capture text cursor position(s) before we continue.
let x = $('#unified-report').prop('selectionStart');
let y = $('#unified-report').prop('selectionEnd');
Modified: comdev/reporter.apache.org/trunk/site/wizard/js/wizard-beta.js
URL:
http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/js/wizard-beta.js?rev=1865338&r1=1865337&r2=1865338&view=diff
==============================================================================
--- comdev/reporter.apache.org/trunk/site/wizard/js/wizard-beta.js (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/wizard-beta.js Sat Aug 17
08:17:48 2019
@@ -3299,10 +3299,11 @@ function UnifiedEditor_highlight_section
let hilites = [];
// Headers are blue
hilites.push({highlight: /^## [^\r\n]+:/mg, className: 'blue' });
- hilites.push({highlight: /^<private>.+?<\/private>/g, className: 'orange'
});
// Placeholders are grey with red border
hilites.push({highlight: PLACEHOLDER, className: 'none' });
-
+ // <private> sections
+ hilites.push({highlight: /<private>[\s\S]+?<\/private>/i, className:
'classified' });
+
// Capture text cursor position(s) before we continue.
let x = $('#unified-report').prop('selectionStart');
let y = $('#unified-report').prop('selectionEnd');
