--- loncom/interface/loncreatecourse.pm	2009/07/27 22:35:12	1.123
+++ loncom/interface/loncreatecourse.pm	2009/08/27 00:06:18	1.126
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Create a course
 #
-# $Id: loncreatecourse.pm,v 1.123 2009/07/27 22:35:12 raeburn Exp $
+# $Id: loncreatecourse.pm,v 1.126 2009/08/27 00:06:18 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -178,7 +178,8 @@ function validate(formname) {
                     'snak' => "Students need access key to enter course",
 		    'kaut' => 
 		    'Key authority (<tt>id@domain</tt>) if other than course',
-                    'cc'   => "Course Coordinator",
+                    'ow'   => "Course Owner",
+                    'cc'   => "(will be assigned Course Coordinator role)",
                     'user' => "Username",
                     'aens' => "Automated enrollment settings",
                     'aesc' => "The following settings control automatic enrollment of students in this class based on information available for this specific course from your institution's official classlists.",
@@ -215,7 +216,8 @@ function validate(formname) {
                     'mnak' => "Members need access key to enter community",
                     'kaug' =>
                     'Key authority (<tt>id@domain</tt>) if other than community',
-                    'gc'   => "Coordinator",
+                    'co'   => "Community Owner", 
+                    'gc'   => "(will be assigned Coordinator role)",
                     'gid'  => "Community ID",
                     'crgr' => "Create Community",
                     'grts' => "Community Group Settings",
@@ -265,6 +267,20 @@ END
                  .&Apache::lonhtmlcommon::start_pick_box()
 
                  .&Apache::lonhtmlcommon::row_headline()
+                 .'<h3>'.$lt{'ow'}.'&nbsp;'.$lt{'cc'}.'</h3>'
+                 .&Apache::lonhtmlcommon::row_closure()
+
+                 .&Apache::lonhtmlcommon::row_title($lt{'user'})
+                 .'<input type="text" size="15" name="ccuname" />'
+                 .&Apache::loncommon::studentbrowser_javascript()
+                 .&Apache::loncommon::selectstudent_link('ccrs','ccuname','ccdomain')
+                 .&Apache::lonhtmlcommon::row_closure()
+
+                 .&Apache::lonhtmlcommon::row_title($lt{'dmn'},"","LC_odd_row_value")
+                 .$domform
+                 .&Apache::lonhtmlcommon::row_closure()
+
+                 .&Apache::lonhtmlcommon::row_headline()
                  .'<h3>'.$lt{'cinf'}.'</h3>'
                  .&Apache::lonhtmlcommon::row_closure()
 
@@ -486,20 +502,6 @@ END
 
                  .&Apache::lonhtmlcommon::row_title($lt{'cgrq'})
                  .'<input type="text" name="crsquota" value="20" size="6" />Mb'
-                 .&Apache::lonhtmlcommon::row_closure()
-
-                 .&Apache::lonhtmlcommon::row_headline()
-                 .'<h3>'.$lt{'cc'}.'</h3>'
-                 .&Apache::lonhtmlcommon::row_closure()
-
-                 .&Apache::lonhtmlcommon::row_title($lt{'user'})
-                 .'<input type="text" size="15" name="ccuname" />'
-                 .&Apache::loncommon::studentbrowser_javascript()
-                 .&Apache::loncommon::selectstudent_link('ccrs','ccuname','ccdomain')
-                 .&Apache::lonhtmlcommon::row_closure()
-
-                 .&Apache::lonhtmlcommon::row_title($lt{'dmn'},"","LC_odd_row_value")
-                 .$domform
                  .&Apache::lonhtmlcommon::row_closure(1)
 
                  .&Apache::lonhtmlcommon::end_pick_box()
@@ -517,6 +519,16 @@ ENDDOCUMENT
     } elsif ($crstype eq 'Community') {
         $r->print(<<ENDDOCUMENT);
 <form action="/adm/createcourse" method="post" name="ccrs">
+<h2>$lt{'co'}&nbsp;$lt{'gc'}</h2>
+<p>
+<label>
+    <b>$lt{'user'}:</b> <input type="text" size="15" name="ccuname" />
+</label>
+</p><p>
+<label>
+    <b>$lt{'dmn'}:</b> $domform
+</label>
+</p>
 <h2>$lt{'ginf'}</h2>
 <p>
 <label><b>$lt{'gtit'}:</b>
@@ -621,22 +633,12 @@ $lt{'asov'}.
     <input type="text" name="reshome" size="30" value="/res/$defdom/" />
 </label>
 </p>
-<p>
 <h2>$lt{'grts'}</h2>
+<p>
 $lt{'grtq'}
 <input type="text" name="crsquota" value="20" />Mb
 </p>
 <hr />
-<h2>$lt{'gc'}</h2>
-<p>
-<label>
-    <b>$lt{'user'}:</b> <input type="text" size="15" name="ccuname" />
-</label>
-</p><p>
-<label>
-    <b>$lt{'dmn'}:</b> $domform
-</label>
-</p>
 <p>
 <input type="hidden" name="prevphase" value="groupone" />
 <input type="hidden" name="phase" value="grouptwo" />
@@ -804,7 +806,7 @@ sub print_intro_page {
     &mt('Create a new course by completing an online form.'),
                  },
                    { internal_name => 'groupone',
-                     name => &mt('Create a single collaborative "community"'),
+                     name => &mt('Create a single community'),
                      short_description =>
     &mt('Create a new collaborative community by completing an online form.'),
                  },
@@ -814,6 +816,11 @@ sub print_intro_page {
     &mt('Upload an attributes file containing specifications for one or more courses or communities in XML format.'),
                      help => 'Batch_Creation',
                  },
+                   { internal_name => 'requestdisplay',
+                     name => &mt('Approve or reject course requests'),
+                     short_description =>
+    &mt('Display course creation requests submitted by authorized users held pending approval by a Domain Coordinator.'),
+                   },
     );
     my $options;
     foreach my $choice (@choices) {
@@ -895,6 +902,26 @@ sub process_batchfile {
  
 }
 
+sub courserequestbrowser_javascript {
+    return <<"ENDREQBRW";
+<script type="text/javascript">
+// <![CDATA[
+var steditbrowser;
+function opencoursereqdisplay(cdom,cnum) {
+    var url = '/adm/requestcourse?action=display';
+    url += '&showdom='+cdom+'&cnum='+cnum;
+    var title = 'Course_Request_Browser';
+    var options = 'scrollbars=1,resizable=1,menubar=0';
+    options += ',width=700,height=600';
+    var stdeditbrowser = open(url,title,options,'1');
+    stdeditbrowser.focus();
+}
+// ]]>
+</script>
+ENDREQBRW
+}
+
+
 # ===================================================================== Handler
 sub handler {
     my $r = shift;
@@ -950,6 +977,33 @@ sub handler {
                    text=>"Creation Outcome",
                    faq=>9,bug=>'Dom Coord Interface',});
            &process_batchfile($r);
+       } elsif ($env{'form.phase'} eq 'requestdisplay') {
+           &Apache::lonhtmlcommon::add_breadcrumb
+                 ({href=>"/adm/createcourse?phase=$env{'form.phase'}",
+                   text=>&mt('[_1] Display Request Queue',),
+                   faq=>9,bug=>'Dom Coord Interface',});
+           my $js = &courserequestbrowser_javascript();
+           my $start_page=&Apache::loncommon::start_page('Display Requests',$js);
+           my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('Display Requests','Course_Request',undef,'Course_Request');
+           $r->print($start_page.$crumbs."\n".'<div>'.
+                     &Apache::loncoursequeueadmin::display_queued_requests(
+                         'domain',$env{'request.role.domain'}).'</div>'.
+                     &Apache::loncommon::end_page());
+       } elsif ($env{'form.phase'} eq 'requestchange') {
+
+           &Apache::lonhtmlcommon::add_breadcrumb
+                 ({href=>"/adm/createcourse?phase=requestdisplay",
+                   text=>&mt('[_1] Display Request Queue',),
+                   faq=>9,bug=>'Dom Coord Interface',},
+                 {href=>"/adm/createcourse?phase=requestchange",
+                   text=>&mt('[_1] Requests Updated',),
+                   faq=>9,bug=>'Dom Coord Interface',},);
+           my $start_page=&Apache::loncommon::start_page('Update Requests Result');
+           my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('Requests Updated','Course_Request',undef,'Course_Request');
+           $r->print($start_page.$crumbs."\n".'<div>'.
+                     &Apache::loncoursequeueadmin::update_request_queue(
+                     'domain',$env{'request.role.domain'}).'</div>'.
+                     &Apache::loncommon::end_page());
        } else {
            &print_intro_page($r);
        }