From 41e3d85bc3339af17852b901f316d23d25b8ce18 Mon Sep 17 00:00:00 2001
From: "jocuri%softhome.net" <>
Date: Fri, 3 Mar 2006 07:29:31 +0000
Subject: [PATCH] Patch for bug 328089: make number of columns in additional
 comments field identical with constants.COMMENT_COLS; patch by Rudolf Ramler
 <rudolf.ramler@scch.at>, r=vladd, a=justdave.

---
 template/en/default/attachment/create.html.tmpl        |  2 +-
 template/en/default/bug/create/create-guided.html.tmpl | 10 +++++-----
 template/en/default/bug/create/create.html.tmpl        |  2 +-
 template/en/default/bug/edit.html.tmpl                 |  2 +-
 template/en/default/global/user-error.html.tmpl        |  2 ++
 template/en/default/list/edit-multiple.html.tmpl       |  2 +-
 template/en/default/pages/linkify.html.tmpl            |  2 +-
 7 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/template/en/default/attachment/create.html.tmpl b/template/en/default/attachment/create.html.tmpl
index 410f274f20..ae64190e08 100644
--- a/template/en/default/attachment/create.html.tmpl
+++ b/template/en/default/attachment/create.html.tmpl
@@ -242,7 +242,7 @@
           id      = 'comment'
           minrows = 6
           maxrows = 15
-          cols    = 80
+          cols    = constants.COMMENT_COLS
           wrap    = 'soft'
         %]
       </td>
diff --git a/template/en/default/bug/create/create-guided.html.tmpl b/template/en/default/bug/create/create-guided.html.tmpl
index 3c29791e5c..b8f1d9fd9e 100644
--- a/template/en/default/bug/create/create-guided.html.tmpl
+++ b/template/en/default/bug/create/create-guided.html.tmpl
@@ -336,7 +336,7 @@ function PutDescription() {
       [% INCLUDE global/textarea.html.tmpl
         name    = 'comment'
         minrows = 6
-        cols    = 80
+        cols    = constants.COMMENT_COLS
       %]
       <p>
         Expand on the Summary. Please be
@@ -388,7 +388,7 @@ function PutDescription() {
       [% INCLUDE global/textarea.html.tmpl
         name           = 'reproduce_steps'
         minrows        = 4
-        cols           = 80
+        cols           = constants.COMMENT_COLS
         defaultcontent = "1.\n2.\n3."
       %]
       <p>
@@ -406,7 +406,7 @@ function PutDescription() {
       [% INCLUDE global/textarea.html.tmpl
         name    = 'actual_results'
         minrows = 4
-        cols    = 80
+        cols    = constants.COMMENT_COLS
       %]
       <p>
         What happened after you performed the steps above?
@@ -422,7 +422,7 @@ function PutDescription() {
       [% INCLUDE global/textarea.html.tmpl
         name    = 'expected_results'
         minrows = 4
-        cols    = 80
+        cols    = constants.COMMENT_COLS
       %]
       <p>
         What should the software have done instead?
@@ -438,7 +438,7 @@ function PutDescription() {
       [% INCLUDE global/textarea.html.tmpl
         name    = 'additional_info'
         minrows = 8
-        cols    = 80
+        cols    = constants.COMMENT_COLS
       %]
       <p>
         Add any additional information you feel may be
diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index d5e0081d90..ed84f33915 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -319,7 +319,7 @@ function set_assign_to() {
          name           = 'comment'
          minrows        = 10
          maxrows        = 25
-         cols           = 80
+         cols           = constants.COMMENT_COLS
          defaultcontent = defaultcontent
        %]
       <br>
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 3c647b67d4..02fb20d613 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -572,7 +572,7 @@
     id        = 'comment'
     minrows   = 10
     maxrows   = 25
-    cols      = 80
+    cols      = constants.COMMENT_COLS
     accesskey = 'c'
   %]
 
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index df249ee10e..225b131110 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -180,6 +180,8 @@
       whine reports
     [% ELSIF object == "sanity_check" %]
       a sanity check
+    [% ELSIF object == "settings" %]
+      settings
     [% ELSIF object == "sudo_session" %]
       an sudo session
     [% ELSIF object == "timetracking_summaries" %]
diff --git a/template/en/default/list/edit-multiple.html.tmpl b/template/en/default/list/edit-multiple.html.tmpl
index dbf73b354b..e6fed24155 100644
--- a/template/en/default/list/edit-multiple.html.tmpl
+++ b/template/en/default/list/edit-multiple.html.tmpl
@@ -214,7 +214,7 @@
   id      = 'comment'
   minrows = 5
   maxrows = 25
-  cols    = 80
+  cols    = constants.COMMENT_COLS
 %]<br>
 
 [% IF groups.size > 0 %]
diff --git a/template/en/default/pages/linkify.html.tmpl b/template/en/default/pages/linkify.html.tmpl
index 9ad92a0d03..48b1932530 100644
--- a/template/en/default/pages/linkify.html.tmpl
+++ b/template/en/default/pages/linkify.html.tmpl
@@ -33,7 +33,7 @@
   [% INCLUDE global/textarea.html.tmpl
     name    = 'text'
     minrows = 20
-    cols    = 80
+    cols    = constants.COMMENT_COLS
   %]
   <br>
   <input type="hidden" name="id" value="linked.html">
-- 
2.47.2