Merge lp:~jjacobs/frack/1069658-empty-ticket-modification-element into lp:frack

[Jonathan Jacobs]

Only show the ticket modification element when all its contents will be invisible (as opposed to none of its contents.)

[Allen Short (washort)]

review: Approve

Unmerged revisions

37. By Jonathan Jacobs on 2012-10-22

Move the "propertyform" form inside the changeticket.html template.

=== modified file 'webclient/frack/resources/changeticket.html'
--- webclient/frack/resources/changeticket.html	2012-05-20 05:35:56 +0000
+++ webclient/frack/resources/changeticket.html	2012-10-22 08:09:24 +0000
@@ -1,3 +1,4 @@
+<form id="propertyform">
 <h3><a id="edit">Add/Change #{{id}} ({{summary}})</a></h3>
   <div class="field">
     <fieldset class="iefix">
@@ -148,3 +149,4 @@
     <input type="button" name="preview" value="Preview" />
     <input type="button" name="sumbit" value="Submit changes" />
   </div>
+</form>
 
=== modified file 'webclient/frack/ticketPage.js'
--- webclient/frack/ticketPage.js	2012-05-20 05:35:56 +0000
+++ webclient/frack/ticketPage.js	2012-10-22 08:09:24 +0000
@@ -70,7 +70,7 @@
                        };
             onSubmit(response.id, data);
           }
-          fill("propertyform", changeticket_form, response);
+          fill("modifyticket", changeticket_form, response);
           q("#propertyform input[name='sumbit']").connect("onclick",
                                                           submitChangeForm);
         }
@@ -84,4 +84,4 @@
         box.text(e);
       }
     };
-});
 \ No newline at end of file
+});
 
=== modified file 'webclient/ticket.html'
--- webclient/ticket.html	2012-10-10 05:52:47 +0000
+++ webclient/ticket.html	2012-10-22 08:09:24 +0000
@@ -48,8 +48,7 @@
       <div id="errorbox"></div>
       <div id="ticketbox"></div>
       <div id="changelog"></div>
-      <form id="propertyform"></form>
+      <div id="modifyticket"></div>
     </div>
-
 </div>
 </body></html>