Place information before controls on upload forms MDL-7491

diff --git a/course/group-edit.html b/course/group-edit.html
index 87a7db72342930fd619a6a081a76dd1410ed7cbf..2c3cd954e20a3557385e4ec67d9b010e00402b1d 100644 (file)
--- a/course/group-edit.html
+++ b/course/group-edit.html
@@ -38,13 +38,15 @@
     if (!empty($CFG->gdversion) and $maxbytes) {  
 ?>
 <tr valign="top">
-    <td align="right"><?php print_string("newpicture") ?>:</td>
+    <td align="right"><?php print_string("newpicture") ?>:<br />(<?php
+       print_string("maxsize", "", display_size($maxbytes));
+       echo ') '; 
+       helpbutton("picture", get_string("helppicture"));
+    ?></td>
     <td>
     <?php
        require_once($CFG->dirroot.'/lib/uploadlib.php');
        upload_print_form_fragment(1,array('imagefile'),null,false,null,0,0,false);
-       helpbutton("picture", get_string("helppicture"));
-       print_string("maxsize", "", display_size($maxbytes)); 
        if (isset($err["imagefile"])) formerr($err["imagefile"]);
     ?>
     </td>

diff --git a/mod/glossary/edit.html b/mod/glossary/edit.html
index 8fe02ba4ee539acbbad490eb5fb316bc0c3bfb76..921696296ce98f36f022e563f16eab611849b701 100644 (file)
--- a/mod/glossary/edit.html
+++ b/mod/glossary/edit.html
@@ -153,14 +153,20 @@ if (isset($errors)) {
 </tr>
 
 <tr valign="top">
-    <td align="right"><b><?php print_string("attachment", "glossary") ?>:<br />(<?php print_string("optional") ?>)&nbsp;</b></td>
+    <td align="right"><b><?php print_string("attachment", "glossary") ?>:<br />
+        <?php
+        echo '(';
+        print_string("maxsize", "", display_size(get_max_upload_file_size($CFG->maxbytes, $course->maxbytes)));
+        echo ')<br />';
+        print_string("optional");
+        echo ' ';
+        helpbutton("attachment", get_string("attachment", "glossary"), "glossary");
+        ?></b>
+    </td>
     <td>
     <?php
        require_once($CFG->dirroot.'/lib/uploadlib.php');
        upload_print_form_fragment(1,array('attachment'),null,false,null,$course->maxbytes,0,false);
-       helpbutton("attachment", get_string("attachment", "glossary"), "glossary");
-       echo '&nbsp;';
-       print_string("maxsize", "", display_size(get_max_upload_file_size($CFG->maxbytes, $course->maxbytes)));
     ?>
     </td>
 </tr>

diff --git a/mod/glossary/import.html b/mod/glossary/import.html
index fc48aba57ba7d34ae53d7d0bb1fecbcebcc7f41c..bbd520208898546b1fd5960eeb4740c86f3155db 100644 (file)
--- a/mod/glossary/import.html
+++ b/mod/glossary/import.html
@@ -1,14 +1,18 @@
 <form method="post" action="import.php" name="form" enctype="multipart/form-data">
 <table border="0" cellpadding="3" cellspacing="3" width="100%">
 <tr>
-    <td align="right" valign="top" width="30%"><b><?php print_string("filetoimport","glossary") ?>:</b></td>
+    <td align="right" valign="top" width="30%"><b><?php print_string("filetoimport","glossary") ?>:<br />
+        <?php
+           echo '(';
+           print_string("maxsize", "", display_size(get_max_upload_file_size($CFG->maxbytes, $course->maxbytes)));
+           echo ') '; 
+           helpbutton("filetoimport", get_string("filetoimport", "glossary"), "glossary"); 
+        ?>
+    </b></td>
     <td width="70%">
     <?php 
        require_once($CFG->dirroot.'/lib/uploadlib.php');
        upload_print_form_fragment(1,array('file'),null,false,null,0,0);
-       helpbutton("filetoimport", get_string("filetoimport", "glossary"), "glossary"); 
-       echo '&nbsp;';
-       print_string("maxsize", "", display_size(get_max_upload_file_size($CFG->maxbytes, $course->maxbytes))); 
     ?>
     </td>
 </tr>

diff --git a/user/edit.html b/user/edit.html
index 26a731aec8abae288e0c1267eb4bc0a9a6a51658..685c2870c1960f666be8aaf10e23a56a82b13cb6 100644 (file)
--- a/user/edit.html
+++ b/user/edit.html
@@ -311,13 +311,18 @@ if (has_capability('moodle/user:update', get_context_instance(CONTEXT_SYSTEM, SI
     </td>
 </tr>
 <tr>
-    <th><?php print_string("newpicture") ?>:</th>
+    <th><?php print_string("newpicture") ?>:<br />
+        <?php
+            echo '(';
+            print_string("maxsize", "", display_size($maxbytes));
+            echo ') ';
+            helpbutton("picture", get_string("helppicture"));
+        ?>
+    </th>
     <td>
     <?php
        require_once($CFG->dirroot.'/lib/uploadlib.php');
        upload_print_form_fragment(1,array('imagefile'),null,false,null,0,0,false);
-       helpbutton("picture", get_string("helppicture"));
-       print_string("maxsize", "", display_size($maxbytes));
        if (isset($err["imagefile"])) formerr($err["imagefile"]);
     ?>
     </td>