Renamed link text to be shorter.

kgodey · kgodey · commit 2d9df0884f06 · 2019-02-20T18:07:05.000-05:00
diff --git a/templates/layout.html b/templates/layout.html
@@ -9,6 +9,7 @@
 <script type="text/javascript" src="{{ '/static/script.js'|url }}"></script>
 <title>{% block title %}Welcome{% endblock %} — Creative Commons on GitHub</title>
 <body>
+<<<<<<< Updated upstream
   <header class="main-header">
     <div class="container">
       <div class="row">
@@ -46,6 +47,39 @@
                   </div>
                 </li>
               </ul>
+=======
+  <header>
+    <nav class="navbar navbar-expand-md navbar-dark">
+      {% set cc_logo = site.get('/').attachments.get('cclogo.svg') %}
+      <a class="navbar-brand" href="#"><img src="{{ cc_logo|url }}"></a>
+      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent"
+        aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+        <span class="navbar-toggler-icon"></span>
+      </button>
+  
+      <div class="collapse navbar-collapse" id="navbarSupportedContent">
+        <ul class="navbar-nav">
+          <li class="nav-item{% if this._path == '/' %} active{% endif
+                    %}"><a class="nav-link" href="{{ '/'|url }}">Home</a></li>
+          {% for href, title in [
+            ['/projects', 'Projects'],
+            ['/community', 'Community'],
+          ] %}
+            <li class="nav-item{% if this.is_child_of(href) %} active{% endif%}">
+              <a class="nav-link" href="{{ href|url }}">{{ title }}</a>
+            </li>
+          {% endfor %}
+          <li class="nav-item dropdown {% if this.is_child_of('/gsoc-2019') %} active{% endif%}">
+            <a class="nav-link" href="/gsoc-2019/" id="navbarDropdown" role="button">GSoC 2019</a>
+            <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+              {% for href, title in [
+                ['/gsoc-2019/project-ideas/all', 'Project Ideas'],
+                ['/gsoc-2019/application-instructions', 'Application Instructions'],
+              ] %}
+                <a class="dropdown-item" href="{{ href|url }}">{{ title }}</a>
+              {% endfor %}
+              <!-- <a class="dropdown-item" href="#">Action</a> -->
+>>>>>>> Stashed changes
             </div>
           </nav>
         </div>
