name work sample urls

thraxil · Feb 24, 2016 · 7bcabd0 · 7bcabd0
1 parent b0c99a4
commit 7bcabd0
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 29 deletions.
diff --git a/spokehub/templates/base.html b/spokehub/templates/base.html
@@ -37,10 +37,10 @@
 	<div id="header-wrapper" class="content-container">
 		<a href="/" id="spokehub-logo"><img src="{{STATIC_URL}}img/spokehub-web-logo.png"></a>
 	  	<nav class="desktop-nav">
-	    	<a class="how" href="/how">HOW</a>
-	    	<a class="we" href="/we">WE</a>
-	    	<a class="work" href="/work">WORK</a>
-	    	<a class="now" href="/now">NOW</a>
+	    	<a class="how" href="/how/">HOW</a>
+	    	<a class="we" href="/we/">WE</a>
+	    	<a class="work" href="/work/">WORK</a>
+	    	<a class="now" href="/now/">NOW</a>
 	  	</nav>
 		<a href="#" id="login-link">Login</a>
 	</div>

diff --git a/spokehub/templates/work/index.html b/spokehub/templates/work/index.html
@@ -22,7 +22,7 @@ <h3>Havana Series</h3>
 					</div>
 				</a>-->
 
-				<a href="fightclub" class="thumb-container-margin">
+				<a href="{% url 'work-fightclub' %}" class="thumb-container-margin">
 					<div class="thumb-container">
 						<img src="{{STATIC_URL}}img/thumbs/fightclub-thumb.jpg" class="thumb">
 						<div class="thumb-overlay">
@@ -32,7 +32,7 @@ <h3>Fight Club Sandwich</h3>
 					</div>
 				</a>
 
-				<a href="sperry" class="thumb-container-margin">
+				<a href="{% url 'work-sperry' %}" class="thumb-container-margin">
 					<div class="thumb-container">
 						<img src="{{STATIC_URL}}img/thumbs/sperry-thumb.jpg" class="thumb">
 						<div class="thumb-overlay">
@@ -41,7 +41,7 @@ <h3>Sperry Odyssey</h3>
 					</div>
 				</a>
 
-				<a href="supper" class="thumb-container-margin">
+				<a href="{% url 'work-supper' %}" class="thumb-container-margin">
 					<div class="thumb-container">
 						<img src="{{STATIC_URL}}img/thumbs/supper-thumb.jpg" class="thumb">
 						<div class="thumb-overlay">
@@ -50,7 +50,7 @@ <h3>Supper Salon 1</h3>
 					</div>
 				</a>
 
-				<a href="artsho5" class="thumb-container-margin">
+				<a href="{% url 'work-artsho5' %}" class="thumb-container-margin">
 					<div class="thumb-container">
 						<img src="{{STATIC_URL}}img/thumbs/artsho-thumb.jpg" class="thumb">
 						<div class="thumb-overlay">
@@ -60,7 +60,7 @@ <h3>ARTSHO5</h3>
 					</div>
 				</a>
 
-				<a href="maddie" class="thumb-container-margin">
+				<a href="{% url 'work-maddie' %}" class="thumb-container-margin">
 					<div class="thumb-container">
 						<img src="{{STATIC_URL}}img/thumbs/maddie-thumb.jpg" class="thumb">
 						<div class="thumb-overlay">
@@ -70,7 +70,7 @@ <h3>Maddie Peterson</h3>
 					</div>
 				</a>
 
-				<a href="sorry" class="thumb-container-margin">
+				<a href="{% url 'work-sorry' %}" class="thumb-container-margin">
 					<div class="thumb-container">
 						<img src="{{STATIC_URL}}img/thumbs/sorry-thumb.jpg" class="thumb">
 						<div class="thumb-overlay">
@@ -80,7 +80,7 @@ <h3>Sorry For Laughing</h3>
 					</div>
 				</a>
 
-				<a href="bca" class="thumb-container-margin">
+				<a href="{% url 'work-bca' %}" class="thumb-container-margin">
 					<div class="thumb-container">
 						<img src="{{STATIC_URL}}img/thumbs/bca-thumb.jpg" class="thumb">
 						<div class="thumb-overlay">
@@ -98,4 +98,4 @@ <h3>Black Cultural Archives</h3>
 	</div>
 {% endblock %}
 
-</div>
+</div>
diff --git a/spokehub/urls.py b/spokehub/urls.py
@@ -44,25 +44,26 @@
         template_name='we/ask.html')),
     (r'^work/$', views.IndexView.as_view(
         template_name='work/index.html')),
-    (r'^work/maddie/$', views.IndexView.as_view(
-        template_name='work/maddie/index.html')),
-    (r'^work/havana/$', views.IndexView.as_view(
-        template_name='work/havana/index.html')),
-    (r'^work/fightclub/$', views.IndexView.as_view(
-        template_name='work/fightclub/index.html')),
-    (r'^work/sperry/$', views.IndexView.as_view(
-        template_name='work/sperry/index.html')),
-    (r'^work/supper/$', views.IndexView.as_view(
-        template_name='work/supper/index.html')),
-    (r'^work/artsho5/$', views.IndexView.as_view(
-        template_name='work/artsho5/index.html')),
-    (r'^work/sorry/$', views.IndexView.as_view(
-        template_name='work/sorry/index.html')),
-    (r'^work/bca/$', views.IndexView.as_view(
-        template_name='work/bca/index.html')),
+
+    url(r'^work/maddie/$', views.IndexView.as_view(
+        template_name='work/maddie/index.html'), name='work-maddie'),
+    url(r'^work/havana/$', views.IndexView.as_view(
+        template_name='work/havana/index.html'), name='work-havana'),
+    url(r'^work/fightclub/$', views.IndexView.as_view(
+        template_name='work/fightclub/index.html'), name='work-fightclub'),
+    url(r'^work/sperry/$', views.IndexView.as_view(
+        template_name='work/sperry/index.html'), name='work-sperry'),
+    url(r'^work/supper/$', views.IndexView.as_view(
+        template_name='work/supper/index.html'), name='work-supper'),
+    url(r'^work/artsho5/$', views.IndexView.as_view(
+        template_name='work/artsho5/index.html'), name='work-artsho5'),
+    url(r'^work/sorry/$', views.IndexView.as_view(
+        template_name='work/sorry/index.html'), name='work-sorry'),
+    url(r'^work/bca/$', views.IndexView.as_view(
+        template_name='work/bca/index.html'), name='work-bca'),
+
     (r'^now/$', views.IndexView.as_view(
         template_name='now/index.html')),
-
     (r'^weold/$', views.IndexView.as_view(
         template_name='main/we.html')),
     (r'^convo/$', views.IndexView.as_view(