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