Merge pull request #2008 from CVEProject/content-rjr-1991

Content rjr 1991
CVEProject · Jun 13, 2023 · 6b00c6e · 6b00c6e
2 parents bbc25dc + cb6aec2
commit 6b00c6e
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 21 deletions.
diff --git a/public/index.html b/public/index.html
@@ -7,7 +7,7 @@
     <link rel="icon" href="<%= BASE_URL %>cvePurpleVFavicon.svg">
     <title><%= htmlWebpackPlugin.options.title %></title>
   </head>
-  <body>
+  <body class="has-navbar-fixed-top">
     <noscript>
       <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
     </noscript>

diff --git a/src/assets/data/faqs.json b/src/assets/data/faqs.json
@@ -273,11 +273,12 @@
 			},
 			{
 				"questionId": "search_cve",
-				"questionText": "How do I search CVE",
+				"questionText": "How do I search the CVE List",
 				"questionResponseParagraphs": [
-					"Use the CVE ID lookup at the top of this page to search by CVE ID, or visit cve.mitre.org to <a href='https://cve.mitre.org/cve/search_cve_list.html' target='_blank'>search by keyword(s)</a>.",
-					"Other free <a href='https://cve.mitre.org/find/search_tips.html#other_search_resources' target='_blank'>CVE List search resources</a> are also available.",
-					"In addition, as part of its enhanced CVE List content, the <a href='https://nvd.nist.gov/' target='_blank'>U.S. National Vulnerability Database (NVD)</a> provides advanced searching features such as by OS; by vendor name, product name, and/or version number; and by vulnerability type, severity, related exploit range, and impact."
+					"<strong>Keyword(s) Search of All CVE Records</strong>",
+					"<ul><li>Search by keyword(s) across <a href='https://github.com/CVEProject/cvelistV5' target='_blank'>ALL FIELDS of all CVE Records</a> in the cvelistV5 downloads repository using the main search box on github.com.</li><li>Search by keyword(s) in the <a href='https://cve.mitre.org/cve/search_cve_list.html' target='_blank'>Description fields ONLY of all CVE Records</a>  using the legacy search page on cve.mitre.org.</li></ul>",
+					"<strong>Search the U.S. National Vulnerability Database (NVD)</strong>",
+					"<ul><li>As part of its enhanced CVE List content, the NVD provides <a href='https://nvd.nist.gov/vuln/search' target='_blank'>advanced searching features</a>  such as by OS; by vendor name, product name, and/or version number; and by vulnerability type, severity, related exploit range, and impact.</li></ul>"
 				]
 			},
 			{

diff --git a/src/assets/style/globals.scss b/src/assets/style/globals.scss
@@ -11,14 +11,6 @@
   display: flex;
   min-height: 100vh;
   flex-direction: column;
-  margin-top: 52px;
-}
-
-// Work around for sticky secondary navbar sticky starting from desktop so page content is responsive 
-@media only screen and (max-width: $desktop) {
-  #app {
-    margin-top: 52px;
-  }
 }
 
 /* Columns customizations start here */
@@ -78,6 +70,7 @@ section.hero:first-of-type{
   padding-top: 1.5rem;
   text-align: center;
 }
+
 /** Layout - Feedback link ends here **/
 
 /* Layout customizations end here */

diff --git a/src/components/PrimaryNavigation.vue b/src/components/PrimaryNavigation.vue
@@ -91,14 +91,9 @@
           </div>
           <div class="navbar-item cve-secondary-navbar-item cve-keyword-search">
             <span class="icon-text mr-2" style="font-size: 14px">
-              <a href="https://cve.mitre.org/cve/search_cve_list.html" target="_blank" class="cve-dark-blue-text">
-                Find CVE Records by keyword on cve.mitre.org
-                <span class="icon cve-icon-xxs" style="margin-left: 0px;">
-                  <p id="CVERecordsKeywordSearch" class="is-hidden">external site</p>
-                  <font-awesome-icon icon="external-link-alt" aria-labelledby="CVERecordsKeywordSearch">
-                  </font-awesome-icon>
-                </span>
-              </a>
+              <router-link to="/ResourcesSupport/FAQs#pc_cve_list_basicssearch_cve" class="cve-dark-blue-text">
+                Find CVE Records by keyword.
+              </router-link>
             </span>
           </div>
         </div>

diff --git a/src/views/ResourcesSupport/FAQs.vue b/src/views/ResourcesSupport/FAQs.vue
@@ -58,6 +58,15 @@
                   </div>
                   <div :id="item.sectionId + qAndA.questionId + 'response'" class="message-body"
                     :class="{'is-hidden': accordian[item.sectionId + qAndA.questionId]}">
+                    <div v-if="qAndA.questionId == 'search_cve'" class="pb-3">
+                      <p>The following methods are available:</p>
+                      <strong>CVE ID Lookup</strong>
+                      <ul>
+                        <li>Search for a specific CVE Record by its CVE ID using the
+                          <router-link :to="{ hash: '#cve-secondary-navbar' }">CVE ID lookup</router-link> at the top of this page.
+                        </li>
+                      </ul>
+                    </div>
                     <p v-html="$sanitize(responsePara)" v-for="(responsePara, index) in qAndA.questionResponseParagraphs"
                       :key="item.sectionId + qAndA.questionId + index"></p>
                   </div>