Changeset 720 for trunk/app/views

Timestamp:

08/11/08 18:34:59 (4 months ago)

Author:

aarkerio

Message:

Quick bugs

Location:

trunk/app/views

Files:

• topics/display.ctp (modified) (2 diffs)
• webquests/view.ctp (modified) (4 diffs)

trunk/app/views/topics/display.ctp

@@ -3 +3 @@
 echo '<h1>'. $data['Forum']['title'] .'</h1>';
 
-echo $html->para(null, $data['User']['username'] . ' suggest topic: <b>'.$data['Topic']['subject'] .'</b>  at <span class="dates">'.$data['Topic']['created'].'</span>');
+echo $html->para(null, $data['User']['username'] .' '. __('suggested topic', true).':<b> '.$data['Topic']['subject'] .'</b>  at <span class="dates">'.$data['Topic']['created'].'</span>');
 
 echo $html->para(null, $html->link(
-$html->image('static/return.jpg', array('alt'=>'Return to '. $data['Forum']['title'], 'title'=>'Return to '. $data['Forum']['title']))
+$html->image('static/return.jpg', array('alt'=>__('Return to', true).' '. $data['Forum']['title'], 'title'=>__('Return to', true).' '. $data['Forum']['title']))
 , '/forums/display/'.$data['Topic']['forum_id'].'/'.$data['Topic']['vclassroom_id'], null, null, false));
 
-echo $html->div('titentry', 'Discussion on '.$data['Topic']['subject']);
-echo $html->para(null, '<b>Discussion topic:</b> '.$data['Topic']['message']);
+echo $html->div('titentry', __('Discussion on', true) .' '.$data['Topic']['subject']);
+echo $html->para(null, '<b>'.__('Discussion topic', true).':</b> '.$data['Topic']['message']);
 
 if ( $belongs === true ):
@@ -23 +23 @@
 
 **/
- $tmp = $ajax->link($html->image("static/reply.gif", array("alt"=>"New reply", "title"=>"Reply")), 
+ $tmp = $ajax->link($html->image("static/reply.gif", array('alt'=>__('Reply', true), 'title'=>__('Reply', true))), 
       '/topics/reply/'.$data['Topic']['vclassroom_id'].'/'.$data['Forum']['id'].'/'.$data['Topic']['id'].'/'.$data['Forum']['user_id'],
                                 array("update" => "qn",

trunk/app/views/webquests/view.ctp

@@ -3 +3 @@
 
 if ( $already === true ):
-      e($html->para(null, 'You already have answered this webquest'));
+      e($html->para(null, __('You already have answered this Webquest', true)));
 endif;
 
@@ -14 +14 @@
 <?php
 echo '<div style="margin:10px auto;padding:5px;border:1px dotted red;">'; 
-   echo '<h2>Introduction</h2>';
+   echo '<h2>'.__('Introduction', true).'</h2>';
    echo '<div>' . $gags->delTags($data['Webquest']['introduction']).'</div>';
 
-   echo '<h2>Tasks</h2>';
+   echo '<h2>'.__('Tasks', true).'</h2>';
    echo '<div>' . $gags->delTags($data['Webquest']['tasks']).'</div>';
 
-   echo '<h2>Process</h2>';
+   echo '<h2>'.__('Process', true).'</h2>';
    echo '<div>' .  $gags->delTags($data['Webquest']['process']).'</div>';
 
@@ -26 +26 @@
    echo '<div>' .  $gags->delTags($data['Webquest']['roles']).'</div>';
 
-   echo '<h2>Evaluation</h2>';
+   echo '<h2>'.__('Evaluation', true).'</h2>';
    echo '<div>' .  $gags->delTags($data['Webquest']['evaluation']).'</div>';
 
-   echo '<h2>Conclusion</h2>';
+   echo '<h2>'.__('Conclusion', true).'</h2>';
    echo '<div>' .  $gags->delTags($data['Webquest']['conclusion']).'</div>';
 
-   echo '<p>Created: <b>'. $data['Webquest']['created'].'</b></p>';
+   echo $html->para(null, __('Created', true) .': <b>'. $data['Webquest']['created'].'</b>');
 echo '</div>';
 
@@ -44 +44 @@
   echo $form->label('ResultWebquest.answer', 'Answer:').'<br />';
   echo $form->textarea('ResultWebquest.answer', array('cols'=>50, 'rows'=>20));
-  echo $form->end('Send');
+  echo $form->end(__('Send', true));
 echo '</fieldset>';
 
 endif;
 
-if ( $session->check('Auth.User') ):
+if ( !$session->check('Auth.User') ):
       e($html->para(null, 'You must belong to class to see this exam'));
 endif;