|
From: <mo...@us...> - 2003-08-13 19:15:32
|
Update of /cvsroot/aimmath/AIM/WEB-INF/maple/aim/admin
In directory sc8-pr-cvs1:/tmp/cvs-serv24258
Modified Files:
Tag: develop_2_1
ZoneStudentHome.mpl ZoneAdminHome.mpl Zone.mpl
Log Message:
minor bug fixes and improvements
Index: ZoneStudentHome.mpl
===================================================================
RCS file: /cvsroot/aimmath/AIM/WEB-INF/maple/aim/admin/Attic/ZoneStudentHome.mpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** ZoneStudentHome.mpl 10 Jul 2003 20:10:04 -0000 1.1.2.1
--- ZoneStudentHome.mpl 13 Aug 2003 19:10:07 -0000 1.1.2.2
***************
*** 9,12 ****
--- 9,15 ----
`aim/admin/Command/Declare`('`admin/ZoneStudentHome`',
+ # KM
+ ['AuthLevel',"zone"],
+ # END KM
['Parameter',
"Action" ::
***************
*** 101,104 ****
--- 104,112 ----
local headtext,foottext,headfile,footfile,action;
+ # KM
+ global DefaultZone;
+ # END KM
+
+
headfile := cat(DefaultZone['RootDir'],"/studenthead.html");
footfile := cat(DefaultZone['RootDir'],"/studentfoot.html");
***************
*** 110,114 ****
if headtext = lasterror then
! headtext := "<h1>Administrator login page</h1>\n<br/>\n";
fi;
--- 118,125 ----
if headtext = lasterror then
! # KM
! # DIST headtext := "<h1>Administrator login page</h1>\n<br/>\n";
! headtext := "<h1>Student login page</h1>\n<br/>\n";
! # END KM
fi;
***************
*** 120,124 ****
headtext := p["HeadText"];
if headtext = "" then
! headtext := "<h1>Administrator login page</h1>\n<br/>\n";
fi;
--- 131,138 ----
headtext := p["HeadText"];
if headtext = "" then
! # KM
! # DIST headtext := "<h1>Administrator login page</h1>\n<br/>\n";
! headtext := "<h1>Student login page</h1>\n<br/>\n";
! # END KM
fi;
***************
*** 130,136 ****
traperror(fclose(footfile));
fi;
! page['Title'] :=__("Administrator login page edit:");
page['FillTemplate',
--- 144,161 ----
traperror(fclose(footfile));
+ # KM
+ try traperror(DefaultZone['MakeLoginPage']);
+ catch :
+ page['SetAlert',"%s\n\n%s",
+ __("Could not create login pages"),lasterr];
+ end:
+ # END KM
+
fi;
! # KM
! # DIST page['Title'] :=__("Administrator login page edit:");
! page['Title'] :=__("Student login page editor:");
! # END
page['FillTemplate',
Index: ZoneAdminHome.mpl
===================================================================
RCS file: /cvsroot/aimmath/AIM/WEB-INF/maple/aim/admin/Attic/ZoneAdminHome.mpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** ZoneAdminHome.mpl 10 Jul 2003 20:10:04 -0000 1.1.2.1
--- ZoneAdminHome.mpl 13 Aug 2003 19:10:07 -0000 1.1.2.2
***************
*** 9,12 ****
--- 9,15 ----
`aim/admin/Command/Declare`('`admin/ZoneAdminHome`',
+ # KM
+ ['AuthLevel',"zone"],
+ # END KM
['Parameter',
"Action" ::
***************
*** 101,104 ****
--- 104,111 ----
local headtext,foottext,headfile,footfile,action;
+ # KM
+ global DefaultZone;
+ # END KM
+
headfile := cat(DefaultZone['RootDir'],"/adminhead.html");
footfile := cat(DefaultZone['RootDir'],"/adminfoot.html");
***************
*** 129,132 ****
--- 136,146 ----
traperror(fclose(headfile));
traperror(fclose(footfile));
+ # KM
+ try traperror(DefaultZone['MakeLoginPage']);
+ catch :
+ page['SetAlert',"%s\n\n%s",
+ __("Could not create login pages"),lasterr];
+ end;
+ # END KM
fi;
Index: Zone.mpl
===================================================================
RCS file: /cvsroot/aimmath/AIM/WEB-INF/maple/aim/admin/Zone.mpl,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -C2 -d -r1.2.2.3 -r1.2.2.4
*** Zone.mpl 13 Jul 2003 14:54:05 -0000 1.2.2.3
--- Zone.mpl 13 Aug 2003 19:10:07 -0000 1.2.2.4
***************
*** 14,19 ****
['Parameter',"SubjectName"],
! ['Parameter',"ShowHiddenSubjects"::boolean = false],
!
['Parameter',
"Action" ::
--- 14,21 ----
['Parameter',"SubjectName"],
! # KM
! # DIST ['Parameter',"ShowHiddenSubjects"::boolean = false],
! ['Parameter',"ShowHiddenSubjects"::boolean = true],
! # END KM
['Parameter',
"Action" ::
***************
*** 189,203 ****
##########
- ["h2",__("ID Note")],
- ["br"],
- __("#Explain ID note"),
- ["br"],
- [["textarea", "name" = "IDNote", "cols" = "70", "rows" = "20"],
- {"IDNote"}
- ],
- ["br"],
-
- ##########
-
[["table", "width" = "100%"],
["tr",
--- 191,194 ----
***************
*** 227,230 ****
--- 218,240 ----
[["hr","noshade"]],
+ ##########
+ # KM
+ # I moved the position of this on the page so more
+ # features are available without scrolling
+
+ ["h2",__("ID Note")],
+ ["br"],
+ __("#Explain ID note"),
+ ["br"],
+ [["textarea", "name" = "IDNote", "cols" = "70", "rows" = "20"],
+ {"IDNote"}
+ ],
+ ["br"],
+ [["hr","noshade"]],
+
+ # END KM
+
+ ##########
+
[["table","width" = "100%"],
["tr",
***************
*** 344,355 ****
["table", "width" = "100%"],
["tr",
! [["th", "align" = "left", "width" = "10%"],
! __("Subject number")],
! [["th", "align" = "left", "width" = "50%"],
! __("Name")],
! [["th", "align" = "left", "width" = "10%"]," "],
! [["th", "align" = "left", "width" = "10%"]," "],
! [["th", "align" = "left", "width" = "10%"]," "],
! [["th", "align" = "left", "width" = "10%"]," "]],
["tr", [["td", "colspan" = "8"],["hr"]]]);
--- 354,365 ----
["table", "width" = "100%"],
["tr",
! [["th", "align" = "left", "width" = "10%"],
! __("Subject number")],
! [["th", "align" = "left", "width" = "50%"],
! __("Name")],
! [["th", "align" = "left", "width" = "10%"]," "],
! [["th", "align" = "left", "width" = "10%"]," "],
! [["th", "align" = "left", "width" = "10%"]," "],
! [["th", "align" = "left", "width" = "10%"]," "]],
["tr", [["td", "colspan" = "8"],["hr"]]]);
***************
*** 359,368 ****
subjecttable['AddContents',
["tr",[["td", "colspan" = "8"],
! __("Visible subjects")]]];
else
togglehidden := page['ActionLink',"ShowHiddenSubjects"];
explainhidden :=
sprintf(__("#Explain hidden subjects (%s)"),
! page['ActionLink',"ShowHiddenSubjects"]);
fi;
--- 369,378 ----
subjecttable['AddContents',
["tr",[["td", "colspan" = "8"],
! __("Visible subjects")]]];
else
togglehidden := page['ActionLink',"ShowHiddenSubjects"];
explainhidden :=
sprintf(__("#Explain hidden subjects (%s)"),
! page['ActionLink',"ShowHiddenSubjects"]);
fi;
***************
*** 378,393 ****
subjecttable['AddContents',
["tr",
! [["td", "align" = "left"],
! [["inputtext",
! "name" = cat(nam,"Order"),
! "value" = sprintf("%A",subjectnumber),
! "size" = "3"]]],
! [["td","align" = "left"],nam],
! [["td","align" = "left"],
! page['ActionLink',"LoadSubjectOptions",[nam]]],
! [["td","align" = "left"],
! page['ActionLink',"AnalyzeSubject",[nam]]],
! [["td","align" = "left"],
! page['ActionLink',"ToggleSubject",[nam],__("Hide")]]]]
od;
fi;
--- 388,403 ----
subjecttable['AddContents',
["tr",
! [["td", "align" = "left"],
! [["inputtext",
! "name" = cat(nam,"Order"),
! "value" = sprintf("%A",subjectnumber),
! "size" = "3"]]],
! [["td","align" = "left"],nam],
! [["td","align" = "left"],
! page['ActionLink',"LoadSubjectOptions",[nam]]],
! [["td","align" = "left"],
! page['ActionLink',"AnalyzeSubject",[nam]]],
! [["td","align" = "left"],
! page['ActionLink',"ToggleSubject",[nam],__("Hide")]]]]
od;
fi;
***************
*** 397,418 ****
subjecttable['AddContents',
["tr",
! [["td", "align" = "center","colspan" = "8"],
! __("There are no hidden subjects for this zone.")]]];
else
subjecttable['AddContents',
["tr",[["td", "colspan" = "8"],["hr"]]],
["tr",[["td", "colspan" = "8"],
! __("Hidden subjects")]]];
for nam in hiddensubjects do
subjecttable['AddContents',
! ["tr",
! [["td", "align" = "left"], " "],
! [["td","align" = "left"],nam],
! [["td","align" = "left"],
! page['ActionLink',"LoadSubjectOptions",[nam]]],
! [["td","align" = "left"]," "],
! [["td","align" = "left"],
! page['ActionLink',"ToggleSubject",[nam],__("Unhide")]]]]
od;
fi;
--- 407,428 ----
subjecttable['AddContents',
["tr",
! [["td", "align" = "center","colspan" = "8"],
! __("There are no hidden subjects for this zone.")]]];
else
subjecttable['AddContents',
["tr",[["td", "colspan" = "8"],["hr"]]],
["tr",[["td", "colspan" = "8"],
! __("Hidden subjects")]]];
for nam in hiddensubjects do
subjecttable['AddContents',
! ["tr",
! [["td", "align" = "left"], " "],
! [["td","align" = "left"],nam],
! [["td","align" = "left"],
! page['ActionLink',"LoadSubjectOptions",[nam]]],
! [["td","align" = "left"]," "],
! [["td","align" = "left"],
! page['ActionLink',"ToggleSubject",[nam],__("Unhide")]]]]
od;
fi;
|
