[LON-CAPA-cvs] cvs: loncom /html/res/adm/pages/annotator admannotations.pm

[raeburn]

raeburn		Sat Dec 29 22:31:16 2018 EDT

  Modified files:              
    /loncom/html/res/adm/pages/annotator	admannotations.pm 
  Log:
  - URL for generation of annotation form in pop-up window, ("Notes" menu
    item clicked) will be: /adm/annotations if server is https://, but
    External Resource served via http://, and /adm/annotation otherwise.
    In the form tag the action item set to "" to accommodate both contexts. 
  
  
Index: loncom/html/res/adm/pages/annotator/admannotations.pm
diff -u loncom/html/res/adm/pages/annotator/admannotations.pm:1.35 loncom/html/res/adm/pages/annotator/admannotations.pm:1.36
--- loncom/html/res/adm/pages/annotator/admannotations.pm:1.35	Fri Mar 20 10:04:53 2009
+++ loncom/html/res/adm/pages/annotator/admannotations.pm	Sat Dec 29 22:31:16 2018
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # This will take annotations and then plug them into a page.
 #
-# $Id: admannotations.pm,v 1.35 2009/03/20 10:04:53 bisitz Exp $
+# $Id: admannotations.pm,v 1.36 2018/12/29 22:31:16 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -117,7 +117,7 @@
     return(<<END_HTML)
 $start_page
  <center>
-  <form name="annotInfo" method="post" action="/adm/annotations">
+  <form name="annotInfo" method="post" action="">
     <textarea name="annotation" wrap="on" rows="12" cols="36" onfocus="javascript:renameButton();">$annotation</textarea><br />
     <input type="hidden" name="symbold" value="$symbnew" />
     <input type="hidden" name="symbnew" value="" />
@@ -155,7 +155,7 @@
     return(<<END_HTML2)
 $start_page
  <center>
-  <form name="annotInfo" method="post" action="/adm/annotations">
+  <form name="annotInfo" method="post" action="">
 <table bgcolor="#FFFFFF" width="100%" height="90%" align="center">
 <td>
 <font size="+1"><i>
@@ -185,7 +185,6 @@
     $r->send_http_header;
     return OK if $r->header_only;
 
-
     my $page;
 
     my ($symb_old,$symb_old_enc) = &Apache::loncommon::clean_symb($env{'form.symbold'},1);