install/templates/1.1.3 - 1.1.4.diff

   1 Index: newreport.tpl
   2 ===================================================================
   3 --- newreport.tpl       (.../tags/1.1.3/templates)      (revision 1306)
   4 +++ newreport.tpl       (.../trunk/templates)   (revision 1306)
   5 @@ -23,7 +23,7 @@
   6
   7  <div id="fieldbody">
   8         <!-- LEFT COLUMN -->
   9 -       <div id="leftcol">
  10 +       <div id="$stylevar[left]col">
  11
  12                 <!-- summary -->
  13                 <fieldset>
  14 @@ -61,12 +61,12 @@
  15         <!-- / LEFT COLUMN -->
  16
  17         <!-- RIGHT COLUMN -->
  18 -       <div id="rightcol">
  19 +       <div id="$stylevar[right]col">
  20
  21                 <!-- summary -->
  22                 <fieldset>
  23                         <legend>{@"Summary"} $help[summary]</legend>
  24 -                       <div class="field"><input type="text" name="summary" size="25" value="{$bugsys->in['summary']}" style="width: 100%" /></div>
  25 +                       <div class="field"><input type="text" name="summary" size="25" value="{$bugsys->in['summary']}" style="width: 100%" maxlength="250" /></div>
  26                 </fieldset>
  27                 <!-- / summary -->
  28
  29 @@ -106,11 +106,11 @@
  30  <div class="clearspill"></div>
  31
  32  <!-- new reply -->
  33 -<div>
  34 +<div style="width: 100%">
  35         <fieldset>
  36                 <legend>{@"Description/Initial Report"}</legend>
  37
  38 -               <textarea name="comment" cols="50" rows="10" style="width: 100%"><if condition="$bugsys->in['comment']">{$bugsys->in['comment']}<else />{$bugsys->options['defaultcomment']}</if></textarea>
  39 +               <textarea name="comment" cols="50" rows="10" class="textarea"><if condition="$bugsys->in['comment']">{$bugsys->in['comment']}<else />{$bugsys->options['defaultcomment']}</if></textarea>
  40         </fieldset>
  41  </div>
  42  <!-- / new reply -->
  43 Index: userctrl.tpl
  44 ===================================================================
  45 --- userctrl.tpl        (.../tags/1.1.3/templates)      (revision 1306)
  46 +++ userctrl.tpl        (.../trunk/templates)   (revision 1306)
  47 @@ -31,7 +31,7 @@
  48                                 <div class="box-mid">
  49                                         <fieldset>
  50                                                 <legend>{@"Display Name"}</legend>
  51 -                                               <input type="text" name="displayname" value="{$userinfo['displayname']}" size="25" style="width: 100%" />
  52 +                                               <input type="text" name="displayname" value="{$userinfo['displayname']}" size="25" style="width: 100%" maxlength="250" />
  53                                         </fieldset>
  54
  55                                         <fieldset>
  56 @@ -74,30 +74,30 @@
  57                                         {@"Please enter your password to change these fields"}:
  58                                         <br />
  59
  60 -                                       <input type="password" name="validate" size="35" />
  61 +                                       <input type="password" name="validate" size="35" maxlength="250" />
  62                                 </div>
  63
  64                                 <div class="box-mid box-margmod-top">
  65                                         <fieldset>
  66                                                 <legend>{@"Password"}</legend>
  67 -                                               <input type="password" name="password" size="25" style="width: 100%" />
  68 +                                               <input type="password" name="password_change" size="25" style="width: 100%" maxlength="250" />
  69                                         </fieldset>
  70
  71                                         <fieldset>
  72                                                 <legend>{@"Confirm Password"}</legend>
  73 -                                               <input type="password" name="password_confirm" size="25" style="width: 100%" />
  74 +                                               <input type="password" name="password_confirm" size="25" style="width: 100%" maxlength="250" />
  75                                         </fieldset>
  76                                 </div>
  77
  78                                 <div class="box-mid box-margmod-top">
  79                                         <fieldset>
  80                                                 <legend>{@"Email"}</legend>
  81 -                                               <input type="text" name="email" size="25" value="$email" style="width: 100%" />
  82 +                                               <input type="text" name="email_change" size="25" value="$email" style="width: 100%" maxlength="250" />
  83                                         </fieldset>
  84
  85                                         <fieldset>
  86                                                 <legend>{@"Confirm Email"}</legend>
  87 -                                               <input type="text" name="email_confirm" size="25" value="$email_confirm" style="width: 100%" />
  88 +                                               <input type="text" name="email_confirm" size="25" value="$email_confirm" style="width: 100%" maxlength="250" />
  89                                         </fieldset>
  90                                 </div>
  91                         </div>
  92 Index: editcomment.tpl
  93 ===================================================================
  94 --- editcomment.tpl     (.../tags/1.1.3/templates)      (revision 1306)
  95 +++ editcomment.tpl     (.../trunk/templates)   (revision 1306)
  96 @@ -30,7 +30,7 @@
  97
  98         <div class="box-mid" style="text-align: $stylevar[left]">
  99                 <if condition="$show['hide']"><div><strong<if condition="$comment['hidden']"> style="color: red"</if>>{@"Hidden"}:</strong> <input type="checkbox" name="hidden" value="1"<if condition="$comment['hidden']"> checked="checked"</if> /></div></if>
 100 -               <textarea name="comment" cols="50" rows="15" style="width: 100%">$comment[comment]</textarea>
 101 +               <textarea name="comment" cols="50" rows="15" class="textarea">$comment[comment]</textarea>
 102         </div>
 103  </div>
 104
 105 Index: editattach.tpl
 106 ===================================================================
 107 --- editattach.tpl      (.../tags/1.1.3/templates)      (revision 1306)
 108 +++ editattach.tpl      (.../trunk/templates)   (revision 1306)
 109 @@ -25,7 +25,7 @@
 110         </div>
 111
 112         <div class="box-mid" style="text-align: $stylevar[left]">
 113 -               <div><strong>{@"Description"}:</strong> <input name="description" type="text" size="35" value="$attachment[description]" /></div>
 114 +               <div><strong>{@"Description"}:</strong> <input name="description" type="text" size="35" maxlength="250" value="$attachment[description]" /></div>
 115                 <div><strong>{@"Obsolete"}:</strong> <input name="obsolete" type="checkbox" value="1"<if condition="$attachment['obsolete']"> checked="checked"</if> /></div>
 116         </div>
 117  </div>
 118 @@ -34,6 +34,7 @@
 119
 120  <div id="submitrow">
 121         <input name="submit" type="submit" value="  {@"Submit"}  " accesskey="s" />
 122 +       <if condition="$show['delete']"><input name="__delete__" type="submit" value="  {@"Delete"}  " /></if>
 123         <input name="reset" type="reset" value="  {@"Reset"}  " accesskey="r" />
 124         <script type="text/javascript"> draw_cancel("showreport.php?bugid=$bug[bugid]"); </script>
 125  </div>
 126 Index: showreport.tpl
 127 ===================================================================
 128 --- showreport.tpl      (.../tags/1.1.3/templates)      (revision 1306)
 129 +++ showreport.tpl      (.../trunk/templates)   (revision 1306)
 130 @@ -18,7 +18,7 @@
 131
 132  <div id="fieldbody">
 133         <!-- LEFT COLUMN -->
 134 -       <div id="leftcol">
 135 +       <div id="$stylevar[left]col">
 136
 137                 <!-- bug id & hidden -->
 138                 <fieldset>
 139 @@ -107,14 +107,14 @@
 140         <!-- / LEFT COLUMN -->
 141
 142         <!-- RIGHT COLUMN -->
 143 -       <div id="rightcol">
 144 +       <div id="$stylevar[right]col">
 145
 146                 <!-- summary -->
 147                 <fieldset>
 148                         <legend>{@"Summary"} $help[summary]</legend>
 149                         <div class="field">
 150                                 <if condition="$show['edit']">
 151 -                                       <input type="text" name="summary" size="25" value="$bug[summary]" style="width: 100%" />
 152 +                                       <input type="text" name="summary" size="25" value="$bug[summary]" style="width: 100%" maxlength="250" />
 153                                 <else />
 154                                         $bug[summary]
 155                                 </if>
 156 @@ -192,11 +192,13 @@
 157
 158  <if condition="$show['newreply']">
 159  <!-- new reply -->
 160 -<fieldset>
 161 -       <legend>{@"New Reply"}<if condition="$show['automations']"> : <a href="explain.php?do=automations">{@"Automation"}</a> <select name="automation">$select[automation]</select></if> $help[newreply]</legend>
 162 -
 163 -       <textarea name="comment" cols="50" rows="10" style="width: 100%"></textarea>
 164 -</fieldset>
 165 +<div style="width: 100%">
 166 +       <fieldset>
 167 +               <legend>{@"New Reply"}<if condition="$show['automations']"> : <a href="explain.php?do=automations">{@"Automation"}</a> <select name="automation">$select[automation]</select></if> $help[newreply]</legend>
 168 +
 169 +               <textarea name="comment" cols="50" rows="10" class="textarea"></textarea>
 170 +       </fieldset>
 171 +</div>
 172  <!-- / new reply -->
 173  </if>
 174
 175 @@ -216,7 +218,7 @@
 176
 177         <if condition="$show['attachments']">
 178         <!-- attachments -->
 179 -       <div id="attachments">
 180 +       <div id="attachments" style="float: $stylevar[right]">
 181         <fieldset>
 182                 <legend>{@"Attachments"}<if condition="$show['putattachments']"> : <a href="attachment.php?do=add&amp;bugid=$bug[bugid]">{@"New"}</a></if></legend>
 183
 184 Index: newattach.tpl
 185 ===================================================================
 186 --- newattach.tpl       (.../tags/1.1.3/templates)      (revision 1306)
 187 +++ newattach.tpl       (.../trunk/templates)   (revision 1306)
 188 @@ -28,7 +28,7 @@
 189
 190         <div class="box-mid box-margmod-bottom" style="text-align: $stylevar[left]">
 191                 <div><input name="attachment" type="file" /></div>
 192 -               <div><strong>{@"Description"}:</strong> <input name="description" type="text" size="35" value="{$bugsys->in['description']}" /></div>
 193 +               <div><strong>{@"Description"}:</strong> <input name="description" type="text" size="35" value="{$bugsys->in['description']}" maxlength="250" /></div>
 194         </div>
 195
 196         <if condition="$show['obsoletes']">
 197 @@ -43,7 +43,7 @@
 198         <div class="box-mid" style="text-align: $stylevar[left]">
 199                 <div><strong>{@"Add Comment"}:</strong>
 200                         <div>
 201 -                               <textarea name="comment" rows="10" cols="50" style="width: 100%">{$bugsys->in['comment']}</textarea>
 202 +                               <textarea name="comment" rows="10" cols="50" class="textarea">{$bugsys->in['comment']}</textarea>
 203                         </div>
 204                 </div>
 205         </div>
 206 Index: showreport_attachment.tpl
 207 ===================================================================
 208 --- showreport_attachment.tpl   (.../tags/1.1.3/templates)      (revision 1306)
 209 +++ showreport_attachment.tpl   (.../trunk/templates)   (revision 1306)
 210 @@ -1,8 +1,6 @@
 211                 <div>
 212 +                       <if condition="$show['editattach']"><span style="float: $stylevar[right]; font-size: 10px">[<a href="attachment.php?do=edit&amp;attachmentid=$attachment[attachmentid]">{@"Edit"}</a>]</span></if>
 213                         <strong><a href="viewattachment.php?attachmentid=$attachment[attachmentid]" target="_blank"<if condition="$attachment['obsolete']"> style="text-decoration: line-through"</if> title="<lang 1="$attachment[user]">{@"Posted by %1$s"}</lang>\n($attachment[date])">$attachment[filename]</a></strong>
 214 -                       <span style="font-size: 10px">
 215 -                               <if condition="$show['editattach']"><span style="float: right">[<a href="attachment.php?do=edit&amp;attachmentid=$attachment[attachmentid]">{@"Edit"}</a>]</span></if>
 216 -                               $attachment[description]
 217 -                       </span>
 218 +                       <span style="font-size: 10px">$attachment[description]</span>
 219                 </div>
 220
 221 Index: header.tpl
 222 ===================================================================
 223 --- header.tpl  (.../tags/1.1.3/templates)      (revision 1306)
 224 +++ header.tpl  (.../trunk/templates)   (revision 1306)
 225 @@ -1,4 +1,11 @@
 226  <div id="header">
 227 +       <!-- quick search -->
 228 +       <form name="quicksearch" action="showreport.php" method="post" style="float: $stylevar[right]; margin-top: 5px; display: inline">
 229 +       <input type="hidden" name="do" value="quicksearch" />
 230 +       {@"Go to bug ID"} <input type="text" name="bugid" size="5" /> <input type="submit" name="submit" value="  {@"Go"}  " />
 231 +       </form>
 232 +       <!-- / quick search -->
 233 +
 234         <span id="title"><a href="index.php">{$bugsys->options['trackertitle']}</a></span>
 235         &nbsp;
 236         <img src="templates/images/clock.gif" alt="{@"Current Date and Time"}" />
 237 @@ -12,7 +19,7 @@
 238  </if>
 239
 240  <div id="tabbar">
 241 -       <span style="float: right" class="smallfont"><a href="syndicate.php"><img src="templates/images/feed.gif" alt="{@"Syndicate"}" style="border: 0px" /> {@"Syndicate"}</a></span>
 242 +       <span style="float: $stylevar[right]" class="smallfont"><a href="syndicate.php"><img src="templates/images/feed.gif" alt="{@"Syndicate"}" style="border: 0px" /> {@"Syndicate"}</a></span>
 243
 244         <a class="tab$focus[index]" href="index.php">{@"Listing"}</a>
 245         <if condition="$show['newreport']">
 246 Index: global.css
 247 ===================================================================
 248 --- global.css  (.../tags/1.1.3/templates)      (revision 1306)
 249 +++ global.css  (.../trunk/templates)   (revision 1306)
 250 @@ -144,6 +144,17 @@
 251         display: inline;
 252  }
 253
 254 +.textarea
 255 +{
 256 +       width: 100%;
 257 +
 258 +       margin: 0px;
 259 +       padding: 0px;
 260 +       left: 0px;
 261 +
 262 +       margin-top: 5px;
 263 +}
 264 +
 265  #copyright
 266  {
 267         text-align: center;
 268 Index: report.css
 269 ===================================================================
 270 --- report.css  (.../tags/1.1.3/templates)      (revision 1306)
 271 +++ report.css  (.../trunk/templates)   (revision 1306)
 272 @@ -32,8 +32,8 @@
 273
 274  #rightcol
 275  {
 276 +       float: right;
 277         width: 49%;
 278 -       margin-left: 50%;
 279  }
 280
 281  /* ################################################################### */
 282 Index: trackerhome.tpl
 283 ===================================================================
 284 --- trackerhome.tpl     (.../tags/1.1.3/templates)      (revision 1306)
 285 +++ trackerhome.tpl     (.../trunk/templates)   (revision 1306)
 286 @@ -15,7 +15,7 @@
 287         <td><a href="{$order['summary']['href']}">{@"Summary"}</a> {$order['summary']['image']}/ <a href="{$order['reporter']['href']}">{@"Reporter"}</a> {$order['reporter']['image']}</td>
 288         <td><a href="{$order['product']['href']}">{@"Product/Version"}</a> {$order['product']['image']}</td>
 289         <td><a href="{$order['status']['href']}">{@"Status"}</a> {$order['status']['image']}/ <a href="{$order['resolution']['href']}">{@"Resolution"}</a> {$order['resolution']['image']}</td>
 290 -       <td><a href="{$order['priority']['href']}">{@"Priority"}</a> {$order['priority']['image']}</a>/ <a href="{$order['severity']['href']}">{@"Severity"}</a> {$order['severity']['image']}</td>
 291 +       <td><a href="{$order['priority']['href']}">{@"Priority"}</a> {$order['priority']['image']}/ <a href="{$order['severity']['href']}">{@"Severity"}</a> {$order['severity']['image']}</td>
 292         <td><a href="{$order['lastpost']['href']}">{@"Last Post"}</a> {$order['lastpost']['image']}</td>
 293  </tr>
 294  $bugs