[Aimmath-commit] AIM/WEB-INF/maple/aim/admin ZoneStudentHome.mpl,1.1.2.2,1.1.2.3 Zone.mpl,1.2.2.4,1.2.2.5

[<mo...@us...>]

Update of /cvsroot/aimmath/AIM/WEB-INF/maple/aim/admin
In directory sc8-pr-cvs1:/tmp/cvs-serv9094

Modified Files:
      Tag: develop_2_1
	ZoneStudentHome.mpl Zone.mpl 
Log Message:
moved ID message input box to Zone Student Login Editor page

Index: ZoneStudentHome.mpl
===================================================================
RCS file: /cvsroot/aimmath/AIM/WEB-INF/maple/aim/admin/Attic/ZoneStudentHome.mpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** ZoneStudentHome.mpl	13 Aug 2003 19:10:07 -0000	1.1.2.2
--- ZoneStudentHome.mpl	14 Aug 2003 15:48:40 -0000	1.1.2.3
***************
*** 70,73 ****
--- 70,89 ----
    [["hr", "noshade"]],
  
+   ##########
+ # KM
+ 
+   ["h2",__("ID Note")],
+   ["br"],
+   __("#Explain ID note"),
+   ["br"],
+   [["textarea", "name" = "IDNote", "cols" = "70", "rows" = "20"],
+    {"IDNote"}
+   ],
+   ["br"],
+   [["hr","noshade"]],
+ 
+ # END KM
+   ##########
+ 
    [["a", "name" = "preview"],["h3",__("Preview:")]],
    {"headtext"},
***************
*** 77,80 ****
--- 93,100 ----
    ],
    ["hr"],
+ # KM
+   {"IDNote"},
+   ["br"],
+ # END KM
    {"foottext"},
    ["br"],
***************
*** 102,112 ****
   ['Process',
    proc(page::`aim/admin/Page`,p::table)
-    local headtext,foottext,headfile,footfile,action;
- 
  # KM
     global DefaultZone;
  # END KM
  
- 
     headfile := cat(DefaultZone['RootDir'],"/studenthead.html");
     footfile := cat(DefaultZone['RootDir'],"/studentfoot.html");
--- 122,132 ----
   ['Process',
    proc(page::`aim/admin/Page`,p::table)
  # KM
+ # DIST   local headtext,foottext,headfile,footfile,action;
+    local headtext,foottext,IDtext,headfile,footfile,action;
+ 
     global DefaultZone;
  # END KM
  
     headfile := cat(DefaultZone['RootDir'],"/studenthead.html");
     footfile := cat(DefaultZone['RootDir'],"/studentfoot.html");
***************
*** 127,131 ****
     
      if foottext = lasterror then foottext := ""; fi;
!    else
  
      headtext := p["HeadText"];
--- 147,159 ----
     
      if foottext = lasterror then foottext := ""; fi;
! 
!    else # SaveZoneStudentHome
! 
! # KM
!     page['SetTable',
!      DefaultZone,
!      'IDNote'
!     ];
! # END KM
  
      headtext := p["HeadText"];
***************
*** 145,149 ****
  
  # KM
!     try traperror(DefaultZone['MakeLoginPage']);
      catch :
       page['SetAlert',"%s\n\n%s",
--- 173,177 ----
  
  # KM
!     try DefaultZone['MakeLoginPage'];
      catch :
       page['SetAlert',"%s\n\n%s",
***************
*** 154,157 ****
--- 182,187 ----
     fi;
  
+    IDtext := DefaultZone['IDNote'];
+ 
  # KM
  # DIST   page['Title'] :=__("Administrator login page edit:");
***************
*** 162,166 ****
      "Title" = subject['Title'],
      "headtext" = headtext,
!     "foottext" = foottext
     ];
    end
--- 192,199 ----
      "Title" = subject['Title'],
      "headtext" = headtext,
!     "foottext" = foottext,
! # KM
!     "IDNote" = IDtext
! # END KM
     ];
    end

Index: Zone.mpl
===================================================================
RCS file: /cvsroot/aimmath/AIM/WEB-INF/maple/aim/admin/Zone.mpl,v
retrieving revision 1.2.2.4
retrieving revision 1.2.2.5
diff -C2 -d -r1.2.2.4 -r1.2.2.5
*** Zone.mpl	13 Aug 2003 19:10:07 -0000	1.2.2.4
--- Zone.mpl	14 Aug 2003 15:48:40 -0000	1.2.2.5
***************
*** 219,239 ****
  
    ##########
- # 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%"],
--- 219,222 ----