COmanage Developers List

Author: benno
Date: 2013-12-09 20:19:49 -0500 (Mon, 09 Dec 2013)
New Revision: 637

Modified:
   registry/trunk/app/Lib/lang.php
   registry/trunk/app/View/CoPetitions/petition-attributes.inc
   registry/trunk/app/View/CoTermsAndConditions/review.ctp
Log:
Link to T&C when viewing petitions (CO-734)

Modified: registry/trunk/app/Lib/lang.php
===================================================================
--- registry/trunk/app/Lib/lang.php     2013-12-09 02:52:03 UTC (rev 636)
+++ registry/trunk/app/Lib/lang.php     2013-12-10 01:19:49 UTC (rev 637)
@@ -738,6 +738,7 @@
   'op.tc.agree' =>    'Agree to Terms and Conditions',
   'op.tc.agree.i' =>  'I Agree',
   'op.tc.review' =>   'Review Terms and Conditions',
+  'op.tc.review.pt' => 'Review All Agreed To Terms and Conditions',
   'op.unlink' =>      'Unlink',
   'op.unlink.confirm' => 'Are you sure you wish to unlink this identity?',
   'op.view' =>        'View',

Modified: registry/trunk/app/View/CoPetitions/petition-attributes.inc
===================================================================
--- registry/trunk/app/View/CoPetitions/petition-attributes.inc 2013-12-09 
02:52:03 UTC (rev 636)
+++ registry/trunk/app/View/CoPetitions/petition-attributes.inc 2013-12-10 
01:19:49 UTC (rev 637)
@@ -369,8 +369,25 @@
 
   <?php if(!empty($vv_terms_and_conditions)): ?>
   <?php $line = 0; ?>
+    <?php if($this->action == 'view'): ?>
     <div class="ui-widget modelbox">
       <div class="boxtitle">
+        <b><?php print _txt('op.tc.agree'); ?></b>
+      </div>
+      <?php
+        // We link to T&C because T&C are not considered part of the 
petition.
+        
+        print $this->Html->link(_txt('op.tc.review.pt'),
+                                array('controller' => 
'co_terms_and_conditions',
+                                      'action' => 'review',
+                                      'copersonid' => 
$co_petitions[0]['CoPetition']['enrollee_co_person_id'],
+                                      'co' => 
$co_petitions[0]['CoPetition']['co_id']),
+                                array('class' => 'linkbutton'));
+      ?>
+    </div>
+    <?php else: // action == view ?>
+    <div class="ui-widget modelbox">
+      <div class="boxtitle">
         <b><?php print _txt('op.tc.agree'); ?></b><br />
         <font class="desc"><?php print _txt('fd.tc.agree.desc'); ?></font>
       </div>
@@ -405,10 +422,10 @@
             </td>
           </tr>
           <?php endforeach; ?>
-        </td>
-      </tr>
-    </tbody>
-  </table>    </div>
+        </tbody>
+      </table>
+    </div>
+    <?php endif; // action == view ?>
   <?php endif; ?>
 
   <table id="<?php print $this->action; ?>_co_petition_attrs" 
class="ui-widget">

Modified: registry/trunk/app/View/CoTermsAndConditions/review.ctp
===================================================================
--- registry/trunk/app/View/CoTermsAndConditions/review.ctp     2013-12-09 
02:52:03 UTC (rev 636)
+++ registry/trunk/app/View/CoTermsAndConditions/review.ctp     2013-12-10 
01:19:49 UTC (rev 637)
@@ -23,7 +23,7 @@
  */
 
   print $this->element("pageTitle", array('title' => _txt('fd.tc.for',
-                                                          
array(generateCn($vv_co_person['Name']), $cur_co['Co']['name']))));
+                                                          
array(generateCn($vv_co_person['PrimaryName']), $cur_co['Co']['name']))));
 ?>
 <script type="text/javascript">
   function open_tandc(title, tandcUrl, mode, agreeUrl) {