Merge pull request #1425 from MITx/feature/ichuang/conditional-module-text-improvement

for conditional require_attempted display "attempted" instead of "completed"

lms/templates/conditional_module.html

@@ -2,8 +2,14 @@
     from django.core.urlresolvers import reverse
     reqm = module.required_modules[0]
     course_id = module.system.course_id
+    condition = module.condition
 %>
 
-<p><a
-href="${reverse('jump_to',kwargs=dict(course_id=course_id, location=reqm.location.url()))}">${reqm.display_name}</a>
-must be completed before this will become visible.</p>
+<p><a href="${reverse('jump_to',kwargs=dict(course_id=course_id, location=reqm.location.url()))}">${reqm.display_name}</a>
+must be 
+% if 'attempted' in condition:
+  attempted
+% else:
+  completed 
+% endif
+before this will become visible.</p>