merge with dev and readd external link icon

Author: alinh-mitre

src/assets/data/boardCharter.json

@@ -13,7 +13,7 @@
 	 },
 	 {"subSectionId": "member_backgrounds",
           "subSectionTitle": "Board Member Backgrounds",
-	  "subSectionParagraphs": ["Board members are not limited to but traditionally fit into one or more of the following categories:<ul><li><b>Technical Implementers</b> provide input and guidance regarding the creation, design, review, maintenance, and applications of CVE List entries (<a href='/ResourcesSupport/FAQs#pc_cve_recordswhat_is_cve_record' target='_blank'>CVE Entries</a>). This may include individuals who integrate CVE Entries into products, such as content and development engineers working for product vendors, and others who consume CVE Entries.</li><li><b>Subject Matter Experts (SMEs)</b> represent a significant constituency related to &mdash; or affected by &mdash; CVE, and are domain experts in the vulnerability management and reporting field. These members may include representatives from product vendors who represent the needs of their company, such as PSIRT team members, or product managers and product strategists who are representing customers.</li><li><b>Advocates</b> actively support or promote CVE in a highly visible fashion. These individuals are respected leaders within the security community who help bring credibility to CVE and give it a wider reach outside of the security community.</li></ul>"],
+	  "subSectionParagraphs": ["Board members are not limited to but traditionally fit into one or more of the following categories:<ul><li><b>Technical Implementers</b> provide input and guidance regarding the creation, design, review, maintenance, and applications of CVE List records (<a href='/ResourcesSupport/FAQs#pc_cve_recordswhat_is_cve_record' target='_blank'>CVE Records</a>). This may include individuals who integrate CVE Records into products, such as content and development engineers working for product vendors, and others who consume CVE Records.</li><li><b>Subject Matter Experts (SMEs)</b> represent a significant constituency related to &mdash; or affected by &mdash; CVE, and are domain experts in the vulnerability management and reporting field. These members may include representatives from product vendors who represent the needs of their company, such as PSIRT team members, or product managers and product strategists who are representing customers.</li><li><b>Advocates</b> actively support or promote CVE in a highly visible fashion. These individuals are respected leaders within the security community who help bring credibility to CVE and give it a wider reach outside of the security community.</li></ul>"],
 	  "subSubSections":[]
 	 },
 	 {"subSectionId": "structure",

src/assets/data/cnaRules.json

@@ -7,7 +7,7 @@
 				"questionId": "what_is_cve",
 				"questionText": "What is CVE",
 				"questionResponseParagraphs": [
-					"The mission of the Common Vulnerability and Enumeration (CVE®) Program is to identify, define, and catalog publicly disclosed cybersecurity vulnerabilities.",
+					"The mission of the Common Vulnerability and Enumeration (CVE<sup>®</sup>) Program is to identify, define, and catalog publicly disclosed cybersecurity vulnerabilities.",
 					"See the <a href='/About/Overview'>Overview</a> page for additional information."
 				]
 			},

src/assets/data/faqs.json

@@ -273,7 +273,7 @@
     "id": "5",
     "label": "Resources & Support",
     "path": "ResourcesSupport",
-    "primaryNavPath": "/ResourcesSupport/ReportRequest",
+    "primaryNavPath": "/ResourcesSupport/Resources",
     "submenu": {
       "Resources": {
         "id": "5.0",

src/assets/data/navigation.json

@@ -72,7 +72,7 @@
     </div>
     <div class="content">
       <p>
-        Use of the CVE® List and the associated references from this website are subject to the
+        Use of the CVE<sup>®</sup> List and the associated references from this website are subject to the
         <router-link to="/Legal/TermsOfUse">terms of use</router-link>. CVE is sponsored by the
         <a href="https://www.dhs.gov/">U.S. Department of Homeland Security (DHS)
           <span class="icon cve-icon-xxs">

src/components/FooterModule.vue

@@ -9,9 +9,8 @@
                 <h3 class="cve-hidden">CVE partnership</h3>
                 <p class="subtitle cve-subtitle has-text-centered">
                   The CVE Program partners with community members worldwide to grow CVE content and expand its usage. Click below to learn more
-                  about the role of <router-link to="/About/Glossary?activeTerm=glossaryCNA">CVE Numbering Authorities(CNAs)</router-link>,
-                  <router-link to="/About/Glossary?activeTerm=glossaryRoot">Root CNAs</router-link>, and
-                  <router-link to="/About/Glossary?activeTerm=glossaryADP">Authorized Data Publishers</router-link>.
+                  about the role of <router-link to="/About/Glossary?activeTerm=glossaryCNA">CVE Numbering Authorities(CNAs)</router-link>, and
+                  <router-link to="/About/Glossary?activeTerm=glossaryRoot">Roots</router-link>.
                 </p>
                 <div class="buttons is-centered">
                   <router-link to="/PartnerInformation/Partner" class="button cve-button cve-button-base-color">Learn More</router-link>

src/components/HomeModule.vue

@@ -102,7 +102,7 @@
               </span>
             </td>
             <td>
-              <p class="is-capitalized">{{event.title}}</p>
+              <p class="">{{event.title}}</p>
               <p class="is-capitalized cve-help-text">
                 <span v-if="event.date.repeat">
                   {{event.date.repeat.recurrence == 'biweekly' ? 'Every other ' : 'Every'}} {{event.date.repeat.day}}

src/components/HomePageSidebarModule.vue

@@ -6,8 +6,10 @@
           <div class="content">
             <h1 :id="cvenavs['About']['submenu']['History']" class="title">
             {{cvenavs['About']['submenu']['History']['label']}}</h1>
-            <p class="cve-help-text">The majority of the links on this page redirects to external websites; these links 
-              will open a new window or tab depending in the web browser used.</p>
+            <p class="cve-help-text">The majority of the links on this page redirects to external websites
+              <span class="icon cve-icon-xxs help-text-icon"><font-awesome-icon icon="external-link-alt" aria-labelledby="extenalSiteLinks"/>
+              </span>; these links will open a new window or tab depending in the web browser used.
+            </p>
             <h2 :id="cvenavs['About']['submenu']['History']['items']['Overview']['anchorId']" class="title cve-heading-top-spacing">
             {{cvenavs['About']['submenu']['History']['items']['Overview']['label']}}</h2>
             <p>

src/views/About/History.vue

@@ -11,7 +11,7 @@
               {{cvenavs['About']['submenu']['Overview']['items']['About the CVE Program']['label']}}
             </h2>
             <p>
-              The mission of the CVE® Program is to identify,
+              The mission of the CVE<sup>®</sup> Program is to identify,
               define, and catalog publicly disclosed cybersecurity
               <router-link to="/About/Glossary?activeTerm=glossaryVulnerability">vulnerabilities</router-link>. There is one
               <router-link to="/About/Glossary?activeTerm=glossaryRecord">CVE Record</router-link> for each
@@ -25,12 +25,12 @@
             <div class="cve-white-bg-gray-border-container">
               <h3 class="title mt-4">CVE Program Overview</h3>
               <figure class ="image is-16by9">  <!-- youtube video -->
-                <iframe class="has-ratio" width="560" height="315" src="https://www.youtube.com/embed/lkWUJXNu0kQ" frameborder="0"
+                <iframe class="has-ratio" width="560" height="315" src="https://www.youtube.com/embed/rrNYEUNsXOY" frameborder="0"
                   allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen>
                 </iframe>
               </figure>
               <p>
-                Introduction to the CVE® Program, including what is CVE, goals of the program, who operates the
+                Introduction to the CVE<sup>®</sup> Program, including what is CVE, goals of the program, who operates the
                 program, and program organization.
               </p>
             </div>

src/views/About/Overview.vue

@@ -7,6 +7,10 @@
              <h1 :id="cvenavs['About']['submenu']['Related Efforts']['id']" class="title">
               {{cvenavs['About']['submenu']['Related Efforts']['label']}}
              </h1>
+            <p class="cve-help-text">Most of the links below will take you to external
+              websites <span class="icon cve-icon-xxs"><font-awesome-icon icon="external-link-alt" aria-labelledby="extenalSiteLinks"/>
+              </span>; these links will open in a new window or tab depending on your browser.</p>
+            <p>
              <h2 :id="cvenavs['About']['submenu']['Related Efforts']['items']['National Vulnerability Database (NVD)']['anchorId']"
               class="title cve-heading-top-spacing">
                {{cvenavs['About']['submenu']['Related Efforts']['items']['National Vulnerability Database (NVD)']['label']}}</h2>
@@ -111,7 +115,7 @@
               {{cvenavs['About']['submenu']['Related Efforts']['items']['Adversarial Tactics, Techniques & Common Knowledge (ATT&CK)']['label']}}
             </h2>
             <p>
-              <a href="https://attack.mitre.org/" target="_blank">ATT&CK®</a> is a knowledge base of cyber adversary behavior and taxonomy
+              <a href="https://attack.mitre.org/" target="_blank">ATT&CK<sup>®</sup></a> is a knowledge base of cyber adversary behavior and taxonomy
               for adversarial
               actions across their lifecycle. Some “Techniques” listed in ATT&CK, which define how an adversary achieves a tactical goal by
               performing an action, target specific CVE Records. For example, the <a href="https://attack.mitre.org/techniques/T1068/"