Gitblit devel
view | history | commit | commitdiff
Paul Martin
2016-04-06 2fca824e349f5fecbf71d940c4521644e92cb0dd
commit | author | age
5e3521 1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
JM 2 <html xmlns="http://www.w3.org/1999/xhtml"  
3       xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.3-strict.dtd"  
4       xml:lang="en"  
5       lang="en"> 
6
7 <body>
8 <wicket:extend>
9
10 <!-- HEADER -->
11 <div style="padding: 10px 0px 15px;">
12     <div style="display:inline-block;" class="ticket-title"><span wicket:id="ticketTitle">[ticket title]</span></div>
13     <a style="padding-left:10px;" class="ticket-number" wicket:id="ticketNumber"></a>
14     <div style="display:inline-block;padding: 0px 10px;vertical-align:top;"><span wicket:id="headerStatus"></span></div>    
15     <div class="hidden-phone hidden-tablet pull-right"><div wicket:id="diffstat"></div></div>
16 </div>
17
18 <!-- TAB NAMES -->
19 <ul class="nav nav-tabs">
20     <li class="active"><a data-toggle="tab" href="#discussion">
21         <i style="color:#888;"class="fa fa-comments"></i> <span class="hidden-phone"><wicket:message key="gb.discussion"></wicket:message></span> <span class="lwbadge" wicket:id="commentCount"></span></a>
22     </li>
23     <li><a data-toggle="tab" href="#commits">
24         <i style="color:#888;"class="fa fa-code"></i> <span class="hidden-phone"><wicket:message key="gb.commits"></wicket:message></span> <span class="lwbadge" wicket:id="commitCount"></span></a>
25     </li>
26     <li><a data-toggle="tab" href="#activity">
27         <i style="color:#888;"class="fa fa-clock-o"></i> <span class="hidden-phone"><wicket:message key="gb.activity"></wicket:message></span></a>
28     </li>
29 </ul>
30     
31 <!-- TABS -->
32 <div class="tab-content">
33         
34     <!-- DISCUSSION TAB -->
35     <div class="tab-pane active" id="discussion">
1f217a 36         <div class="row" style="min-height: 500px;">
5e3521 37                 
JM 38             <!-- LEFT SIDE -->
39             <div class="span8">        
40                 <div class="ticket-meta-middle">
41                     <!-- creator -->
42                     <span class="attribution-emphasize" wicket:id="whoCreated">[someone]</span><span wicket:id="creationMessage" class="attribution-text" style="padding: 0px 3px;">[created this ticket]</span> <span class="attribution-emphasize" wicket:id="whenCreated">[when created]</span>
43                 </div>
44                 <div class="ticket-meta-bottom"">
45                     <div class="ticket-text markdown" wicket:id="ticketDescription">[description]</div>
46                 </div>
47                 
48                 <!-- COMMENTS and STATUS CHANGES (DISCUSSIONS TAB) -->
49                 <div wicket:id="discussion"></div>
50         
51         
52                 <!-- ADD COMMENT (DISCUSSIONS TAB) -->
53                 <div id="addcomment" wicket:id="newComment"></div>
54             </div>
55
56             <!-- RIGHT SIDE -->    
57             <div class="span4 hidden-phone">
58                 <div class="status-display" style="padding-bottom: 5px;">
59                     <div wicket:id="ticketStatus" style="display:block;padding: 5px 10px 10px;">[ticket status]</div>
60                 </div>        
61                 <div wicket:id="labels" style="border-top: 1px solid #ccc;padding: 5px 0px;">
62                     <span class="label ticketLabel" wicket:id="label">[label]</span>
63                 </div>
64                 
65                 <div wicket:id="controls"></div>
66                 
67                 <div style="border: 1px solid #ccc;padding: 10px;margin: 5px 0px;">
68                     <table class="summary" style="width: 100%">
69                         <tr><th><wicket:message key="gb.type"></wicket:message></th><td><span wicket:id="ticketType">[type]</span></td></tr>
f9c78c 70                         <tr><th><wicket:message key="gb.priority"></wicket:message></th><td><span wicket:id="priority">[priority]</span></td></tr>
PM 71                         <tr><th><wicket:message key="gb.severity"></wicket:message></th><td><span wicket:id="severity">[severity]</span></td></tr>
5e3521 72                         <tr><th><wicket:message key="gb.topic"></wicket:message></th><td><span wicket:id="ticketTopic">[topic]</span></td></tr>
JM 73                         <tr><th><wicket:message key="gb.responsible"></wicket:message></th><td><span wicket:id="responsible">[responsible]</span></td></tr>
74                         <tr><th><wicket:message key="gb.milestone"></wicket:message></th><td><span wicket:id="milestone">[milestone]</span></td></tr>
75                         <tr><th><wicket:message key="gb.votes"></wicket:message></th><td><span wicket:id="votes" class="badge">1</span> <a style="padding-left:5px" wicket:id="voteLink" href="#">vote</a></td></tr>
76                         <tr><th><wicket:message key="gb.watchers"></wicket:message></th><td><span wicket:id="watchers" class="badge">1</span> <a style="padding-left:5px" wicket:id="watchLink" href="#">watch</a></td></tr>
77                         <tr><th><wicket:message key="gb.export"></wicket:message></th><td><a rel="nofollow" target="_blank" wicket:id="exportJson"></a></td></tr>
78                         
79                     </table>
80                 </div>
81                 
82                 <div>
83                     <span class="attribution-text" wicket:id="participantsLabel"></span>
84                     <span wicket:id="participants"><span style="padding: 0px 2px;" wicket:id="participant"></span></span>
85                 </div>
86             </div>
87         </div>        
88         
89     </div>
90     
91     
92     <!-- COMMITS TAB -->
93     <div class="tab-pane" id="commits">
94         <div wicket:id="patchset"></div>
95     </div>
96     
97     
98     <!-- ACTIVITY TAB -->
99     <div class="tab-pane" id="activity">
100         <div wicket:id="activity"></div>    
101     </div>
102     
103 </div> <!-- END TABS -->
104
105
106 <!-- BARNUM DOWNLOAD MODAL -->
107 <div id="ptModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="ptModalLabel" aria-hidden="true">
108   <div class="modal-header">
109     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
110     <h3 id="ptModalLabel"><img src="barnum_32x32.png"></img> Barnum <small><wicket:message key="gb.ptDescription"></wicket:message></small></h3>
111   </div>
112   <div class="modal-body">
113     <p><wicket:message key="gb.ptDescription1"></wicket:message></p>
114     
115     <h4><wicket:message key="gb.ptSimplifiedCollaboration"></wicket:message></h4>
116     <pre class="gitcommand">
117 pt checkout 123
118 ...
119 git commit
120 pt push</pre>
121     
122     <h4><wicket:message key="gb.ptSimplifiedMerge"></wicket:message></h4>
123     <pre class="gitcommand">pt pull 123</pre>    
124     <p><wicket:message key="gb.ptDescription2"></wicket:message></p>
125   </div>
126   <div class="modal-footer">
127     <a class="btn btn-appmenu" href="/pt" ><wicket:message key="gb.download"></wicket:message></a>
128   </div>
129 </div>
130
131
132 <!-- MILESTONE PROGRESS FRAGMENT -->
133 <wicket:fragment wicket:id="milestoneProgressFragment">
134     <div style="display:inline-block;padding-right: 10px" wicket:id="link"></div>
135     <div style="display:inline-block;margin-bottom: 0px;width: 100px;height:10px;" class="progress progress-success">
136         <div class="bar" wicket:id="progress"></div>
137     </div>    
138 </wicket:fragment>
139
140
85775a 141 <!-- OPEN TICKET CONTROLS FRAGMENT -->
JM 142 <wicket:fragment wicket:id="openControlsFragment">
5e3521 143     <div class="hidden-phone hidden-tablet">
JM 144         <div class="btn-group" style="display:inline-block;">
145             <a class="btn btn-small dropdown-toggle" data-toggle="dropdown" href="#"><wicket:message key="gb.status"></wicket:message> <span class="caret"></span></a>
146             <ul class="dropdown-menu">
147                 <li wicket:id="newStatus"><a wicket:id="link">[status]</a></li>                            
148             </ul>
149         </div>
150         
151         <div class="btn-group" style="display:inline-block;">    
152             <a class="btn btn-small dropdown-toggle" data-toggle="dropdown" href="#"><wicket:message key="gb.responsible"></wicket:message> <span class="caret"></span></a>
153             <ul class="dropdown-menu">
154                 <li wicket:id="newResponsible"><a wicket:id="link">[responsible]</a></li>                            
155             </ul>
156         </div>
157         
158         <div class="btn-group" style="display:inline-block;">
159             <a class="btn btn-small dropdown-toggle" data-toggle="dropdown" href="#"><wicket:message key="gb.milestone"></wicket:message> <span class="caret"></span></a>
160             <ul class="dropdown-menu">
161                 <li wicket:id="newMilestone"><a wicket:id="link">[milestone]</a></li>                            
162             </ul>
163         </div>
164         
165         <div class="btn-group" style="display:inline-block;">
166             <a class="btn btn-small" wicket:id="editLink"></a>
167         </div>
168     </div>
169 </wicket:fragment>
170
171
85775a 172 <!-- CLOSED TICKET CONTROLS FRAGMENT -->
JM 173 <wicket:fragment wicket:id="closedControlsFragment">
174     <div class="hidden-phone hidden-tablet">
175         
176         <div class="btn-group" style="display:inline-block;">
177             <a class="btn btn-small" wicket:id="editLink"></a>
178         </div>
179     </div>
180 </wicket:fragment>
181
182
5e3521 183 <!-- STATUS INDICATOR FRAGMENT -->
JM 184 <wicket:fragment wicket:id="ticketStatusFragment">
185     <div style="font-size:2.5em;padding-bottom: 5px;">
186         <i wicket:id="ticketIcon">[ticket type]</i>
187     </div>
188     <div style="font-size:1.5em;" wicket:id="ticketStatus">[ticket status]</div>    
189 </wicket:fragment>
190
191
192 <!-- DISCUSSION FRAGMENT -->
193 <wicket:fragment wicket:id="discussionFragment">
194     <h3 style="padding-top:10px;"><wicket:message key="gb.comments"></wicket:message></h3>
195     <div wicket:id="discussion">
196         <div style="padding: 10px 0px;" wicket:id="entry"></div>
197     </div>
198 </wicket:fragment>
199
200 <!-- NEW COMMENT FRAGMENT -->
201 <wicket:fragment wicket:id="newCommentFragment">
202     <div class="row">
203         <div class="span8">
204             <hr/>
205         </div>
206     </div>
207     
208     <h3 style="padding:0px 0px 10px;"><wicket:message key="gb.addComment"></wicket:message></h3>
209     
210     <div class="row">
211         <div class="span1 hidden-phone" style="text-align:right;">
212             <span wicket:id="newCommentAvatar">[avatar]</span>
213         </div>
214         <div class="span7 attribution-border" style="background-color:#fbfbfb;">
215             <div class="hidden-phone attribution-triangle"></div>
216             <div wicket:id="commentPanel"></div>
217         </div>    
218     </div>
219 </wicket:fragment>
220
221
222 <!-- COMMENT FRAGMENT -->
223 <wicket:fragment wicket:id="commentFragment">
224 <div class="row">
225     <div class="span1 hidden-phone" style="text-align:right;">
226         <span wicket:id="changeAvatar">[avatar]</span>
227     </div>
228     <div class="span7 attribution-border">
229         <!-- <div class="hidden-phone attribution-triangle"></div> -->
230         <div class="attribution-header" style="border-radius:20px;">
231              <span class="indicator-large-dark"><i wicket:id="commentIcon"></i></span><span class="attribution-emphasize" wicket:id="changeAuthor">[author]</span> <span class="attribution-text"><span class="hidden-phone"><wicket:message key="gb.commented">[commented]</wicket:message></span></span><p class="attribution-header-pullright" ><span class="attribution-date" wicket:id="changeDate">[comment date]</span><a class="attribution-link" wicket:id="changeLink"><i class="iconic-link"></i></a></p>
232         </div>
233         <div class="markdown attribution-comment">
234             <div class="ticket-text" wicket:id="comment">[comment text]</div>
235         </div>
236     </div>
237 </div>
238 </wicket:fragment>
239
240
241 <!-- STATUS CHANGE FRAGMENT -->
242 <wicket:fragment wicket:id="statusFragment">
243 <div class="row" style="opacity: 0.5;filter: alpha(opacity=50);">
244     <div class="span7 offset1">        
245         <div style="padding: 8px;border: 1px solid translucent;">
246              <span class="indicator-large-dark"><i></i></span><span class="attribution-emphasize" wicket:id="changeAuthor">[author]</span> <span class="attribution-text"><span class="hidden-phone"><wicket:message key="gb.changedStatus">[changed status]</wicket:message></span></span> <span style="padding-left:10px;"><span wicket:id="statusChange"></span></span><p class="attribution-header-pullright" ><span class="attribution-date" wicket:id="changeDate">[comment date]</span><a class="attribution-link" wicket:id="changeLink"><i class="iconic-link"></i></a></p>
247         </div>
248     </div>        
249 </div>
250 </wicket:fragment>
251
252
253 <!-- BOUNDARY FRAGMENT -->
254 <wicket:fragment wicket:id="boundaryFragment">
255 <div class="row" style="padding: 15px 0px 10px 0px;">
256     <div class="span7 offset1" style="border-top: 2px dotted #999;" />
257 </div>
258 </wicket:fragment>
259
260
261 <!-- MERGE/CLOSE FRAGMENT -->
262 <wicket:fragment wicket:id="mergeCloseFragment">
263 <div wicket:id="merge" style="padding-top: 10px;"></div>    
264 <div wicket:id="close"></div>
265 <div wicket:id="boundary"></div>
266 </wicket:fragment>
267
268
269 <!-- MERGE FRAGMENT -->
270 <wicket:fragment wicket:id="mergeFragment">
271 <div class="row">
272     <div class="span7 offset1">
273         <span class="status-change aui-lozenge aui-lozenge-success"><wicket:message key="gb.merged"></wicket:message></span>
274         <span class="attribution-emphasize" wicket:id="changeAuthor">[author]</span> <span class="attribution-text"><wicket:message key="gb.mergedPatchset">[merged patchset]</wicket:message></span>
275         <span class="attribution-emphasize" wicket:id="commitLink">[commit]</span> <span style="padding-left:2px;" wicket:id="toBranch"></span>
276         <p class="attribution-pullright"><span class="attribution-date" wicket:id="changeDate">[change date]</span></p>
277     </div>
278 </div>
279 </wicket:fragment>
280
281
282 <!-- PROPOSE A PATCHSET FRAGMENT -->
283 <wicket:fragment wicket:id="proposeFragment">
284     <div class="featureWelcome">
285         <div class="row">
286             <div class="icon span2 hidden-phone"><i class="fa fa-code"></i></div>
287             <div class="span9">        
288                 <h1><wicket:message key="gb.proposePatchset"></wicket:message></h1>
289                 <div class="markdown">
290                     <p><wicket:message key="gb.proposePatchsetNote"></wicket:message></p>
291                     <p><span wicket:id="proposeInstructions"></span></p>
292                     <h4><span wicket:id="gitWorkflow"></span></h4>
293                     <div wicket:id="gitWorkflowSteps"></div>
294                     <h4><span wicket:id="ptWorkflow"></span> <small><wicket:message key="gb.ptDescription"></wicket:message> (<a href="#ptModal" role="button" data-toggle="modal"><wicket:message key="gb.about"></wicket:message></a>)</small></h4>
295                     <div wicket:id="ptWorkflowSteps"></div>
296                 </div>
297             </div>
298         </div>
299     </div>
300 </wicket:fragment>
301
302
4affd0 303 <!-- CAN NOT PROPOSE FRAGMENT -->
JM 304 <wicket:fragment wicket:id="canNotProposeFragment">
305     <div class="featureWelcome">
306         <div class="row">
307             <div class="icon span2 hidden-phone"><i class="fa fa-ban"></i></div>
308             <div class="span9">        
309                 <h1><wicket:message key="gb.canNotProposePatchset"></wicket:message></h1>
310                 <div class="markdown">
311                     <p><span wicket:id="reason"></span></p>
312                 </div>
313             </div>
314         </div>
315     </div>
316 </wicket:fragment>
317
318
5e3521 319 <!-- PATCHSET FRAGMENT -->
JM 320 <wicket:fragment wicket:id="patchsetFragment">
a0d5c8 321     <div class="row" style="padding: 0px;">
5e3521 322          <div class="span12 attribution-border">
a0d5c8 323              <div wicket:id="mergePanel" style="margin-bottom: 10px;"></div>
JM 324             <div wicket:id="panel"></div>
5e3521 325         </div>
JM 326     </div>
327     
328     <h3><span wicket:id="commitsInPatchset"></span></h3>
329     <div class="row">
330         <div class="span12">
331             <table class="table tickets">
332                 <thead>
333                     <tr>
334                         <th class="hidden-phone"><wicket:message key="gb.author"></wicket:message></th>
335                         <th ><wicket:message key="gb.commit"></wicket:message></th>                        
336                         <th colspan="2"><wicket:message key="gb.title"></wicket:message></th>        
337                         <th style="text-align: right;"><wicket:message key="gb.date"></wicket:message></th>
338                     </tr>
339                 </thead>
340                 <tbody>
341                     <tr wicket:id="commit">
342                         <td class="hidden-phone"><span wicket:id="authorAvatar">[avatar]</span> <span wicket:id="author">[author]</span></td>
343                         <td><span class="shortsha1" wicket:id="commitId">[commit id]</span><span class="hidden-phone" style="padding-left: 20px;" wicket:id="diff">[diff]</span></td>                        
344                         <td><span class="attribution-text" wicket:id="title">[title]</span></td>
345                         <td style="padding:8px 0px;text-align:right;"><span style="padding-right:40px;"><span wicket:id="commitDiffStat"></span></span></td>            
346                         <td style="text-align:right;"><span class="attribution-date" wicket:id="commitDate">[commit date]</span></td>    
347                     </tr>
348                 </tbody>
349             </table>
350         </div>    
351     </div>
352 </wicket:fragment>
353
354
355 <!-- COLLAPSIBLE PATCHSET (temp) -->
356 <wicket:fragment wicket:id="collapsiblePatchsetFragment">
357 <div class="accordion" id="accordionPatchset" style="clear:both;margin: 0px;">
a0d5c8 358 <div class="patch-group" style="margin-bottom: 20px;">
5e3521 359        <div class="accordion-heading">
JM 360         <div class="attribution-patch-pullright">    
361             <div style="padding-bottom: 2px;"> 
362                 <span class="attribution-date" wicket:id="changeDate">[patch date]</span>
363             </div>
364
365             <!-- Client commands menu -->
366             <div class="btn-group pull-right hidden-phone hidden-tablet">
367                 <a class="btn btn-mini btn-appmenu" data-toggle="collapse" data-parent="#accordionCheckout" href="#bodyCheckout"><wicket:message key="gb.checkout"></wicket:message> <span class="caret"></span></a>
368             </div>
369             
370             <!-- Compare Patchsets menu -->
371             <div class="btn-group pull-right hidden-phone hidden-tablet" style="padding-right: 5px;">
372                 <a class="btn btn-mini dropdown-toggle" data-toggle="dropdown" href="#">
373                     <wicket:message key="gb.compare"></wicket:message> <span class="caret"></span>
374                 </a>
375                 <ul class="dropdown-menu">
376                     <li><span wicket:id="compareMergeBase"></span></li>
377                     <li wicket:id="comparePatch"><span wicket:id="compareLink"></span></li>
378                 </ul>
379             </div>
380
381         </div>
382         <div style="padding:8px 10px;">
383             <div>
384             <span class="attribution-emphasize" wicket:id="changeAuthor">[author]</span> <span class="attribution-text"><span wicket:id="uploadedWhat"></span></span>
385             <a wicket:message="title:gb.showHideDetails" data-toggle="collapse" data-parent="#accordionPatchset" href="#bodyPatchset"><i class="fa fa-toggle-down"></i></a>            
386             </div>
387             <div wicket:id="patchsetStat"></div>
388         </div>
389     </div>
390     
391     <div style="padding: 10px;color: #444;background:white;border-top:1px solid #ccc;">
392         <div class="pull-right" wicket:id="reviewControls"></div>
393         <span style="font-weight:bold;padding-right:10px;"><wicket:message key="gb.reviews"></wicket:message></span> <span wicket:id="reviews" style="padding-right:10px;"><i style="font-size:16px;" wicket:id="score"></i> <span wicket:id="reviewer"></span></span>
394     </div>          
395                 
396     <div id="bodyPatchset" class="accordion-body collapse" style="clear:both;">
397         <div class="accordion-inner">
398             <!-- changed paths -->
399             <table class="pretty" style="border: 0px;">
400                 <tr wicket:id="changedPath">
401                     <td class="changeType"><span wicket:id="changeType">[change type]</span></td>
402                     <td class="path"><span wicket:id="pathName">[commit path]</span></td>            
403                     <td class="hidden-phone rightAlign">                        
404                         <span class="hidden-tablet" style="padding-right:20px;" wicket:id="diffStat"></span>
405                         <span class="link" style="white-space: nowrap;">
406                             <a wicket:id="diff"><wicket:message key="gb.diff"></wicket:message></a> | <a wicket:id="view"><wicket:message key="gb.view"></wicket:message></a>
407                         </span>
408                     </td>
409                 </tr>
410             </table>
411         </div>
412     </div>
413 </div>
414 <div id="bodyCheckout" class="accordion-body collapse" style="background-color:#fbfbfb;clear:both;">
415   <div class="alert submit-info" style="padding:4px;">
416     <div class="merge-panel" style="border: 1px solid #F1CB82;">
417       <div class="ticket-text">  
418         <h4><wicket:message key="gb.checkoutViaCommandLine"></wicket:message></h4>
419         <p><wicket:message key="gb.checkoutViaCommandLineNote"></wicket:message></p>
420
421         <h4>Git</h4>
422         <p class="step">
423           <b><span wicket:id="gitStep1"></span>:</b> <wicket:message key="gb.checkoutStep1"></wicket:message> <span wicket:id="gitCopyStep1"></span>
424         </p>
425         <pre wicket:id="gitPreStep1" class="gitcommand"></pre>
426         <p class="step">
427           <b><span wicket:id="gitStep2"></span>:</b> <wicket:message key="gb.checkoutStep2"></wicket:message> <span wicket:id="gitCopyStep2"></span>
428         </p>
429         <pre wicket:id="gitPreStep2" class="gitcommand"></pre>
430         
431         <hr/>
432         <h4>Barnum <small><wicket:message key="gb.ptDescription"></wicket:message> (<a href="#ptModal" role="button" data-toggle="modal"><wicket:message key="gb.about"></wicket:message></a>)</small> </h4>
433         <p class="step">
434           <wicket:message key="gb.ptCheckout"></wicket:message> <span wicket:id="ptCopyStep"></span>
435         </p>
436         <pre wicket:id="ptPreStep" class="gitcommand"></pre>
437      </div>
438    </div>
439  </div>
440 </div>
441 </div>
442 </wicket:fragment>
443
444 <!--ACTIVITY -->
445 <wicket:fragment wicket:id="activityFragment">    
446     <table class="table tickets">
447         <thead>
448             <tr>
449                 <th><wicket:message key="gb.author"></wicket:message></th>
450                 <th colspan='3'><wicket:message key="gb.action"></wicket:message></th>        
451                 <th style="text-align: right;"><wicket:message key="gb.date"></wicket:message></th>
452             </tr>
453         </thead>
454         <tbody>
455             <tr wicket:id="event">
456                 <td><span class="hidden-phone" wicket:id="changeAvatar">[avatar]</span> <span class="attribution-emphasize" wicket:id="changeAuthor">[author]</span></td>
457                 <td>
458                     <span class="attribution-txt"><span wicket:id="what">[what happened]</span></span>
459                     <div wicket:id="fields"></div>
460                 </td>
461                 <td style="text-align:right;">
462                     <span wicket:id="patchsetType">[revision type]</span>                    
463                 </td>
464                 <td><span class="hidden-phone hidden-tablet aui-lozenge aui-lozenge-subtle" wicket:id="patchsetRevision">[R1]</span>
cd7e4f 465                     <span class="fa fa-fw" style="padding-left:15px;"><a wicket:id="deleteRevision" class="fa fa-fw fa-trash delete-patchset"></a></span>
5e3521 466                     <span class="hidden-tablet hidden-phone" style="padding-left:15px;"><span wicket:id="patchsetDiffStat"></span></span>
JM 467                 </td>            
468                 <td style="text-align:right;"><span class="attribution-date" wicket:id="changeDate">[patch date]</span></td>    
469             </tr>
470         </tbody>
471     </table>
472 </wicket:fragment>
473
474
475 <!-- REVIEW CONTROLS -->
476 <wicket:fragment wicket:id="reviewControlsFragment">
477     <div class="btn-group pull-right hidden-phone hidden-tablet">
478         <a class="btn btn-mini dropdown-toggle" data-toggle="dropdown" href="#">
479             <wicket:message key="gb.review"></wicket:message> <span class="caret"></span>
480         </a>
481         <ul class="dropdown-menu">
482             <li><span><a wicket:id="approveLink">approve</a></span></li>
483             <li><span><a wicket:id="looksGoodLink">looks good</a></span></li>
484             <li><span><a wicket:id="needsImprovementLink">needs improvement</a></span></li>
485             <li><span><a wicket:id="vetoLink">veto</a></span></li>
486         </ul>
487     </div>
488 </wicket:fragment>
489
490
491 <!-- MERGEABLE PATCHSET FRAGMENT -->
492 <wicket:fragment wicket:id="mergeableFragment">
493     <div class="alert alert-success submit-info" style="padding:4px;">
494         <div class="merge-panel" style="border: 1px solid rgba(70, 136, 70, 0.5);">
495             <div class="pull-right" style="padding-top:5px;">
496                 <a class="btn btn-success" wicket:id="mergeButton"></a>
497             </div>
498             <h4><i class="fa fa-check-circle"></i> <span wicket:id="mergeTitle"></span></h4>
499             <div wicket:id="mergeMore"></div>
500         </div>
501     </div>
502 </wicket:fragment>
503
504
505 <!-- COMMAND LINE MERGE INSTRUCTIONS -->
506 <wicket:fragment wicket:id="commandlineMergeFragment">
507     <div class="accordion" id="accordionInstructions" style="margin: 0px;">
508         <span wicket:id="instructions"></span>
509         <a wicket:message="title:gb.showHideDetails" data-toggle="collapse" data-parent="#accordionInstructions" href="#bodyInstructions"><i class="fa fa-toggle-down"></i></a>
510     </div>
511
512     <div id="bodyInstructions" class="ticket-text accordion-body collapse" style="clear:both;">
513         <hr/>
514         <h4><wicket:message key="gb.mergingViaCommandLine"></wicket:message></h4>    
515         <p><wicket:message key="gb.mergingViaCommandLineNote"></wicket:message></p>
516         
517         <h4>Git</h4>
518         <p class="step">
519             <b><span wicket:id="mergeStep1"></span>:</b> <wicket:message key="gb.mergeStep1"></wicket:message> <span wicket:id="mergeCopyStep1"></span>
520         </p>
521         <pre wicket:id="mergePreStep1" class="gitcommand"></pre>
522         <p class="step">
523             <b><span wicket:id="mergeStep2"></span>:</b> <wicket:message key="gb.mergeStep2"></wicket:message> <span wicket:id="mergeCopyStep2"></span>
524         </p>
525         <pre wicket:id="mergePreStep2" class="gitcommand"></pre>
526         <p class="step">
527             <b><span wicket:id="mergeStep3"></span>:</b> <wicket:message key="gb.mergeStep3"></wicket:message> <span wicket:id="mergeCopyStep3"></span>
528         </p>
529         <pre wicket:id="mergePreStep3" class="gitcommand"></pre>
530         
531         <hr/>
532         <h4>Barnum <small><wicket:message key="gb.ptDescription"></wicket:message> (<a href="#ptModal" role="button" data-toggle="modal"><wicket:message key="gb.about"></wicket:message></a>)</small></h4>
533         <p class="step">
534           <wicket:message key="gb.ptMerge"></wicket:message> <span wicket:id="ptMergeCopyStep"></span>
535         </p>
536         <pre wicket:id="ptMergeStep" class="gitcommand"></pre>
537     </div>        
538 </wicket:fragment>
539
540
541 <!-- ALREADY MERGED FRAGMENT -->
542 <wicket:fragment wicket:id="alreadyMergedFragment">
543     <div class="alert alert-success submit-info" style="padding:4px;">
544         <div class="merge-panel" style="border: 1px solid rgba(70, 136, 70, 0.5);">
545             <h4><i class="fa fa-check-circle"></i> <span wicket:id="mergeTitle"></span></h4>
546         </div>
547     </div>
548 </wicket:fragment>
549
550
551 <!-- NOT-MERGEABLE FRAGMENT -->
552 <wicket:fragment wicket:id="notMergeableFragment">
553     <div class="alert alert-error submit-info" style="padding:4px;">
554         <div class="merge-panel" style="border: 1px solid rgba(136, 70, 70, 0.5);">
555             <h4><i class="fa fa-exclamation-triangle"></i> <span wicket:id="mergeTitle"></span></h4>
556             <div wicket:id="mergeMore"></div>
557         </div>
558     </div>
559 </wicket:fragment>
560
561 <!-- VETOED PATCHSET FRAGMENT -->
562 <wicket:fragment wicket:id="vetoedFragment">
563     <div class="alert alert-error submit-info" style="padding:4px;">
564         <div class="merge-panel" style="border: 1px solid rgba(136, 70, 70, 0.5);">
565             <h4><i class="fa fa-exclamation-circle"></i> <span wicket:id="mergeTitle"></span></h4>
566             <wicket:message key="gb.patchsetVetoedMore"></wicket:message>
567         </div>
568     </div>
569 </wicket:fragment>
570
571
572 <!-- NOT APPROVED PATCHSET FRAGMENT -->
573 <wicket:fragment wicket:id="notApprovedFragment">
574     <div class="alert alert-info submit-info" style="padding:4px;">
575         <div class="merge-panel" style="border: 1px solid rgba(0, 70, 200, 0.5);">
576             <h4><i class="fa fa-minus-circle"></i> <span wicket:id="mergeTitle"></span></h4>
577             <div wicket:id="mergeMore"></div>            
578         </div>
579     </div>
580 </wicket:fragment>
581
582
583 <!-- Plain JavaScript manual copy & paste -->
584 <wicket:fragment wicket:id="jsPanel">
585       <span style="vertical-align:baseline;">
586           <img wicket:id="copyIcon" wicket:message="title:gb.copyToClipboard"></img>
587       </span>
588 </wicket:fragment>
589     
590
591 <!-- flash-based button-press copy & paste -->
592 <wicket:fragment wicket:id="clippyPanel">
593     <object wicket:message="title:gb.copyToClipboard" style="vertical-align:middle;"
594                wicket:id="clippy"
595                width="14" 
596                height="14"
597                bgcolor="#ffffff" 
598                quality="high"
599                wmode="transparent"
600                scale="noscale"
f9ce9f 601                allowScriptAccess="sameDomain"></object>
5e3521 602 </wicket:fragment>
JM 603     
604 </wicket:extend>    
605 </body>
606 </html>