Merge pull request #152 from ptrourke/issue/147/guide-link

Issue/147/guide link
LibraryOfCongress · Dec 16, 2014 · 6200ba6 · 6200ba6
2 parents f2d4db5 + 9d81671
commit 6200ba6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
@@ -1,7 +1,8 @@
 South>=0.8.4,<2.0
 Django==1.6.2
 django-localflavor-us==1.1
-pillow==2.1.0
+# pillow==2.1.0 # See unix.stackexchange.com 105265
+-e git+https://github.com/python-imaging/Pillow.git#egg=Pillow
 django-announcements==1.0.2
 django-celery==3.0.23
 django-registration==1.0
@@ -13,7 +14,7 @@ django-require==1.0.5
 django-gravatar2==1.1.3
 
 # django-curation is required by viewshare.apps.discover
--e git+git://github.com/theatlantic/django-curation.git#egg=django-curation
+-e git+https://github.com/theatlantic/django-curation.git#egg=django-curation
 
 # Uncomment for uservoice integration
 # pycrypto==2.3
diff --git a/viewshare/templates/site_base.html b/viewshare/templates/site_base.html
@@ -55,7 +55,7 @@
       <ul class="dropdown-menu" role="menu" aria-labelledby="drop1">
         <li><a href="{% url 'userguide' %}">User's Guide</a></li>
         <li><a href="http://viewshare.uservoice.com/knowledgebase/articles/240426-faq">FAQ</a></li>
-        <li><a href="{% url 'profile_detail' 'Guide' %}">Ask the Guide</a></li>
+        <li><a href="{% url 'profile_detail' 'guide' %}">Ask the Guide</a></li>
       </ul>
     </li><li class="divider-vertical"></li>
     {% if user.is_staff %}<li><a href="/admin/" target="_blank"><i class="fa fa-cogs fa-lg"></i> {% trans "Admin" %}</a></li><li class="divider-vertical"></li>{% endif %}