Merge pull request #1039 from gitblit/962-Patchset-Revision-Delete

Paul Martin

2016-04-06 2fca824e349f5fecbf71d940c4521644e92cb0dd

 src/main/java/com/gitblit/wicket/pages/TicketPage.html

@@ -33,7 +33,7 @@
      

   <!-- DISCUSSION TAB -->

   <div class="tab-pane active" id="discussion">

      <div class="row">

      <div class="row" style="min-height: 500px;">

            

         <!-- LEFT SIDE -->

         <div class="span8">      

@@ -67,6 +67,8 @@
            <div style="border: 1px solid #ccc;padding: 10px;margin: 5px 0px;">

               <table class="summary" style="width: 100%">

                  <tr><th><wicket:message key="gb.type"></wicket:message></th><td><span wicket:id="ticketType">[type]</span></td></tr>

                  <tr><th><wicket:message key="gb.priority"></wicket:message></th><td><span wicket:id="priority">[priority]</span></td></tr>

                  <tr><th><wicket:message key="gb.severity"></wicket:message></th><td><span wicket:id="severity">[severity]</span></td></tr>

                  <tr><th><wicket:message key="gb.topic"></wicket:message></th><td><span wicket:id="ticketTopic">[topic]</span></td></tr>

                  <tr><th><wicket:message key="gb.responsible"></wicket:message></th><td><span wicket:id="responsible">[responsible]</span></td></tr>

                  <tr><th><wicket:message key="gb.milestone"></wicket:message></th><td><span wicket:id="milestone">[milestone]</span></td></tr>

@@ -316,9 +318,10 @@


<!-- PATCHSET FRAGMENT -->

<wicket:fragment wicket:id="patchsetFragment">

   <div class="row" style="padding: 0px 0px 20px;">

   <div class="row" style="padding: 0px;">

       <div class="span12 attribution-border">

         <div wicket:id="panel"></div>		
          <div wicket:id="mergePanel" style="margin-bottom: 10px;"></div>

         <div wicket:id="panel"></div>

      </div>

   </div>

   

@@ -351,9 +354,8 @@


<!-- COLLAPSIBLE PATCHSET (temp) -->

<wicket:fragment wicket:id="collapsiblePatchsetFragment">

<div wicket:id="mergePanel" style="margin-bottom: 10px;"></div>

<div class="accordion" id="accordionPatchset" style="clear:both;margin: 0px;">

<div class="patch-group">

<div class="patch-group" style="margin-bottom: 20px;">

      <div class="accordion-heading">

      <div class="attribution-patch-pullright">   

         <div style="padding-bottom: 2px;"> 

@@ -460,6 +462,7 @@
               <span wicket:id="patchsetType">[revision type]</span>               

            </td>

            <td><span class="hidden-phone hidden-tablet aui-lozenge aui-lozenge-subtle" wicket:id="patchsetRevision">[R1]</span>

               <span class="fa fa-fw" style="padding-left:15px;"><a wicket:id="deleteRevision" class="fa fa-fw fa-trash delete-patchset"></a></span>

               <span class="hidden-tablet hidden-phone" style="padding-left:15px;"><span wicket:id="patchsetDiffStat"></span></span>

            </td>         

            <td style="text-align:right;"><span class="attribution-date" wicket:id="changeDate">[patch date]</span></td>   

@@ -555,7 +558,6 @@
   </div>

</wicket:fragment>





<!-- VETOED PATCHSET FRAGMENT -->

<wicket:fragment wicket:id="vetoedFragment">

   <div class="alert alert-error submit-info" style="padding:4px;">

@@ -596,7 +598,7 @@
             quality="high"

             wmode="transparent"

             scale="noscale"

             allowScriptAccess="always"></object>

             allowScriptAccess="sameDomain"></object>

</wicket:fragment>

   

</wicket:extend>