Initial simplification of the bug metadata display.

diff --git a/templates/bugfield_input_checkbox.tpl b/templates/bugfield_input_checkbox.tpl
index acad0e05b47ba213e3450b8f13bdbfe62cf1304e..431b21a7d156b5499e1c6ae1fc40d48fcfab136e 100644 (file)
--- a/templates/bugfield_input_checkbox.tpl
+++ b/templates/bugfield_input_checkbox.tpl
@@ -1,6 +1,6 @@
        <!-- custom field$field[fieldid] -->
-       <fieldset>
-               <legend>$field[name] $help[field$field[fieldid]]</legend>
-               <div class="field"><if condition="$searchMode"><select name="custom$field[fieldid]"><option value="0">{@"Ignore"}</option><option value="1">{@"Yes"}</option><option value="-1">{@"No"}</option></select><else /><input name="custom$field[fieldid]" type="checkbox" value="1"$selected /></if></div>
-       </fieldset>
-       <!-- / custom field$field[fieldid] -->
\ No newline at end of file
+       <div class="field">
+               <div class="label">$field[name] $help[field$field[fieldid]]</div>
+               <div class="value"><if condition="$searchMode"><select name="custom$field[fieldid]"><option value="0">{@"Ignore"}</option><option value="1">{@"Yes"}</option><option value="-1">{@"No"}</option></select><else /><input name="custom$field[fieldid]" type="checkbox" value="1"$selected /></if></div>
+       </div>
+       <!-- / custom field$field[fieldid] -->

diff --git a/templates/bugfield_input_text.tpl b/templates/bugfield_input_text.tpl
index 576fc8f0bb817c4866a0032e7712e85710e8bb3e..492fb44af0e139d62c8cf408ef40fc90899fe41c 100644 (file)
--- a/templates/bugfield_input_text.tpl
+++ b/templates/bugfield_input_text.tpl
@@ -1,6 +1,6 @@
        <!-- custom field$field[fieldid] -->
-       <fieldset>
-               <legend>$field[name] $help[field$field[fieldid]]</legend>
-               <div class="field"><input name="custom$field[fieldid]" type="text" value="$value" size="35"<if condition="$field['maxlength']"> maxlength="$field[maxlength]"</if> /></div>
-       </fieldset>
+       <div class="field">
+               <div class="label">$field[name] $help[field$field[fieldid]]</div>
+               <div class="value"><input name="custom$field[fieldid]" type="text" value="$value" size="35"<if condition="$field['maxlength']"> maxlength="$field[maxlength]"</if> /></div>
+       </div>
        <!-- / custom field$field[fieldid] -->

diff --git a/templates/bugfield_select_single.tpl b/templates/bugfield_select_single.tpl
index 919adab90e62f3f0254ac0b4b5b83cbe3d51a9c2..eb63af2782c30c365a4b580807604c2788f41795 100644 (file)
--- a/templates/bugfield_select_single.tpl
+++ b/templates/bugfield_select_single.tpl
@@ -1,6 +1,6 @@
        <!-- custom field$field[fieldid] -->
-       <fieldset>
-               <legend>$field[name] $help[field$field[fieldid]]</legend>
-               <div class="field"><select name="custom$field[fieldid]">$options</select></div>
-       </fieldset>
-       <!-- / custom field$field[fieldid] -->
\ No newline at end of file
+       <div class="field">
+               <div class="label">$field[name] $help[field$field[fieldid]]</div>
+               <div class="value"><select name="custom$field[fieldid]">$options</select></div>
+       </div>
+       <!-- / custom field$field[fieldid] -->

diff --git a/templates/bugfield_static_text.tpl b/templates/bugfield_static_text.tpl
index 617bcdaf2e5d798e912e75c560be4ff3793e475c..d7a9309d9e9310b9373a2596d79430e85616b2ec 100644 (file)
--- a/templates/bugfield_static_text.tpl
+++ b/templates/bugfield_static_text.tpl
@@ -1,6 +1,6 @@
        <!-- custom field$field[fieldid] -->
-       <fieldset>
-               <legend>$field[name] $help[field$field[fieldid]]</legend>
+       <div class="field">
+               <div class="label">$field[name] $help[field$field[fieldid]]</div>
                <div class="field">$field[value]</div>
-       </fieldset>
+       </div>
        <!-- / custom field$field[fieldid] -->

diff --git a/templates/fields.css b/templates/fields.css
index 3924b2bb3ba396bda9082c83d313afc8db108c7f..99a01709352cabf09c75d3928e5f74bffde6f2fb 100644 (file)
--- a/templates/fields.css
+++ b/templates/fields.css
@@ -18,38 +18,34 @@
 || ###################################################################
 \*=====================================================================*/
 
-legend
-{
-       background-color: rgb(51, 51, 51);
-       font-weight: bold;
-       font-size: 11px;
-       margin-left: 10px;
-       color: rgb(255, 255, 255);
-       padding: 2px;
-       border: 1px solid rgb(0, 0, 0);
+.field {
+  display: flex;
+  width: 100%;
+
+  margin: 3px 0;
 }
 
-       legend a
-       {
-               color: rgb(255, 255, 255);
-       }
+.field .label {
+  width: 20%;
 
-fieldset
-{
-       border-width: 1px 0px 0px 0px;
-       border-color: rgb(0, 0, 0);
-       border-style: solid;
-       padding: 5px;
+  background-color: rgb(78, 78, 78);
+  font-weight: bold;
+  font-size: 11px;
+  color: rgb(255, 255, 255);
+  padding: 3px;
+  border: 1px solid rgb(0, 0, 0);
 }
 
-.helplink
-{
-       border: none;
+  .field .label a {
+    color: rgb(255, 255, 255);
+  }
+
+.field .value {
+  width: 80%;
+  padding: 3px;
 }
 
-/*=====================================================================*\
-|| ###################################################################
-|| # $HeadURL$
-|| # $Id$
-|| ###################################################################
-\*=====================================================================*/
\ No newline at end of file
+.helplink {
+  border: none;
+  float: right;
+}

diff --git a/templates/newreport.tpl b/templates/newreport.tpl
index 61c8801a377f1d796f5d87842284fea692c2786b..f77b0ad2cd8246aea30c3836668b3db06cf19da4 100644 (file)
--- a/templates/newreport.tpl
+++ b/templates/newreport.tpl
@@ -26,33 +26,33 @@ $header
        <div id="$stylevar[left]col">
 
                <!-- summary -->
-               <fieldset>
-                       <legend>{@"Reporter"} $help[reporter]</legend>
-                       <div class="field">$reporter</div>
-               </fieldset>
+               <div class="field">
+                       <div class="label">{@"Reporter"} $help[reporter]</div>
+                       <div class="value">$reporter</div>
+               </div>
                <!-- / summary -->
 
                <!-- product -->
-               <fieldset>
-                       <legend><a href="explain.php?do=products">{@"Product/Version"}</a> $help[product]</legend>
-                       <div class="field"><select name="product"><if condition="!$bugsys->in['product']"><option value="0" selected="selected">{@"Select..."}</option></if>$productSelect</select></div>
-               </fieldset>
+               <div class="field">
+                       <div class="label"><a href="explain.php?do=products">{@"Product/Version"}</a> $help[product]</div>
+                       <div class="value"><select name="product"><if condition="!$bugsys->in['product']"><option value="0" selected="selected">{@"Select..."}</option></if>$productSelect</select></div>
+               </div>
                <!-- / product -->
 
                <if condition="$show['changestatus']">
                <!-- status -->
-               <fieldset>
-                       <legend>{@"Status"} $help[status]</legend>
-                       <div class="field"><select name="status">$select[status]</select></div>
-               </fieldset>
+               <div class="field">
+                       <div class="label">{@"Status"} $help[status]</div>
+                       <div class="value"><select name="status">$select[status]</select></div>
+               </div>
                <!-- / status -->
                </if>
 
                <!-- severity -->
-               <fieldset>
-                       <legend>{@"Severity"} $help[severity]</legend>
-                       <div class="field"><select name="severity">$select[severity]</select></div>
-               </fieldset>
+               <div class="field">
+                       <div class="label">{@"Severity"} $help[severity]</div>
+                       <div class="value"><select name="severity">$select[severity]</select></div>
+               </div>
                <!-- / severity -->
 
                $customfields[left]
@@ -64,36 +64,36 @@ $header
        <div id="$stylevar[right]col">
 
                <!-- summary -->
-               <fieldset>
-                       <legend>{@"Summary"} $help[summary]</legend>
-                       <div class="field"><input type="text" name="summary" size="25" value="{$bugsys->in['summary']}" style="width: 100%" maxlength="250" /></div>
-               </fieldset>
+               <div class="field">
+                       <div class="label">{@"Summary"} $help[summary]</div>
+                       <div class="value"><input type="text" name="summary" size="25" value="{$bugsys->in['summary']}" style="width: 100%" maxlength="250" /></div>
+               </div>
                <!-- / summary -->
 
                <if condition="$show['assign']">
                <!-- assignment -->
-               <fieldset>
-                       <legend>{@"Assignment"} $help[assignedto]</legend>
-                       <div class="field"><select name="assignedto"><option value="0" selected="selected">{@"No Assignment"}</option>$select[dev]</select></div>
-               </fieldset>
+               <div class="field">
+                       <div class="label">{@"Assignment"} $help[assignedto]</div>
+                       <div class="value"><select name="assignedto"><option value="0" selected="selected">{@"No Assignment"}</option>$select[dev]</select></div>
+               </div>
                <!-- / assignment -->
                </if>
 
                <if condition="$show['changestatus']">
                <!-- resolution -->
-               <fieldset>
-                       <legend>{@"Resolution"} $help[resolution]</legend>
-                       <div class="field"><select name="resolution">$select[resolution]</select></div>
-               </fieldset>
+               <div class="field">
+                       <div class="label">{@"Resolution"} $help[resolution]</div>
+                       <div class="value"><select name="resolution">$select[resolution]</select></div>
+               </div>
                <!-- / resolution -->
                </if>
 
                <if condition="$show['changestatus']">
                <!-- priority -->
-               <fieldset>
-                       <legend>{@"Priority"} $help[priority]</legend>
-                       <div class="field"><select name="priority">$select[priority]</select></div>
-               </fieldset>
+               <div class="field">
+                       <div class="label">{@"Priority"} $help[priority]</div>
+                       <div class="value"><select name="priority">$select[priority]</select></div>
+               </div>
                <!-- / priority -->
                </if>
 
@@ -107,13 +107,15 @@ $header
 
 <!-- new reply -->
 <div style="width: 100%">
-       <fieldset>
-               <legend>{@"Description/Initial Report"}</legend>
+       <div class="field">
+               <div class="label">{@"Description/Initial Report"}</div>
 
+               <div class="value">
                <textarea name="comment" cols="50" rows="10" class="textarea"><if condition="$bugsys->in['comment']">{$bugsys->in['comment']}<else />{$bugsys->options['defaultcomment']}</if></textarea>
 
                <div><input type="checkbox" name="parselinks" value="1"<if condition="$bugsys->in['parselinks']"> checked="checked"</if> /> {@"Parse Links in the Comment"}</div>
-       </fieldset>
+               </div>
+       </div>
 </div>
 <!-- / new reply -->
 
@@ -129,4 +131,4 @@ $header
 
 <!-- <script type="text/javascript"> setup_report("{$bugsys->in['product']}", "{$bugsys->in['component']}", "{$bugsys->in['version']}"); </script> -->
 
-$footer
\ No newline at end of file
+$footer

diff --git a/templates/search.tpl b/templates/search.tpl
index bbfcbc113126c02ece02a504dfa2763968a1e248..c85504dc400d012f4fbdcc646cb9b134ff288a4c 100644 (file)
--- a/templates/search.tpl
+++ b/templates/search.tpl
@@ -28,52 +28,52 @@ $header
        <div id="leftcol">
 
                <!-- search mode -->
-               <fieldset>
-                       <legend>{@"Search Mode"}</legend>
+               <div class="field">
+                       <div class="label">{@"Search Mode"}</div>
 
-                       <div class="field">
+                       <div class="value">
                                <select name="mode">
                                        <option value="1" selected="selected">{@"Any Words"}</option>
                                        <option value="2">{@"All Words"}</option>
                                        <option value="3">{@"Raw Boolean Search"}</option>
                                </select>
                        </div>
-               </fieldset>
+               </div>
                <!-- / search mode -->
 
                <!-- reporter -->
-               <fieldset>
-                       <legend>{@"Reporter"} $help[reporter]</legend>
-                       <div class="field"><input type="text" name="reporter" size="25" style="width: 100%" /></div>
-               </fieldset>
+               <div class="field">
+                       <div class="label">{@"Reporter"} $help[reporter]</div>
+                       <div class="value"><input type="text" name="reporter" size="25" style="width: 100%" /></div>
+               </div>
                <!-- / reporter -->
 
                <!-- product & version -->
-               <fieldset>
-                       <legend>{@"Product / Version"} $help[product]</legend>
-                       <div class="field"><select name="product[]" size="10" multiple="multiple">$productSelect</select></div>
-               </fieldset>
+               <div class="field">
+                       <div class="label">{@"Product / Version"} $help[product]</div>
+                       <div class="value"><select name="product[]" size="10" multiple="multiple">$productSelect</select></div>
+               </div>
                <!-- / product & version -->
 
                <!-- status -->
-               <fieldset>
-                       <legend>{@"Status"} $help[status]</legend>
-                       <div class="field"><select name="status[]" size="4" multiple="multiple">$select[status]</select></div>
-               </fieldset>
+               <div class="field">
+                       <div class="label">{@"Status"} $help[status]</div>
+                       <div class="value"><select name="status[]" size="4" multiple="multiple">$select[status]</select></div>
+               </div>
                <!-- / status -->
 
                <!-- priority -->
-               <fieldset>
-                       <legend>{@"Priority"} $help[priority]</legend>
-                       <div class="field"><select name="priority[]" size="4" multiple="multiple">$select[priority]</select></div>
-               </fieldset>
+               <div class="field">
+                       <div class="label">{@"Priority"} $help[priority]</div>
+                       <div class="value"><select name="priority[]" size="4" multiple="multiple">$select[priority]</select></div>
+               </div>
                <!-- / priority -->
 
                <!-- date -->
-               <fieldset>
-                       <legend>{@"Date (submitted since)"}</legend>
+               <div class="field">
+                       <div class="label">{@"Date (submitted since)"}</div>
 
-                       <div class="field">
+                       <div class="value">
                                <select name="date">
                                        <option value="0">{@"Any Date"}</option>
                                        <option value="1">{@"Today"}</option>
@@ -85,7 +85,7 @@ $header
                                        <option value="365">{@"1 Year"}</option>
                                </select>
                        </div>
-               </fieldset>
+               </div>
                <!-- / date -->
 
                $customfields[left]
@@ -97,17 +97,17 @@ $header
        <div id="rightcol">
 
                <!-- summary -->
-               <fieldset>
-                       <legend>{@"Summary / Comment Text"}</legend>
-                       <div class="field"><input type="text" name="summary" size="25" style="width: 100%" /></div>
-               </fieldset>
+               <div class="field">
+                       <div class="label">{@"Summary / Comment Text"}</div>
+                       <div class="value"><input type="text" name="summary" size="25" style="width: 100%" /></div>
+               </div>
                <!-- / summary -->
 
                <!-- sort by -->
-               <fieldset>
-                       <legend>{@"Sort By"}</legend>
+               <div class="field">
+                       <div class="label">{@"Sort By"}</div>
 
-                       <div class="field">
+                       <div class="value">
                                <select name="sortby">
                                        <option value="relevance">{@"Relevance"}</option>
                                        <option value="bugid">{@"Bug ID"}</option>
@@ -123,42 +123,42 @@ $header
                                        <option value="desc">{@"Descending"}</option>
                                </select>
                        </div>
-               </fieldset>
+               </div>
                <!-- / sort by -->
 
                <!-- assignment -->
-               <fieldset>
-                       <legend>{@"Assignment"} $help[assignedto]</legend>
-                       <div class="field"><select name="assignedto[]" size="4" multiple="multiple">$select[dev]</select></div>
-               </fieldset>
+               <div class="field">
+                       <div class="label">{@"Assignment"} $help[assignedto]</div>
+                       <div class="value"><select name="assignedto[]" size="4" multiple="multiple">$select[dev]</select></div>
+               </div>
                <!-- / assignment -->
 
                <!-- resolution -->
-               <fieldset>
-                       <legend>{@"Resolution"} $help[resolution]</legend>
-                       <div class="field"><select name="resolution[]" size="4" multiple="multiple">$select[resolution]</select></div>
-               </fieldset>
+               <div class="field">
+                       <div class="label">{@"Resolution"} $help[resolution]</div>
+                       <div class="value"><select name="resolution[]" size="4" multiple="multiple">$select[resolution]</select></div>
+               </div>
                <!-- / resolution -->
 
                <!-- severity -->
-               <fieldset>
-                       <legend>{@"Severity"} $help[severity]</legend>
-                       <div class="field"><select name="severity[]" size="4" multiple="multiple">$select[severity]</select></div>
-               </fieldset>
+               <div class="field">
+                       <div class="label">{@"Severity"} $help[severity]</div>
+                       <div class="value"><select name="severity[]" size="4" multiple="multiple">$select[severity]</select></div>
+               </div>
                <!-- / severity -->
 
                <if condition="$bugsys->userinfo['userid']">
                <!-- favorite -->
-               <fieldset>
-                       <legend>{@"Favorite"}</legend>
-                       <div class="field">
+               <div class="field">
+                       <div class="label">{@"Favorite"}</div>
+                       <div class="value">
                                <select name="favorite">
                                        <option value="0">{@"Ignore"}</option>
                                        <option value="1">{@"Yes"}</option>
                                        <option value="-1">{@"No"}</option>
                                </select>
                        </div>
-               </fieldset>
+               </div>
                <!-- / favorite -->
                </if>
 
@@ -177,4 +177,4 @@ $header
 
 </form>
 
-$footer
\ No newline at end of file
+$footer

diff --git a/templates/showreport.tpl b/templates/showreport.tpl
index a8f2540928db00e4e7ef89ab59fe493726ab69f7..392675bad98278a06668e77cd2726edc40a5529a 100644 (file)
--- a/templates/showreport.tpl
+++ b/templates/showreport.tpl
@@ -21,9 +21,9 @@ $header
        <div id="$stylevar[left]col">
 
                <!-- bug id & hidden -->
-               <fieldset>
-                       <legend>{@"Bug Id"} $help[bugid]</legend>
-                       <div class="field">
+               <div class="field">
+                       <div class="label">{@"Bug Id"} $help[bugid]</div>
+                       <div class="value">
                                $bug[bugid]
 
                                <if condition="$show['edit']">
@@ -38,53 +38,53 @@ $header
                                <if condition="$show['subscribe']">/ [<a href="favorite.php?do=handle&amp;bugid=$bug[bugid]">$favoritetext</a>]</if>
                                <if condition="$show['delete']">/ [<a href="editreport.php?do=delete&amp;bugid=$bug[bugid]">{@"Delete"}</a>]</if>
                        </div>
-               </fieldset>
+               </div>
                <!-- / bug id & hidden -->
 
                <!-- reporter -->
-               <fieldset>
-                       <legend>{@"Reporter"} $help[reporter]</legend>
-                       <div class="field">$bug[userinfo]</div>
-               </fieldset>
+               <div class="field">
+                       <div class="label">{@"Reporter"} $help[reporter]</div>
+                       <div class="value">$bug[userinfo]</div>
+               </div>
                <!-- / reporter -->
 
                <!-- product -->
-               <fieldset>
-                       <legend><a href="explain.php?do=products">{@"Product/Version"}</a> $help[product]</legend>
-                       <div class="field">$bug[product] <if condition="$bug['component']">/ $bug[component]</if> / <if condition="$show['edit']"><select name="product">$productSelect</select><else />$bug[version]</if></div>
-               </fieldset>
+               <div class="field">
+                       <div class="label"><a href="explain.php?do=products">{@"Product/Version"}</a> $help[product]</div>
+                       <div class="value">$bug[product] <if condition="$bug['component']">/ $bug[component]</if> / <if condition="$show['edit']"><select name="product">$productSelect</select><else />$bug[version]</if></div>
+               </div>
                <!-- / product -->
 
                <!-- status -->
-               <fieldset>
-                       <legend>{@"Status"} $help[status]</legend>
-                       <div class="field">
+               <div class="field">
+                       <div class="label">{@"Status"} $help[status]</div>
+                       <div class="value">
                                <if condition="$show['changestatus']">
                                        <select name="status">$select[status]</select>
                                <else />
                                        $bug[status]
                                </if>
                        </div>
-               </fieldset>
+               </div>
                <!-- / status -->
 
                <!-- severity -->
-               <fieldset>
-                       <legend>{@"Severity"} $help[severity]</legend>
-                       <div class="field">
+               <div class="field">
+                       <div class="label">{@"Severity"} $help[severity]</div>
+                       <div class="value">
                                <if condition="$show['edit']">
                                        <select name="severity">$select[severity]</select>
                                <else />
                                        $bug[severity]
                                </if>
                        </div>
-               </fieldset>
+               </div>
                <!-- / severity -->
 
                <!-- duplicate -->
-               <fieldset>
-                       <legend>{@"Duplicate Of"} $help[duplicateof]</legend>
-                       <div class="field">
+               <div class="field">
+                       <div class="label">{@"Duplicate Of"} $help[duplicateof]</div>
+                       <div class="value">
                                <if condition="$show['edit']">
                                        <input type="text" name="duplicateof" size="10" value="<if condition="$bug['duplicateof']">$bug[duplicateof]</if>" />
                                        <if condition="$bug['duplicateof']"><a href="showreport.php?bugid=$bug[duplicateof]" title="$duplicate[summary]" target="_blank">$duplicate[bugid]</a></if>
@@ -92,7 +92,7 @@ $header
                                        <if condition="$bug['duplicateof']"><a href="showreport.php?bugid=$bug[duplicateof]">$duplicateof[summary]</a><else />{@"- none -"}</if>
                                </if>
                        </div>
-               </fieldset>
+               </div>
                <!-- / duplicate -->
 
                $customfields[left]
@@ -104,75 +104,75 @@ $header
        <div id="$stylevar[right]col">
 
                <!-- summary -->
-               <fieldset>
-                       <legend>{@"Summary"} $help[summary]</legend>
-                       <div class="field">
+               <div class="field">
+                       <div class="label">{@"Summary"} $help[summary]</div>
+                       <div class="value">
                                <if condition="$show['edit']">
                                        <input type="text" name="summary" size="25" value="$bug[summary]" style="width: 100%" maxlength="250" />
                                <else />
                                        $bug[summary]
                                </if>
                        </div>
-               </fieldset>
+               </div>
                <!-- / summary -->
 
                <!-- reporting time -->
-               <fieldset>
-                       <legend>{@"Report Time"} $help[dateline]</legend>
-                       <div class="field">$bug[datetime]</div>
-               </fieldset>
+               <div class="field">
+                       <div class="label">{@"Report Time"} $help[dateline]</div>
+                       <div class="value">$bug[datetime]</div>
+               </div>
                <!-- / reporting time -->
 
                <!-- assignment -->
-               <fieldset>
-                       <legend>{@"Assignment"} $help[assignedto]</legend>
-                       <div class="field">
+               <div class="field">
+                       <div class="label">{@"Assignment"} $help[assignedto]</div>
+                       <div class="value">
                                <if condition="$show['assign']">
                                        <select name="assignedto"><option value="0"<if condition="!$bug['assignedto']"> selected="selected"</if>>{@"No Assignment"}</option>$select[dev]</select>
                                <else />
                                        <if condition="$bug['assigninfo']">$bug[assigninfo]<else />{@"- none -"}</if>
                                </if>
                        </div>
-               </fieldset>
+               </div>
                <!-- / assignment -->
 
                <!-- resolution -->
-               <fieldset>
-                       <legend>{@"Resolution"} $help[resolution]</legend>
-                       <div class="field">
+               <div class="field">
+                       <div class="label">{@"Resolution"} $help[resolution]</div>
+                       <div class="value">
                                <if condition="$show['changestatus']">
                                        <select name="resolution">$select[resolution]</select>
                                <else />
                                        $bug[resolution]
                                </if>
                        </div>
-               </fieldset>
+               </div>
                <!-- / resolution -->
 
                <!-- priority -->
-               <fieldset>
-                       <legend>{@"Priority"} $help[priority]</legend>
-                       <div class="field">
+               <div class="field">
+                       <div class="label">{@"Priority"} $help[priority]</div>
+                       <div class="value">
                                <if condition="$show['changestatus']">
                                        <select name="priority">$select[priority]</select>
                                <else />
                                        $bug[priority]
                                </if>
                        </div>
-               </fieldset>
+               </div>
                <!-- / priority -->
 
                <!-- dependencies -->
-               <fieldset>
-                       <legend>{@"Dependencies"} $help[dependency]</legend>
-                       <div class="field">
+               <div class="field">
+                       <div class="label">{@"Dependencies"} $help[dependency]</div>
+                       <div class="value">
                                <if condition="$show['edit']">
                                        <input type="text" name="dependency" size="25" value="$bug[dependency]" /> $dependencies
                                <else />
                                        <if condition="$dependencies">$dependencies<else />{@"- none -"}</if>
                                </if>
                        </div>
-               </fieldset>
+               </div>
                <!-- / dependencies -->
 
                $customfields[right]
@@ -187,13 +187,16 @@ $header
 <if condition="$show['newreply']">
 <!-- new reply -->
 <div style="width: 100%">
-       <fieldset>
-               <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>
+       <div class="field">
+               <div class="label">{@"New Reply"} $help[newreply]
+               <if condition="$show['automations']"> <div><a href="explain.php?do=automations">{@"Automation"}</a> <select name="automation">$select[automation]</select></div></if></div>
 
+               <div class="value">
                <textarea name="comment" cols="50" rows="10" class="textarea"></textarea>
 
                <div><input type="checkbox" name="parselinks" value="1"<if condition="$bugsys->in['parselinks']"> checked="checked"</if> /> {@"Parse Links in the Comment"}</div>
-       </fieldset>
+               </div>
+       </div>
 </div>
 <!-- / new reply -->
 </if>
@@ -215,34 +218,36 @@ $header
        <if condition="$show['attachments']">
        <!-- attachments -->
        <div id="attachments" style="float: $stylevar[right]">
-       <fieldset>
-               <legend>{@"Attachments"}<if condition="$show['putattachments']"> : <a href="attachment.php?do=add&amp;bugid=$bug[bugid]">{@"New"}</a></if></legend>
+       <div class="field">
+               <div class="label">{@"Attachments"}<if condition="$show['putattachments']"> : <a href="attachment.php?do=add&amp;bugid=$bug[bugid]">{@"New"}</a></if></div>
 
-               $attachments
-       </fieldset>
+               <div class="value">$attachments</div>
+       </div>
        </div>
        <!-- / attachments -->
        </if>
 
        <!-- show votes -->
        <div id="votes<if condition="$show['attachments']"><if condition="!$show['vote']">fifty</if><else /><if condition="!$show['vote']">hundred</if></if>">
-       <fieldset>
-               <legend>{@"Votes"}</legend>
+       <div class="field">
+               <div class="label">{@"Votes"}</div>
 
+               <div class="value">
                <div><strong>{@"For"}:</strong> $vote[votefor] ($vote[forpercent]%)</div>
                <div><strong>{@"Against"}:</strong> $vote[voteagainst] ($vote[againstpercent]%)</div>
                <div><strong>{@"Total"}:</strong> $vote[total]</div>
-       </fieldset>
+               </div>
+       </div>
        </div>
        <!-- / show votes -->
 
        <if condition="$show['vote']">
        <!-- your vote -->
        <div id="yourvote">
-       <fieldset>
-               <legend>{@"Your Vote"}</legend>
+       <div class="field">
+               <div class="label">{@"Your Vote"}</div>
 
-               <form name="vote" action="vote.php" method="post" class="form">
+               <form name="vote" action="vote.php" method="post" class="form value">
                        <input type="hidden" name="do" value="vote" />
                        <input type="hidden" name="bugid" value="$bug[bugid]" />
                        <input type="radio" name="vote" value="1" /> {@"Vote For (+1)"}<br />
@@ -250,7 +255,7 @@ $header
 
                        <input type="submit" name="submit" value="  {@"Vote"}  " accesskey="v" />
                </form>
-       </fieldset>
+       </div>
        </div>
        <!-- / your vote -->
        </if>
@@ -265,4 +270,4 @@ $description
 
 $comments
 
-$footer
\ No newline at end of file
+$footer