resolving conflicts from @curlee 's pull request

views/auth/signup.html

@@ -1,12 +1,12 @@
 {% extends 'auth/layout.html' %}
 {% set bodyClass = 'sign-up' %}
-{% set pageTitle = 'Sign Up' %}
+{% set pageTitle = 'Sign Up & Start Exploring' %}
 {% set navItem = 'sign-up' %}
 {% set months = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'] %}
 
 {% block content %}
 	<form class="form-horizontal span6 offset3" method="post">
-		<p class="lead">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
+		<p class="lead">Explore badges you can earn and level up for citywide challenges. Create an account to get started!</p>
 		<input type="hidden" name="_csrf" value="{{ csrfToken }}">
 		<fieldset>
 			<div class="control-group">

views/claim.html

@@ -25,7 +25,7 @@
     </div>
   {% else %}
             <p>To claim the badge you've earned, enter the "claim code" written on the paper badge you received from your teacher, counselor or mentor.</p>
-            <p>Then hit the "Claim This Badge" button on your screen. Once you do this, the badge will be added to your dashboard and you can throw the piece of paper away (better yet, recycle it!).</p>
+            <p>Then hit the "Claim This Badge" button on your screen. Once you do this, the badge will be added to your My Badges page and you can throw the piece of paper away (or, better yet, recycle it!).</p>
 
     <h3>Already have a claim code?</h3>
     <form method="get" class="form-horizontal well span6 offset3">

views/includes/badge-thumbnail.html

@@ -24,7 +24,7 @@ doesn't have a URL #}
 		{% include "includes/add-to-playlist-btn.html" %}
 	{% endif %}
 	</div>
-	<a href="{{ itemUrl(url, item) }}"><img src="{{ item.image }}"></a>
+	<a href="{{ item.url }}"><img src="{% if item.imageUrl %}{{ item.imageUrl }}{% else %}{% if item.image %}{{item.image}}{% else %}{{item.issuer.imageUrl}}{% endif %}{% endif %}"></a>
 	<figcaption class="caption">
 		<p>{{ item.name }}</p>
 		{% if item.description %}

views/layout.html

@@ -36,7 +36,7 @@
                                     {% if user %}
                                         {% if user.type == 'learner' %}
                                             <li class="dropdown backpack{% if navItem == 'backpack' %} active{% endif %}">
-                                                <a class="dropdown-toggle" role="button" data-toggle="dropdown" id="backpack-menu-toggle">My Backpack <i class="caret"></i></a>
+                                                <a class="dropdown-toggle" role="button" data-toggle="dropdown" id="backpack-menu-toggle">My CSOL <i class="caret"></i></a>
                                                 <ul class="dropdown-menu" role="menu" id="backpack-menu" aria-labelledby="backpack-menu-toggle">
                                                     <li role="presentation"{% if subNavItem == 'badges' %} class="active"{% endif %}>
                                                         <a role="menuitem" tabindex="-1" href="/mybadges">My Badges</a>

views/user/backpack.html

@@ -15,6 +15,13 @@
   </li>
 {% endblock %}
 
+{% block item_actions %}
+{#
+  {{ super() }}
+  <a class="btn show-tooltip" title="Add to your favorites" href="{{ item.url }}/favorite"><i class="icon-heart"></i></a>
+#}
+{% endblock %}
+
 {% block modal %}
   <!-- Modal -->
   <div id="shareModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">

views/user/dashboard.html

@@ -22,7 +22,7 @@
     {% for current in dependants %}
     <h3>{{ current.getDisplayName() }}'s recent activity</h3>
     {% if current.activities.length %}
-			<ul class="activities thumbnails">
+      <ul class="activity thumbnails">
         {% for activity in current.activities %}
           <li class="span3">
             {% include "includes/learner-activity.html" %}
@@ -32,7 +32,7 @@
     {% else %}
       <p>{{ current.getDisplayName() }} does not have any recent activity.</p>
     {% endif %}
-		<p class="text-right"><a href="/dashboard/{{ current.username }}" class="btn">See all activity &raquo;</a></p>
+    <p class="text-right"><a href="/dashboard/{{ dependant.username }}" class="btn">See all activity &raquo;</a></p>
     {% endfor %}
   {% endblock %}
 {% endblock %}