Merge pull request #237 from secure-systems-lab/update-projects-new

JustinCappos · web-flow · commit 178c3617bd72 · 2025-12-02T14:34:50.000-05:00
Update projects from #156
diff --git a/.gitignore b/.gitignore
@@ -48,4 +48,4 @@ node_modules
 .jekyll-cache
 
 # Ruby
-.bundle
+.bundle
diff --git a/_data/data.yml b/_data/data.yml
diff --git a/_test/data/test_01_projects_vs_project.yml b/_test/data/test_01_projects_vs_project.yml
@@ -43,7 +43,8 @@ projects:
         image: "img/projects/tuf_diagram.png"
         site: "https://theupdateframework.github.io"
         status: *stealth
-        description: "Software must be updated frequently to not only ensure"
+        description:
+          - "Software must be updated frequently to not only ensure"
         products: "TUF is used in production by"
         people:
             - *justin_cappos
diff --git a/_test/data/test_02_project_list_vs_str.yml b/_test/data/test_02_project_list_vs_str.yml
@@ -43,7 +43,8 @@ projects:
         image: "img/projects/tuf_diagram.png"
         site: "https://theupdateframework.github.io"
         status: *stealth
-        description: "Software must be updated frequently to not only ensure"
+        description:
+          - "Software must be updated frequently to not only ensure"
         products: "TUF is used in production by"
         people:
             - *justin_cappos
diff --git a/_test/data/test_03_misspelled_alias.yml b/_test/data/test_03_misspelled_alias.yml
@@ -43,7 +43,8 @@ projects:
         image: "img/projects/tuf_diagram.png"
         site: "https://theupdateframework.github.io"
         status: *stealth
-        description: "Software must be updated frequently to not only ensure"
+        description:
+          - "Software must be updated frequently to not only ensure"
         products: "TUF is used in production by"
         people:
             - *justin_cappos
diff --git a/_test/data/test_04_unescaped_quotes.yml b/_test/data/test_04_unescaped_quotes.yml
@@ -43,7 +43,8 @@ projects:
         image: "img/projects/tuf_diagram.png"
         site: "https://theupdateframework.github.io"
         status: *stealth
-        description: "Software must be updated frequently to not only ensure"
+        description:
+          - "Software must be updated frequently to not only ensure"
         products: "TUF is used in production by"
         people:
             - *justin_cappos
diff --git a/_test/data/test_05_alias_instead_of_str.yml b/_test/data/test_05_alias_instead_of_str.yml
@@ -43,7 +43,8 @@ projects:
         image: "img/projects/tuf_diagram.png"
         site: "https://theupdateframework.github.io"
         status: *stealth
-        description: "Software must be updated frequently to not only ensure"
+        description:
+          - "Software must be updated frequently to not only ensure"
         products: "TUF is used in production by"
         people:
             - *justin_cappos
diff --git a/_test/data/test_data.yml b/_test/data/test_data.yml
@@ -43,7 +43,8 @@ projects:
         image: "img/projects/tuf_diagram.png"
         site: "https://theupdateframework.github.io"
         status: *stealth
-        description: "Software must be updated frequently to not only ensure"
+        description:
+          - "Software must be updated frequently to not only ensure"
         products: "TUF is used in production by"
         people:
             - *justin_cappos
diff --git a/_test/yamale_schema.yml b/_test/yamale_schema.yml
@@ -47,7 +47,7 @@ project:
     image: str(required=False)
     site: str(required=False)
     status: include('status')
-    description: str()
+    description: list(str())
     products: str()
     people: list(any(include('person'), include('proj_person')))
     tags: list(include('tag'))
diff --git a/css/projects.scss b/css/projects.scss
@@ -74,6 +74,10 @@
         font-weight: bold;
         font-size: 1.2rem;
     }
+
+    h5 {
+      font-family: 'Bebas Neue', Helvetica, Arial, sans-serif;
+    }
 }
 
 /* Tooltips - http://www.w3schools.com/howto/howto_css_tooltip.asp */
diff --git a/overview.md b/overview.md
@@ -1,6 +1,7 @@
 ---
 title: Overview
 subnav: overview
+permalink: /overview/
 layout: default
 ---
 
diff --git a/people.html b/people.html
@@ -1,6 +1,7 @@
 ---
 title: People
 subnav: people
+permalink: /people/
 layout: default
 ---
 <link rel="stylesheet" href="{{ site.baseurl }}css/people.css">
diff --git a/press.html b/press.html
@@ -1,6 +1,7 @@
 ---
 title: Press
 subnav: press
+permalink: /press/
 layout: default
 ---
 
diff --git a/projects.html b/projects.html
@@ -1,6 +1,7 @@
 ---
 title: Projects
 subnav: projects
+permalink: /projects/
 layout: default
 ---
 
@@ -58,22 +59,22 @@ <h3><a href="#{{ project.anchor }}"> {{ project.name | size_upcase }} </a></h3>
     <img class="image" src="{{ project.image }}"></img>
     {% endif %}
 
-    <div class="description"><p>
-      {{ project.description }}
-    </p></div>
+      <div class="description">
+          {% for desc in project.description %}
+          <p>
+              {{ desc }}
+          </p>
+          {% endfor %}
+      </div>
 
-    <ul>
        {% if project.products %}
-         <li>
-           <span class="header">Products: </span>
-           <span class="products">{{ project.products }}</span>
-         </li>
+          <h5 class="header">Products</h5>
+          <p class="products">{{ project.products }}</p>
        {% endif %}
 
        {% if project.people %}
-          <br />
-          <li><div class="people">
-             <span class="header">People: </span>
+          <div class="people">
+              <h5 class="header">People</h5>
              {% assign personLinks = '' | split:':' %}
              {% for person in project.people %}
              {% if person == nil %}
@@ -87,9 +88,8 @@ <h3><a href="#{{ project.anchor }}"> {{ project.name | size_upcase }} </a></h3>
              {% endfor %}
 
              {{ personLinks | array_to_sentence_string }}
-          </div></li>
+          </div>
        {% endif %}
-    </ul>
   </div>
   {% endfor %}
   <div class="project">
diff --git a/publications.html b/publications.html
@@ -1,6 +1,7 @@
 ---
 title: Publications
 subnav: publications
+permalink: /publications/
 layout: default
 ---
 

-Original file line number
+Diff line change
 .jekyll-cache
 # Ruby
 -.bundle
 +.bundle
Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,10 @@`
`74`	`74`	`font-weight: bold;`
`75`	`75`	`font-size: 1.2rem;`
`76`	`76`	`}`
	`77`	`+`
	`78`	`+ h5 {`
	`79`	`+ font-family: 'Bebas Neue', Helvetica, Arial, sans-serif;`
	`80`	`+ }`
`77`	`81`	`}`
`78`	`82`
`79`	`83`	`/* Tooltips - http://www.w3schools.com/howto/howto_css_tooltip.asp */`