Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Issue #47: Change 'social' to 'brotherhood' #48

Merged
merged 1 commit into from

1 participant

@rogerskw
Owner

No description provided.

@rogerskw rogerskw merged commit 6d2283e into from
@rogerskw rogerskw deleted the branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Mar 8, 2014
  1. @rogerskw
This page is out of date. Refresh to see the latest.
View
4 articles/urls.py
@@ -11,9 +11,9 @@
url(r'^$', views.index, name='index'),
url(r'^service/$', views.service, name='service'),
url(r'^pd/$', views.professional_development, name='professional_development'),
- url(r'^social/$', views.social, name='social'),
+ url(r'^brotherhood/$', views.brotherhood, name='brotherhood'),
url(r'^(?P<article_id>\d+)', views.get_article, name='article'),
url(r'^service/(?P<article_id>\d+)', views.get_article, name='article'),
url(r'^pd/(?P<article_id>\d+)', views.get_article, name='article'),
- url(r'^social/(?P<article_id>\d+)', views.get_article, name='article'),
+ url(r'^brotherhood/(?P<article_id>\d+)', views.get_article, name='article'),
)
View
4 articles/views.py
@@ -49,8 +49,8 @@ def service(request):
def professional_development(request):
return general_listing(request, 'Professional Development', 'PD')
-def social(request):
- return general_listing(request, 'Social', 'Social')
+def brotherhood(request):
+ return general_listing(request, 'Brotherhood', 'Brotherhood')
def get_article(request, article_id):
art = get_object_or_404(Article, pk=article_id)
View
BIN  db.sqlite3
Binary file not shown
View
2  templates/base.html
@@ -61,7 +61,7 @@
<ul class="dropdown-menu">
<li><a href="/articles/service">Service</a></li>
<li><a href="/articles/pd">Professional Development</a></li>
- <li><a href="/articles/social">Social</a></li>
+ <li><a href="/articles/brotherhood">Brotherhood</a></li>
<li><a href="/articles/">All</a></li>
</ul></li>
<li><a href="/events" style="color:#DADADA;">Upcoming Events</a></li>
View
2  templates/index.html
@@ -86,7 +86,7 @@
</div>
<div class="col-lg-4 col-md-4">
<h3>
- <i class="fa fa-folder-open"></i> Social
+ <i class="fa fa-folder-open"></i> Brotherhood
</h3>
<p>
Our members pride themselves upon sharing a brotherhood unlike any other
Something went wrong with that request. Please try again.