more content updates to prep for launch

Faris Chebib · Faris Chebib · commit b9e75053fb75 · 2015-04-21T22:04:03.000-04:00
diff --git a/_includes/meetuptmpl.html b/_includes/meetuptmpl.html
@@ -1,20 +1,27 @@
 {% raw %}
 <div ng-controller="MeetupCtrl as meetup">
-  <ul>
+  <ul class='list-unstyled'>
     <li ng-repeat="event in meetup.events
     |filter:{announced:true}
     |orderBy:event.time">
       <h2>
         {{ event.time+event.utc_offset|date:"MMMM d, h:mma":"UTC" }}
       </h2>
-      <h2>
-        <a href='{{ event.event_url }}'>{{ event.name }}</a>
-        <a href='{{ event.gmap_url }}'>
+      <h3>
+        <a ng-href='{{ event.event_url }}'>{{ event.name }}</a>
+        <a ng-href='{{ event.gmap_url }}'>
           <span class="glyphicon glyphicon-map-marker"></span>
         </a>
-      </h2>
+      </h3>
       <div ng-bind-html="event.description">
       </div>
+      <div>
+        <a class="btn btn-lg btn-success"
+          ng-href="{{ event.event_url }}">
+          <small>{{ event.yes_rsvp_count }} Attending</small><br/>
+          <b>Join us!</b>
+        </a>
+      </div>
       <div>
         {{ event|json }}
       </div>
diff --git a/_includes/topnav.html b/_includes/topnav.html
@@ -23,8 +23,8 @@
       class="active"
     {% endif %}
     >
-      <a ui-sref="upcoming">
-        Meetups
+      <a ui-sref="locations">
+        Locations
       </a>
     </li>
     <li role="presentation"
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -21,12 +21,13 @@
 </head>
 
 <body id="utahpython.org"><div class="container">
-  <div class="header">
-    <h1><a href="/">Utah Python User Group</a></h1>
-  </div>
+    <div class="header">
+      <h1><a href="/">Utah Python User Group</a></h1>
+    </div>
 
-  <div class="content">
-    {{ content }}
+    <div class="content">
+      {{ content }}
+    </div>
   </div>
-</div></body>
+</body>
 </html>
diff --git a/locations.md b/locations.md
@@ -1,6 +1,6 @@
 ---
 layout: utahpython
-title: "Meetups"
+title: "Locations"
 upcoming-nav: True
 url-needle-map: http://maps.google.com/maps?q=14864+Pony+Express+Dr.+Bluffdale,+UT+84065
 url-group: https://groups.google.com/forum/#!forum/utahpython
@@ -13,7 +13,7 @@ url-dupont-map: https://goo.gl/maps/rqX2I
 url-pyladies-meetup: http://www.meetup.com/Salt-Lake-Pyladies/
 ---
 
-## Meetups
+## Locations
 
 Utah Python a number of different meetups around Utah.
 
diff --git a/presentations.md b/presentations.md
@@ -6,6 +6,11 @@ present-nav: True
 
 # Past Presentations
 
+<div class="alert alert-warning">
+  <span class="glyphicon glyphicon-warning-sign"></span>
+  This page is still undergoing updates.
+</div>
+
 ## 2011
 
 {:.table .table-bordered .table-striped}
diff --git a/static/js/controller.js b/static/js/controller.js
@@ -12,9 +12,9 @@ angular.module('utahPython', ['ui.router', 'ngSanitize'])
         url: "/about",
         templateUrl: "about.html"
       })
-      .state('upcoming', {
-        url: "/upcoming",
-        templateUrl: "upcoming.html"
+      .state('locations', {
+        url: "/locations",
+        templateUrl: "locations.html"
       })
       .state('past_present', {
         url: "/presentations",
