Mercurial > public > sg101
changeset 1071:5a6349fb72bd
Convert store page to V3 design.
| author | Brian Neal <bgneal@gmail.com> |
|---|---|
| date | Sun, 10 Apr 2016 14:31:08 -0500 |
| parents | 6ac56115e0a8 |
| children | 4054f22583b3 |
| files | sg101/templates/store/base.html sg101/urls.py sg101/views.py |
| diffstat | 3 files changed, 161 insertions(+), 112 deletions(-) [+] |
line wrap: on
line diff
--- a/sg101/templates/store/base.html Sat Apr 09 17:15:32 2016 -0500 +++ b/sg101/templates/store/base.html Sun Apr 10 14:31:08 2016 -0500 @@ -1,10 +1,9 @@ -{% extends 'base.html' %} +{% extends 'v3/base.html' %} {% load static from staticfiles %} {% block content %} <h2>SurfGuitar101 Store</h2> - -{% block status_msg %}{% endblock %} +<a name="top"></a> <h3>Editor's Choice: Recommended Surf Music Items</h3> <p> @@ -13,119 +12,162 @@ all surf music fans. Check them out and tell them SG101 sent you! </p> -<h4>Surfin' Guitars: Instrumental Surf Bands Of The Sixties 3rd edition</h4> -<p> -<img src="https://s3-us-west-1.amazonaws.com/sg101.user.photos/txP9MTW4RSa3xMm8wRIKrw.JPG" class="left" alt="Surfin' Guitars"> -Robert J. Dalley Publications proudly announces the release of <em>Surfin' Guitars: Instrumental Surf Bands Of The Sixties</em>. -The printed 3rd edition is available on <a href="https://createspace.com/5862474">Amazon Create</a> for $59.95 plus shipping. -This 420 page tome, regarded by many as the "bible of surf music", has been fully revised and expanded to 59 surf groups from the 1960's -including Manuel & the Renegades, New Dimensions, Newport Nomads, Rhythm Kings, Surf Teens, Teenbeats, Trademarks, Vara-Tones, Velvetones, -and Zorba & the Greeks. Most of the photos, record LP covers, 45rpm labels and posters are now in color. Surfin' Guitars will soon be available -to download as an E-book. -</p><p> -Thanks to all of you for your support, patience, suggestions and other contributions you have provided over the years since my book was first published in 1988. Enjoy and keep surf music alive!<br> -<em>--Bob Dalley</em> -<br class="clear"> -</p> +<section> + <h4>Surfin' Guitars: Instrumental Surf Bands Of The Sixties 3rd edition</h4> + <div class="media-object stack-for-small"> + <div class="media-object-section"> + <div class="thumbnail"> + <img src="https://s3-us-west-1.amazonaws.com/sg101.user.photos/txP9MTW4RSa3xMm8wRIKrw.JPG" alt="Surfin' Guitars"> + </div> + </div> + <div class="media-object-section"> + <p> + Robert J. Dalley Publications proudly announces the release of <em>Surfin' Guitars: Instrumental Surf Bands Of The Sixties</em>. + The printed 3rd edition is available on <a href="https://createspace.com/5862474">Amazon Create</a> for $59.95 plus shipping. + This 420 page tome, regarded by many as the "bible of surf music", has been fully revised and expanded to 59 surf groups from the 1960's + including Manuel & the Renegades, New Dimensions, Newport Nomads, Rhythm Kings, Surf Teens, Teenbeats, Trademarks, Vara-Tones, Velvetones, + and Zorba & the Greeks. Most of the photos, record LP covers, 45rpm labels and posters are now in color. Surfin' Guitars will soon be available + to download as an E-book. + </p> + <blockquote> + Thanks to all of you for your support, patience, suggestions and other + contributions you have provided over the years since my book was first + published in 1988. Enjoy and keep surf music alive! + <cite>Bob Dalley</cite> + </blockquote> + </div> + </div> + <p class="quiet"><a href="#top">Back to Top</a></p> +</section> <hr> -<h4>Southern California Surf Music, 1960-1965</h4> -<p> -<img src="https://s3.amazonaws.com/sg101.forum.photos/1J216kvLQpejvHjC3dTG7A.jpg" class="left" alt="Southern California Surf Music"> -"<strong>Southern Californai Surf Music, 1960-1965</strong>, is the new book by John Blair, -noted surf historian and leader of the surf revival band "Jon & The -Nightriders." -</p> -<p> -The early 1960s was a great time for kids in Southern California who -experienced the explosion of surf music beginning with Dick Dale & The -Del-Tones at the Rendezvous Ballroom. Weekends were for dancing at the -Rendezvous, Harmony Park, Revelaire Club, or the Retail Clerk's Hall. The -Belairs, Eddie & The Showmen, The Challengers, Tornadoes, Chantays, -Surfaris, and hundreds more surf bands plied their trade and created a cultural -sensation in the process. Here's the story of how that happened. Many seldom -seen photographs, some never before published -</p> -<p>Order now at <a href="http://johnblair.us">John Blair's website</a>.</p> -<br class="clear"> +<section> + <h4>Southern California Surf Music, 1960-1965</h4> + <div class="media-object stack-for-small"> + <div class="media-object-section"> + <div class="thumbnail"> + <img src="https://s3.amazonaws.com/sg101.forum.photos/1J216kvLQpejvHjC3dTG7A.jpg" alt="Southern California Surf Music"> + </div> + </div> + <div class="media-object-section"> + <p> + <strong>Southern California Surf Music, 1960-1965</strong>, is the new + book by John Blair, noted surf historian and leader of the surf + revival band <strong>Jon & The Nightriders.</strong> + </p> + <p> + The early 1960s was a great time for kids in Southern California who + experienced the explosion of surf music beginning with Dick Dale & The + Del-Tones at the Rendezvous Ballroom. Weekends were for dancing at the + Rendezvous, Harmony Park, Revelaire Club, or the Retail Clerk's Hall. The + Belairs, Eddie & The Showmen, The Challengers, Tornadoes, Chantays, + Surfaris, and hundreds more surf bands plied their trade and created a cultural + sensation in the process. Here's the story of how that happened. Many seldom + seen photographs, some never before published. + </p> + <p>Order now at <a href="http://johnblair.us">John Blair's website</a>.</p> + </div> + </div> + <p class="quiet"><a href="#top">Back to Top</a></p> +</section> <hr> -<h4>Pounding Surf - “The Original Full-Length Surf Music Documentary”</h4> -<p> -The <a href="http://www.surfdrums.com/home.html">Pounding Surf</a> is an -amazing DVD with <strong>two complete features</strong>: <strong>A Drummer's -Guide to Surf Music</strong>, a colorful history of the surf music genre which -features great live performances and interviews with key figures, hosted by -surf guitar pioneer <a href="http://pjmoto.com">Paul Johnson</a> from the -Belairs. The second part is <strong>The Art of Surf Drumming</strong>, which is -an instructional video for drummers with tips and lessons from four great -drummers! -</p> -<p> -As Paul Johnson says: <em>“Please be assured: this package is NOT just for -drummers — it’s for everyone who loves good music! What started out as just -a simple idea for a “surf drum instruction video” has ended up as a much -larger concept...”</em> -</p> -<p>Watch the trailer now:</p> +<section> + <h4>Pounding Surf - “The Original Full-Length Surf Music Documentary”</h4> + <p> + The <a href="http://www.surfdrums.com/home.html">Pounding Surf</a> is an + amazing DVD with <strong>two complete features</strong>: <strong>A Drummer's + Guide to Surf Music</strong>, a colorful history of the surf music genre which + features great live performances and interviews with key figures, hosted by + surf guitar pioneer <a href="http://pjmoto.com">Paul Johnson</a> from the + Belairs. The second part is <strong>The Art of Surf Drumming</strong>, which is + an instructional video for drummers with tips and lessons from four great + drummers! + </p> + <blockquote> + Please be assured: this package is NOT just for + drummers — it’s for everyone who loves good music! What started out as just + a simple idea for a “surf drum instruction video” has ended up as a much + larger concept. + <cite>Paul Johnson</cite> + </blockquote> + <p>Watch the trailer now:</p> -<iframe width="480" height="360" src="https://www.youtube-nocookie.com/embed/MddiCnbtc1E?rel=0" frameborder="0" allowfullscreen></iframe> + <div class="flex-video"> + <iframe width="480" height="360" + src="https://www.youtube-nocookie.com/embed/MddiCnbtc1E?rel=0" + frameborder="0" allowfullscreen></iframe> + </div> -<p> -Order now at the <a href="http://www.surfdrums.com/home.html">Pounding Surf website</a>. -</p> -<div class="info"> <p> - SurfGuitar101 members can receive the special "bro deal": The Pounding - Surf DVD for only $20, plus $3 for shipping (international shipping is $15). - To take advantage of this offer, bypass the above website send a Paypal - payment directly to <a href="mailto:4orders@surfdrums.com">4orders@surfdrums.com</a>, or send check or - money order to: + Order now at the <a href="http://www.surfdrums.com/home.html">Pounding Surf website</a>. </p> - <address> - E.G.O. Productions<br /> - PO Box 12012<br /> - Costa Mesa, CA 92627<br /> - </address> -</div> -<hr /> + <div class="callout primary"> + <p> + SurfGuitar101 members can receive the special "bro deal": The Pounding + Surf DVD for only $20, plus $3 for shipping (international shipping is $15). + To take advantage of this offer, bypass the above website send a Paypal + payment directly to <a href="mailto:4orders@surfdrums.com">4orders@surfdrums.com</a>, or send check or + money order to: + </p> + <address> + E.G.O. Productions<br /> + PO Box 12012<br /> + Costa Mesa, CA 92627<br /> + </address> + </div> + <p class="quiet"><a href="#top">Back to Top</a></p> +</section> +<hr> -<h4>The Illustrated Dicography of Surf Music 1961-1965</h4> -<p> -John Blair, the lead guitar player for legendary surf revival band <strong>Jon -& The Nightriders</strong>, has put together the definitive guide to the -hundreds of singles and albums from surf music's golden era of 1961-165. Now in -its fourth edition, this book features more information, an expanded index, and -color photos. Foreword by Dick Dale, the King of the Surf Guitar himself! -</p> -<p><img src="{% static "store/blairs_book.jpg" %}" /></p> -<p>Order now at <a href="http://johnblair.us">John Blair's website</a>.</p> +<section> + <h4>The Illustrated Dicography of Surf Music 1961-1965</h4> + <div class="media-object stack-for-small"> + <div class="media-object-section"> + <div class="thumbnail"> + <img src="{% static "store/blairs_book.jpg" %}" /> + </div> + </div> + <div class="media-object-section"> + <p> + John Blair, the lead guitar player for legendary surf revival band <strong>Jon + & The Nightriders</strong>, has put together the definitive guide to the + hundreds of singles and albums from surf music's golden era of 1961-165. Now in + its fourth edition, this book features more information, an expanded index, and + color photos. Foreword by <strong>Dick Dale</strong>, the King of the Surf Guitar himself! + </p> + <p>Order now at <a href="http://johnblair.us">John Blair's website</a>.</p> + </div> + </div> + <p class="quiet"><a href="#top">Back to Top</a></p> +</section> +<hr> -<hr /> +<section> + <h4>Reverb Junkies</h4> + <p> + <a href="http://reverbjunkiesfilm.com/">Reverb Junkies</a> is a high-energy feature + film documenting the current surf music scene in southern California. + </p> + <p> + <a href="http://reverbjunkiesfilm.com/">Reverb Junkies</a> takes you inside this + little known sub-genre of Rock and Roll. This documentary introduces you to some + of the people playing the fastest, hottest instrumental music around and to the + rabid fans of all ages who are driven to keep the music alive. + </p> + <p><em>Editor's note: Some of the people featured in this film are also members + of SurfGuitar101.com!</em></p> + <p>View the trailer here:</p> -<h4>Reverb Junkies</h4> -<p> -<a href="http://reverbjunkiesfilm.com/">Reverb Junkies</a> is a high-energy feature -film documenting the current surf music scene in southern California. -</p> -<p> -<a href="http://reverbjunkiesfilm.com/">Reverb Junkies</a> takes you inside this -little known sub-genre of Rock and Roll. This documentary introduces you to some -of the people playing the fastest, hottest instrumental music around and to the -rabid fans of all ages who are driven to keep the music alive. -</p> -<p><em>Editor's note: Some of the people featured in this film are also members -of SurfGuitar101.com!</em></p> -<p>View the trailer here:</p> + <div class="flex-video"> + <iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/8l72mQbx5zk?rel=0" frameborder="0" allowfullscreen></iframe> + </div> -<iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/8l72mQbx5zk?rel=0" frameborder="0" allowfullscreen></iframe> - -<p> -Order from the <a href="http://reverbjunkiesfilm.com/">Reverb Junkies - website</a>. T-shirts are now available as well! -</p> - -<hr /> - + <p> + Order from the <a href="http://reverbjunkiesfilm.com/">Reverb Junkies + website</a>. T-shirts are now available as well! + </p> + <p class="quiet"><a href="#top">Back to Top</a></p> +</section> {% endblock %}
--- a/sg101/urls.py Sat Apr 09 17:15:32 2016 -0500 +++ b/sg101/urls.py Sun Apr 10 14:31:08 2016 -0500 @@ -14,6 +14,7 @@ from custom_search.forms import CustomModelSearchForm from custom_search.views import UserSearchView from core.views import FixedView +from sg101.views import StoreView urlpatterns = [ @@ -41,14 +42,8 @@ url(r'^reset/done/$', django.contrib.auth.views.password_reset_complete), url(r'^store/$', - TemplateView.as_view(template_name='store/base.html'), + StoreView.as_view(), name='store'), - url(r'^store/cancel/$', - TemplateView.as_view(template_name='store/cancel.html'), - name='store-cancel'), - url(r'^store/thanks/$', - TemplateView.as_view(template_name='store/thanks.html'), - name='store-thanks'), url(r'^admin/', include(admin.site.urls)), url(r'^accounts/', include('accounts.urls')),
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sg101/views.py Sun Apr 10 14:31:08 2016 -0500 @@ -0,0 +1,12 @@ +"""Misc views for SG101""" + +from django.views.generic import TemplateView + + +class StoreView(TemplateView): + template_name = 'store/base.html' + + def get_context_data(self, **kwargs): + context = super(StoreView, self).get_context_data(**kwargs) + context['V3_DESIGN'] = True + return context