Skip to content

Commit

Permalink
Fluffing (#23677)
Browse files Browse the repository at this point in the history
  • Loading branch information
@mikermcneil
mikermcneil authored Nov 10, 2024
1 parent 8b2d216 commit 1db781f
Show file tree
Hide file tree
Showing 6 changed files with 66 additions and 64 deletions.
1 change: 1 addition & 0 deletions website/config/routes.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -499,6 +499,7 @@ module.exports.routes = {
//
// For example, a clever user might try to visit fleetdm.com/documentation, not knowing that Fleet's website
// puts this kind of thing under /docs, NOT /documentation. These "convenience" redirects are to help them out.
'GET /testimonials': 'https://github.com/fleetdm/fleet/blob/28cd420b086c23a6606ba17c4f3821ed267c6bbb/handbook/company/testimonials.yml#L190',
'GET /admin': '/admin/email-preview',
'GET /renew': 'https://calendly.com/zayhanlon/fleet-renewal-discussion',
'GET /documentation': '/docs',
Expand Down
82 changes: 42 additions & 40 deletions website/views/layouts/layout.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,41 +156,42 @@
</a>
</div>
<div purpose="mobile-nav-container" id="mobileDropdowns">
<a purpose="mobile-dropdown-toggle" class="d-flex align-items-center collapsed" data-toggle="collapse" data-target="#mobileNavbarToggleUseCases" aria-haspopup="true" aria-expanded="false">Platform</a>
<a purpose="mobile-dropdown-toggle" class="d-flex align-items-center collapsed" data-toggle="collapse" data-target="#mobileNavbarToggleUseCases" aria-haspopup="true" aria-expanded="false">Multi platform</a>
<div id="mobileNavbarToggleUseCases" purpose="mobile-dropdown" class="collapse align-items-start" data-parent="#mobileDropdowns">
<a purpose="mobile-dropdown-link" href="/device-management">Device management (MDM)</a>
<a purpose="mobile-dropdown-link" href="/endpoint-ops">Endpoint operations</a>
<a purpose="mobile-dropdown-link" href="/vulnerability-management">Vulnerability management</a>
<a purpose="mobile-dropdown-link" href="/device-management">Device management &nbsp; <small>(+ MDM)</small></a>
<a purpose="mobile-dropdown-link" href="/endpoint-ops">Observability &nbsp; <small>(+ scripting)</small></a>
<a purpose="mobile-dropdown-link" href="/vulnerability-management">Software management &nbsp; <small>(+ CVEs)</small></a>
<a purpose="mobile-dropdown-link" href="/integrations">Integrations</a>
</div>
<hr>
<a purpose="mobile-dropdown-toggle" class="d-flex align-items-center collapsed" data-toggle="collapse" data-target="#mobileNavbarToggleDocumentation" aria-haspopup="true" aria-expanded="false">Documentation</a>
<a purpose="mobile-dropdown-toggle" class="d-flex align-items-center collapsed" data-toggle="collapse" data-target="#mobileNavbarToggleDocumentation" aria-haspopup="true" aria-expanded="false">Docs</a>
<div id="mobileNavbarToggleDocumentation" purpose="mobile-dropdown" class="collapse" data-parent="#mobileDropdowns">
<a purpose="mobile-dropdown-link" href="/docs">Docs</a>
<a purpose="mobile-dropdown-link" href="/docs/rest-api">REST API</a>
<a purpose="mobile-dropdown-link" href="/guides">Guides</a>
<a purpose="mobile-dropdown-link" href="/queries">Built-in queries</a>
<a purpose="mobile-dropdown-link" href="/tables">Data tables</a>
<span>SUPPORT</span>
<a purpose="mobile-dropdown-link" href="/docs">Get started</a>
<a purpose="mobile-dropdown-link" href="/queries">Built-in checks</a>
<a purpose="mobile-dropdown-link" href="/tables">Raw data</a>
<a purpose="mobile-dropdown-link" href="/articles">Tutorials &amp; guides</a>
<a purpose="mobile-dropdown-link" href="/docs/rest-api">API</a>
<span class="mt-2 mb-2">SUPPORT</span>
<div purpose="indented-mobile-links">
<a purpose="mobile-dropdown-link" href="/support">Chat</a>
<a purpose="mobile-dropdown-link" href="/docs/deploy/introduction">Hosting</a>
<a purpose="mobile-dropdown-link" href="/contribute">Contribute</a>
<a purpose="mobile-dropdown-link" href="/releases">Release notes</a>
<a purpose="mobile-dropdown-link" href="/better">"Why is Fleet on my computer?"</a>
<a purpose="mobile-dropdown-link" href="/new-license">Get your license</a>
<a purpose="mobile-dropdown-link" href="/contribute">Contribute</a>
</div>
</div>
<hr>
<a purpose="mobile-dropdown-toggle" class="d-flex align-items-center mr-4 collapsed" data-toggle="collapse" data-target="#mobileNavbarToggleCommunity">Community</a>
<a purpose="mobile-dropdown-toggle" class="d-flex align-items-center mr-4 collapsed" data-toggle="collapse" data-target="#mobileNavbarToggleCommunity">Stories</a>
<div id="mobileNavbarToggleCommunity" purpose="mobile-dropdown" class="collapse" data-parent="#mobileDropdowns">
<a purpose="mobile-dropdown-link" href="/support">Chat</a>
<a purpose="mobile-dropdown-link" href="/support">Ask around</a>
<a purpose="mobile-dropdown-link" target="_blank" href="/testimonials">What people are saying</a>
<a purpose="mobile-dropdown-link" href="/announcements">News</a>
<a purpose="mobile-dropdown-link" href="/podcasts">Podcasts</a>
<a purpose="mobile-dropdown-link" href="/articles">Articles</a>
<a purpose="mobile-dropdown-link" href="/success-stories">Success stories</a>
<span>COMPANY</span>
<span class="mt-2 mb-2">COMPANY</span>
<div purpose="indented-mobile-links">
<a purpose="mobile-dropdown-link" href="/handbook">Handbook</a>
<a purpose="mobile-dropdown-link" href="/handbook/company#history">Origins &nbsp; <small>(Fleet &amp; osquery)</small></a>
<a purpose="mobile-dropdown-link" href="/handbook">The handbook</a>
<!-- <a purpose="mobile-dropdown-link" href="/handbook/company/leadership#ceo-flaws">CEO flaws</a> -->
<a purpose="mobile-dropdown-link" href="/logos">Logos & artwork</a>
<a purpose="mobile-dropdown-link" href="/handbook/company/why-this-way#why-open-source">Why open source?</a>
</div>
Expand All @@ -210,47 +211,48 @@
</div>
<%}%>
<%if(!hideGetStartedButton){%>
<a purpose="glass-header-btn" style="padding: 4px 16px; line-height: 24px; width: 100px" class="btn btn-sm btn-primary align-items-center d-flex mt-4" href="/register">Start now</a>
<a purpose="glass-header-btn" style="padding: 4px 16px; line-height: 24px; width: 110px" class="btn btn-sm btn-primary align-items-center d-flex mt-4" href="/contact">Take a tour</a>
<% }%>
</div>
</div>
<%/* Desktop Navigation bar */%>
<div purpose="header-nav" class="d-none d-lg-flex align-items-center justify-content-around">
<div purpose="dropdown-button" class="btn-group">
<a purpose="header-nav-btn" class="dropdown-toggle align-items-center <%= typeof currentSection !== 'undefined' && currentSection === 'platform' ? 'current-section' : '' %>" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Platform</a>
<a purpose="header-nav-btn" class="dropdown-toggle align-items-center <%= typeof currentSection !== 'undefined' && currentSection === 'platform' ? 'current-section' : '' %>" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Multi platform</a>
<div purpose="header-dropdown" class="dropdown-menu">
<a class="dropdown-item" href="/device-management">Device management (MDM)</a>
<a class="dropdown-item" href="/endpoint-ops">Endpoint operations</a>
<a class="dropdown-item" href="/vulnerability-management">Vulnerability management</a>
<a class="dropdown-item" href="/device-management">Device management <small>+ MDM</small></a>
<a class="dropdown-item" href="/endpoint-ops">Observability <small>+ scripting, monitoring</small></a>
<a class="dropdown-item" href="/vulnerability-management">Software management <small>+ CVEs, usage, app library</small></a>
<a class="dropdown-item" href="/integrations">Integrations</a>
</div>
</div>
<div purpose="dropdown-button" class="btn-group">
<a purpose="header-nav-btn" button-text="Documentation" class="dropdown-toggle align-items-center <%= typeof currentSection !== 'undefined' && currentSection === 'documentation' ? 'current-section' : '' %>" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Documentation</a>
<div purpose="dropdown-button" class="btn-group" style="width: 74px;">
<a purpose="header-nav-btn" button-text="Documentation" class="dropdown-toggle align-items-center <%= typeof currentSection !== 'undefined' && currentSection === 'documentation' ? 'current-section' : '' %>" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Docs</a>
<div purpose="header-dropdown" class="dropdown-menu">
<a class="dropdown-item" href="/docs">Docs</a>
<a class="dropdown-item" href="/docs/rest-api">REST API</a>
<a class="dropdown-item" href="/guides">Guides</a>
<a class="dropdown-item" href="/queries"><%= ['eo-it', 'mdm'].includes(primaryBuyingSituation) ? 'Built-in checks' : 'Built-in queries' %></a>
<a class="dropdown-item" href="/tables">Data tables</a>
<a class="dropdown-item" href="/docs">Get started</a>
<a class="dropdown-item" href="/queries">Built-in checks</a><!-- «« FUTURE: consider different menu label such as 'Off the shelf', because i'm just casually a hover menu here and so it's less intentional. I didn't click "docs" first, like I did on mobile-->
<a class="dropdown-item" href="/tables">Raw data</a>
<a class="dropdown-item" href="/guides">Tutorials &amp; guides</a>
<a class="dropdown-item" href="/docs/rest-api">API</a>
<span class="muted dropdown-header">SUPPORT</span>
<a class="dropdown-item" href="/support">Chat</a>
<a class="dropdown-item" href="/docs/deploy/introduction">Hosting</a>
<a class="dropdown-item" href="/contribute">Contribute</a>
<a class="dropdown-item" href="/releases">Release notes</a>
<a class="dropdown-item" href="/better">"Why is Fleet on my computer?"</a>
<a class="dropdown-item" href="/new-license">Get your license</a>
<a class="dropdown-item" href="/contribute">Contribute</a>
</div>
</div>
<div purpose="dropdown-button" class="btn-group">
<a purpose="header-nav-btn" button-text="Community" class="dropdown-toggle align-items-center <%= typeof currentSection !== 'undefined' && currentSection === 'community' ? 'current-section' : '' %>" data-toggle="dropdown">Community</a>
<div purpose="dropdown-button" class="btn-group" style="width: 89px;">
<a purpose="header-nav-btn" button-text="Community" class="dropdown-toggle align-items-center <%= typeof currentSection !== 'undefined' && currentSection === 'community' ? 'current-section' : '' %>" data-toggle="dropdown">Stories</a>
<div purpose="header-dropdown" class="dropdown-menu">
<a class="dropdown-item" href="/support">Chat</a>
<a class="dropdown-item" href="/support">Ask around</a>
<a class="dropdown-item" target="_blank" href="/testimonials">What people are saying</a>
<a class="dropdown-item" href="/announcements">News</a>
<a class="dropdown-item" href="/podcasts">Podcasts</a>
<a class="dropdown-item" href="/articles">Articles</a>
<a class="dropdown-item" href="/success-stories">Success stories</a>
<a class="dropdown-item" href="/contact">Take a tour</a><!-- «« included here in the desktop hover nav because unlike the mobile nav (which has 'Take a tour' as a primary CTA), there is no option to do that on desktop from other pages otherwise -->
<span class="muted dropdown-header">COMPANY</span>
<a class="dropdown-item" href="/handbook">Handbook</a>
<a class="dropdown-item" href="/handbook/company#history">Origins &nbsp; <small>(Fleet &amp; osquery)</small></a>
<a class="dropdown-item" href="/handbook">The handbook</a>
<a class="dropdown-item" href="/logos">Logos/artwork</a>
<a class="dropdown-item" href="/handbook/company/why-this-way#why-open-source">Why open source?</a>
</div>
Expand All @@ -261,7 +263,7 @@
allowtransparency="true" frameborder="0" scrolling="0" width="100" height="20"></iframe>
</span>
<%if(!hideGetStartedButton){%>
<a purpose="glass-header-btn" class="align-items-center d-flex" href="/register">Start now</a>
<a purpose="glass-header-btn" class="align-items-center d-flex" href="/register">Try it yourself</a>
<% }%>
<% if(_.has(me, 'id')) {%>
<a purpose="log-out-button" href="/logout" class="justify-content-end text-decoration-none">Log out</a>
Expand Down
4 changes: 2 additions & 2 deletions website/views/pages/docs/basic-documentation.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</div>
<div class="form-control border-0 ">
<input class="docsearch-input pr-1"
placeholder="Search the docs..." aria-label="Search the docs"
placeholder="Search..." aria-label="Search the docs and guides"
/>
</div>
</div>
Expand Down Expand Up @@ -74,7 +74,7 @@
</div>
<div class="form-control border-0 ">
<input class="docsearch-input pr-1"
placeholder="Search the docs..." aria-label="Search the docs"
placeholder="Search the docs..." aria-label="Search the docs and guides"
v-model="inputTextValue"/>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions website/views/pages/endpoint-ops.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
<p>Use "read-only" mode or enable remote scripting to automate anything on every operating system, including Linux.</p>
<% }%>
<div purpose="button-row" class="d-flex flex-md-row flex-column justify-content-start align-items-center">
<a purpose="cta-button" href="/register">Start now</a>
<animated-arrow-button href="/contact">Talk to us</animated-arrow-button>
<a purpose="cta-button" href="/contact">Take a tour</a>
<animated-arrow-button href="/register">Try it yourself</animated-arrow-button>
</div>
</div>
</div>
Expand Down
10 changes: 5 additions & 5 deletions website/views/pages/homepage.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<p>Replace the sprawl with <%= primaryBuyingSituation === 'vm'? 'secure, open-source reporting that works the way you want' : primaryBuyingSituation === 'eo-security'? 'open-source endpoint observability for every platform' : 'a modern device management platform that works the way you want' %>.</p>
<div purpose="button-row" class="d-flex flex-sm-row flex-column justify-content-center align-items-center">
<a purpose="cta-button" href="<%= primaryBuyingSituation === 'mdm' ? '/device-management' : primaryBuyingSituation === 'vm' ? '/vulnerability-management' : primaryBuyingSituation === 'eo-security' ? '/endpoint-ops' : primaryBuyingSituation === 'eo-it' ? '/endpoint-ops' : '/device-management' %>">Learn how</a>
<animated-arrow-button href="/contact">Talk to us</animated-arrow-button>
<animated-arrow-button target="_blank" href="/testimonials">What people are saying</animated-arrow-button>
</div>
</div>
</div>
Expand Down Expand Up @@ -369,7 +369,7 @@

<div purpose="feature" class="ml-sm-0">
<img alt="transparency" src="/images/homepage-icon-transparency-54x64@2x.png" class="mx-auto mx-md-0">
<h5>Scope transparency</h5>
<h5>"Why is this running on my computer?"</h5>
<p>Let end users see the source code for exactly <a href="/better">how they are being monitored</a>, and set clear expectations about what is and isn’t acceptable use of work computers.</p>
</div>

Expand All @@ -381,8 +381,8 @@

<div purpose="feature" class="mr-sm-0 mb-0">
<img alt="An open book" src="/images/homepage-icon-openness-80x64@2x.png">
<h5>We value openness</h5>
<p>Fleet's company <a href="/handbook">handbook</a> is public and open source. You can read about the <a href="/handbook/company#history">history of Fleet and osquery</a> and our commitment to improving the product.</p>
<h5>Open source</h5>
<p>All of Fleet's source code is <a href="/handbook/company/why-this-way#why-open-source">public</a>, and our company <a href="/handbook">handbook</a> is public and open to the world. You can read about the <a href="/handbook/company#history">history of Fleet and osquery</a> and our commitment to improving the product.</p>
</div>

</div>
Expand All @@ -396,7 +396,7 @@
<h4>For teams with lots of computing devices</h4>
<h1 class="mx-auto <%= primaryBuyingSituation%>"><%- partial('../partials/primary-tagline.partial.ejs') %></h1>
<div purpose="button-row" style="margin-top: 40px;" class="d-flex flex-sm-row flex-column justify-content-center align-items-center mx-auto">
<a purpose="cta-button" href="/register">Start now</a>
<a purpose="cta-button" href="/register">Try it yourself</a>
<animated-arrow-button href="/contact">Talk to us</animated-arrow-button>
</div>
</div>
Expand Down
Loading

1 comment on commit 1db781f

@mikermcneil
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Topic:

Website: Refresh navigation and update verbiage in a few spots to make it clearer

f.k.a. "Fluffing", which was confusing, and is just an alusion to how I used to have a job where I would get there early at 6:30 am and test the VHS and DVD players in the classrooms in university, and clean the podiums. (They called us "fluffers".)

Please sign in to comment.