Mercurial > public > madeira

changeset 21:f3052378ab47

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updating the home page with a 6 video playlist from Mahogany's. Fixed the flyers on the gig page under chrome. Updated the copyright on the base template.
author Brian Neal <bgneal@gmail.com>
date Sun, 20 Mar 2011 19:53:35 +0000
parents 7aa63299adf6
children ccb0f675427e efb2da0b5d10
files mysite/templates/band/base.html mysite/templates/band/gigs.html mysite/templates/band/index.html
diffstat 3 files changed, 8 insertions(+), 27 deletions(-) [+]
line wrap: on
line diff
--- a/mysite/templates/band/base.html	Wed Sep 08 23:15:57 2010 +0000
+++ b/mysite/templates/band/base.html	Sun Mar 20 19:53:35 2011 +0000
@@ -52,7 +52,7 @@
 </div>
 
 <div id="footer" class="span-24 last">
-Website &copy; 2008 - 2010 by The Madeira <br />
+Website &copy; 2008 - 2011 by The Madeira <br />
 Visit <a href="http://myspace.com/themadeira">The Madeira on Myspace</a><br />
 and <a href="http://facebook.com/themadeira">The Madeira on Facebook</a><br />
 </div>
--- a/mysite/templates/band/gigs.html	Wed Sep 08 23:15:57 2010 +0000
+++ b/mysite/templates/band/gigs.html	Sun Mar 20 19:53:35 2011 +0000
@@ -88,8 +88,9 @@
 {% if flyerGigs %}
 <div class="thumb-box">
    <h2>Flyers</h2>
-   <center>
+   <div style="width:90%; margin-left:auto;">
    {% for gig in flyerGigs %}
+      <div style="display:inline-table;">
       <table class="image-table">
          <caption>{{ gig.venue.name}}, {{ gig.date|date:"F 'y" }}</caption>
          <tr><td>
@@ -97,8 +98,9 @@
             <img src="{{ gig.flyer.get_thumbnail_url }}" alt="{{ gig.date|date:"F d, Y" }}" title="{{ gig.date|date:"F d, Y" }}" /></a>
          </td></tr>
       </table>
+      </div>
    {% endfor %}
-   </center>
+   </div>
    <div clear="all"></div>
    <center><p>To see all our flyers in full size, check out our <a href="{% url band.views.flyers %}">show flyer gallery</a>.</p></center>
 </div>
--- a/mysite/templates/band/index.html	Wed Sep 08 23:15:57 2010 +0000
+++ b/mysite/templates/band/index.html	Sun Mar 20 19:53:35 2011 +0000
@@ -6,23 +6,6 @@
 {% block custom_js %}
 <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
 <script type="text/javascript" src="{{ MEDIA_URL }}js/fancybox/jquery.fancybox-1.3.1.pack.js"></script>
-<script type="text/javascript" src="{{ MEDIA_URL }}js/jquery.cross-slide.min.js"></script>
-<script type="text/javascript">
-$(function() {
-   $('a.fancybox').fancybox();
-   $('#slideshow').crossSlide({
-     speed: 45,
-     fade: 1
-   }, [
-      { src: '{{ MEDIA_URL }}images/slideshow/1.jpg', dir: 'up'   },
-      { src: '{{ MEDIA_URL }}images/slideshow/2.jpg', dir: 'down' },
-      { src: '{{ MEDIA_URL }}images/slideshow/3.jpg', dir: 'up'   },
-      { src: '{{ MEDIA_URL }}images/slideshow/4.jpg', dir: 'down' },
-      { src: '{{ MEDIA_URL }}images/slideshow/5.jpg', dir: 'up'   },
-      { src: '{{ MEDIA_URL }}images/slideshow/6.jpg', dir: 'down' }
-   ]);
-});
-</script>
 {% endblock %}
 {% load markup %}
 {% block content %}
@@ -64,13 +47,9 @@
 
 <div>
    <center>
-   <h2>Highlights of Summer 2010</h2>
-   <div id="slideshow">
-   </div>
-   <p>The Madeira at FesTiki 2010. Photos by <a href="http://www.fennerphotography.com/">Fenner Photography</a>.</p>
-   <object width="500" height="405"><param name="movie" value="http://www.youtube.com/v/-vSs2SoIBkI?fs=1&amp;hl=en_US&amp;rel=0&amp;color1=0x2b405b&amp;color2=0x6b8ab6&amp;border=1"></param><param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param><embed src="http://www.youtube.com/v/-vSs2SoIBkI?fs=1&amp;hl=en_US&amp;rel=0&amp;color1=0x2b405b&amp;color2=0x6b8ab6&amp;border=1" type="application/x-shockwave-flash" allowscriptaccess="always" allowfullscreen="true" width="500" height="405"></embed></object>
-   <p>The Madeira perform <strong>The Witch Doctor</strong> (a new original!) at FesTiki 2010. Video courtesy of
-   Unsteady Freddie.</p>
+   <h2>New Song Preview!</h2>
+<object width="480" height="385"><param name="movie" value="http://www.youtube.com/p/B67E923C98CCECD8?hl=en_US&fs=1"></param><param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param><embed src="http://www.youtube.com/p/B67E923C98CCECD8?hl=en_US&fs=1" type="application/x-shockwave-flash" width="480" height="385" allowscriptaccess="always" allowfullscreen="true"></embed></object>
+   <p>Check out this set of 6 videos from our show at Mahogany's in February. Five of the songs are new originals slated for our new album! Video courtesy of TikiTim.</p>
    </center>
 </div>