Menu
▾
▴
[WWcvs] webwork2: Merge changes with HEAD (Re-target view and edit links to use
|
From: dpvc v. a. <we...@ma...> - 2006-01-11 22:45:54
|
Log Message:
-----------
Merge changes with HEAD (Re-target view and edit links to use the view
and edit windows)
Modified Files:
--------------
webwork2/lib/WeBWorK/ContentGenerator:
ProblemSet.pm
ProblemSets.pm
webwork2/lib/WeBWorK/ContentGenerator/Instructor:
ProblemList.pm
ProblemSetDetail.pm
SetMaker.pm
Revision Data
-------------
Index: ProblemSets.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm,v
retrieving revision 1.66
retrieving revision 1.67
diff -Llib/WeBWorK/ContentGenerator/ProblemSets.pm -Llib/WeBWorK/ContentGenerator/ProblemSets.pm -u -r1.66 -r1.67
--- lib/WeBWorK/ContentGenerator/ProblemSets.pm
+++ lib/WeBWorK/ContentGenerator/ProblemSets.pm
@@ -59,7 +59,7 @@
my $editorURL = $self->systemLink($editorPage, params => { file_type => "course_info" });
print CGI::p(CGI::b("Course Info"), " ",
- CGI::a({href=>$editorURL}, "[edit]"));
+ CGI::a({href=>$editorURL, target=>"WW_Editor"}, "[edit]"));
} else {
print CGI::p(CGI::b("Course Info"));
}
Index: ProblemSet.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm,v
retrieving revision 1.71
retrieving revision 1.72
diff -Llib/WeBWorK/ContentGenerator/ProblemSet.pm -Llib/WeBWorK/ContentGenerator/ProblemSet.pm -u -r1.71 -r1.72
--- lib/WeBWorK/ContentGenerator/ProblemSet.pm
+++ lib/WeBWorK/ContentGenerator/ProblemSet.pm
@@ -210,8 +210,9 @@
my $displayMode = $r->param("displayMode") || $ce->{pg}->{options}->{displayMode};
if (defined $r->param("editMode") and $r->param("editMode") eq "temporaryFile") {
- my $screenHeaderPath = $r->param('sourceFilePath');
- #$screenSetHeader = "$screenSetHeader.$userID.tmp";
+ $screenSetHeader = $r->param('sourceFilePath');
+ $self->addmessage(CGI::div({class=>'temporaryFile'}, "Viewing temporary file: ",
+ $screenSetHeader));
$displayMode = $r->param("displayMode") if $r->param("displayMode");
}
@@ -243,13 +244,12 @@
);
if (defined($set) and $authz->hasPermissions($userID, "modify_problem_sets")) {
- #FIXME ? can't edit the default set header this way
my $editorPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::PGProblemEditor",
courseID => $courseID, setID => $set->set_id, problemID => 0);
my $editorURL = $self->systemLink($editorPage, params => { file_type => 'set_header'});
print CGI::p(CGI::b("Set Info"), " ",
- CGI::a({href=>$editorURL}, "[edit]"));
+ CGI::a({href=>$editorURL, target=>"WW_Editor"}, "[edit]"));
} else {
print CGI::p(CGI::b("Set Info"));
}
Index: ProblemList.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemList.pm,v
retrieving revision 1.33
retrieving revision 1.34
diff -Llib/WeBWorK/ContentGenerator/Instructor/ProblemList.pm -Llib/WeBWorK/ContentGenerator/Instructor/ProblemList.pm -u -r1.33 -r1.34
--- lib/WeBWorK/ContentGenerator/Instructor/ProblemList.pm
+++ lib/WeBWorK/ContentGenerator/Instructor/ProblemList.pm
@@ -522,12 +522,12 @@
$urlpath->new(type=>'instructor_problem_editor_withset_withproblem',
args=>{courseID =>$courseName,setID=>$setName,problemID=>$problemID}
)
- )}, "Edit it" ) .
+ ), target=>"WW_Editor"}, "Edit it" ) .
' '.
CGI::a({href=>$self->systemLink( $urlpath->new(type=>'problem_detail',
args=>{courseID =>$courseName,setID=>$setName,problemID=>$problemID}
),
- params =>{effectiveUser => $editForUserName} )}, "Try it") .
+ params =>{effectiveUser => $editForUserName} ), target=>"WW_View"}, "Try it") .
CGI::br() .
CGI::start_table().
Index: ProblemSetDetail.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm,v
retrieving revision 1.32
retrieving revision 1.33
diff -Llib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm -Llib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm -u -r1.32 -r1.33
--- lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm
+++ lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm
@@ -1250,8 +1250,8 @@
print CGI::Tr({}, CGI::td({}, [
CGI::start_table({border => 0, cellpadding => 0}) .
CGI::Tr({}, CGI::td({}, $properties{$header}->{name})) .
- CGI::Tr({}, CGI::td({}, CGI::a({href => $editHeaderLink}, "Edit it"))) .
- CGI::Tr({}, CGI::td({}, CGI::a({href => $viewHeaderLink}, "View it"))) .
+ CGI::Tr({}, CGI::td({}, CGI::a({href => $editHeaderLink, target=>"WW_Editor"}, "Edit it"))) .
+ CGI::Tr({}, CGI::td({}, CGI::a({href => $viewHeaderLink, target=>"WW_View"}, "View it"))) .
# CGI::Tr({}, CGI::td({}, CGI::checkbox({name => "defaultHeader", value => $header, label => "Use Default"}))) .
CGI::end_table(),
# "",
@@ -1367,8 +1367,8 @@
print CGI::Tr({}, CGI::td({}, [
CGI::start_table({border => 0, cellpadding => 1}) .
CGI::Tr({}, CGI::td({}, problem_number_popup($problemID, $maxProblemNumber))) .
- CGI::Tr({}, CGI::td({}, CGI::a({href => $editProblemLink}, "Edit it"))) .
- CGI::Tr({}, CGI::td({}, CGI::a({href => $viewProblemLink}, "Try it" . ($forOneUser ? " (as $editForUser[0])" : "")))) .
+ CGI::Tr({}, CGI::td({}, CGI::a({href => $editProblemLink, target=>"WW_Editor"}, "Edit it"))) .
+ CGI::Tr({}, CGI::td({}, CGI::a({href => $viewProblemLink, target=>"WW_View"}, "Try it" . ($forOneUser ? " (as $editForUser[0])" : "")))) .
($forUsers ? "" : CGI::Tr({}, CGI::td({}, CGI::checkbox({name => "deleteProblem", value => $problemID, label => "Delete it?"})))) .
# CGI::Tr({}, CGI::td({}, "Delete it?" . CGI::input({type => "checkbox", name => "deleteProblem", value => $problemID}))) .
($forOneUser ? "" : CGI::Tr({}, CGI::td({}, CGI::checkbox({name => "markCorrect", value => $problemID, label => "Mark Correct?"})))) .
Index: SetMaker.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm,v
retrieving revision 1.59
retrieving revision 1.60
diff -Llib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm -Llib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm -u -r1.59 -r1.60
--- lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm
+++ lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm
@@ -832,7 +832,7 @@
setID=>"Undefined_Set",
problemID=>"1"),
params=>{sourceFilePath => "$sourceFileName", problemSeed=> $problem_seed}
- )}, "Edit it" );
+ ), target=>"WW_Editor"}, "Edit it" );
my $displayMode = $self->r->param("mydisplayMode");
$displayMode = $self->r->ce->{pg}->{options}->{displayMode}
@@ -849,7 +849,7 @@
sourceFilePath => "$sourceFileName",
displayMode => $displayMode,
}
- )}, "Try it");
+ ), target=>"WW_View"}, "Try it");
my %add_box_data = ( -name=>"trial$cnt",-value=>1,-label=>"Add this problem to the target set on the next update");
if($mark & SUCCESS) {
|
