From 3106850076d88589c7f692d9005a829ac00a0081 Mon Sep 17 00:00:00 2001 From: Katherine Fleming <2205659+kflemin@users.noreply.github.com> Date: Tue, 12 Dec 2023 06:24:44 -0800 Subject: [PATCH 1/4] Added BPS document links in SEED, UBID, and AT sections (#89) * Fix Emails (#74) * Fix emails * Address Co-authored-by: Alex Swindler * Deploy latest changes (#76) * Fix emails * Address * update links to seed (#75) Co-authored-by: Hannah Eslinger Co-authored-by: Alex Swindler * adding bps links to seed, ubid, and at --------- Co-authored-by: Hannah Eslinger Co-authored-by: Alex Swindler Co-authored-by: Nicholas Long <1907354+nllong@users.noreply.github.com> --- .../audit-template/resources/resources.component.html | 2 ++ src/app/tool/seed/resources/resources.component.html | 9 +++++++++ src/app/tool/ubid/resources/resources.component.html | 2 ++ 3 files changed, 13 insertions(+) diff --git a/src/app/tool/audit-template/resources/resources.component.html b/src/app/tool/audit-template/resources/resources.component.html index 51c2513..da39df8 100644 --- a/src/app/tool/audit-template/resources/resources.component.html +++ b/src/app/tool/audit-template/resources/resources.component.html @@ -12,4 +12,6 @@

Resources

  • Audit Template to Asset Score Conversion Example
  • NYC LL87 Energy Audit Data Collection Tool Webinar
  • NYC LL87 Energy Audit Data Collection Tool Webinar Presentation Slides
    • +
  • Audit Template: A Tool for Streamlining Compliance in Building Performance Standards (BPS) +
    • diff --git a/src/app/tool/seed/resources/resources.component.html b/src/app/tool/seed/resources/resources.component.html index cbfe26c..80e700b 100644 --- a/src/app/tool/seed/resources/resources.component.html +++ b/src/app/tool/seed/resources/resources.component.html @@ -113,6 +113,15 @@

    Multi-Tab Files

    Date Fields in Excel™ Files

    If you are importing an Excel™ file (XLS, XLXS) into SEED, make sure that any field defined with a "date" format in Excel™ actually has data in it that is a date. If a field has non-date data (such as an integer) in a date-formatted field, SEED will not import that record.

    + +

    Benchmarking and Building Performance Standard (BPS) Programs

    +

    The SEED platform can be used to implement and track a benchmarking or building performance standard program. More information about these programs can be found below.

    + + diff --git a/src/app/tool/ubid/resources/resources.component.html b/src/app/tool/ubid/resources/resources.component.html index 6e9c8c2..aa09514 100644 --- a/src/app/tool/ubid/resources/resources.component.html +++ b/src/app/tool/ubid/resources/resources.component.html @@ -17,6 +17,8 @@

    Resources

  • UBID Public Sector Implementation Guide & Technical Resources Directory
  • UBID Case Study: The District of Columbia
  • "Unique Building Identifier: A natural key for building data matching and its energy applications"
    • +
  • Quick Guide - Considerations for Creating a Covered Buildings List for a Building Performance Standard (BPS) or Benchmarking Program (PDF) +
    • From b30a01dd8e4754ca926567e2539a62582478bd9c Mon Sep 17 00:00:00 2001 From: Nicholas Long <1907354+nllong@users.noreply.github.com> Date: Thu, 14 Dec 2023 13:51:10 -0700 Subject: [PATCH 2/4] update version (#93) --- .github/workflows/deploy.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 8d62400..4532705 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -28,7 +28,7 @@ jobs: npx ng build - name: Deploy Main Site - uses: JamesIves/github-pages-deploy-action@4.1.1 + uses: JamesIves/github-pages-deploy-action@v4.5.0 if: github.ref == 'refs/heads/main' with: branch: gh-pages @@ -53,7 +53,7 @@ jobs: aws s3 sync --delete ./dist s3://${{ secrets.AWS_STAGING_BUCKET }} - name: Deploy NREL - uses: JamesIves/github-pages-deploy-action@4.1.1 + uses: JamesIves/github-pages-deploy-action@v4.5.0 if: github.ref == 'refs/heads/nrel' with: repository-name: BuildingEnergyTools/tools-website-nrel @@ -62,7 +62,7 @@ jobs: token: ${{ secrets.DEPLOY_STAGING_KEY }} - name: Deploy LBNL - uses: JamesIves/github-pages-deploy-action@4.1.1 + uses: JamesIves/github-pages-deploy-action@v4.5.0 if: github.ref == 'refs/heads/lbnl' with: repository-name: BuildingEnergyTools/tools-website-lbnl @@ -71,7 +71,7 @@ jobs: token: ${{ secrets.DEPLOY_STAGING_KEY }} - name: Deploy PNNL - uses: JamesIves/github-pages-deploy-action@4.1.1 + uses: JamesIves/github-pages-deploy-action@v4.5.0 if: github.ref == 'refs/heads/pnnl' with: repository-name: BuildingEnergyTools/tools-website-pnnl From c5eea60c1c6960ed4c4259052cad9efa06fb53d6 Mon Sep 17 00:00:00 2001 From: Nicholas Long <1907354+nllong@users.noreply.github.com> Date: Fri, 20 Sep 2024 17:12:33 +0200 Subject: [PATCH 3/4] 508 cleanup (#96) * add SEED R&D100 * Move bsync ref (#64) * add SEED R&D100 (#62) Co-authored-by: kflemin <2205659+kflemin@users.noreply.github.com> * move bsync reference to appropriate section Co-authored-by: Nicholas Long <1907354+nllong@users.noreply.github.com> * cleanup links * accessibility updates * update yellow for contrast * adding ubid resources * at and seed resources update * remove empty lines * syntax fix * update precommit versions * update version of github push * update versions --------- Co-authored-by: kflemin <2205659+kflemin@users.noreply.github.com> --- .github/workflows/deploy.yml | 12 +-- .pre-commit-config.yaml | 4 +- README.md | 4 + src/app/app-routing.module.ts | 1 + src/app/app.component.html | 2 + src/app/app.component.scss | 18 +++++ src/app/app.component.ts | 7 +- src/app/header/header.component.html | 6 +- src/app/header/header.component.scss | 6 ++ src/app/home/graphic/graphic.component.html | 26 +++--- src/app/home/graphic/graphic.component.scss | 18 ++++- src/app/home/home.component.html | 37 +++------ src/app/home/home.component.scss | 29 +++++-- src/app/menu/menu.component.html | 8 +- src/app/menu/menu.component.scss | 5 ++ .../components/tool/tool.component.html | 14 ++-- .../components/tool/tool.component.scss | 4 + .../tool/asset-score/dev/dev.component.html | 2 +- .../asset-score/goals/goals.component.html | 2 +- .../tool/asset-score/home/home.component.html | 1 + .../resources/resources.component.html | 2 +- .../audit-template/home/home.component.html | 1 + .../resources/resources.component.html | 36 ++++++--- .../compliance/compliance.component.html | 2 +- src/app/tool/bedes/faq/faq.component.html | 18 ++--- src/app/tool/bedes/home/home.component.html | 1 + .../tool/bedes/related/related.component.html | 2 +- src/app/tool/better/dev/dev.component.html | 2 +- .../tool/better/goals/goals.component.html | 2 +- src/app/tool/better/home/home.component.html | 1 + src/app/tool/better/news/news.component.html | 2 +- .../better/resources/resources.component.html | 8 +- .../bpd/contribute/contribute.component.html | 2 +- src/app/tool/bpd/data/data.component.html | 2 +- src/app/tool/bpd/dev/dev.component.html | 2 +- src/app/tool/bpd/faq/faq.component.html | 16 ++-- src/app/tool/bpd/home/home.component.html | 1 + .../bpd/resources/resources.component.html | 2 +- .../tool/bpd/security/security.component.html | 2 +- .../collaborators.component.html | 2 +- .../tool/building-sync/dev/dev.component.html | 2 +- .../tool/building-sync/faq/faq.component.html | 20 ++--- .../building-sync/home/home.component.html | 1 + .../resources/resources.component.html | 12 +-- .../comstock-resstock/dev/dev.component.html | 2 +- .../goals/goals.component.html | 2 +- .../home/home.component.html | 1 + .../resources/resources.component.html | 32 ++++---- .../tool/goals/analyze/analyze.component.html | 2 +- .../compliance/compliance.component.html | 2 +- .../goals/customize/customize.component.html | 2 +- src/app/tool/goals/home/home.component.html | 1 + .../tool/goals/target/target.component.html | 2 +- .../tool/seed/allies/allies.component.html | 8 +- src/app/tool/seed/dev/dev.component.html | 10 +-- src/app/tool/seed/faq/faq.component.html | 28 +++---- src/app/tool/seed/home/home.component.html | 1 + src/app/tool/seed/news/news.component.html | 2 +- .../seed/resources/resources.component.html | 74 +++++++++--------- .../seed/resources/resources.component.scss | 4 + .../seed/resources/resources.component.ts | 3 +- .../tool/third-party/home/home.component.html | 10 +-- src/app/tool/ubid/home/home.component.html | 1 + .../ubid/resources/resources.component.html | 4 +- .../analysis-evaluation.component.html | 18 +++-- .../analysis-evaluation.component.scss | 7 ++ .../collection-reporting.component.html | 4 +- .../collection-reporting.component.scss | 7 ++ .../data-standardization.component.html | 14 ++-- .../developers/developers.component.html | 2 +- .../developers/developers.component.scss | 7 ++ .../goals-outcomes.component.html | 2 +- .../goals-outcomes.component.scss | 7 ++ .../help-desk/help-desk.component.html | 3 +- .../management-compliance.component.html | 6 +- .../management-compliance.component.scss | 7 ++ src/assets/css/app.css | 7 +- src/assets/images/analysis-box.jpg | Bin 43813 -> 32139 bytes src/styles/_theme.scss | 2 +- 79 files changed, 387 insertions(+), 244 deletions(-) create mode 100644 src/app/tool/seed/resources/resources.component.scss diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 4532705..f2d05d8 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -14,10 +14,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout 🛎️ - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set node version - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: 16.18.0 @@ -28,7 +28,7 @@ jobs: npx ng build - name: Deploy Main Site - uses: JamesIves/github-pages-deploy-action@v4.5.0 + uses: JamesIves/github-pages-deploy-action@v4.6.4 if: github.ref == 'refs/heads/main' with: branch: gh-pages @@ -53,7 +53,7 @@ jobs: aws s3 sync --delete ./dist s3://${{ secrets.AWS_STAGING_BUCKET }} - name: Deploy NREL - uses: JamesIves/github-pages-deploy-action@v4.5.0 + uses: JamesIves/github-pages-deploy-action@v4.6.4 if: github.ref == 'refs/heads/nrel' with: repository-name: BuildingEnergyTools/tools-website-nrel @@ -62,7 +62,7 @@ jobs: token: ${{ secrets.DEPLOY_STAGING_KEY }} - name: Deploy LBNL - uses: JamesIves/github-pages-deploy-action@v4.5.0 + uses: JamesIves/github-pages-deploy-action@v4.6.4 if: github.ref == 'refs/heads/lbnl' with: repository-name: BuildingEnergyTools/tools-website-lbnl @@ -71,7 +71,7 @@ jobs: token: ${{ secrets.DEPLOY_STAGING_KEY }} - name: Deploy PNNL - uses: JamesIves/github-pages-deploy-action@v4.5.0 + uses: JamesIves/github-pages-deploy-action@v4.6.4 if: github.ref == 'refs/heads/pnnl' with: repository-name: BuildingEnergyTools/tools-website-pnnl diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c4a4995..6e61521 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,7 +8,7 @@ exclude: | repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.4.0 + rev: v4.6.0 hooks: - id: trailing-whitespace - id: check-added-large-files @@ -24,7 +24,7 @@ repos: - id: pretty-format-json args: ["--autofix", "--no-sort-keys", "--no-ensure-ascii"] - repo: https://github.com/pre-commit/mirrors-prettier - rev: v3.0.0-alpha.4 + rev: v4.0.0-alpha.8 hooks: - id: prettier # for now ignoring html, css, scss, javascript diff --git a/README.md b/README.md index 4db8f4e..d99cfda 100644 --- a/README.md +++ b/README.md @@ -59,3 +59,7 @@ To manually sync the website with the S3 bucket, configure permissions for using ng build aws s3 sync dist s3://nrel-btodatatools-web-prod-bucket ``` + +## Subdomain management + +There are three subdomains on GitHub that are used to view the website before pushing to develop and main. diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index d3a6180..1228ed6 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -74,6 +74,7 @@ const routes: Routes = [{ @NgModule({ imports: [RouterModule.forRoot(routes, { scrollPositionRestoration: 'enabled', + anchorScrolling: 'enabled', useHash: true })], exports: [RouterModule] diff --git a/src/app/app.component.html b/src/app/app.component.html index 091e31f..5f7b8d9 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,3 +1,5 @@ + +
    diff --git a/src/app/app.component.scss b/src/app/app.component.scss index 43b8c6b..6ee556f 100644 --- a/src/app/app.component.scss +++ b/src/app/app.component.scss @@ -1,5 +1,9 @@ @import "theme"; +*:focus { + outline: 2px solid #005FCC; +} + :host { display: flex; flex-direction: column !important; @@ -7,3 +11,17 @@ min-height: 100%; margin: 0 auto; } + +.skip-link { + background: #ffff; + height: 30px; + left: 50%; + padding: 4px; + position: absolute; + transform: translateY(-100%); + transition: transform 0.3s; +} + +.skip-link:focus { + transform: translateY(0%); +} diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 865f006..69c1ed3 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -10,7 +10,7 @@ import { appTitle, Constants } from '@shared/classes/constants'; styleUrls: ['./app.component.scss'] }) export class AppComponent { - + currentUrl: any = '' constructor( public router: Router, private titleService: TitleService @@ -24,6 +24,11 @@ export class AppComponent { } else { titleService.setTitle(appTitle); } + if (event.url != '') { + this.currentUrl = event.url; + } else { + this.currentUrl =''; + } } }); } diff --git a/src/app/header/header.component.html b/src/app/header/header.component.html index ed60375..a4833a9 100644 --- a/src/app/header/header.component.html +++ b/src/app/header/header.component.html @@ -13,11 +13,11 @@

    Building Performance Tools

    - Energy.gov - Office of Energy Efficiency and Renewable Energy + Energy.gov + Office of Energy Efficiency and Renewable Energy - +
    diff --git a/src/app/header/header.component.scss b/src/app/header/header.component.scss index 3e21ba1..ee6b6df 100644 --- a/src/app/header/header.component.scss +++ b/src/app/header/header.component.scss @@ -1,5 +1,11 @@ @import "theme"; +.focus { + &:focus { + outline: 2px solid #005FCC; + } +} + .top-header { background-color: #094f58; background-image: url("/assets/images/datatools_header.jpg"); diff --git a/src/app/home/graphic/graphic.component.html b/src/app/home/graphic/graphic.component.html index 5b692b8..8b7ce3b 100644 --- a/src/app/home/graphic/graphic.component.html +++ b/src/app/home/graphic/graphic.component.html @@ -2,43 +2,45 @@
    -

    GOALS & OUTCOMES

    +

    GOALS & OUTCOMES

    - +
    ComStock & ResStock outcomes icon
    -

    Assess Impacts and Identify New Opportunities

    +

    + Assess Impacts and Identify New Opportunities
    - +
    BETTER outcomes icon
    -

    Identify Measures and Suggest Areas for Deeper Evaluations

    +

    + Identify Measures and Suggest Areas for Deeper Evaluations
    - +
    Asset Score Outcomes icon
    -

    Bring Buildings into Compliance with EUI and GHGe Requirements

    +

    Bring Buildings into Compliance with EUI and GHGe Requirements
    - +
    third-party outcomes icon
    -

    Customize Your Workflow with CRM, Data Visualizations, and More

    +

    Customize Your Workflow with CRM, Data Visualizations, and More
    @@ -49,7 +51,7 @@

    GOALS & OUTCOMES

    -

    DATA COLLECTION & REPORTING

    +

    DATA COLLECTION & REPORTING

    @@ -87,7 +89,7 @@

    DATA COLLECTION & REPORTING

    -

    MANAGEMENT & COMPLIANCE

    +

    MANAGEMENT & COMPLIANCE

    @@ -121,7 +123,7 @@

    MANAGEMENT & COMPLIANCE

    -

    ANALYSIS & EVALUATION

    +

    ANALYSIS & EVALUATION

    diff --git a/src/app/home/graphic/graphic.component.scss b/src/app/home/graphic/graphic.component.scss index 8fc42df..13f5ff1 100644 --- a/src/app/home/graphic/graphic.component.scss +++ b/src/app/home/graphic/graphic.component.scss @@ -14,13 +14,17 @@ height: 0; } +.card-text { + a { + color: #000; + } +} + .mat-card { - cursor: pointer; transition: filter 200ms ease-in-out; } .mat-card-content { - cursor: pointer; margin-bottom: 0; } @@ -34,9 +38,17 @@ .header { padding: 1.7rem 10px 0; - font-weight: 500; + font-weight: 400; color: white; text-align: center; + h2 { + color: white; + font-family: "Roboto", sans-serif; + font-size: 1.8rem; + line-height: 3rem; + padding-left: 4rem; + padding-top: 10px; + } } .header1, diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html index 664d49e..02045ba 100644 --- a/src/app/home/home.component.html +++ b/src/app/home/home.component.html @@ -2,23 +2,12 @@

    The U.S. Department of Energy developed a comprehensive suite of tools for accessing, managing, analyzing and sharing building energy data. This website describes how they can be used to support building performance standards (BPS) policies, one of many possible use cases.

    - -
    -

    Find Your Tool or Workflow

    +

    Find Your Tool or Workflow

    Mouse over and click on the tools below to get more information.
    When you're ready, follow the 'Learn More' button to see just how easy data can be.

    @@ -29,27 +18,27 @@

    Find Your Tool or Workflow

    -
    -

    Get started with
    data standardization

    -
    +
    +

    Get started with
    data standardization

    +
    -
    -

    Help Desk

    -
    +
    +

    Contact the
    Help Desk

    +
    -
    -

    Explore the analysis tools

    -
    +
    +

    Explore the
    analysis tools

    +
    -
    -

    Find information for developers

    -
    +
    +

    Find information
    for developers

    +
    diff --git a/src/app/home/home.component.scss b/src/app/home/home.component.scss index 30fbe7b..2a890dd 100644 --- a/src/app/home/home.component.scss +++ b/src/app/home/home.component.scss @@ -78,7 +78,7 @@ a { width: 100%; margin-left: 0; - h2 { + h1 { font-weight: 400; margin-top: 5px; color: white; @@ -101,22 +101,34 @@ a { .dev { background-position: center; background-size: cover; - cursor: pointer; - height: 200px; - padding: 1rem 1rem; + height: 120px; + padding: 1.5rem 1rem; - h3 { + h2 { color: white; font-family: "Roboto", sans-serif; font-size: 1.8rem; line-height: 3rem; padding-left: 4rem; padding-top: 10px; + + .box-arrow { + margin-left: 20px; + width: 5rem; + } + } + + a { + color: #fff; + i { + padding-right: 5px; + } } } .standardize { - background-image: url("/assets/images/get-started-box.jpg"); + /* background-image: url("/assets/images/get-started-box.jpg"); */ + background: #0A4F58; } .help { @@ -124,7 +136,8 @@ a { } .explore-tools { - background-image: url("/assets/images/analysis-box.jpg"); + background: #0174A1; + /* background-image: url("/assets/images/analysis-box.jpg"); */ } .dev { @@ -157,7 +170,7 @@ a { .explore-tools, .help, .standardize { - h3 { + h2 { font-size: 1rem; line-height: 1.5rem; } diff --git a/src/app/menu/menu.component.html b/src/app/menu/menu.component.html index ba64764..353aba6 100644 --- a/src/app/menu/menu.component.html +++ b/src/app/menu/menu.component.html @@ -18,14 +18,16 @@
    -
    {{ navItem.title }}
    +
    + {{ navItem.title }} +
    -
    {{ child.title }}
    -
    {{ child.title }}
    +
    {{ child.title }}
    +
    {{ child.title }}
    diff --git a/src/app/menu/menu.component.scss b/src/app/menu/menu.component.scss index ab53d3f..18fe453 100644 --- a/src/app/menu/menu.component.scss +++ b/src/app/menu/menu.component.scss @@ -91,6 +91,11 @@ top: -4px; } } + + a { + color: #000; + } + } } diff --git a/src/app/shared/components/tool/tool.component.html b/src/app/shared/components/tool/tool.component.html index f81cc7a..41529f0 100644 --- a/src/app/shared/components/tool/tool.component.html +++ b/src/app/shared/components/tool/tool.component.html @@ -4,12 +4,14 @@
    diff --git a/src/app/shared/components/tool/tool.component.scss b/src/app/shared/components/tool/tool.component.scss index 06110f7..8951e76 100644 --- a/src/app/shared/components/tool/tool.component.scss +++ b/src/app/shared/components/tool/tool.component.scss @@ -6,6 +6,10 @@ &[data-color="#{$i}"] { nav div.active { background-color: $color; + a { + color: #fff; + text-decoration: none; + } } &::ng-deep { diff --git a/src/app/tool/asset-score/dev/dev.component.html b/src/app/tool/asset-score/dev/dev.component.html index 8f91780..14d87c8 100644 --- a/src/app/tool/asset-score/dev/dev.component.html +++ b/src/app/tool/asset-score/dev/dev.component.html @@ -1,4 +1,4 @@ -

    Links for Developers

    +

    Links for Developers

    We welcome use of the Asset Score by energy services companies, consultants, software providers and other parties that offer services to building owners to improve the energy efficiency of buildings. Such providers can integrate their tools seamlessly with the Asset Score through an application programming interface (API).

    RESTful Web Service

    diff --git a/src/app/tool/asset-score/goals/goals.component.html b/src/app/tool/asset-score/goals/goals.component.html index 2dbf6ab..d8e1730 100644 --- a/src/app/tool/asset-score/goals/goals.component.html +++ b/src/app/tool/asset-score/goals/goals.component.html @@ -1,3 +1,3 @@ -

    Goals & Outcomes

    +

    Goals & Outcomes

    Use the Asset Score tool to identify a compliance pathway for any buildings which don't meet your program's performance criteria. After entering audit data into Audit Template, you can create an Asset Score report with one click. This report will include a customized, prioritized list of cost-effective upgrade recommendations which can be shared with building owners.

    diff --git a/src/app/tool/asset-score/home/home.component.html b/src/app/tool/asset-score/home/home.component.html index b034e2b..553ddd7 100644 --- a/src/app/tool/asset-score/home/home.component.html +++ b/src/app/tool/asset-score/home/home.component.html @@ -1,3 +1,4 @@ +

    Asset Score

    Asset Score is a "miles-per-gallon" rating for buildings. Use it to quickly assess a building's efficiency and see the best upgrades for reaching performance goals.

    diff --git a/src/app/tool/asset-score/resources/resources.component.html b/src/app/tool/asset-score/resources/resources.component.html index 27faf43..5867596 100644 --- a/src/app/tool/asset-score/resources/resources.component.html +++ b/src/app/tool/asset-score/resources/resources.component.html @@ -1,4 +1,4 @@ -

    Resources

    +

    Resources

    The following documents are available to help you understand and use Asset Score:

    diff --git a/src/app/tool/audit-template/home/home.component.html b/src/app/tool/audit-template/home/home.component.html index 2b3567d..50c52cb 100644 --- a/src/app/tool/audit-template/home/home.component.html +++ b/src/app/tool/audit-template/home/home.component.html @@ -1,3 +1,4 @@ +

    Audit Template

    Frustrated with the complexities of collecting and managing audit data? Audit Template makes it simple — think of it as an "easy button" for audits.

    diff --git a/src/app/tool/audit-template/resources/resources.component.html b/src/app/tool/audit-template/resources/resources.component.html index da39df8..0cf21c3 100644 --- a/src/app/tool/audit-template/resources/resources.component.html +++ b/src/app/tool/audit-template/resources/resources.component.html @@ -1,17 +1,27 @@ -

    Resources

    +

    Resources

    +

    Audit Template Training

    + +

    Audit Template

    + diff --git a/src/app/tool/bedes/compliance/compliance.component.html b/src/app/tool/bedes/compliance/compliance.component.html index cdc51a0..e2bcadc 100644 --- a/src/app/tool/bedes/compliance/compliance.component.html +++ b/src/app/tool/bedes/compliance/compliance.component.html @@ -1,4 +1,4 @@ -

    BEDES Compliance

    +

    BEDES Compliance

    Interested in developing a BEDES-compliant application? The BEDES team is available to provide guidance and technical assistance to a limited number of software developers and other entities, including help with developing mappings and checking compliance. To take advantage of this opportunity, please contact us.

    There are two different paths for compliance: through Mapping and Exchange, as shown in Table 1. Mapping compliance documents the relationships between the native terms and definitions used in an application and their associated BEDES terms. See the BEDES Mapping Procedure for guidance on how to create a mapping. Exchange compliance takes Mapping compliance one step further by establishing a schema for exchanging that information electronically.

    diff --git a/src/app/tool/bedes/faq/faq.component.html b/src/app/tool/bedes/faq/faq.component.html index b8a6e21..7848f28 100644 --- a/src/app/tool/bedes/faq/faq.component.html +++ b/src/app/tool/bedes/faq/faq.component.html @@ -1,27 +1,27 @@ -

    FAQ

    +

    FAQ

    -

    What is BEDES?

    +

    What is BEDES?

    The Building Energy Data Exchange Specification (BEDES) provides a common set of terms, definitions and data field formats that can be used by public and private software tools, data schemas and databases working within the building energy performance sector. These shared terms and definitions make it possible for all of these different implementations to work in the same "language"; since they all utilize BEDES, data can be easily imported and exported, compared, and aggregated for analysis.

    -

    Why doesn't BEDES define relationships or a hierarchy for its data fields and definitions?

    +

    Why doesn't BEDES define relationships or a hierarchy for its data fields and definitions?

    By limiting itself to terms, definitions, and data field formats, BEDES retains greater flexibility and can be adopted by a variety of different data schemas and software tools. Relationships and hierarchy are left to the various schemas that map to BEDES. If there a market demand and pathway for standardizing relationships, BEDES may take that up in the future.

    -

    How can I view the BEDES Dictionary?

    +

    How can I view the BEDES Dictionary?

    View the BEDES Dictionary.

    -

    How can I become BEDES compliant?

    +

    How can I become BEDES compliant?

    Software developers and other entities that collect or distribute building energy performance data can either adopt an existing schema that uses BEDES terms, or develop their own. For more information, see the BEDES Compliance page.

    The BEDES team can provide limited assistance to answer questions, provide guidance and check compliance. If you have questions about using BEDES in your product or process, please email BTODataTools@ee.doe.gov.

    -

    What are the benefits of becoming BEDES compliant?

    +

    What are the benefits of becoming BEDES compliant?

    BEDES compliance facilitates the exchange of data with other BEDES compliant products, including commonly used federal tools such as Portfolio Manager and the Building Performance Database. Because the data does not need to be manually translated and reformatted, it can be exchanged between products with lower cost, greater speed and fewer potential errors. As the BEDES compliant ecosystem of software tools and schemas grows, the value of compliance will continue to increase.

    Early adopters will play an important role in shaping the growth and development of BEDES. Additionally, BEDES compliant products can be recognized by DOE on the web site and featured in events, conferences, press releases, success stories, etc.

    -

    How does BEDES relate to existing building energy efficiency data implementations such as Portfolio Manager or HPXML?

    +

    How does BEDES relate to existing building energy efficiency data implementations such as Portfolio Manager or HPXML?

    BEDES was developed to align as much as possible with existing data implementation that have substantial market traction, serve similar use cases to BEDES, and provide data terms and definitions. These data implementations, as well as others, have been "knitted together" in the BEDES Dictionary to ensure that BEDES uses established definitions wherever possible. In order to accommodate data fields from sometimes-conflicting implementations, BEDES uses generalized terminology and occasionally has multiple terms to define one implementation field. Although BEDES is in alignment with established implementations, it is impossible to maintain all fields exactly the same. For this reason, we are developing official mappings/translators between BEDES and these common data implementations, which will be posted on the LBNL site as they are completed.

    -

    Will BEDES work with existing federal software tools such as Asset Score, Home Energy Score, and the Building Performance Database?

    +

    Will BEDES work with existing federal software tools such as Asset Score, Home Energy Score, and the Building Performance Database?

    Many stakeholders already rely on federal analytical tools such as the asset scoring tools, and the Buildings Performance Database (BPD). These tools have been mapped to the BEDES dictionary, and will soon be exchange-compliant as well. Aligning the data formats for all these tools and activities reduces the data management burden for external stakeholders and unlocks the full utility of data that is already collected. For a more complete list of these tools, see the Related Applications page.

    -

    Are there plans to use BEDES for energy simulation tools?

    +

    Are there plans to use BEDES for energy simulation tools?

    In the near term, BEDES is primarily focused on use cases pertaining to empirical analysis of whole building energy use and building characteristics, which overlaps with some of the data needed for simulation tools. In the next phase of development BEDES will consider expanding its scope to cover all of the detail required for building simulation tools.

    diff --git a/src/app/tool/bedes/home/home.component.html b/src/app/tool/bedes/home/home.component.html index 836e705..0c9ed1e 100644 --- a/src/app/tool/bedes/home/home.component.html +++ b/src/app/tool/bedes/home/home.component.html @@ -1,3 +1,4 @@ +

    BEDES

    Ambiguous terms are a constant problem for any organization that collects data from multiple sources. If several energy auditors each have their own definition of "gross floor area," for example, it's very difficult to combine their submissions in a single dataset.

    The Building Energy Data Exchange Specification (BEDES) solves this problem. It's a data dictionary that includes terms, definitions, units of measure and data types. Different tools, databases and data formats can use BEDES to exchange information.

    Using BEDES-compliant tools and datasets in your workflows is an easy way to standardize data, making it more valuable and easier to manage. diff --git a/src/app/tool/bedes/related/related.component.html b/src/app/tool/bedes/related/related.component.html index d96413c..4ad345a 100644 --- a/src/app/tool/bedes/related/related.component.html +++ b/src/app/tool/bedes/related/related.component.html @@ -1,4 +1,4 @@ -

    Related Applications

    +

    Related Applications

    diff --git a/src/app/tool/better/dev/dev.component.html b/src/app/tool/better/dev/dev.component.html index 1e27be4..1940556 100644 --- a/src/app/tool/better/dev/dev.component.html +++ b/src/app/tool/better/dev/dev.component.html @@ -1,4 +1,4 @@ -

    Links for Developers

    +

    Links for Developers

    • BETTER GitHub repository. BETTER's modular, cross-platform analytical engine can be adopted, redeveloped, and redistributed freely under an open-source license, allowing users to incorporate BETTER's analytical capabilities into their own software platforms and tools.
      • diff --git a/src/app/tool/better/goals/goals.component.html b/src/app/tool/better/goals/goals.component.html index 0c7d444..6746be6 100644 --- a/src/app/tool/better/goals/goals.component.html +++ b/src/app/tool/better/goals/goals.component.html @@ -1,4 +1,4 @@ -

      Goals & Outcomes

      +

      Goals & Outcomes

      Quantify savings potential, identify measures, and suggest areas for deeper evaluations.

      BETTER provides analyses at the individual building and portfolio levels. BETTER's Individual Building Report shows:

      diff --git a/src/app/tool/better/home/home.component.html b/src/app/tool/better/home/home.component.html index 6de98e3..c3f4ac4 100644 --- a/src/app/tool/better/home/home.component.html +++ b/src/app/tool/better/home/home.component.html @@ -1,3 +1,4 @@ +

      BETTER

      The Building Efficiency Targeting Tool for Energy Retrofits (BETTER) identifies cost-saving energy and emissions reductions in buildings and portfolios, without site visits or complex modeling. Use it to identify immediate cost-saving operational and technological improvements and target buildings and systems for more in-depth audits and analysis.

      diff --git a/src/app/tool/better/news/news.component.html b/src/app/tool/better/news/news.component.html index e057d81..e3e5062 100644 --- a/src/app/tool/better/news/news.component.html +++ b/src/app/tool/better/news/news.component.html @@ -1,2 +1,2 @@ -

      News

      +

      News

      diff --git a/src/app/tool/better/resources/resources.component.html b/src/app/tool/better/resources/resources.component.html index 8be16e5..0e19263 100644 --- a/src/app/tool/better/resources/resources.component.html +++ b/src/app/tool/better/resources/resources.component.html @@ -1,12 +1,12 @@ -

      Resources

      +

      Resources

      -

      How It Works

      +

      How It Works

      BETTER utilizes an open-source, data-driven analytical engine and user-friendly web interface to automatically analyze a building's monthly energy usage in response to weather conditions. With minimal data inputs, the tool benchmarks a building's electric and fossil energy usage against peers; quantifies energy, cost and greenhouse gas (GHG) reduction potentials at the building and portfolio levels; and recommends energy efficiency measures to decarbonize and electrify buildings and portfolios.

      -

      Who is Using BETTER?

      +

      Who is Using BETTER?

      BETTER is used by federal, state, and municipal government agencies, including the National Aeronautics and Space Administration (NASA) – Goddard Space Flight Center and the Department of Energy and Environment in the District of Columbia; school districts; energy service companies, including Johnson Controls; multinational corporations; investors and lenders, like Citi; and non-profit organizations, such as World Resources Institute (WRI). For more on pilot projects, visit better.lbl.gov/news/.

      -

      Interoperability

      +

      Interoperability

      BETTER can be used in combination with the U.S. Environmental Protection Agency ENERGY STAR® PortfolioManager® and the U.S. Department of Energy (DOE) Building Energy Asset Score to conduct multilayered analysis on buildings to deliver both superior structural performance and operational energy performance. Currently, BETTER can input data from ENERGY STAR® PortfolioManager®, and a BuildingSync® file read/write capability is being added to facilitate data and analytics transfer between BETTER and Asset Score, Audit Template, and the Standard Energy Efficiency Data (SEED)TM Platform.

      diff --git a/src/app/tool/bpd/contribute/contribute.component.html b/src/app/tool/bpd/contribute/contribute.component.html index c1a2cd3..86de735 100644 --- a/src/app/tool/bpd/contribute/contribute.component.html +++ b/src/app/tool/bpd/contribute/contribute.component.html @@ -1,4 +1,4 @@ -

      Contribute Your Data

      +

      Contribute Your Data

      BPD aims to be a seminal resource that informs and supports decision-making and investment across the energy efficiency landscape. But the value of the BPD depends on the quantity and depth of data it contains. More data will enable analysis of more retrofit measures, building types and locations, expand the uses and applications, and continue to increase the value and quality of the BPD.

      diff --git a/src/app/tool/bpd/data/data.component.html b/src/app/tool/bpd/data/data.component.html index 984b413..00e4c66 100644 --- a/src/app/tool/bpd/data/data.component.html +++ b/src/app/tool/bpd/data/data.component.html @@ -1,4 +1,4 @@ -

      About the Data

      +

      About the Data

      The BPD contains information for over 1 million commercial and residential buildings. Fields include location (city, state, ZIP, climate zone), floor area and primary use type, operational characteristics (operating hours and number of occupants), systems level data (lighting, heating, and cooling types), certifications (ENERGY STAR, LEED, etc.), and more. For the full list of fields, refer to the API documentation. Data availability depends on location and building type, but in general, most buildings have location, type, and energy use data, while few buildings have operational, systems, or certifications data.

      diff --git a/src/app/tool/bpd/dev/dev.component.html b/src/app/tool/bpd/dev/dev.component.html index 6e4d98c..9dddcbe 100644 --- a/src/app/tool/bpd/dev/dev.component.html +++ b/src/app/tool/bpd/dev/dev.component.html @@ -1,3 +1,3 @@ -

      Links for Developers

      +

      Links for Developers

      The BPD features an application programming interface, which enables external software tools to run analytical queries on the dataset and incorporate the results into their own products. See the documentation to learn more.

      diff --git a/src/app/tool/bpd/faq/faq.component.html b/src/app/tool/bpd/faq/faq.component.html index 86b0a68..425a752 100644 --- a/src/app/tool/bpd/faq/faq.component.html +++ b/src/app/tool/bpd/faq/faq.component.html @@ -1,22 +1,22 @@ -

      FAQ

      +

      FAQ

      -

      Does the BPD have time series data?

      +

      Does the BPD have time series data?

      We aggregate all data to annual intervals.

      -

      Does the BPD allow pre- and post-retrofit analysis of the same buildings?

      +

      Does the BPD allow pre- and post-retrofit analysis of the same buildings?

      In general, no. It's possible that some building's data were measured both before and after a retrofit, but we are typically not provided with data indicating when retrofits were performed.

      -

      Is the BPD data weather normalized?

      +

      Is the BPD data weather normalized?

      No. It contains only measured data.

      -

      How can you be sure there aren't two records about the same building in the BPD?

      +

      How can you be sure there aren't two records about the same building in the BPD?

      We run an analysis on all combinations of buildings that checks similarity of building characteristics and removes any duplicates that are found. In cases of missing data, we assume records match unless we can prove that they are different.

      -

      How does the BPD relate to ENERGY STAR Portfolio Manager?

      +

      How does the BPD relate to ENERGY STAR Portfolio Manager?

      The BPD and Portfolio Manager are complementary. Portfolio Manager is a benchmarking and tracking tool that collects information on your building in order to generate a whole-building energy-efficiency score. The BPD allows users to explore the relationship between energy performance and physical and operational characteristics of many similar buildings in order to identify and evaluate efficiency opportunities. In fact, the BPD contains data on all of the buildings in Portfolio Manager that have been engineer-verified.

      -

      How does the BPD relate to CBECS and RECS?

      +

      How does the BPD relate to CBECS and RECS?

      The BPD serves a complementary function to the Energy Information Administration's Commercial Buildings Energy Consumption Survey (CBECS) and Residential Energy Consumption Survey (RECS). CBECS and RECS are statistically valid samples of the national commercial and residential building stocks, and are two of the data sources for the BPD. See our comparison of the BPD and CBECS.

      -

      How does the BPD relate to the Green Button initiative?

      +

      How does the BPD relate to the Green Button initiative?

      The Green Button initiative is an industry-led effort that responds to a White House initiative to provide utility customers, such as building owners and managers and major tenants, with easy and secure access to their energy usage information in a standardized electronic format. The BPD is able to accept Green Button data but the minimum data requirements for the BPD include additional fields as well, such as floor area and building age.

      diff --git a/src/app/tool/bpd/home/home.component.html b/src/app/tool/bpd/home/home.component.html index 96869d9..c495660 100644 --- a/src/app/tool/bpd/home/home.component.html +++ b/src/app/tool/bpd/home/home.component.html @@ -1,3 +1,4 @@ +

      BPD

      Would you like to see how a building stacks up against real-world peers? The Building Performance Database (BPD) features measured performance data for over 1 million U.S. buildings — the largest public collection of such information available.

      diff --git a/src/app/tool/bpd/resources/resources.component.html b/src/app/tool/bpd/resources/resources.component.html index eb83420..b12fbb9 100644 --- a/src/app/tool/bpd/resources/resources.component.html +++ b/src/app/tool/bpd/resources/resources.component.html @@ -1,4 +1,4 @@ -

      Resources

      +

      Resources

      • BPD Overview
        • diff --git a/src/app/tool/bpd/security/security.component.html b/src/app/tool/bpd/security/security.component.html index 49f6dd3..9a3c378 100644 --- a/src/app/tool/bpd/security/security.component.html +++ b/src/app/tool/bpd/security/security.component.html @@ -1,4 +1,4 @@ -

        Privacy & Security

        +

        Privacy & Security

        We do not provide access to raw data or information on individual buildings. The GUI and API return aggregated results on groups of buildings, and ensures those groups are large enough that individual buildings cannot be identified. The BPD does not contain any personally identifiable information (e.g., building owner or occupant names or addresses). Data contributed to the BPD is protected by law from release under the Freedom of Information Act. For more information, see our privacy terms.

        diff --git a/src/app/tool/building-sync/collaborators/collaborators.component.html b/src/app/tool/building-sync/collaborators/collaborators.component.html index f6637b1..cfe9db3 100644 --- a/src/app/tool/building-sync/collaborators/collaborators.component.html +++ b/src/app/tool/building-sync/collaborators/collaborators.component.html @@ -1,4 +1,4 @@ -

        Collaborators & Adopters

        +

        Collaborators & Adopters

        diff --git a/src/app/tool/building-sync/dev/dev.component.html b/src/app/tool/building-sync/dev/dev.component.html index 9e7de5c..526db52 100644 --- a/src/app/tool/building-sync/dev/dev.component.html +++ b/src/app/tool/building-sync/dev/dev.component.html @@ -1,4 +1,4 @@ -

        Links for Developers

        +

        Links for Developers

        • BuildingSync Schema
        • BuildingSync Tools
          • diff --git a/src/app/tool/building-sync/faq/faq.component.html b/src/app/tool/building-sync/faq/faq.component.html index 4dd06c5..9412a0a 100644 --- a/src/app/tool/building-sync/faq/faq.component.html +++ b/src/app/tool/building-sync/faq/faq.component.html @@ -1,21 +1,21 @@ -

          FAQ

          - -

          What is BuildingSync?

          +

          What is BuildingSync?

          BuildingSync is a standardized language for commercial building energy audit data that software developers can use to exchange data between audit tools. Taking the form of an XML schema, BuildingSync can be required by building owners and audit program managers to allow data analysis and aggregation across multiple buildings in order to evaluate program performance and analyze trends.

          It was developed using the standard energy data terminology defined in the Building Energy Data Exchange Specification (BEDES). BuildingSync is one of the first implementations of BEDES Version 1.0, and it was developed in close collaboration with the BEDES working groups.

          BuildingSync standardizes the format of the energy audit data itself. It is not intended to standardize the calculations performed on these data by engineers, analysts, software packages, or other audit tools.

          -

          What are the components of BuildingSync?

          +

          What are the components of BuildingSync?

          BuildingSync consists of two files and a reference sheet, which are all offered as free downloads.

          @@ -25,12 +25,12 @@

          What are the components of BuildingSync?

          The BuildingSync Geometry Reference Sheet illustrates how most of the simplified geometric terms (shapes, side names, vertices, orientations) are defined in the context of BuildingSync.

          -

          Why was BuildingSync developed?

          +

          Why was BuildingSync developed?

          Currently the energy audit industry lacks a common data collection format. Data collection differs widely between energy auditors, as do the outputs from various energy audit software tools. This makes it difficult to aggregate the data collected by different auditors, or to make comparisons between buildings that have been audited with different software applications.

          Energy audits of commercial buildings are becoming increasingly common, and even required, in the federal sector and in cities like New York City and San Francisco. The American Society of Heating, Refrigeration and Air Conditioning Engineers (ASHRAE) is in the process of developing a national standard for commercial building energy audits; however, this process is complicated by the lack of a standard data specification for information collected and reported, as well as the lack of consistency in data formats across audit software applications.

          -

          What can BuildingSync do?

          +

          What can BuildingSync do?

          BuildingSync can facilitate a consistent history of energy audit data across the life of a building or a group of buildings, and thus enable lower costs and higher energy performance results. It can also allow easier aggregation and analysis of audits conducted by different companies using different software. BuildingSync covers the essential data collected across all ASHRAE Audit Levels as defined in Procedures for Commercial Building Energy Audits, and includes all data necessary for the calculation of a Commercial Building Energy Asset Score.

          BuildingSync provides a common schema for energy audit data that can be utilized by a variety of software and databases. Using the schema ensures that data collected for a single building over time is consistent and comparable, that data from different buildings can be easily aggregated and compared for large-scale analysis, and that data can be transferred between a variety of software tools. This streamlines the energy audit process and lead to new opportunities for using the resulting data to achieve greater energy efficiency.

          @@ -39,7 +39,7 @@

          What can BuildingSync do?

          The schema was built using the standard terminology defined in the Building Energy Data Exchange Specification (BEDES) dictionary. Existing data formats and guidance about how to conduct energy audits were incorporated whenever possible, making it easier to reconcile and map data from existing databases to BuildingSync.

          -

          Who should use BuildingSync?

          +

          Who should use BuildingSync?

          BuildingSync considers the needs and interests of all stakeholders in the energy audit industry, including building owners, auditors, software developers, and program managers. Existing data formats and datasets were leveraged whenever possible, to avoid duplication of effort and minimize the effort required to perform data reconciliation and mapping from existing databases. Using BuildingSync, audit data can be collected and reported in a format that allows many different users to analyze and process the data to answer their specific questions.

            diff --git a/src/app/tool/building-sync/home/home.component.html b/src/app/tool/building-sync/home/home.component.html index 715c7f9..9405088 100644 --- a/src/app/tool/building-sync/home/home.component.html +++ b/src/app/tool/building-sync/home/home.component.html @@ -1,3 +1,4 @@ +

            BuildingSync

            Managing inconsistent audit data takes a lot of work. When auditors use different tools or file formats, program managers do the best they can to collect, combine, analyze and monitor this vital but frustrating information.

            The BuildingSync schema solves this problem. It's a standardized language for building energy audits that makes sharing and using audit data easy. Simply ask auditors to produce BuildingSync-compatible reports to leverage the power of standardized data.

            diff --git a/src/app/tool/building-sync/resources/resources.component.html b/src/app/tool/building-sync/resources/resources.component.html index b87ff06..8806438 100644 --- a/src/app/tool/building-sync/resources/resources.component.html +++ b/src/app/tool/building-sync/resources/resources.component.html @@ -1,18 +1,18 @@ -

            Resources

            +

            Resources

            The following documents are available to help you understand and use BuildingSync:

            Each release of the schema includes several supporting documents, the Schema, a Data Dictionary, and a List of Measures. More information regarding each of the supporting documents is described below. -

            Schema

            +

            Schema

            The BuildingSync schema can be used to create and validate XML files. Various schema versions have been released.

            -

            Data Dictionary

            +

            Data Dictionary

            The data field "dictionary" includes field names, definitions, units, and other attributes for the enumerated fields. The data dictionary is aligned with BEDES, but includes only the subset of data fields that are relevant for energy audits. This page can be referenced to help standardize the terminology used in energy audits, but it does not provide a structure that allows data to be exchanged across different applications.

            -

            List of Measures

            +

            List of Measures

            The list of measures defined in the BuildingSync Schema contain a TechnologyCategory and a list of valid enumerations.

            -

            Other Supporting Documents

            +

            Other Supporting Documents

            There are several supporting documents that are independent of the version of the schema. The supporting documents include Example Files, a Geometry Reference Sheet, and an Implementation Guide. More information can be found below.

            Building Procurement

            @@ -27,7 +27,7 @@

            Onboarding Guide

            Geometry Reference Sheet

            The BuildingSync Geometry Reference Sheet illustrates how most of the simplified geometric terms (shapes, side names, vertices, orientations) are defined in the context of BuildingSync.

            -

            Publications and Presentations

            +

            Publications and Presentations

            2022

            diff --git a/src/app/tool/comstock-resstock/dev/dev.component.html b/src/app/tool/comstock-resstock/dev/dev.component.html index 3d2214e..a4be559 100644 --- a/src/app/tool/comstock-resstock/dev/dev.component.html +++ b/src/app/tool/comstock-resstock/dev/dev.component.html @@ -1,4 +1,4 @@ -

            Links for Developers

            +

            Links for Developers

            diff --git a/src/app/tool/comstock-resstock/goals/goals.component.html b/src/app/tool/comstock-resstock/goals/goals.component.html index 61c4086..fae7f53 100644 --- a/src/app/tool/comstock-resstock/goals/goals.component.html +++ b/src/app/tool/comstock-resstock/goals/goals.component.html @@ -1,2 +1,2 @@ -

            Goals & Outcomes

            +

            Goals & Outcomes

            Use the ComStock and ResStock tools to gain high-level insights into energy use of the building stock in a particular geographic area (down to the county resolution). Understand your area's building stock performance and characteristics and analyze the scenarios of interest to you -- including the feasibility and savings potential of a building performance standard.

            diff --git a/src/app/tool/comstock-resstock/home/home.component.html b/src/app/tool/comstock-resstock/home/home.component.html index d30e535..760b008 100644 --- a/src/app/tool/comstock-resstock/home/home.component.html +++ b/src/app/tool/comstock-resstock/home/home.component.html @@ -1,3 +1,4 @@ +

            ComStock & ResStock

            ComStock and ResStock are building stock-level diagnostic tools. States, municipalities, utilities and manufacturers can use them to identify high-impact improvements and make better program decisions.

            -

            Green Building Registry

            +

            Green Building Registry

            Green Building Registry logo
            @@ -23,7 +23,7 @@

            Green Building Registry

            -

            GRID

            +

            GRID

            Green Building Registry logo
            @@ -31,7 +31,7 @@

            GRID

            -

            SHIFT

            +

            SHIFT

            Open Tech logo

            The building components market is shifting. OPEN's Shift analytics platform smooths this transition. The BC Energy Step Code is being used by a growing number of local governments to drive higher energy performance in new buildings in their jurisdiction.

            diff --git a/src/app/tool/ubid/home/home.component.html b/src/app/tool/ubid/home/home.component.html index 62b480a..e992f0e 100644 --- a/src/app/tool/ubid/home/home.component.html +++ b/src/app/tool/ubid/home/home.component.html @@ -1,3 +1,4 @@ +

            UBID

            Does your organization have a "natural key" to unlock the power of its building-related data? Natural keys — like a VIN or Social Security number — are based on real-world attributes. Datasets with natural keys are much more powerful and require much less staff time to manage.

            Addresses and lot numbers are "pseudo" keys. They can refer to more than one building and are prone to data entry errors. Datasets with pseudo keys are very hard to connect and difficult to manage.

            diff --git a/src/app/tool/ubid/resources/resources.component.html b/src/app/tool/ubid/resources/resources.component.html index aa09514..5c90127 100644 --- a/src/app/tool/ubid/resources/resources.component.html +++ b/src/app/tool/ubid/resources/resources.component.html @@ -1,4 +1,4 @@ -

            Resources

            +

            Resources

            The following documents are available to help you understand and use the Unique Building ID:

            @@ -19,6 +19,8 @@

            Resources

          • "Unique Building Identifier: A natural key for building data matching and its energy applications"
          • Quick Guide - Considerations for Creating a Covered Buildings List for a Building Performance Standard (BPS) or Benchmarking Program (PDF)
            • +
          • X Marks the Spot; So Does UBID
            • +
          • Property Search Landing Page - Miami-Dade County (miamidade.gov)
          diff --git a/src/app/tools-overview/analysis-evaluation/analysis-evaluation.component.html b/src/app/tools-overview/analysis-evaluation/analysis-evaluation.component.html index 43b8bf2..1359593 100644 --- a/src/app/tools-overview/analysis-evaluation/analysis-evaluation.component.html +++ b/src/app/tools-overview/analysis-evaluation/analysis-evaluation.component.html @@ -1,12 +1,14 @@
          -

          Analysis & Evaluation

          +

          Analysis & Evaluation

          Would you like to turn building data into actionable upgrade recommendations? Explore the tools at right to learn how they work together to deliver real-world results.

          Use the ComStock and ResStock models to identify the most impactful upgrade measures for your local building stock. Learn more about ComStock and ResStock.

          @@ -15,7 +17,9 @@

          Analysis & Evaluation

          Use BETTER to identify immediate, cost-saving energy efficiency measures in your portfolio and to pinpoint opportunities for further assessment. Learn more about BETTER.

          @@ -24,7 +28,9 @@

          Analysis & Evaluation

          Asset Score is a "miles-per-gallon" rating for buildings. Use it to quickly generate a report containing current and potential efficiency scores along with a prioritized list of cost-effective upgrade recommendations. Learn more about Asset Score.

          @@ -33,7 +39,9 @@

          Analysis & Evaluation

          The Building Performance Database (BPD) is the nation's largest source of commercial and residential building energy data. Use it to learn more about your buildings and how they perform against user-defined peer groups. Learn more about BPD.

          diff --git a/src/app/tools-overview/analysis-evaluation/analysis-evaluation.component.scss b/src/app/tools-overview/analysis-evaluation/analysis-evaluation.component.scss index f5fa0a3..f96c04d 100644 --- a/src/app/tools-overview/analysis-evaluation/analysis-evaluation.component.scss +++ b/src/app/tools-overview/analysis-evaluation/analysis-evaluation.component.scss @@ -4,3 +4,10 @@ a, a:visited { color: nth($colors, 3); /* for accessibility */ } + +h1 { + color: #4c4c4c; + font-size: 18px; + font-weight: 500; + text-transform: uppercase; +} diff --git a/src/app/tools-overview/collection-reporting/collection-reporting.component.html b/src/app/tools-overview/collection-reporting/collection-reporting.component.html index 9676d5d..f9a7473 100644 --- a/src/app/tools-overview/collection-reporting/collection-reporting.component.html +++ b/src/app/tools-overview/collection-reporting/collection-reporting.component.html @@ -1,6 +1,6 @@
          -

          Data Collection & Reporting

          +

          Data Collection & Reporting

          Would you like to easily capture building audit and energy use information? Explore the tools at right to learn how they work together to simplify data collection.

          @@ -17,7 +17,7 @@

          Data Collection & Reporting

          Use Audit Template to collect, store and report building energy audit data. Learn more about Audit Template.

          diff --git a/src/app/tools-overview/collection-reporting/collection-reporting.component.scss b/src/app/tools-overview/collection-reporting/collection-reporting.component.scss index da8bced..597f551 100644 --- a/src/app/tools-overview/collection-reporting/collection-reporting.component.scss +++ b/src/app/tools-overview/collection-reporting/collection-reporting.component.scss @@ -4,3 +4,10 @@ a, a:visited { color: nth($colors, 1); } + +h1 { + color: #4c4c4c; + font-size: 18px; + font-weight: 500; + text-transform: uppercase; +} diff --git a/src/app/tools-overview/data-standardization/data-standardization.component.html b/src/app/tools-overview/data-standardization/data-standardization.component.html index f67abb4..584b27a 100644 --- a/src/app/tools-overview/data-standardization/data-standardization.component.html +++ b/src/app/tools-overview/data-standardization/data-standardization.component.html @@ -1,6 +1,6 @@
          -

          Data Standardization: The Foundation of a Building Performance Policy

          +

          Data Standardization: The Foundation of a Building Performance Policy

          "Standardization" is the process of bringing building energy efficiency data into a common format, making it much easier to collect, store, analyze, and share. Use the navigator below to learn more about the tiers of data standardization.

          @@ -18,10 +18,10 @@

          Data Standardization: The Foundation of a Building Perfo
          BEDES logo
          -

          Use Standard Data Terms

          +

          Use Standard Data Terms

           -

          Standardize Data Terms

          +

          Standardize Data Terms

          If you're not ready to adopt a standard audit reporting tool or file format, we recommend that jurisdictions and auditors use common data terms in their systems. This is the most basic level of standardization.

          The Building Energy Data Exchange Specification (BEDES) contains over 600 building energy terms developed by DOE and the Lawrence Berkeley National Laboratory (LBNL). Using BEDES terms is a very simple way to improve data quality, enabling you to do more in less time.

          @@ -34,11 +34,11 @@

          Standardize Data Terms

          BuildingSync logo
          -

          Use a Standard File Format

          +

          Use a Standard File Format

           -

          Standardize File Formats

          +

          Standardize File Formats

          If you're not ready to adopt a single reporting tool like Audit Template, we recommend that jurisdictions and auditors use tools that can export data in a standard format like BuildingSync.

          BuildingSync is a language built on top of the BEDES dictionary used to describe buildings in a way that computers can understand. It provides a way to share building and audit information so that it's easier to give to other people and ensures that information will be just as usable ten years from now as it is today.

          BuildingSync is what enables Audit Template, Asset Score, SEED, and many other applications to work with BPS-related data so well.

          @@ -52,11 +52,11 @@

          Standardize File Formats

          Audit Template logo
          -

          Use a Standard Tool

          +

          Use a Standard Tool

           -

          Standardize Data Collection

          +

          Standardize Data Collection

          Using a single tool like Audit Template to collect data is the easiest and most effective way to standardize data. This approach maximizes the value, persistence, usability and portability of audit data.

          Auditors can use a mobile app to submit data using one of several ASHRAE-standard or custom reporting templates. Program administrators access a City Dashboard to monitor submissions, verify data, and download reports.

          Because Audit Template uses the BuildingSync file format, audit data is future-proof and easily shared with those who need it. You can even generate an Asset Score report with cost-effective upgrade recommendations and a 1-10 overall efficiency rating.

          diff --git a/src/app/tools-overview/developers/developers.component.html b/src/app/tools-overview/developers/developers.component.html index 2776ef9..1ce5966 100644 --- a/src/app/tools-overview/developers/developers.component.html +++ b/src/app/tools-overview/developers/developers.component.html @@ -1,6 +1,6 @@
          -

          For Developers

          +

          For Developers

          Would you like to take your building data even further? Are you a product or service provider interested in incorporating data or features from the building energy data tools? Explore the tools at right to learn more about the wealth of opportunities available to developers.

          diff --git a/src/app/tools-overview/developers/developers.component.scss b/src/app/tools-overview/developers/developers.component.scss index 1df8f2e..1102cef 100644 --- a/src/app/tools-overview/developers/developers.component.scss +++ b/src/app/tools-overview/developers/developers.component.scss @@ -4,3 +4,10 @@ a, a:visited { color: nth($colors, 2); } + +h1 { + color: #4c4c4c; + font-size: 18px; + font-weight: 500; + text-transform: uppercase; +} diff --git a/src/app/tools-overview/goals-outcomes/goals-outcomes.component.html b/src/app/tools-overview/goals-outcomes/goals-outcomes.component.html index 74cd66f..fa0d8dd 100644 --- a/src/app/tools-overview/goals-outcomes/goals-outcomes.component.html +++ b/src/app/tools-overview/goals-outcomes/goals-outcomes.component.html @@ -1,6 +1,6 @@
          -

          Goals & Outcomes

          +

          Goals & Outcomes

          Learn more about how the building energy data tools can help your organization realize its ultimate goals:

          diff --git a/src/app/tools-overview/goals-outcomes/goals-outcomes.component.scss b/src/app/tools-overview/goals-outcomes/goals-outcomes.component.scss index 2cbc639..3821e80 100644 --- a/src/app/tools-overview/goals-outcomes/goals-outcomes.component.scss +++ b/src/app/tools-overview/goals-outcomes/goals-outcomes.component.scss @@ -4,3 +4,10 @@ a, a:visited { color: nth($colors, 4); } + +h1 { + color: #4c4c4c; + font-size: 18px; + font-weight: 500; + text-transform: uppercase; +} diff --git a/src/app/tools-overview/help-desk/help-desk.component.html b/src/app/tools-overview/help-desk/help-desk.component.html index 96a4f08..d68d14c 100644 --- a/src/app/tools-overview/help-desk/help-desk.component.html +++ b/src/app/tools-overview/help-desk/help-desk.component.html @@ -1,7 +1,7 @@
          -

          Help Desk

          +

          Help Desk

          Submit technical questions about Building Data Tools (e.g., BuildingSync, ComStock, SEED, Audit Template) here. You may also submit general questions and questions that span across multiple tools. Please visit @@ -75,6 +75,7 @@

          Help Desk

          +
          diff --git a/src/app/tools-overview/management-compliance/management-compliance.component.html b/src/app/tools-overview/management-compliance/management-compliance.component.html index c63ed4e..2ce24d7 100644 --- a/src/app/tools-overview/management-compliance/management-compliance.component.html +++ b/src/app/tools-overview/management-compliance/management-compliance.component.html @@ -1,12 +1,14 @@
          -

          Maintenance & Compliance

          +

          Maintenance & Compliance

          Would you like to easily store, share and analyze your building data without spreadsheets? The SEED Platform makes it possible.

          SEED is a central database for building energy data. It was developed as an enterprise-grade solution to the problems associated with manual, spreadsheet-based processes. Learn more.

          diff --git a/src/app/tools-overview/management-compliance/management-compliance.component.scss b/src/app/tools-overview/management-compliance/management-compliance.component.scss index 1df8f2e..1102cef 100644 --- a/src/app/tools-overview/management-compliance/management-compliance.component.scss +++ b/src/app/tools-overview/management-compliance/management-compliance.component.scss @@ -4,3 +4,10 @@ a, a:visited { color: nth($colors, 2); } + +h1 { + color: #4c4c4c; + font-size: 18px; + font-weight: 500; + text-transform: uppercase; +} diff --git a/src/assets/css/app.css b/src/assets/css/app.css index 8132701..057d74a 100755 --- a/src/assets/css/app.css +++ b/src/assets/css/app.css @@ -536,7 +536,7 @@ h6 .small, h1, .h1 { - font-size: 36px; + font-size: 30px; letter-spacing: -.5px; color: #2B2B2B; font-weight: 400; @@ -544,15 +544,16 @@ h1, h2, .h2 { - font-size: 30px; + font-size: 24px; font-weight: 400; color: #007934; letter-spacing: -.5px; + text-transform: uppercase; } h3, .h3 { - font-size: 24px; + font-size: 22px; font-weight: 400; color: #4c4c4c; text-transform: uppercase; diff --git a/src/assets/images/analysis-box.jpg b/src/assets/images/analysis-box.jpg index f9d929cdc10579dd47fa8f5671ad0b29782fffbc..3baf13b358d0ecc388794080eb20f85c52caf181 100644 GIT binary patch delta 12257 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

          k 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 VD%Tz)k6Df#J!+1fM+ouL|Jje2b#(v$ diff --git a/src/styles/_theme.scss b/src/styles/_theme.scss index b83afc2..a2307eb 100644 --- a/src/styles/_theme.scss +++ b/src/styles/_theme.scss @@ -6,7 +6,7 @@ $pad: 26px; $blueGray: #6e8591; $gray: #eee; -$orange: #f5af13; +$orange: #9C6D07; $colors: #0174a1 From aba3554d7e38a7de69a96edf2d35bdd75f74738f Mon Sep 17 00:00:00 2001 From: Nicholas Long <1907354+nllong@users.noreply.github.com> Date: Fri, 20 Sep 2024 22:32:26 +0200 Subject: [PATCH 4/4] Add note about deploy (#97) * add SEED R&D100 * Move bsync ref (#64) * add SEED R&D100 (#62) Co-authored-by: kflemin <2205659+kflemin@users.noreply.github.com> * move bsync reference to appropriate section Co-authored-by: Nicholas Long <1907354+nllong@users.noreply.github.com> * cleanup links * accessibility updates * update yellow for contrast * adding ubid resources * at and seed resources update * remove empty lines * syntax fix * update precommit versions * update version of github push * update versions * note about deploy --------- Co-authored-by: kflemin <2205659+kflemin@users.noreply.github.com> --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index d99cfda..00650fa 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,8 @@ The most basic workflow to edit content is to leverage GitHub's website to creat - `lbnl` - branch to stage LBNL updates - `nrel` - branch to stage NREL updates +** TODO: This needs to be updated, the deployment to these staging branches isn't working as expected. For now deploy to develop and the normal staging branch for testing ** + The staging branches should be the jumping off point for each user in the respective labs; however, ensure that the staging branch is up-to-date with develop before starting. This is easily done by creating a new pull request in GitHub and having the base branch be the national lab. Click on the links below to be directed to this for you: - [Update PNNL with Develop](https://github.com/BuildingEnergyTools/tools-website/compare/pnnl...develop)