projects / pgdu2018.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 919adcb)
update navigation structure
authorSarah Conway <sarah.conway@crunchydata.com>
Tue, 18 Sep 2018 21:00:48 +0000 (14:00 -0700)
committerSarah Conway <sarah.conway@crunchydata.com>
Tue, 18 Sep 2018 21:00:48 +0000 (14:00 -0700)
templates/base.html patch | blob | blame | history
templates/index_base.html patch | blob | blame | history

diff --git a/templates/base.html b/templates/base.html
index e863c6faeb634022027b5d05df9a1de1dbee8c83..260bc52a25fa3fff8ff06840e6e99b6d319b4979 100644 (file)
--- a/templates/base.html
+++ b/templates/base.html
@@ -23,21 +23,16 @@
    <body class="{{page}}">
 
        <!-- Navigation -->
-       <nav id="header" class="navbar navbar-fixed-top">
-           <div id="header-container" class="container-fluid navbar-container">
-               <!-- Brand and toggle get grouped for better mobile display -->
-               <div class="navbar-header">
-                   <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false">
-                       <i class="fa fa-bars"></i>
-                   </button>
-                   <a class="navbar-brand" href="{{link("")}}">
-                       <img id="logo" src="{{media("images/mstile-310x310.png")}}" alt="PgDU Logo">
-                       <h1 class="heading">PgDU 2018</h1>
-                   </a>
-               </div>
-               <!-- Collect the nav links, forms, and other content for toggling -->
-               <div id="navbar" class="collapse navbar-collapse">
-                   <ul class="nav navbar-nav navbar-right">
+           <nav class="navbar navbar-expand-lg navbar-light bg-light fixed-top">
+               <a class="navbar-brand p-0" href="/">
+                   <img id="logo" src="{{media("images/mstile-310x310.png")}}" alt="PgDU Logo">
+                   <h1 class="heading">PgDU 2018</h1>
+               </a>
+               <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#pgNavbar" aria-controls="pgNavbar" aria-expanded="false" aria-label="Toggle navigation">
+                   <span class="navbar-toggler-icon"></span>
+               </button>
+               <div class="collapse navbar-collapse" id="navbar">
+                   <ul class="navbar-nav mr-auto">
                        <li><a href="{{link("")}}">Home</a></li>
                        {{menulink("about", "About")}}
                        <li><a href="{{pgdulink("events/pgdu2018/callforpapers/")}}">Call for Papers</a></li>
@@ -45,9 +40,8 @@
                        <!-- <li><a href="https://postgresql.us/events/feedback/pgopen2018/">Feedback</a></li> -->
                        <!-- {{menulink("feedback", "Feedback")}} -->
                    </ul>
-               </div><!-- /.navbar-collapse -->
-           </div><!-- /.container-fluid -->
-       </nav>
+               </div>
+           </nav>
       <section id="main" class="wrapper">
                <div class="container">
            {%block content%}{%endblock%}
diff --git a/templates/index_base.html b/templates/index_base.html
index 3d315112e1c98dc8fbf38c5edf83a6206efdf264..4e98bbe9bbd4525aa537fa8e635d08663c5e03f0 100644 (file)
--- a/templates/index_base.html
+++ b/templates/index_base.html
@@ -22,34 +22,24 @@
    </head>
    <body class="{{page}}">
        <!-- Navigation -->
-       <nav id="header" class="navbar navbar-fixed-top">
-           <div id="header-container" class="container-fluid navbar-container">
-               <!-- Brand and toggle get grouped for better mobile display -->
-               <div class="navbar-header">
-                   <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false">
-                       <i class="fa fa-bars"></i>
-                   </button>
-                   <a class="navbar-brand" href="{{link("")}}">
-                       <img id="logo" src="{{media("images/mstile-310x310.png")}}" alt="PgDU Logo">
-                       <h1 class="heading">PgDU 2018</h1>
-                   </a>
-               </div>
-               <!-- Collect the nav links, forms, and other content for toggling -->
-               <div id="navbar" class="collapse navbar-collapse">
-                   <ul class="nav navbar-nav navbar-right">
-                       <li><a href="{{link("")}}">Home</a></li>
-                       {{menulink("about", "About")}}
-                       {{menulink("blog", "Blog")}}
-                       <!--<li><a href="{{pgdulink("events/pgopen2018/sessions/")}}">Talks</a></li>-->
-                       <!-- <li><a href="{{pgdulink("events/pgopen2018/schedule/")}}">Schedule</a></li> -->
-                       <!-- <li><a href="{{pgdulink("events/pgopen2018/feedback/")}}">Feedback</a></li> -->
-                       {{menulink("callforpapers", "Call for Papers")}}
-                       <!-- {{menulink("feedback", "Feedback")}} -->
-                       {{menulink("venue", "Venue & Hotel")}}
-                       {{menulink("sponsors", "Sponsors")}}
-                   </ul>
-               </div><!-- /.navbar-collapse -->
-           </div><!-- /.container-fluid -->
+       <nav class="navbar navbar-expand-lg navbar-light bg-light fixed-top">
+           <a class="navbar-brand p-0" href="/">
+               <img id="logo" src="{{media("images/mstile-310x310.png")}}" alt="PgDU Logo">
+               <h1 class="heading">PgDU 2018</h1>
+           </a>
+           <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#pgNavbar" aria-controls="pgNavbar" aria-expanded="false" aria-label="Toggle navigation">
+               <span class="navbar-toggler-icon"></span>
+           </button>
+           <div class="collapse navbar-collapse" id="navbar">
+               <ul class="navbar-nav mr-auto">
+                   <li><a href="{{link("")}}">Home</a></li>
+                   {{menulink("about", "About")}}
+                   <li><a href="{{pgdulink("events/pgdu2018/callforpapers/")}}">Call for Papers</a></li>
+                   <!-- <li><a href="{{pgdulink("events/pgopen2018/schedule/")}}">Schedule</a></li> -->
+                   <!-- <li><a href="https://postgresql.us/events/feedback/pgopen2018/">Feedback</a></li> -->
+                   <!-- {{menulink("feedback", "Feedback")}} -->
+               </ul>
+           </div>
        </nav>
 
        {%block content%}{%endblock%}
PgDU 2018