diff --git a/README.md b/README.md
index 641f2fe..eaef37f 100644
--- a/README.md
+++ b/README.md
@@ -37,6 +37,6 @@ Adding to submenu:
Adding new image:
- add image to /static/images/
- use images/image_name.png as the path in markdown
- *Note: images being added in html '{{absURL "images/DocumentImages/overviewOverlay.png"}}' or it will not render in github pages*
+ *Note: images being added in html '{{absURL "images/DocumentImages/overviewOverlay.jpg"}}' or it will not render in github pages*
CSS Edits:
- do NOT use the CSS in the theme, go to /assets/sass/custom.scss to make changes.
diff --git a/assets/js/main.js b/assets/js/main.js
index 1d4e08b..94b545b 100644
--- a/assets/js/main.js
+++ b/assets/js/main.js
@@ -3,32 +3,133 @@
html5up.net | @ajlkn
Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
*/
-
(function($) {
-// Hide the Arcana and HTML5 in the footer
-// Grab the footer element by class name
-const COPYRIGHT_FOOTER = document.getElementsByClassName("menu")[0];
-
-// Ensure that the element exists before proceeding
-if (COPYRIGHT_FOOTER) {
- // Get all
children of the selected element
- const COPYRIGHT_FOOTER_LIST_ITEMS = COPYRIGHT_FOOTER.getElementsByTagName("li");
-
- // Get the indexes of the last two items
- const totalItems = COPYRIGHT_FOOTER_LIST_ITEMS.length;
- if (totalItems >= 2) {
- const secondToLastIndex = totalItems - 2;
- const lastIndex = totalItems - 1;
-
- // Select the last two list items
- const secondLastItem = COPYRIGHT_FOOTER_LIST_ITEMS[secondToLastIndex];
- const lastItem = COPYRIGHT_FOOTER_LIST_ITEMS[lastIndex];
-
- // Remove the display of the two list items
- secondLastItem.style.display = 'none';
- lastItem.style.display = 'none';
+
+ function debounce(func, delay) {
+ let debounceTimer;
+ return function() {
+ const context = this;
+ const args = arguments;
+ clearTimeout(debounceTimer);
+ debounceTimer = setTimeout(() => func.apply(context, args), delay);
+ }
+ }
+
+ // Breakpoints to align accomplishments pictures
+ const calibrationMap = {
+ 2560: 500,
+ 1920: 450,
+ 1680: 430,
+ 1520: 360,
+ 1440: 360,
+ 1280: 430,
+ 1024: 240,
+ 768: 240,
+ 736: 130,
+ 425: 130
+ };
+
+ // Function to execute when a breakpoint is hit
+ function onBreakpointHit(width, offset) {
+ // console.log(`Window has hit the width of ${width}px or lower. Using offset ${offset}px.`);
+ calibrateAccomplishmentsSide(offset);
+ }
+
+ function checkWindowWidth() {
+ const currentWidth = window.innerWidth;
+ // console.log(`Current window width: ${currentWidth}`); // Log the current width for debugging
+ const calibrationList = Object.keys(calibrationMap).map(Number).sort((a, b) => a - b);
+ const lastBreakpoint = calibrationList[calibrationList.length - 1]; // Get the largest breakpoint
+
+ let appliedBreakpoint = null;
+
+ for (const width of calibrationList) {
+ if (currentWidth <= width) {
+ appliedBreakpoint = width;
+ break; // Exit the loop once the first applicable breakpoint is found
+ }
+ }
+
+ // If no suitable breakpoint was found, use the largest breakpoint
+ if (appliedBreakpoint === null) {
+ appliedBreakpoint = lastBreakpoint;
+ }
+
+ // console.log("checking applied breakpoint", appliedBreakpoint);
+ if (appliedBreakpoint !== null) {
+ onBreakpointHit(appliedBreakpoint, calibrationMap[appliedBreakpoint]);
+ }
+ }
+
+
+ // Debounce the checkWindowWidth function
+ const debouncedCheckWindowWidth = debounce(checkWindowWidth, 200);
+
+ // Add the event listener for window resize
+ window.addEventListener('resize', debouncedCheckWindowWidth);
+
+ const SIDEBAR_CONTAINER = document.getElementById("AccomplishmentsRight")
+ const HEADINGS = document.querySelectorAll("h3")
+ const PICTURE_FIGS = document.getElementsByClassName("AccomplishmentFig")
+ const pictureFigsArray = Array.from(PICTURE_FIGS);
+ const lastIndex = pictureFigsArray.length - 1; // Get last index of array
+
+ calibrateAccomplishmentsSide = (align_int) => {
+ let headerMap = {}
+ // for each H3 element in header, headerMap[h3.id] = h3.offsetTop //(pixels from top)
+ if (PICTURE_FIGS.length != 0){ // If picture figs exist, the length will never be 0
+ // no longer messes up every h3 element on the website, only adjusts those on the
+ // accomplishments page
+ HEADINGS.forEach((h3, index) => {
+ if (index != 0){
+ h3.style.marginTop = 125 + "px";
+ }
+ headerMap[h3.id] = h3.offsetTop
+ })
+ }
+ // for each fig in picture_fig, if fig.data-correspond match headerMap
+ // then fig.top = headerMap[fig.data-correspond]px;
+ pictureFigsArray.forEach((fig, index) => {
+ let correspondId = fig.getAttribute('data-correspond');
+ if (headerMap[correspondId] !== undefined) {
+ // Set the top position of the fig to the corresponding header offset
+ fig.style.top = headerMap[correspondId] - align_int + "px";
+ }
+
+ // Check if the current fig is the last entry
+ if (index === lastIndex) {
+ // Grab the offsetTop of the last entry fig
+ const lastFigOffsetTop = fig.offsetTop;
+ // equaling the sidebar to the length of which the last picture's bottom
+ // side is
+ SIDEBAR_CONTAINER.style.height = lastFigOffsetTop + 400 + "px";
+ }
+ });
+ }
+ checkWindowWidth()
+
+ // Footer
+ const COPYRIGHT_FOOTER = document.getElementsByClassName("menu")[0];
+
+ if (COPYRIGHT_FOOTER) {
+ // Grab Footer
's
+ const COPYRIGHT_FOOTER_LIST_ITEMS = COPYRIGHT_FOOTER.getElementsByTagName("li");
+
+ // Get the indexes of the last two items
+ const totalItems = COPYRIGHT_FOOTER_LIST_ITEMS.length;
+ if (totalItems >= 2) {
+ const secondToLastIndex = totalItems - 2;
+ const lastIndex = totalItems - 1;
+
+ // Select the last two list items
+ const secondLastItem = COPYRIGHT_FOOTER_LIST_ITEMS[secondToLastIndex];
+ const lastItem = COPYRIGHT_FOOTER_LIST_ITEMS[lastIndex];
+
+ // Remove the display of the two
's
+ secondLastItem.style.display = 'none';
+ lastItem.style.display = 'none';
+ }
}
-}
var $window = $(window),
$body = $('body');
@@ -125,17 +226,17 @@ if (COPYRIGHT_FOOTER) {
if (slideIndex > slides.length) {slideIndex = 1}
for (i = 0; i < dots.length; i++) {
dots[i].className = dots[i].className.replace(" active", "");
- }
+ }
slides[slideIndex-1].style.display = "block";
dots[slideIndex-1].className += " active";
- if (slideIndex == 1){
+ if (slideIndex == 1){ // Change image every 8 seconds on the first slide, 13 on every other
delay = 8000
} else{
delay = 13000
}
- setTimeout(showSlides, delay); // Change image every 8 seconds on the first slide, 13 on every other
+ setTimeout(showSlides, delay);
}
diff --git a/assets/sass/custom.scss b/assets/sass/custom.scss
index d8a364b..33200d2 100644
--- a/assets/sass/custom.scss
+++ b/assets/sass/custom.scss
@@ -25,26 +25,174 @@ img {vertical-align: middle;}
+$breakpoints: (
+ laptopls: 2685px,
+ laptopl: 2560px,
+ default: 1920px,
+ wide: 1680px,
+ laptopm: 1520px,
+ laptops: 1440px,
+ normal: 1280px,
+ tablet: 1024px,
+ narrow: 980px,
+ narrower: 840px,
+ mobile: 736px,
+ mobilel: 480px,
+ mobilem: 400px,
+ mobiles: 350px,
+);
+
+@mixin breakpoint($point) {
+ @media (max-width: map-get($breakpoints, $point)) {
+ @content;
+ }
+}
+
/* Slideshow container */
+#banner {
+ /* Adjusting margin for CTA below the slideshow banner */
+ margin-bottom: 32.9%;
+
+ @include breakpoint(laptopls){
+ margin-bottom: 34%
+ }
+
+ @include breakpoint(laptopl){
+ margin-bottom: 32.9%
+ }
+
+ @include breakpoint(default){
+ margin-bottom: 24.8%;
+ }
+
+ @include breakpoint(wide) {
+ margin-bottom: 24.8%;
+ }
+
+ @include breakpoint(laptopm) {
+ margin-bottom: 26.8%
+ }
+
+ @include breakpoint(laptops) {
+ margin-bottom: 25.1%
+ }
+
+ @include breakpoint(normal) {
+ margin-bottom: 25%;
+ }
+
+ @include breakpoint(tablet){
+ margin-bottom: 22.4%;
+ }
+
+ @include breakpoint(narrow) {
+ margin-bottom: 22%;
+ }
+
+ @include breakpoint(narrower) {
+ margin-bottom: 11%;
+ }
+
+ @include breakpoint(mobilel){
+ margin-bottom: -13%;
+ }
+
+ @include breakpoint(mobilem){
+ margin-bottom : -22%;
+ }
+
+ @include breakpoint(mobiles){
+ margin-bottom: -36%
+ }
+}
+
.slideshow-container {
max-width: 100%;
position: relative;
margin: auto;
- text-align: center;
- img{
+ text-align: center;
+
+ img {
width: 100vw;
height: 30vw;
- }
-
+
+ @include breakpoint(laptopls){
+ margin-bottom: 34%
+ }
+
+ @include breakpoint(laptopl){
+ margin-bottom: 32.9%
+ }
+
+ @include breakpoint(default){
+ margin-bottom: 24.8%;
+ }
+
+ @include breakpoint(wide) {
+ margin-bottom: 24.8%;
+ }
+
+ @include breakpoint(laptopm) {
+ margin-bottom: 26.8%
+ }
+ @include breakpoint(laptops) {
+ margin-bottom: 25.1%
+ }
+
+ @include breakpoint(normal) {
+ margin-bottom: 25%;
+ }
+
+ @include breakpoint(tablet){
+ margin-bottom: 22.4%;
+ }
+
+ @include breakpoint(narrow) {
+ margin-bottom: 22%;
+ }
+
+ @include breakpoint(narrower) {
+ margin-bottom: 11%;
+ }
+
+ @include breakpoint(mobilel){
+ margin-bottom: -13%;
+ }
+
+ @include breakpoint(mobilem){
+ margin-bottom : -22%;
+ }
+
+ @include breakpoint(mobiles){
+ margin-bottom: -36%
+ }
+ }
}
+/* Container to hold the image and handle the cropping */
+.mySlides {
+ position: relative;
+ width: 100%;
+ padding-top: 56.25%;
+ overflow: hidden;
+}
+/* Image styling to ensure it covers the container */
+.mySlides img {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ object-fit: cover;
+ z-index: -1;
+}
/* Caption text */
.text {
color:white;
- font-size: 30px;
+ // font-size: 30px;
padding: 50px 0px;
position: absolute;
top: 20%;
@@ -54,6 +202,15 @@ img {vertical-align: middle;}
line-height: 2.6vw;
color:white;
text-shadow: 2px 2px 0px black;
+
+ @include breakpoint(mobile){
+ font-size: 10px;
+ text-shadow: 0.7px 0.7px 0px black;
+ }
+
+ @include breakpoint(mobilel){
+ font-size: 7px;
+ }
}
/* Number text (1/3 etc) */
@@ -65,6 +222,11 @@ img {vertical-align: middle;}
top: 0;
}
+.blue-text {
+ color: rgb(69, 208, 255);
+ text-decoration: underline;
+}
+
/* The dots/bullets/indicators */
.active {
@@ -105,12 +267,21 @@ img {vertical-align: middle;}
.figConfigpdf h4 {
line-height: 100%;
font-size: 1vw;
- font-size: 1vw;
line-height: 1.3vw;
margin-bottom: 1.2vw;
text-align:left;
max-width: 100%;
color:black;
+
+ @include breakpoint(narrow){
+ line-height: 3vw;
+ font-size: 2vw
+ }
+
+ @include breakpoint(mobilel){
+ line-height: 4vw;
+ font-size: 3vw
+ }
}
.figConfigpdf figcaption{
@@ -122,6 +293,16 @@ img {vertical-align: middle;}
text-align:left;
max-width: 100%;
color:black;
+
+ @include breakpoint(narrow){
+ line-height: 3vw;
+ font-size: 2vw
+ }
+ @include breakpoint(mobilel){
+ line-height: 4vw;
+ font-size: 3vw;
+ margin-top: 7px;
+ }
}
}
@@ -146,9 +327,15 @@ img {vertical-align: middle;}
min-width: 20vw;
}
+/* Market Images on their individual page */
+.market_image{
+ width:65%;
+}
+
/* For sidebar Info */
.SidebarFig {
+ margin-bottom: 10px;
display: flex;
flex-direction: column;
align-items: center;
@@ -186,21 +373,57 @@ img {vertical-align: middle;}
}
.SidebarFig img {
- max-width: 100%;
+ max-width: 212px;
height: auto;
display: block;
margin: 0 auto;
@media (max-width: 1440px) {
- max-width: 90%;
+ max-width: 110px;
}
@media (max-width: 1024px) {
- max-width: 80%;
+ max-width: 170px;
}
}
+// Handling Accomplishments styles
+#AccomplishmentsRight {
+ flex: 0 0 30%;
+ position: relative;
+}
+
+#AccomplishmentsRight .AccomplishmentFig {
+ position:absolute;
+}
+
+
+.AccomplishmentFig {
+ @extend .SidebarFig;
+ img {
+ max-width: 100%;
+ height: auto;
+ display: block;
+ margin: 0 auto;
+
+ @media (max-width: 1440px) {
+ max-width: 90%;
+ }
+
+ @media (max-width: 1024px) {
+ max-width: 80%;
+ }
+
+ @include breakpoint(narrower) {
+ max-width: 50%
+ }
+
+ @include breakpoint(mobilel){
+ max-width: 100%;
+ }
+ }
+}
.SidebarFig h4{
@@ -229,18 +452,13 @@ img {vertical-align: middle;}
max-width:100%;
font-size: 1.5vw;
- @media (max-width: 480px) {
- margin-right: 20%;
- }
-
- @media (min-width: 576px) {
- font-size: 2vw;
+ @include breakpoint(mobilel){
+ margin-right: 1%;
+ font-size: 11px
}
- @media (min-width: 768px) {
- font-size: 2vw;
- }
- @media (min-width: 992px) {
- font-size: 1.5vw;
+
+ @include breakpoint(mobilem){
+ font-size: 8px
}
}
@@ -353,13 +571,19 @@ a.imageLink{
}
header {
+
p {
- color: _palette(fg-light);
+ // color: _palette(fg-light);
+ color: rgb(66, 66, 66);
font-size: 1em;
position: relative;
margin-top: -1.25em;
margin-bottom: 0.25em;
font-style:italic;
+
+ @include breakpoint(mobile){
+ margin-top: 5px
+ }
}
&.major {
@@ -382,6 +606,22 @@ header {
}
}
+#highlights-heading {
+ text-align: center;
+ font-size: 20px;
+ padding-left: 5px;
+ padding-right: 5px;
+
+ h1{
+ @include breakpoint(mobilel){
+ font-size: 15px;
+ }
+
+ @include breakpoint(mobiles){
+ font-size: 13px
+ }
+ }
+}
.PlaylistFig{
display: inline-table;
@@ -398,4 +638,11 @@ header {
margin-bottom:0.1vw;
}
+}
+
+/* Fix for squished logo on mobile */
+#titleBar{
+ span h1 a img{
+ width: 400px;
+ }
}
\ No newline at end of file
diff --git a/content/ABOUT/About.md b/content/ABOUT/About.md
index abeae8d..382250a 100644
--- a/content/ABOUT/About.md
+++ b/content/ABOUT/About.md
@@ -5,7 +5,7 @@ menu: main
weight: 30
image: images/VOLTTRON-Device-Better2.jpg
image_alt: "Hello!"
-
+weight: 2
sidebar_left: AboutSidebar
diff --git a/content/ARCHIVES/Publications.md b/content/ARCHIVES/Publications.md
index 0878e10..23c5a91 100644
--- a/content/ARCHIVES/Publications.md
+++ b/content/ARCHIVES/Publications.md
@@ -20,12 +20,12 @@ weight: 41
{{< figure class="figConfigpdf" title="Eclipse VOLTTRON Threat Profile - May 2019" src="../../images/publications/ThreatProfile1.jpg" link="../../Documents/publications/ThreatProfile1.pdf" caption="Establishes security requirements, justifies security measures, and yields actionable controls...">}}
{{< figure class="figConfigpdf" title="Security Features Eclipse VOLTTRON Distributed Sensing and Control Platform" src="../../images/publications/SecurityFeatures.jpg" link="../../Documents/publications/SecurityFeatures.pdf" caption="Eclipse VOLTTRON enables rapid authoring and secure deployment of autonomous software agentss...">}}
{{< figure class="figConfigpdf" title="Eclipse VOLTTRON Deployment and Scalability" src="../../images/publications/VOLTTRON_Scalability-update-final_Page_01.jpg" link="../../Documents/publications/Eclipse VOLTTRON_Scalability-update-final.pdf" caption="Throughout Fiscal Years (FY) 2016 and early 2017, Pacific Northwest National Laboratory (PNNL)...">}}
-{{< figure class="figConfigpdf" title="Eclipse VOLTTRON Documentation" src="../../images/publications/VOLTTRON_Documentation.jfif" link="http://VOLTTRON.readthedocs.io/en/develop/index.html" caption="This resource serves as a user guide for the deployment of...">}}
+{{< figure class="figConfigpdf" title="Eclipse VOLTTRON Documentation" src="../../images/publications/VOLTTRON_Documentation.jfif" link="https://eclipse-volttron.readthedocs.io/" caption="This resource serves as a user guide for the deployment of...">}}
{{< figure class="figConfigpdf" title="Eclipse VOLTTRON Brochure" src="../../images/publications/VOLTTRON_Brochure.jpg" link="../../Documents/VOLTTRON_Brochure_V11_WEB.pdf" caption="Eclipse VOLTTRON is an open source distributed control and sensing software platform...">}}
{{< figure class="figConfigpdf" title="Transactive Control of Commercial Building HVAC Systems" src="../../images/publications/TCC_HVAC_Systems.jpg" link="../../Documents/publications/TCC_HVAC_Systems.pdf" caption="This document details the development and testing of market-based...">}}
{{< figure class="figConfigpdf" title="Coordination and Control of Flexible Buildings" src="../../images/publications/RenewableIntegrations.jpg" link="../../Documents/publications/RenewableIntegration.pdf" caption="Renewable energy resources such as wind and solar power have a high degree of uncertainty...">}}
{{< figure class="figConfigpdf" title="Intelligent Load Control" src="../../images/publications/IntelligentLoadControl.jpg" link="../../Documents/publications/IntelligentLoadControl.pdf" caption="This report describes how the intelligent load control (ILC) algorithm can be implemented to achieve peak demand reduction while minimizing impacts on occupant comfort...">}}
-{{< figure class="figConfigpdf" title="Eclipse VOLTTRON Buildings" src="../../images/publications/EnergyEfficiencyBuild1.png" link="../../Documents/VOLTTRON_buildings_2017.pdf" caption="Descriptions of how Eclipse VOLTTRON can be used to enable improved control of building operations and energy efficiency.">}}
+{{< figure class="figConfigpdf" title="Eclipse VOLTTRON Buildings" src="../../images/publications/Build1.png" link="../../Documents/VOLTTRON_buildings_2017.pdf" caption="Descriptions of how Eclipse VOLTTRON can be used to enable improved control of building operations and energy efficiency.">}}
{{< figure class="figConfigpdf" title="Eclipse VOLTTRON Security" src="../../images/publications/SecureEnergyEfficiencyTool.png" link="../../Documents/VOLTTRON_security_2017.pdf" caption="A summary of Eclipse VOLTTRON's cutting-edge security features.">}}
{{< figure class="figConfigpdf" title="Eclipse VOLTTRON Grid Services" src="../../images/publications/DistributingWithTheGrid.png" link="../../Documents/VOLTTRON_gridservices_2017.pdf" caption="Descriptions of how Eclipse VOLTTRON can be used to improve integration of distributed energy resources...">}}
{{< figure class="figConfigpdf" title="Eclipse VOLTTRON Tech to Market" src="../../images/publications/TtM_BuildingGuide.png" link="../../Documents/VOLTTRON_Tech_to_Market.pdf" caption="Provides a basic description of Eclipse VOLTTRON capabilities...">}}
diff --git a/content/ARCHIVES/Quotes.md b/content/ARCHIVES/Quotes.md
index 5a9f038..bb0a1fb 100644
--- a/content/ARCHIVES/Quotes.md
+++ b/content/ARCHIVES/Quotes.md
@@ -30,10 +30,3 @@ strives to build best in class enterprise-grade technology solutions to actively
supportive community have allowed EPRI researchers to efficiently and affordably implement this technology within our controls, emerging energy storage technology, and microgrid
research. Although EPRI’s current use cases (energy storage system controls) are not technically within Volttron’s smart building automation scope, the tool has proven more than capable in these contexts "
— Joe Thompson, Technical Leader, Electric Power Research Institute
-
-
-
-
-
-
-
diff --git a/content/Developers.md b/content/Developers.md
index 88eacbc..d4297fb 100644
--- a/content/Developers.md
+++ b/content/Developers.md
@@ -26,15 +26,6 @@ Eclipse VOLTTRON™ is an open source, secure, scalable, and distributed platfor
-
**Eclipse VOLTTRON™ Resources**
The Eclipse VOLTTRON development team supports the wider user community with numerous resources in an effort to maximize transparency and simplify working with the platform. The project is hosted on GitHub for source control, issue tracking, and documentation. Visit Read the Docs for more information.
diff --git a/content/_index.md b/content/_index.md
index 3e75c4b..822958d 100644
--- a/content/_index.md
+++ b/content/_index.md
@@ -1,7 +1,7 @@
---
title: HOME
menu: main
-weight: 10
+weight: 1
---
diff --git a/content/highlights/AddsValue.md b/content/highlights/AddsValue.md
index 93919b9..5d38426 100644
--- a/content/highlights/AddsValue.md
+++ b/content/highlights/AddsValue.md
@@ -1,21 +1,18 @@
---
-title: "Adding Value"
+title: "Adds Value"
weight: 50
-image: images/VOLTTRON-Device-Better2.jpg
-image_alt: "Hello!"
+# image: images/VOLTTRON-Device-Better2.jpg
+# image_alt: "Device with VOLTTRON installed."
sidebar_left: developerSide
---
-### Developer Friendly
-Eclipse VOLTTRON, in field tests and actual applications, adds value by reducing implementation, integration and application development costs, which allows users to devote resources to other needs. Value also comes in results. In power grid- and buildings-related deployments, the platform has delivered energy efficiency improvements.
-
### Eclipse VOLTTRON value-adding features include:
* Built-in security, which likely will reduce platform maintenance costs over time
-* Quality results at lower costs—It is open source and runs on low-priced commodity boards ($35 or less), greatly enabling low-cost implementation and maintenance
+* Quality results at lower costs—It is open source and runs on low-priced commodity boards, greatly enabling low-cost implementation and maintenance
* Affordable application development
* Interoperability, connecting devices, protocols, and other platforms
-* Availability of ongoing engagement and technical assistance provided by the Eclipse VOLTTRON development team—The team holds regular “Office Hours” meetings with users to discuss new features and plans, collaborate and answer questions.
\ No newline at end of file
+* Availability of ongoing engagement and technical assistance provided by the Eclipse VOLTTRON development team—The team holds regular “Office Hours” meetings with users to discuss new features and plans, collaborate and answer questions.
diff --git a/content/highlights/CostEffective.md b/content/highlights/CostEffective.md
index 8ae83ad..18fb0f3 100644
--- a/content/highlights/CostEffective.md
+++ b/content/highlights/CostEffective.md
@@ -3,7 +3,7 @@ title: "Cost Effective"
weight: 50
-image: images/VOLTTRON-Device-Better2.jpg
+# image: images/VOLTTRON-Device-Better2.jpg
image_alt: "Hello!"
sidebar_left: developerSide
diff --git a/content/highlights/Interoperable.md b/content/highlights/Interoperable.md
index 1bfe836..f216996 100644
--- a/content/highlights/Interoperable.md
+++ b/content/highlights/Interoperable.md
@@ -3,8 +3,8 @@ title: "Interoperable"
weight: 50
-image: images/VOLTTRON-Device-Better2.jpg
-image_alt: "Hello!"
+# image: images/VOLTTRON-Device-Better2.jpg
+# image_alt: "Hello!"
sidebar_left: interopSide
diff --git a/content/highlights/OpenSource.md b/content/highlights/OpenSource.md
index 2aa0015..7d4ca19 100644
--- a/content/highlights/OpenSource.md
+++ b/content/highlights/OpenSource.md
@@ -3,14 +3,13 @@ title: "Open Source"
weight: 50
-image: images/VOLTTRON-Device-Better2.jpg
-image_alt: "Hello!"
+# image: images/VOLTTRON-Device-Better2.jpg
+# image_alt: "Device powered by VOLTTRON."
sidebar_left: OpensourceSide
---
-###
Eclipse VOLTTRON software, platform services, and agents are open source and employ a Berkeley Software Distribution-style license, allowing the free distribution and development of the software. The license supports organizations developing proprietary solutions on top of the open-source code.
-The platform’s open-source status helps reduce operation, installation, programming and overall integration costs. Further, Eclipse VOLTTRON’s active community of users meets on a regular basis to discuss the technology and contribute improvements and solutions, which helps ensure Eclipse VOLTTRON’s ongoing usefulness and value. Learn more about this aspect of Eclipse VOLTTRON.
+The platform’s open-source status helps reduce operation, installation, programming and overall integration costs. Further, Eclipse VOLTTRON’s active community of users meets on a regular basis to discuss the technology and contribute improvements and solutions, which helps ensure Eclipse VOLTTRON’s ongoing usefulness and value.
-A separately licensed platform plugin provides additional capabilities to the platform for large-scale, real-world deployments.
\ No newline at end of file
+A separately licensed platform plugin provides additional capabilities to the platform for large-scale, real-world deployments.
diff --git a/content/highlights/Potential.md b/content/highlights/Potential.md
index 38250f8..1cd676c 100644
--- a/content/highlights/Potential.md
+++ b/content/highlights/Potential.md
@@ -3,12 +3,11 @@ title: "Boundless Potential"
weight: 50
-image: images/VOLTTRON-Device-Better2.jpg
-image_alt: "Hello!"
+# image: images/VOLTTRON-Device-Better2.jpg
+# image_alt: "Hello!"
sidebar_left: PotentialSide
---
-###
Eclipse VOLTTRON is versatile. Designed initially to improve power grid operations, this technology enables decision-making and solutions for any need that requires collection, management and analysis of data streams. Just use your imagination!
Eclipse VOLTTRON is:
@@ -18,6 +17,7 @@ Eclipse VOLTTRON is:
* Scalable
* Interoperable
* Sophisticated yet simple—providing a readily useful environment for quick, cost-effective solution development.
+
Beyond grid and buildings, potential uses extend to improved interoperability between utility systems and proprietary home energy technologies; cybersecurity applications; data management; product tracking; energy efficiency in non-building disciplines, such as irrigation management; and more.
The Eclipse VOLTTRON platform—and by extension, its users—continues to benefit from the U.S. Department of Energy’s ongoing development funding and support. DOE wants to optimize the platform for buildings-grid integration and transactive energy, but the agency also is supportive of alternate uses—and full realization—of the technology’s potential.
\ No newline at end of file
diff --git a/content/highlights/Scalable.md b/content/highlights/Scalable.md
index ea1b936..e50b22e 100644
--- a/content/highlights/Scalable.md
+++ b/content/highlights/Scalable.md
@@ -3,8 +3,8 @@ title: "Scalable"
weight: 50
-image: images/VOLTTRON-Device-Better2.jpg
-image_alt: "Hello!"
+# image: images/VOLTTRON-Device-Better2.jpg
+# image_alt: "Hello!"
sidebar_left: ScalableSide
---
diff --git a/content/highlights/Secure.md b/content/highlights/Secure.md
index a2affdc..b2a4196 100644
--- a/content/highlights/Secure.md
+++ b/content/highlights/Secure.md
@@ -1,10 +1,10 @@
---
-title: "Security"
+title: "Secure"
weight: 50
-image: images/VOLTTRON-Device-Better2.jpg
-image_alt: "Hello!"
+# image: images/VOLTTRON-Device-Better2.jpg
+# image_alt: "Hello!"
sidebar_left: SecureSide
diff --git a/content/highlights/developerfriendly.md b/content/highlights/developerfriendly.md
index 69bbee7..04e3b5f 100644
--- a/content/highlights/developerfriendly.md
+++ b/content/highlights/developerfriendly.md
@@ -3,8 +3,8 @@ title: "Developer Friendly"
weight: 50
-image: images/VOLTTRON-Device-Better2.jpg
-image_alt: "Hello!"
+# image: images/VOLTTRON-Device-Better2.jpg
+# image_alt: "Hello!"
sidebar_left: developerSide
diff --git a/content/posts/BuildingsOperations.md b/content/posts/BuildingsOperations.md
index 4fbc4eb..d96f0df 100644
--- a/content/posts/BuildingsOperations.md
+++ b/content/posts/BuildingsOperations.md
@@ -6,27 +6,7 @@ description: Eclipse VOLTTRON capabilities improve control and operation of buil
sidebar_left: BuildingsOperationsLeft
sidebar_right: BuildingsOperationsRight
summary: Eclipse VOLTTRON capabilities improve control and operation of building devices and systems, leading to enhanced performance and energy efficiency.
+hideImage: true
---
-
-
+{{< img src="../../images/MarketsImages/BuildingImageMarkets2.png" class="market_image" id="BuildingOperations" alt="Building of Operations" >}}
diff --git a/content/posts/ConnectedHomes.md b/content/posts/ConnectedHomes.md
index a3e3194..2aa0c92 100644
--- a/content/posts/ConnectedHomes.md
+++ b/content/posts/ConnectedHomes.md
@@ -8,15 +8,6 @@ sidebar_right: ConnectedHomeRight
summary: Whether it involves control of thermostats, lighting, hot water or other functions, Eclipse VOLTTRON is a secure solution that can help turn today’s house into tomorrow’s connected home, enabling features that result in improved energy efficiency, cost savings and convenience.
+hideImage: true
---
-
+{{< img src="../../images/MarketsImages/ConnectHouse.png" class="market_image" id="ConnectedHomes" alt="Building of Operations" >}}
diff --git a/content/posts/DataManagement.md b/content/posts/DataManagement.md
index c8867ff..bd40edc 100644
--- a/content/posts/DataManagement.md
+++ b/content/posts/DataManagement.md
@@ -5,7 +5,10 @@ Description: Eclipse VOLTTRON offers a cost-effective method for gathering, anal
image: images/MarketsImages/DataManImage.png
date: "2020-01-04T00:00:00"
sidebar_left: DMLeft
+hideImage: true
---
+{{< img src="../../images/MarketsImages/DataManImage.png" class="market_image" id="DataManagement" alt="Building of Operations" >}}
+
Eclipse VOLTTRON, with Modbus and BACnet implementations, enables gathering and dispositioning of data.
diff --git a/content/posts/DistEnergyResources.md b/content/posts/DistEnergyResources.md
index 23637bd..2ac608a 100644
--- a/content/posts/DistEnergyResources.md
+++ b/content/posts/DistEnergyResources.md
@@ -1,11 +1,14 @@
---
title: Distributed Energy Resources
-
Description: Eclipse VOLTTRON enables secure coordination of building energy loads and distributed energy resources, such as generation from solar panels or storage from batteries, with the power grid. This coordination offers significant new flexibility to the grid and supports large-scale integration of renewable generation.
image: images/MarketsImages/DistEnergyImage.png
date: "2020-01-04T00:00:00"
sidebar_left: DERSide
+hideImage: true
---
+
+{{< img src="../../images/MarketsImages/DistEnergyImage.png" class="market_image" id="DERimage" alt="Distributed Energy Resources" >}}
+
Eclipse VOLTTRON generates powerful outcomes for distributed energy resources (DERs), buildings and the grid! The technology enables effective, secure coordination of DERs, including wind and solar generation and battery storage, with building energy loads and the power system. This offers significant new flexibility to the grid and supports large-scale DER integration, benefitting everyone from building owners and managers to power system operators, utilities, energy services providers and consumers.
With Eclipse VOLTTRON, data, devices and decisions connect seamlessly and securely based on user needs and preferences.
diff --git a/content/posts/MarketSolns.md b/content/posts/MarketSolns.md
index 77320ee..1678eae 100644
--- a/content/posts/MarketSolns.md
+++ b/content/posts/MarketSolns.md
@@ -7,6 +7,3 @@ date: "2020-01-04T00:00:00"
sidebar_left: MarketSlnLeft
sidebar_right: MarketSlnRight
---
-
diff --git a/data/homepage.yml b/data/homepage.yml
index 966aeb8..430837e 100644
--- a/data/homepage.yml
+++ b/data/homepage.yml
@@ -13,52 +13,58 @@ items:
items:
- title: Developer Friendly
icon: fa-laptop
- content:
- Eclipse VOLTTRON's creation benefitted from innovative thinking that looked at today's needs from every angle-and
- brought it all together in a versatile solution that's easy to implement and use
+ content: >
+ Eclipse VOLTTRON's creation benefitted from innovative thinking that looked at today's needs from every angle—and
+ brought it all together in a versatile solution that's easy to implement and use.
URL: "highlights/developerfriendly"
+
- title: Cost Effective
icon: fa-piggy-bank
content:
Eclipse VOLTTRON is open source software, can be hosted on inexpensive computing resources, and enables
- rapid delivery of innovations on a range of computing devices
+ rapid delivery of innovations on a range of computing devices.
URL: "highlights/costeffective"
+
- title: Adds Value
icon: fa-gem
content:
The Eclipse VOLTTRON platform reduces costs, improves functionality, and provides a secure, stable foundation on
- which to innovate and build low-cost applications
+ which to innovate and build low-cost applications.
URL: "highlights/addsvalue"
+
- title: Secure
icon: fa-lock
content: >
- Underpinned with a robust security foundation, Eclipse VOLTTRON combts today's
+ Underpinned with a robust security foundation, Eclipse VOLTTRON combats today's
cyber vulnerabilities and attacks, providing a safe environment for transacting
- information and data
+ information and data.
URL: "highlights/secure"
+
- title: Interoperable
icon: fa-quote-right
content: >
- Eclipse VOLTTRON makes it possible for diverse systems and subsytems, in and out of the energy
- sector, to interact and connect, open and flexible by design
+ Eclipse VOLTTRON makes it possible for diverse systems and subsystems, in and out of the energy
+ sector, to interact and connect.
URL: "highlights/interoperable"
+
- title: Open Source
icon: fa-wrench
content: >
- Eclipse VOLTTRON is publically availible at no cost and benefits from a community of users
- that advocate for and advance the software platform's ongoing development
+ Eclipse VOLTTRON is publicly available at no cost and benefits from a community of users
+ that advocates for and advances the software platform's ongoing development.
URL: "highlights/opensource"
+
- title: Scalable
icon: fa-balance-scale
content: >
- Eclipse VOLTTRON makes it possible for diverse systems and subsystems, in and out of the energy sector, to interact
- and connect
+ Eclipse VOLTTRON™’s flexibility makes it possible to manage and control a handful of devices—or many more.
URL: "highlights/scalable"
+
- title: Boundless Potential
icon: fa-lightbulb
- content:
- For utilities, building owners, entrepreneurs, integrators and others,
- Eclipse VOLTTRON helps solve your challenges
+ content: >
+ For utilities, building owners, entrepreneurs, integrators and others, VOLTTRON™ helps solve your
+ challenges—and offers unique opportunities to envision and create marketable products and services.
URL: "highlights/potential"
diff --git a/layouts/_default/home.html b/layouts/_default/home.html
new file mode 100644
index 0000000..065852a
--- /dev/null
+++ b/layouts/_default/home.html
@@ -0,0 +1,28 @@
+
+
+
+ {{- partial "head/head.html" . -}}
+ {{- template "_internal/opengraph.html" . -}}
+
+
+ {{- partial "analytics/google-tag-manager/body.html" . }}
+
+ {{- partial "header.html" . }}
+
+
+ {{ with index ( index .Site.Data .Site.Language.Lang | default .Site.Data ) (.Param "homepage_data" | default "homepage") }}
+ {{- if .banner.enable }}
+ {{- partial "homepage/banner.html" .banner -}}
+ {{- end }}
+
+ {{- range .items }}
+ {{- partial (printf "homepage/blocks/%s.html" .type) (dict "ctx" $ "item" .) }}
+ {{- end }}
+ {{ end }}
+
+ {{- partial "footer/footer.html" . -}}
+
{{- end }}
- {{- if .Params.image }}
+
+ {{ printf "hideImage: %v" .Params.hideImage }}
+
+
+ {{ if and .Params.image (not (eq .Params.hideImage true)) }}
{{ end }}
{{ range .RegularPagesRecursive }}
{{ .Render "shortblock" }}
{{ end }}
-
-
{{ end }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
new file mode 100644
index 0000000..4903017
--- /dev/null
+++ b/layouts/_default/single.html
@@ -0,0 +1,17 @@
+{{ define "main" }}
+
+
{{ .Title }}
+
{{ .Description }}
+ {{ if .Site.Params.show_post_dates | default true }}
+ {{- with .Date }}{{ end }}
+ {{ end }}
+ {{ partial "tags.html" . }}
+
+
+
+ {{ if and .Params.image (not (eq .Params.hideImage true)) }}
+
+ {{ end }}
+
+ {{- .Content }}
+{{ end }}
diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html
index 4f48111..0fb1eef 100644
--- a/layouts/_default/taxonomy.html
+++ b/layouts/_default/taxonomy.html
@@ -6,12 +6,15 @@
{{ .Title }}
{{- end }}
- {{- if .Params.image }}
+
+ {{ printf "hideImage: %v" .Params.hideImage }}
+
+
+ {{ if and .Params.image (not (eq .Params.hideImage true)) }}
{{ end }}
{{ range .Pages }}
{{ .Render "taxonomyshortblock" }}
{{ end }}
-
{{ end }}
diff --git a/layouts/partials/homepage/banner.html b/layouts/partials/homepage/banner.html
index a21e068..a1fd158 100644
--- a/layouts/partials/homepage/banner.html
+++ b/layouts/partials/homepage/banner.html
@@ -7,39 +7,56 @@
1 / 4
-
+
The Eclipse VOLTTRON open-source software platform offers an environment where data and devices connect
- seamlessly and securely make decisions based on user needs and preferences
+ seamlessly and securely to make decisions based on user needs and preferences
+ 
- 
- ![]({{absURL "images/DocumentImages/overviewOverlay.png"}})
+ ![]({{absURL "images/DocumentImages/overviewOverlay.jpg"}})
![]({{absURL "images/AccomplishmentsImages/smb.png"}})
+![]({{absURL "images/AccomplishmentsImages/ILC.png"}})
![]({{absURL "images/AccomplishmentsImages/EED_1787_FIG_HomesGraphicRev_v7_1600x1200 (1).png"}})
+ ![]({{absURL "images/AccomplishmentsImages/supporting_connected_communites_brandon_jacoby.jpg"}})
![]({{absURL "images/AccomplishmentsImages/DC_Buildings.jpg"}})
+ ![]({{absURL "images/AccomplishmentsImages/campus_2.png"}})
![]({{absURL "images/AccomplishmentsImages/Web_Size_Power_2.jpg"}})
+ ![]({{absURL "images/DocumentImages/Build1.png" }})
+ ![]({{absURL "images/DocumentImages/Build1.jfif" }})
![]({{absURL "images/DocumentImages/SecureImage.png"}})
+ ![]({{absURL "images/DocumentImages/SecureImage.jpg"}})
![]({{absURL "images/DocumentImages/overviewOverlay.png" }})
+ ![]({{absURL "images/DocumentImages/overviewOverlay.jpg" }})
![]({{absURL "images/DocumentImages/VOLTTRON Documentation.jfif" }})
+
+ ![]({{absURL "images/DocumentImages/VOLTTRON_Documentation.jfif" }})
![]({{absURL "images/DocumentImages/Build1.png"}})
+ ![]({{absURL "images/DocumentImages/Build1.jfif"}})
diff --git a/public/archives/publications/index.html b/public/archives/publications/index.html
index c0fca3d..7462447 100644
--- a/public/archives/publications/index.html
+++ b/public/archives/publications/index.html
@@ -185,7 +185,7 @@ 
+ 