[opw-web] Hide mentor information for not-yet-accepted projects from students

[Owen Taylor <otaylor src gnome org>]

commit e8eddcf51f09beeda7bb2e5947a1a5f93b9258a4
Author: Owen W. Taylor <otaylor fishsoup net>
Date:   Mon Mar 10 13:00:22 2014 -0400

    Hide mentor information for not-yet-accepted projects from students

 modules/mod_view_projects.php                 |    8 ++++++--
 skins/easterngreen/html/tpl_view_project.html |    4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/modules/mod_view_projects.php b/modules/mod_view_projects.php
index c8fae5a..a91fe5e 100644
--- a/modules/mod_view_projects.php
+++ b/modules/mod_view_projects.php
@@ -439,6 +439,9 @@ else if ($action == 'view')
     $user->restrict($project_data['is_accepted'] != 0 ||
                    ($project_data['is_accepted'] == 0 && $is_owner), true);
 
+    // Only allow mentors and admins to view mentorship unless project is accepted
+    $can_view_mentor = $project_data['is_accepted'] == 1 || $user->is_admin || $role == 'm';
+
     // Assign participant data
     $mentor = '-';
     $has_mentor = false;
@@ -451,7 +454,7 @@ else if ($action == 'view')
             $passed = $participant['passed'];
             $student = $participant['username'];
         }
-        else if ($participant['role'] == 'm')
+        else if ($can_view_mentor && $participant['role'] == 'm')
         {
             $has_mentor = true;
             $mentor = $participant['username'];
@@ -588,11 +591,12 @@ else if ($action == 'view')
         'attachments_list'          => $attachments_list,
         'success_message'           => isset($success_message) ? $success_message : '',
         'success_visibility'        => $skin->visibility(empty($success_message), true),
+        'mentor_visibility'         => $skin->visibility($can_view_mentor),
         'edit_visibility'           => $skin->visibility($is_owner || $user->is_admin),
         'attach_visibility'         => $skin->visibility($is_owner),
         'attachments_visibility'    => $skin->visibility(count($attachment_data) > 0),
         'delete_visibility'         => $skin->visibility($user->is_admin),
-        'mentorship_visibility'     => $skin->visibility($can_mentor),
+        'mentor_project_visibility' => $skin->visibility($can_mentor),
         'actions_visibility'        => $skin->visibility($is_owner || $can_mentor || $user->is_admin),
         'subscribe_visibility'      => $skin->visibility(isset($show_subscribe)),
         'approve_visibility'        => $skin->visibility($can_approve),
diff --git a/skins/easterngreen/html/tpl_view_project.html b/skins/easterngreen/html/tpl_view_project.html
index b9330d9..3d5f582 100644
--- a/skins/easterngreen/html/tpl_view_project.html
+++ b/skins/easterngreen/html/tpl_view_project.html
@@ -37,7 +37,7 @@
         <div class="span8">[[project_student]]</div>
     </div>
 
-    <div class="row">
+    <div class="row [[mentor_visibility]]">
         <div class="span2">{{mentor}}</div>
         <div class="span8">[[project_mentor]]</div>
     </div>
@@ -70,7 +70,7 @@
             {{edit}}
         </a>
 
-        <button type="submit" name="mentor_apply" class="btn [[mentorship_visibility]]">
+        <button type="submit" name="mentor_apply" class="btn [[mentor_project_visibility]]">
             <i class="icon-briefcase icon-black"></i>
             {{mentor_project}}
         </button>