Merge pull request #94 from open-austin/mrollins/footer

91: Mrollins/footer
open-austin · Sep 4, 2018 · b31f863 · b31f863
2 parents f6f8e00 + e5e426a
commit b31f863
Show file tree

Hide file tree

Showing 10 changed files with 76 additions and 19 deletions.
diff --git a/src/influencetx/legislators/templates/legislators/legislator_detail.html b/src/influencetx/legislators/templates/legislators/legislator_detail.html
@@ -10,20 +10,25 @@
 {% endblock css %}
 
 {% block content %}
-  <div class="summary-info text-center mt-3">
 
-    <img src="{{ legislator.photo_url }}"/>
-    <h2>{{ legislator }}</h2>
-    <p class="text-muted">{{ legislator.party_label }}</p>
-    <p class="text-muted">{{ legislator.chamber_label }}</p>
-    <p class="text-muted"> District {{ legislator.district  }}</p>
-    <p><a href="{{ legislator.url }}">Full Biography</a></p>
+<div class="summary-info text-center mt-3 mb-4">
+  <img src="{{ legislator.photo_url }}"/>
+  <h2>{{ legislator }}</h2>
+  <p class="text-muted">{{ legislator.party_label }}</p>
+  <p class="text-muted">{{ legislator.chamber_label }}</p>
+  <p class="text-muted"> District {{ legislator.district  }}</p>
+  <p><a target="_blank" href="{{ legislator.url }}">Full Biography</a></p>
+</div>
 
-  </div>
+<nav class="nav nav-tabs nav-fill mb-3">
+  <a class="nav-item nav-link active" data-toggle="tab" href="#nav-votes">Votes</a>
+  <a class="nav-item nav-link" data-toggle="tab" href="#nav-donors">Top Donors</a>
+</nav>
+<div class="tab-content">
+  <div id="nav-votes" class="tab-pane active">
+  <!-- <h5 class="section-title bg-intx-secondary">Votes</h5> -->
 
-  <h5 class="section-title bg-intx-secondary">Votes</h5>
-
-  <table id="vote-list" class="table table-sm">
+  <table id="vote-list" class="table table-striped table-sm">
     <thead>
       <th class="hidden-sm-down">Date</th>
       <th>Bill</th>
@@ -41,11 +46,12 @@ <h5 class="section-title bg-intx-secondary">Votes</h5>
       </tr>
     {% endfor %}
   </table>
+</div><!-- end #vote-list -->
 
+<div id="nav-donors" class="tab-pane">
+  <!-- <h5 class="section-title bg-intx-secondary">Top Donors</h5> -->
 
-  <h5 class="section-title bg-intx-secondary">Top Donors</h5>
-
-  <table id="donors-list" class="table table-sm">
+  <table id="donors-list" class="table table-striped table-sm">
     <thead>
       <th>Donor</th>
       <th>Amount</th>
@@ -61,6 +67,10 @@ <h5 class="section-title bg-intx-secondary">Top Donors</h5>
       </tr>
     {% endfor %}
   </table>
+</div> <!-- end #nav-donors -->
+</div><!-- end .tab-content -->
+<br><br><br>
+{% include "pages/footer.html" %}
 {% endblock content %}
 
 {% block javascript %}

diff --git a/src/influencetx/legislators/templates/legislators/legislator_list.html b/src/influencetx/legislators/templates/legislators/legislator_list.html
@@ -38,7 +38,7 @@ <h5 class="legislator-name">{{ person }}</h5>
       {% endfor %}
     </ul>
   </div>
-
+<br>
 {% endblock content %}
 
 {% block javascript %}

diff --git a/src/influencetx/static/css/project.css b/src/influencetx/static/css/project.css
diff --git a/src/influencetx/templates/base.html b/src/influencetx/templates/base.html
@@ -26,6 +26,17 @@
 
     {% endblock %}
 
+    <!-- Global site tag (gtag.js) Google Analytics -->
+    <script async src="https://www.googletagmanager.com/gtag/js?id=UA-125051879-1"></script>
+    <script>
+      window.dataLayer = window.dataLayer || [];
+      function gtag(){dataLayer.push(arguments);}
+      gtag('js', new Date());
+
+      gtag('config', 'UA-125051879-1');
+    </script>
+    <!-- Google Analytics -->
+
   </head>
 
   <body>
@@ -34,7 +45,7 @@
         <button class="navbar-toggler navbar-toggler-right" 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>
-        <a class="navbar-brand" href="{% url 'donors:donor-list' %}">INFLUENCE TEXAS<sup>os</sup></a>
+        <a class="navbar-brand" href="{% url 'home' %}">INFLUENCE TEXAS<sup>os</sup></a>
 
         <div class="collapse navbar-collapse" id="navbarSupportedContent">
           <ul class="navbar-nav mr-auto">
@@ -71,7 +82,7 @@
       {% endif %}
 
       {% block content %}
-        <p>Use this document as a way to quick start any new project.</p>
+        <p>Welcome to the INFLUENCE TEXAS OS project.</p>
       {% endblock content %}
 
     </div> <!-- /container -->

diff --git a/src/influencetx/templates/openstates/bill_detail.html b/src/influencetx/templates/openstates/bill_detail.html
@@ -60,4 +60,5 @@ <h2>Bill Details</h2>
   </p>
 
 </div>
+<br><br><br>
 {% endblock content %}
diff --git a/src/influencetx/templates/pages/about.html b/src/influencetx/templates/pages/about.html
@@ -26,4 +26,5 @@ <h4>Get Involved</h4>
 
   <h4>TOS and Privacy</h4>
   Please read our <a href="https://influencetexas.com/os-tos" target="_blank" rel="noopener noreferrer">TOS</a> and <a href="https://influencetexas.com/os-privacy" target="_blank" rel="noopener noreferrer">Privacy Policy</a>.
+<br><br><br>
 {% endblock content %}
diff --git a/src/influencetx/templates/pages/footer.html b/src/influencetx/templates/pages/footer.html
@@ -0,0 +1,15 @@
+<footer class="footer bg-intx-primary">
+  <div align="center">
+    <ul class="flatten">
+      <li>
+        <a href="https://github.com/open-austin/influence-texas/releases/tag/0.1.85.3" target="_blank">v0.1.85.3</a>
+      </li>
+      <li>
+        <a href="https://influencetexas.com/os-tos" target="_blank" rel="noopener noreferrer">TOS</a>
+      </li>
+      <li>
+        <a href="https://influencetexas.com" target="_blank" rel="noopener noreferrer">A Project by Influence Texas P.B.C.</a>
+      </li>
+    </ul>
+  </div>
+</footer>
diff --git a/src/influencetx/templates/pages/home.html b/src/influencetx/templates/pages/home.html
@@ -17,4 +17,6 @@
     </td>
   </tr>
 </table>
+<br><br><br>
+{% include "pages/footer.html" %}
 {% endblock content %}
diff --git a/src/influencetx/tpj/templates/tpj/donor_detail.html b/src/influencetx/tpj/templates/tpj/donor_detail.html
@@ -36,7 +36,8 @@ <h5 class="section-title bg-intx-secondary">Top Contributions</h5>
       </tr>
     {% endfor %}
   </table>
-
+<br><br><br>
+{% include "pages/footer.html" %}
 {% endblock content %}
 
 {% block javascript %}

diff --git a/src/influencetx/tpj/templates/tpj/donor_list.html b/src/influencetx/tpj/templates/tpj/donor_list.html
@@ -27,7 +27,7 @@ <h2>Top Donors</h2>
       {% endfor %}
     </ul>
   </div>
-
+<br>
 {% endblock content %}
 
 {% block javascript %}