cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager HTMLManagerServlet.java

[yoavs]

yoavs       2004/09/17 12:50:20

  Modified:    webapps/docs changelog.xml
               webapps/manager/WEB-INF/classes/org/apache/catalina/manager
                        HTMLManagerServlet.java
  Log:
  Bugzilla 29485, MessageFormat needs double-quoted single quotes.
  
  Revision  Changes    Path
  1.107     +5 -0      jakarta-tomcat-catalina/webapps/docs/changelog.xml
  
  Index: changelog.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
  retrieving revision 1.106
  retrieving revision 1.107
  diff -u -r1.106 -r1.107
  --- changelog.xml     15 Sep 2004 19:23:45 -0000      1.106
  +++ changelog.xml     17 Sep 2004 19:50:19 -0000      1.107
  @@ -54,6 +54,11 @@
     </subsection>
   
     <subsection name="Webapps">
  +    <changelog>
  +      <fix>
  +        <bug>29485</bug>: I broke the HTML manager when adding JavaScript 
confirmation, fixed now ;) (yoavs)
  +      </fix>
  +    </changelog>
     </subsection>
   </section>
   
  
  
  
  1.15      +6 -6      
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java
  
  Index: HTMLManagerServlet.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- HTMLManagerServlet.java   2 Sep 2004 19:13:38 -0000       1.14
  +++ HTMLManagerServlet.java   17 Sep 2004 19:50:20 -0000      1.15
  @@ -567,9 +567,9 @@
           " <td class=\"row-left\">\n" +
           "  <small>\n" +
           "  &nbsp;{1}&nbsp;\n" +
  -        "  &nbsp;<a href=\"{2}\" onclick=\"return(confirm('Are you 
sure?'))\">{3}</a>&nbsp;\n" +
  -        "  &nbsp;<a href=\"{4}\" onclick=\"return(confirm('Are you 
sure?'))\">{5}</a>&nbsp;\n" +
  -        "  &nbsp;<a href=\"{6}\" onclick=\"return(confirm('Are you 
sure?'))\">{7}</a>&nbsp;\n" +
  +        "  &nbsp;<a href=\"{2}\" onclick=\"return(confirm(''Are you 
sure?''))\">{3}</a>&nbsp;\n" +
  +        "  &nbsp;<a href=\"{4}\" onclick=\"return(confirm(''Are you 
sure?''))\">{5}</a>&nbsp;\n" +
  +        "  &nbsp;<a href=\"{6}\" onclick=\"return(confirm(''Are you 
sure?''))\">{7}</a>&nbsp;\n" +
           "  </small>\n" +
           " </td>\n" +
           "</tr>\n";
  @@ -577,10 +577,10 @@
       private static final String STOPPED_APPS_ROW_BUTTON_SECTION =
           " <td class=\"row-left\">\n" +
           "  <small>\n" +
  -        "  &nbsp;<a href=\"{0}\" onclick=\"return(confirm('Are you 
sure?'))\">{1}</a>&nbsp;\n" +
  +        "  &nbsp;<a href=\"{0}\" onclick=\"return(confirm(''Are you 
sure?''))\">{1}</a>&nbsp;\n" +
           "  &nbsp;{3}&nbsp;\n" +
           "  &nbsp;{5}&nbsp;\n" +
  -        "  &nbsp;<a href=\"{6}\" onclick=\"return(confirm('Are you 
sure?'))\">{7}</a>&nbsp;\n" +
  +        "  &nbsp;<a href=\"{6}\" onclick=\"return(confirm(''Are you 
sure?''))\">{7}</a>&nbsp;\n" +
           "  </small>\n" +
           " </td>\n" +
           "</tr>\n";
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]