Skip to content

Commit

Permalink
Merge pull request #497 from creativecommons/header-footer
Browse files Browse the repository at this point in the history 
correct URLs in header and footer menus
  • Loading branch information
@possumbilities
possumbilities authored Nov 16, 2023
2 parents f7ba713 + 8b31412 commit 5fdc53f
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 19 deletions.
2 changes: 1 addition & 1 deletion docs/index.html
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><meta name="description" content="Want to license your work with Creative Commons, but not sure where to start, or which license is right for you? Use our license chooser!"><link rel="icon" href="/favicon.ico"><link rel="icon" type="image/png" href="https://creativecommons.org/wp-content/uploads/2016/05/cc-site-icon-300x300.png" sizes="192x192"><link rel="apple-touch-icon-precomposed" href="https://creativecommons.org/wp-content/uploads/2016/05/cc-site-icon-300x300.png"><meta name="twitter:card" content="summary"><meta name="twitter:site" content="@creativecommons"><meta name="twitter:creator" content="@creativecommons"><meta property="og:url" content="https://beta-chooser.creativecommons.org"><meta property="og:title" content="Choose a License"><meta property="og:type" content="website"><meta property="og:description" content="Want to license your work with Creative Commons, but not sure where to start, or which license is right for you? Use our license chooser!"><meta property="og:image" content="https://mirrors.creativecommons.org/presskit/logos/cc.logo.large.png"><meta property="og:locale" content="en_US"><meta property="og:locale:alternate" content="ru_RU"><title>Choose a License</title><link href="/css/chunk-1869ec59.896f9d80.css" rel="prefetch"><link href="/js/chunk-1869ec59.4ce1e365.js" rel="prefetch"><link href="/css/app.ead3a94e.css" rel="preload" as="style"><link href="/js/app.92628bde.js" rel="preload" as="script"><link href="/js/chunk-vendors.0f0ac3fb.js" rel="preload" as="script"><link href="/css/app.ead3a94e.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but License Chooser doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/js/chunk-vendors.0f0ac3fb.js"></script><script src="/js/app.92628bde.js"></script></body></html>
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><meta name="description" content="Want to license your work with Creative Commons, but not sure where to start, or which license is right for you? Use our license chooser!"><link rel="icon" href="/favicon.ico"><link rel="icon" type="image/png" href="https://creativecommons.org/wp-content/uploads/2016/05/cc-site-icon-300x300.png" sizes="192x192"><link rel="apple-touch-icon-precomposed" href="https://creativecommons.org/wp-content/uploads/2016/05/cc-site-icon-300x300.png"><meta name="twitter:card" content="summary"><meta name="twitter:site" content="@creativecommons"><meta name="twitter:creator" content="@creativecommons"><meta property="og:url" content="https://beta-chooser.creativecommons.org"><meta property="og:title" content="Choose a License"><meta property="og:type" content="website"><meta property="og:description" content="Want to license your work with Creative Commons, but not sure where to start, or which license is right for you? Use our license chooser!"><meta property="og:image" content="https://mirrors.creativecommons.org/presskit/logos/cc.logo.large.png"><meta property="og:locale" content="en_US"><meta property="og:locale:alternate" content="ru_RU"><title>Choose a License</title><link href="/css/chunk-1869ec59.896f9d80.css" rel="prefetch"><link href="/js/chunk-1869ec59.4ce1e365.js" rel="prefetch"><link href="/css/app.ead3a94e.css" rel="preload" as="style"><link href="/js/app.5ce8c832.js" rel="preload" as="script"><link href="/js/chunk-vendors.0f0ac3fb.js" rel="preload" as="script"><link href="/css/app.ead3a94e.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but License Chooser doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/js/chunk-vendors.0f0ac3fb.js"></script><script src="/js/app.5ce8c832.js"></script></body></html>
2 changes: 2 additions & 0 deletions docs/js/app.5ce8c832.js
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions docs/js/app.5ce8c832.js.map
View file

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions docs/js/app.92628bde.js
View file

This file was deleted.

1 change: 0 additions & 1 deletion docs/js/app.92628bde.js.map
View file

This file was deleted.

10 changes: 5 additions & 5 deletions src/components/FooterSection.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@

<nav class="footer-menu">
<ul>
<li><a href="/about/contact">Contact</a></li>
<li><a href="https://creativecommons.org/about/contact">Contact</a></li>
<li><a href="https://mail.creativecommons.org/subscribe" target="_blank">Newsletter</a></li>
<li><a href="/privacy">Privacy</a></li>
<li><a href="/policies">Policies</a></li>
<li><a href="/terms">Terms</a></li>
<li><a href="https://creativecommons.org/privacy">Privacy</a></li>
<li><a href="https://creativecommons.org/policies">Policies</a></li>
<li><a href="https://creativecommons.org/terms">Terms</a></li>
</ul>
</nav>

Expand Down Expand Up @@ -50,7 +50,7 @@


<div class="license">
<p>Except where otherwise <a href="/policies/#license">noted</a>, content on this site is licensed under a <a href="/licenses/by/4.0/">Creative Commons Attribution 4.0 International license</a>. Icons by <a href="https://fontawesome.com/" target="_blank">Font Awesome</a>.</p>
<p>Except where otherwise <a href="https://creativecommons.org/policies/#license">noted</a>, content on this site is licensed under a <a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International license</a>. Icons by <a href="https://fontawesome.com/" target="_blank">Font Awesome</a>.</p>

<svg>
<use href="../../static/vocabulary/svg/cc/icons/cc-icons.svg#cc-logo"></use>
Expand Down
16 changes: 6 additions & 10 deletions src/components/HeaderSection.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
<button class="expand-menu">Menu</button>
<nav class="primary-menu">
<ul>
<li><a href="/about/mission">Who We Are</a></li>
<li><a href="/about">What We Do</a></li>
<li><a href="/share-your-work">Licenses and Tools</a></li>
<li><a href="/blog">Blog</a></li>
<li><a href="/about/support-cc/">Support Us</a></li>
<li><a href="https://creativecommons.org/about/mission">Who We Are</a></li>
<li><a href="https://creativecommons.org/about">What We Do</a></li>
<li><a href="https://creativecommons.org/share-your-work">Licenses and Tools</a></li>
<li><a href="https://creativecommons.org/blog">Blog</a></li>
<li><a href="https://creativecommons.org/about/support-cc/">Support Us</a></li>
</ul>
</nav>

<nav class="ancilliary-menu">
<ul>
<li><a class="search icon-attach fa-search" href="/?s">Search</a></li>
<li><a class="search icon-attach fa-search" href="https://creativecommons.org/?s">Search</a></li>
<li><a class="donate icon-attach fa-heart" href="https://www.classy.org/give/313412/#!/donation/checkout?c_src=website&c_src2=top-of-page-banner" target="_blank">Donate</a></li>
<li><button class="explore">Explore CC</button></li>
</ul>
Expand Down Expand Up @@ -47,10 +47,6 @@
<a href="https://summit.creativecommons.org/" target="_blank">Global Summit</a>
<p>Attend our annual event, promoting the power of open licensing</p>
</li>
<li>
<a href="/choose" target="_blank">Chooser</a>
<p>Get help choosing the appropriate license for your work</p>
</li>
<li>
<a href="https://search.creativecommons.org/" target="_blank">Search Portal</a>
<p>Find engines to search openly licensed material for creative and educational reuse</p>
Expand Down

0 comments on commit 5fdc53f

Please sign in to comment.