Index: openacs-4/packages/ae-portlet/catalog/ae-portlet.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ae-portlet/catalog/ae-portlet.en_US.ISO-8859-1.xml,v diff -u -r1.7 -r1.8 --- openacs-4/packages/ae-portlet/catalog/ae-portlet.en_US.ISO-8859-1.xml 8 Feb 2006 15:43:14 -0000 1.7 +++ openacs-4/packages/ae-portlet/catalog/ae-portlet.en_US.ISO-8859-1.xml 20 Feb 2006 13:18:31 -0000 1.8 @@ -2,20 +2,20 @@ <message_catalog package_key="ae-portlet" package_version="0.2d3" locale="en_US" charset="ISO-8859-1"> <msg key="ae_admin">Course Evaluation Admin</msg> - <msg key="Anonymous">Anonymous?</msg> + <msg key="Anonymous">Is this an anonymous evaluation?</msg> <msg key="Class">Class</msg> <msg key="Edit_Evaluation">Edit Evaluation</msg> <msg key="Edit_Your_Response">Edit Your Response</msg> <msg key="error_one_ae">There should be only one instance of Anon Eval for admin purpose</msg> <msg key="Finish_Evaluation">Finish Evaluation</msg> <msg key="lt_No_evaluations_presen">No evaluations presently available</msg> <msg key="lt_No_unpublished_evalua">No unpublished evaluations</msg> - <msg key="lt_NOTE_This_is_an_admin">#NOTE: This is an admin only section for unpublished evaluations</msg> + <msg key="lt_NOTE_This_is_an_admin">Evaluations Admin Section (only visible for administrators)</msg> <msg key="lt_Sorry_this_evaluation">Sorry, this evaluation is over</msg> <msg key="New_Evaluation">New Evaluation</msg> <msg key="Publish">Publish</msg> <msg key="Results">Results</msg> - <msg key="Take_Evaluation">Take Evaluation</msg> + <msg key="Take_Evaluation">Start Evaluation</msg> <msg key="Test_Evaluation">Test Evaluation</msg> <msg key="title">Title</msg> <msg key="Unpublish">Unpublish</msg> Index: openacs-4/packages/ae-portlet/lib/ae-portlet-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ae-portlet/lib/ae-portlet-chunk.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/packages/ae-portlet/lib/ae-portlet-chunk.tcl 9 Feb 2006 14:32:53 -0000 1.8 +++ openacs-4/packages/ae-portlet/lib/ae-portlet-chunk.tcl 20 Feb 2006 13:18:32 -0000 1.9 @@ -29,7 +29,7 @@ set groupby_list { label "[_ ae-portlet.Class]" type multivar - values { { "[_ ae-portlet.Class]" { {groupby community_name} } } } + values { { "" { {groupby community_name} } } } } } else { set groupby_list [list] @@ -42,6 +42,10 @@ -html { width 100% } \ -no_data "#ae-portlet.lt_No_evaluations_presen#" \ -elements { + community_name { + hide_p 1 + link_url_col community_name_link + } title { label "" display_template { @@ -68,13 +72,15 @@ </if> <else> + <if @assessments.package_admin_p@ ne 1> <if @assessments.over_p@> [_ ae-portlet.lt_Sorry_this_evaluation] - <if @assessments.package_admin_p@ eq 1> - <a href="@assessments.assessment_url;noquote@">#ae-portlet.Take_Evaluation#</a> - </if> </if> <else> + <a href="@assessments.assessment_url;noquote@">\#ae-portlet.Take_Evaluation\#</a> + </else> + </if> + <else> <a href="@assessments.assessment_url;noquote@">[_ ae-portlet.Test_Evaluation]</a> </else> @@ -90,7 +96,7 @@ -groupby $groupby_list set status_clause "and not ci.live_revision is null" -db_multirow -extend { edit_response_url view_url edit_url assessment_url status_url anonymous_url edit_url results_url package_admin_p over_p } assessments answered_assessments {} { +db_multirow -extend { edit_response_url view_url edit_url assessment_url status_url anonymous_url edit_url results_url package_admin_p over_p community_name_link } assessments answered_assessments {} { set base_url [site_node::get_url_from_object_id -object_id $package_id] set package_admin_p [permission::permission_p -party_id $user_id -object_id $package_id -privilege "admin"] @@ -109,6 +115,8 @@ } else { set over_p 0 } + + set community_name_link [site_node::get_url -node_id $comm_node_id] } if { $community_id ne "" } {