[mantisbt-commits] mantisbt.git branch, master, updated. release-1.2.0rc1-337-g1e87c20

[<gi...@ma...>]

The branch, master has been updated
       via  1e87c208a4b95ada5c99cc38159a51f79f4b2690 (commit)
      from  81dd8e669d22e9ebb413c3bac0f6a27d1bd1e7d7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1e87c208a4b95ada5c99cc38159a51f79f4b2690
Author: David Hicks <hic...@op...>
Date:   Tue Nov 24 14:06:59 2009 +1100

    Cleanup Max. Size label placement for attachments

-----------------------------------------------------------------------

Summary of changes:
 bug_file_upload_inc.php  |    5 ++---
 bug_report_page.php      |    4 ++--
 lang/strings_english.txt |    4 ++--
 proj_doc_add_page.php    |    6 +++---
 proj_doc_edit_page.php   |    6 +++---
 5 files changed, 12 insertions(+), 13 deletions(-)

-----------------------------------------------------------------------

commit 1e87c208a4b95ada5c99cc38159a51f79f4b2690
Author: David Hicks <hic...@op...>
Date:   Tue Nov 24 14:06:59 2009 +1100

    Cleanup Max. Size label placement for attachments

diff --git a/bug_file_upload_inc.php b/bug_file_upload_inc.php
index 55d1432..52db06c 100644
--- a/bug_file_upload_inc.php
+++ b/bug_file_upload_inc.php
@@ -51,9 +51,8 @@
 <tr class="row-1">
 	<td class="category" width="15%">
 		<?php echo lang_get( 'select_file' ) ?><br />
-		<?php
-			// FIXME: hard coded "k" in here.
-			echo '<span class="small">(' . lang_get( 'max_file_size_label' ) . lang_get( 'word_separator' ) . number_format( $t_max_file_size/1000 ) . 'k)</span>'?>
+		<?php //FIXME: hard coded "k" in here. ?>
+		<span class="small"><?php echo lang_get( 'max_file_size_label' ) . lang_get( 'word_separator' ) . number_format( $t_max_file_size/1000 ) ?>k</span>
 	</td>
 	<td width="85%">
 		<input type="hidden" name="bug_id" value="<?php echo $f_bug_id ?>" />
diff --git a/bug_report_page.php b/bug_report_page.php
index fa09508..08ea0ec 100644
--- a/bug_report_page.php
+++ b/bug_report_page.php
@@ -462,8 +462,8 @@
 ?>
 	<tr <?php echo helper_alternate_class() ?>>
 		<td class="category">
-			<?php echo lang_get( 'upload_file' ) ?>
-			<?php echo '<span class="small">(' . lang_get( 'max_file_size_label' ) . lang_get( 'word_separator' ) . number_format( $t_max_file_size/1000 ) . 'k)</span>'?>
+			<?php echo lang_get( 'upload_file' ) ?><br />
+			<span class="small"><?php echo lang_get( 'max_file_size_label' ) . lang_get( 'word_separator' ) . number_format( $t_max_file_size/1000 ) ?>k</span>
 		</td>
 		<td>
 			<input type="hidden" name="max_file_size" value="<?php echo $t_max_file_size ?>" />
diff --git a/lang/strings_english.txt b/lang/strings_english.txt
index 991f047..7656c5d 100644
--- a/lang/strings_english.txt
+++ b/lang/strings_english.txt
@@ -564,8 +564,8 @@ $s_file_upload_msg = 'File upload successful.';
 $s_upload_file = 'Upload File';
 $s_select_file = 'Select File';
 $s_upload_file_button = 'Upload File';
-$s_max_file_size = 'Max. size';
-$s_max_file_size_label = 'Max. size:';
+$s_max_file_size = 'Maximum size';
+$s_max_file_size_label = 'Maximum size:';
 
 # bug_reopen.php
 $s_bug_reopened_msg = 'Issue has been reopened...';
diff --git a/proj_doc_add_page.php b/proj_doc_add_page.php
index cbd2dae..0268ad8 100644
--- a/proj_doc_add_page.php
+++ b/proj_doc_add_page.php
@@ -72,9 +72,9 @@
 </tr>
 <tr class="row-1">
 	<td class="category">
-		<span class="required">*</span><?php echo lang_get( 'select_file' );
-			// FIXME: hard coded "k" in here.
-			echo '<br /><span class="small">(' . lang_get( 'max_file_size_label' ) . lang_get( 'word_separator' ) . number_format( $t_max_file_size/1000 ) . 'k)</span>'?>
+		<span class="required">*</span><?php echo lang_get( 'select_file' ); ?><br />
+		<?php // FIXME: hard coded "k" in here. ?>
+		<span class="small"><?php echo lang_get( 'max_file_size_label' ) . lang_get( 'word_separator' ) . number_format( $t_max_file_size/1000 ) ?>k</span>
 	</td>
 	<td>
 		<input type="hidden" name="max_file_size" value="<?php echo $t_max_file_size ?>" />
diff --git a/proj_doc_edit_page.php b/proj_doc_edit_page.php
index 5d02242..a21ea9e 100644
--- a/proj_doc_edit_page.php
+++ b/proj_doc_edit_page.php
@@ -102,9 +102,9 @@
 </tr>
 <tr class="row-2">
 	<td class="category">
-		<?php echo lang_get( 'select_file' );
-				  // FIXME: hard coded "k" in here.
-				  echo '<br /><span class="small">(' . lang_get( 'max_file_size_label' ) . lang_get( 'word_separator' ) . number_format( $t_max_file_size/1000 ) . 'k)</span>'?>
+		<?php echo lang_get( 'select_file' ); ?><br />
+		<?php // FIXME: hard coded "k" in here. ?>
+		<span class="small"><?php echo lang_get( 'max_file_size_label' ) . lang_get( 'word_separator' ) . number_format( $t_max_file_size/1000 ) ?>k</span>
 	</td>
 	<td>
 		<input type="hidden" name="max_file_size" value="<?php echo $t_max_file_size ?>" />

-----------------------------------------------------------------------


--
Mantis Bug Tracker