(metacademy#59) setting lighter color for links of already known conc…

…epts while browsing

server/static/css/standard.css

@@ -146,6 +146,14 @@ a.sidr-class-ac-li-a {
 }
 
 
+.internal-link.known-concept{
+    color: #BB9CB0;
+    text-decoration: none;
+}
+.internal-link.known-concept:hover{
+    text-decoration:underline;
+    color:#B25291;
+}
 .internal-link, .focus-link{
     color: #A01F70;
     text-decoration: none;

server/static/html/browsing.html

@@ -92,7 +92,7 @@ <h3>Concepts</h3>
         <ul>
           {% for concept in uncat_concepts %}
             {% if concept.is_finished %}
-              <li> <a class="internal-link" href="{% url 'graphs:concepts' concept.tag %}"> {{concept.title}} </a> </li>
+            <li> <a class="internal-link{% if concept in known_concepts %} known-concept{% endif %}" href="{% url 'graphs:concepts' concept.tag %}"> {{concept.title}} </a> </li>
             {% endif %}
           {% endfor %}
         </ul>

server/views.py

@@ -11,6 +11,7 @@
 
 from apps.graph.models import Concept, Tag
 from apps.roadmaps.models import Roadmap
+from apps.user_management.models import Profile
 from forms import ContactForm
 
 
@@ -44,6 +45,7 @@ def get_browsing_view(request):
     """
     Return the list of concepts and roadmaps, sorted by category
     """
+    print "browsing"
     tags = Tag.objects.exclude(title='Meta').extra(select={'lower_title': 'lower(title)'}).order_by("lower_title").all()
     tags = list(Tag.objects.filter(title='Meta').all()) + list(tags)     # Meta tag should appear first
 
@@ -57,10 +59,14 @@ def get_browsing_view(request):
     uncat_course_guides = Roadmap.objects.filter(tags=None, roadmapsettings__doc_type='Course Guide') \
                           .extra(select={'lower_title': 'lower(title)'}).order_by("lower_title").all()
     uncat_course_guides = filter(Roadmap.is_listed_in_main, uncat_course_guides)
-
+
+    learned = None
+    if request.user.is_authenticated():
+        uprof, _ = Profile.objects.get_or_create(pk=request.user.pk)
+        learned = [concept for cs in uprof.learned.all() for concept in Concept.objects.filter(id=cs.id).all()]
 
     return render(request, "browsing.html", {'tags': tags, 'uncat_concepts': uncat_concepts, 'uncat_roadmaps': uncat_roadmaps,
-                                             'uncat_course_guides': uncat_course_guides})
+                                             'uncat_course_guides': uncat_course_guides, 'known_concepts': learned})