[opw-web] Fix problem with conflicting _visibility skin variables

[Owen Taylor <otaylor src gnome org>]

commit 2cd05bdf9da30529110a8f4a489d403099b31f06
Author: Owen W. Taylor <otaylor fishsoup net>
Date:   Tue May 12 16:38:49 2015 -0400

    Fix problem with conflicting _visibility skin variables
    
    mentor_visibility and student_visibility are set globally, so we
    need to use something else for the contract pages to distinguish
    editing/viewing contracts for mentors and students.

 modules/mod_contract.php                  |    4 ++--
 skins/easterngreen/html/tpl_contract.html |   10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/modules/mod_contract.php b/modules/mod_contract.php
index b723cfd..0ee0f6a 100644
--- a/modules/mod_contract.php
+++ b/modules/mod_contract.php
@@ -71,8 +71,8 @@ if ($accept_contract == 'accept') {
 $skin->assign(array(
      'view_visibility'   => $skin->visibility($has_accepted),
      'review_visibility' => $skin->visibility(!$has_accepted),
-     'mentor_visibility' => $skin->visibility($is_mentor),
-     'student_visibility' => $skin->visibility($is_student),
+     'program_mentor_visibility' => $skin->visibility($is_mentor),
+     'program_student_visibility' => $skin->visibility($is_student),
      'contract_accepted_time' => date('M d, Y h:m:s', $contract_accepted_time)
              ));
 
diff --git a/skins/easterngreen/html/tpl_contract.html b/skins/easterngreen/html/tpl_contract.html
index eaa0b70..948731d 100644
--- a/skins/easterngreen/html/tpl_contract.html
+++ b/skins/easterngreen/html/tpl_contract.html
@@ -1,15 +1,15 @@
 <div class="alert [[review_visibility]]">
-  <div  class="[[student_visibility]]">
+  <div  class="[[program_student_visibility]]">
     {{review_contract_notice_student}}
   </div>
-  <div  class="[[mentor_visibility]]">
+  <div  class="[[program_mentor_visibility]]">
     {{review_contract_notice_mentor}}
   </div>
 </div>
 <div class="alert [[view_visibility]]">
   {{view_contract_notice}} [[contract_accepted_time]]
 </div>
-<div class="[[mentor_visibility]]">
+<div class="[[program_mentor_visibility]]">
 </div>
 <script type="text/javascript">
 function checkScroll(e) {
@@ -18,7 +18,7 @@ function checkScroll(e) {
    }
 }
 </script>
-<div class="[[student_visibility]] contract-text" onscroll="checkScroll(event)">
+<div class="[[program_student_visibility]] contract-text" onscroll="checkScroll(event)">
 <p>OUTREACHY INTERNSHIP PROGRAM<br />
 Internship Terms of Participation<br />
 Last edited – May 1, 2015</p>
@@ -99,7 +99,7 @@ Entire Agreement.  This letter contains the entire agreement between you and Con
 <p>If the ITOP are acceptable to you, please FIXME – (fill out the form and click on the “Accept” button 
below) by no later than FIXME DATE. At the time you sign and return it, this letter shall take effect as a 
legally-binding agreement between you and Conservancy on the basis set forth above.  Please download a copy 
of this agreement for your records.</p>
 </div>
 
-<div class="[[mentor_visibility]] contract-text" onscroll="checkScroll(event)">
+<div class="[[program_mentor_visibility]] contract-text" onscroll="checkScroll(event)">
 <p>OUTREACHY INTERNSHIP PROGRAM<br />
 Mentorship Terms of Participation<br />
 last edited – May 1, 2015<br />