Changeset 157

Show
Ignore:
Timestamp:
09/02/10 11:27:17 (17 months ago)
Author:
gnum
Message:

Fixes #103, also moved single participant view to /singles/ so that it would follow the general logic

Location:
trunk
Files:
3 modified
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/languages/en.php

    r155 r157  
    106106        File: /edufeedr/views/default/edufeedr/educourse_blog.php 
    107107        File: /edufeedr/views/default/edufeedr/singles/educourse_comment.php 
    108         Lines: 44, 50 
     108        Lines: 51, 52 
    109109        Text: read more 
    110110        _missing_translation_ 
     
    329329        File: /edufeedr/views/default/edufeedr/educourse_post.php 
    330330        File: /edufeedr/views/default/edufeedr/singles/educourse_comment.php 
    331         Lines: 48, 24, 59 
     331        Lines: 55, 24, 61 
    332332        Text: hide 
    333333        _missing_translation_ 
     
    360360         
    361361        /*  
    362         File: /edufeedr/views/default/edufeedr/forms/join_educourse.php 
    363         Lines: 59 
    364         Text: Sign up 
    365         _missing_translation_ 
    366         */ 
    367         "edufeedr:submit:signup" => "Sign up", 
    368          
    369         /*  
    370362        File: /edufeedr/views/default/edufeedr/educourse_blog.php 
    371         Lines: 86 
     363        Lines: 88 
    372364        Text: Hidden comments 
    373365        _missing_translation_ 
     
    404396        File: /edufeedr/views/default/edufeedr/educourse_hidden.php 
    405397        File: /edufeedr/views/default/edufeedr/educourse_post.php 
    406         Lines: 37, 21, 18 
     398        Lines: 36, 21, 18 
    407399        Text: %s by %s 
    408400        _missing_translation_ 
     
    435427         
    436428        /*  
    437         File: /edufeedr/views/default/edufeedr/single_educourse_participant.php 
     429        File: /edufeedr/views/default/edufeedr/singles/educourse_participant.php 
    438430        Lines: 13 
    439         Text: Edit participant 
    440         _missing_translation_ 
    441         */ 
    442         "edufeedr:course:edit:participant" => "Edit participant", 
     431        Text: Edit 
     432        _missing_translation_ 
     433        */ 
     434        "edufeedr:course:edit:participant" => "Edit", 
    443435         
    444436        /*  
     
    469461         
    470462        /*  
    471         File: /edufeedr/views/default/edufeedr/single_educourse_participant.php 
     463        File: /edufeedr/views/default/edufeedr/singles/educourse_participant.php 
    472464        Lines: 18 
    473         Text: Remove participant 
    474         _missing_translation_ 
    475         */ 
    476         "edufeedr:course:remove:participant" => "Remove participant", 
     465        Text: Remove 
     466        _missing_translation_ 
     467        */ 
     468        "edufeedr:course:remove:participant" => "Remove", 
    477469         
    478470        /*  
     
    541533         
    542534        /*  
    543         File: /edufeedr/views/default/edufeedr/single_educourse_participant.php 
    544         Lines: 20 
    545         Text: Are you sure you want to remove participant %s? 
    546         _missing_translation_ 
    547         */ 
    548         "edufeedr:course:remove:participant:confirmation" => "Are you sure you want to remove participant %s?", 
     535        File: /edufeedr/views/default/edufeedr/forms/join_educourse.php 
     536        Lines: 59 
     537        Text: Sign up 
     538        _missing_translation_ 
     539        */ 
     540        "edufeedr:submit:signup" => "Sign up", 
    549541         
    550542        /*  
     
    564556        */ 
    565557        "edufeedr:label:joining:educourse:name" => "Course %s", 
     558         
     559        /*  
     560        File: /edufeedr/views/default/edufeedr/singles/educourse_participant.php 
     561        Lines: 20 
     562        Text: Are you sure you want to remove participant %s? 
     563        _missing_translation_ 
     564        */ 
     565        "edufeedr:course:remove:participant:confirmation" => "Are you sure you want to remove participant %s?", 
    566566         
    567567        /*  
     
    931931        /*  
    932932        File: /edufeedr/views/default/edufeedr/educourse_blog.php 
    933         Lines: 83 
     933        Lines: 85 
    934934        Text: Hidden posts 
    935935        _missing_translation_ 
  • trunk/languages/et.php

    r155 r157  
    106106        File: /edufeedr/views/default/edufeedr/educourse_blog.php 
    107107        File: /edufeedr/views/default/edufeedr/singles/educourse_comment.php 
    108         Lines: 44, 50 
     108        Lines: 51, 52 
    109109        Text: read more 
    110110        _missing_translation_ 
     
    329329        File: /edufeedr/views/default/edufeedr/educourse_post.php 
    330330        File: /edufeedr/views/default/edufeedr/singles/educourse_comment.php 
    331         Lines: 48, 24, 59 
     331        Lines: 55, 24, 61 
    332332        Text: hide 
    333333        _missing_translation_ 
     
    360360         
    361361        /*  
    362         File: /edufeedr/views/default/edufeedr/forms/join_educourse.php 
    363         Lines: 59 
    364         Text: Sign up 
    365         _missing_translation_ 
    366         */ 
    367         "edufeedr:submit:signup" => "Sign up", 
    368          
    369         /*  
    370362        File: /edufeedr/views/default/edufeedr/educourse_blog.php 
    371         Lines: 86 
     363        Lines: 88 
    372364        Text: Hidden comments 
    373365        _missing_translation_ 
     
    404396        File: /edufeedr/views/default/edufeedr/educourse_hidden.php 
    405397        File: /edufeedr/views/default/edufeedr/educourse_post.php 
    406         Lines: 37, 21, 18 
     398        Lines: 36, 21, 18 
    407399        Text: %s by %s 
    408400        _missing_translation_ 
     
    435427         
    436428        /*  
    437         File: /edufeedr/views/default/edufeedr/single_educourse_participant.php 
     429        File: /edufeedr/views/default/edufeedr/singles/educourse_participant.php 
    438430        Lines: 13 
    439         Text: Edit participant 
    440         _missing_translation_ 
    441         */ 
    442         "edufeedr:course:edit:participant" => "Edit participant", 
     431        Text: Edit 
     432        _missing_translation_ 
     433        */ 
     434        "edufeedr:course:edit:participant" => "Edit", 
    443435         
    444436        /*  
     
    469461         
    470462        /*  
    471         File: /edufeedr/views/default/edufeedr/single_educourse_participant.php 
     463        File: /edufeedr/views/default/edufeedr/singles/educourse_participant.php 
    472464        Lines: 18 
    473         Text: Remove participant 
    474         _missing_translation_ 
    475         */ 
    476         "edufeedr:course:remove:participant" => "Remove participant", 
     465        Text: Remove 
     466        _missing_translation_ 
     467        */ 
     468        "edufeedr:course:remove:participant" => "Remove", 
    477469         
    478470        /*  
     
    541533         
    542534        /*  
    543         File: /edufeedr/views/default/edufeedr/single_educourse_participant.php 
    544         Lines: 20 
    545         Text: Are you sure you want to remove participant %s? 
    546         _missing_translation_ 
    547         */ 
    548         "edufeedr:course:remove:participant:confirmation" => "Are you sure you want to remove participant %s?", 
     535        File: /edufeedr/views/default/edufeedr/forms/join_educourse.php 
     536        Lines: 59 
     537        Text: Sign up 
     538        _missing_translation_ 
     539        */ 
     540        "edufeedr:submit:signup" => "Sign up", 
    549541         
    550542        /*  
     
    564556        */ 
    565557        "edufeedr:label:joining:educourse:name" => "Course %s", 
     558         
     559        /*  
     560        File: /edufeedr/views/default/edufeedr/singles/educourse_participant.php 
     561        Lines: 20 
     562        Text: Are you sure you want to remove participant %s? 
     563        _missing_translation_ 
     564        */ 
     565        "edufeedr:course:remove:participant:confirmation" => "Are you sure you want to remove participant %s?", 
    566566         
    567567        /*  
     
    931931        /*  
    932932        File: /edufeedr/views/default/edufeedr/educourse_blog.php 
    933         Lines: 83 
     933        Lines: 85 
    934934        Text: Hidden posts 
    935935        _missing_translation_ 
  • trunk/views/default/edufeedr/educourse_participants.php

    r150 r157  
    1919            /*translation:Course participants*/ 
    2020            $body .= '<label>' . elgg_echo('edufeedr:label:course:participants') . ':</label>'; 
    21             $body .= '<ol>';            foreach ($participants as $participant) {                $body .= elgg_view('edufeedr/single_educourse_participant', array('participant' => $participant, 'entity' => $vars['entity'])); 
     21            $body .= '<ol>';            foreach ($participants as $participant) {                $body .= elgg_view('edufeedr/singles/educourse_participant', array('participant' => $participant, 'entity' => $vars['entity'])); 
    2222            } 
    2323            $body .= '</ol>'; 
  • trunk/views/default/edufeedr/singles/educourse_participant.php

    r75 r157  
    1010                if (edufeedrCanEditEducourse($vars['entity'])) { 
    1111                        echo '&nbsp;&nbsp;'; 
    12                         /*translation:Edit participant*/ 
     12                        /*translation:Edit*/ 
    1313                        echo '<a href="' . $vars['url'] . 'pg/edufeedr/edit_participant/' . $vars['entity']->getGUID() . '/' . $vars['participant']->id . '">' . elgg_echo('edufeedr:course:edit:participant') . '</a>'; 
    1414                        echo '&nbsp;&nbsp;'; 
    1515                        echo elgg_view('output/confirmlink', array( 
    1616                                'href' => $vars['url'] . 'action/edufeedr/remove_participant?educourse=' . $vars['entity']->getGUID() . '&participant_number=' . $vars['participant']->id, 
    17                                 /*translation:Remove participant*/ 
     17                                /*translation:Remove*/ 
    1818                                'text' => elgg_echo('edufeedr:course:remove:participant'), 
    1919                                /*translation:Are you sure you want to remove participant %s?*/ 
    20                                 'confirm' => sprintf(elgg_echo('edufeedr:course:remove:participant:confirmation'), $vars['participant']->firstname . ' ' . $vars['participant']->lastname) 
     20                                'confirm' => sprintf(elgg_echo('edufeedr:course:remove:participant:confirmation'), $vars['participant']->firstname . ' ' . $vars['participant']->lastname), 
     21                                'class' => 'edufeedr_action_delete_or_remove' 
    2122                                ) 
    2223                        );