-
Notifications
You must be signed in to change notification settings - Fork 3
/
Copy pathspaces-conflicts.html
389 lines (352 loc) · 15 KB
/
spaces-conflicts.html
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>jBPM Suite</title>
<link href="css/kie-main.css" rel="stylesheet" media="screen, print">
<!-- debugging tool -->
<link rel="stylesheet" href="https://cdn.rawgit.com/srambach/classbxr/5456df40/css/classbxr.css">
<!-- jQuery -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
<!-- Bootstrap JS -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.4/js/bootstrap.min.js"></script>
</head>
<body>
<div class="kie-page">
<a class="kie-skiplink" href="#kie-main-content">Skip to main content</a>
<!-- Masthead -->
<nav class="kie-page__masthead navbar navbar-default navbar-pf " role="navigation">
<div class="navbar-header ">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse-1">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a href="/" class="navbar-brand">
<img class="kie-brand-icon" src="images/kie-ide.png" alt="JBoss BPM Suite"/>
</a>
</div>
<div class="collapse navbar-collapse navbar-collapse-1">
<ul class="nav navbar-nav navbar-iconic">
<li>
<a class="nav-item-iconic" href="bpm-home-rh.html" title="Home"><i class="pficon pficon-home"></i></a>
</li>
</ul>
<ul class="nav navbar-nav kie-yamm">
<li class="dropdown kie-yamm--fw">
<a class="dropdown-toggle nav-item-iconic" id="dropdownMenu2" data-toggle="dropdown" aria-haspopup="true"
aria-expanded="true" tabindex="0">
Menu
<span class="caret"></span>
</a>
<ul class="dropdown-menu kie-yamm__dropdown-menu" aria-labelledby="dropdownMenu2">
<!-- mega menu sections -->
<li class="kie-yamm__section col-xs-12 col-md-3">
<h3 class="kie-yamm__title">Design</h3>
<ul class="kie-yamm__subsection">
<li><a href="#">Projects</a></li>
<li><a href="#">Dashboards</a></li>
</ul>
</li>
<li class="kie-yamm__section col-xs-12 col-md-3">
<h3 class="kie-yamm__title">Configure</h3>
<ul class="kie-yamm__subsection">
<li><a href="#">Deployments</a></li>
<li><a href="#">Execution Servers</a></li>
</ul>
</li>
<li class="kie-yamm__section col-xs-12 col-md-3 ">
<h3 class="kie-yamm__title">Manage</h3>
<ul class="kie-yamm__subsection">
<li><a href="#">Process Definitions</a></li>
<li><a href="#">Process Instances</a></li>
<li><a href="#">Jobs</a></li>
</ul>
</li>
<li class="kie-yamm__section col-xs-12 col-md-3">
<h3 class="kie-yamm__title">Track</h3>
<ul class="kie-yamm__subsection">
<li><a href="#">Task Lists</a></li>
<li><a href="#">Task Reports</a></li>
<li><a href="#">Process Reports</a></li>
<li><a href="#">Business Dashboards</a></li>
</ul>
</li>
</ul>
</li>
</ul>
<ul class="nav navbar-nav navbar-right navbar-iconic">
<li class="dropdown">
<a href="#" class="dropdown-toggle nav-item-iconic" id="dropdownMenu3" data-toggle="dropdown" aria-haspopup="true">
<span title="Applications" class="fa fa-th"></span>
</a>
<ul class="dropdown-menu" aria-labelledby="dropdownMenu3">
<li><a href="">Application 1</a></li>
<li><a href="">Application 2</a></li>
<li><a href="">Application 3</a></li>
</ul>
</li>
<li>
<a class="nav-item-iconic" href="#help" data-toggle="modal" title="Help"><i class="fa fa-question"></i></a>
</li>
<li>
<a class="nav-item-iconic" href="settings.html" title="Settings"><i class="pficon pficon-equalizer"></i></a>
</li>
<li class="dropdown">
<a class="dropdown-toggle nav-item-iconic" id="dropdownMenu4" data-toggle="dropdown" aria-haspopup="true"
aria-expanded="true" tabindex="0">
<span title="Username" class="pficon pficon-user"></span>
Brian Johnson
<span class="caret"></span>
</a>
<ul class="dropdown-menu" aria-labelledby="dropdownMenu4">
<li><a href="#about" data-toggle="modal">About</a></li>
<li><a href="#">Log Out</a></li>
</ul>
</li>
</ul>
</div>
</nav>
<main role="main" id="kie-main-content" tabindex="-1" class="kie-page__content ">
<div class="container-fluid ">
<!-- Breadcrumb row -->
<div class="row">
<div class="col-xs-12">
<ol class="breadcrumb">
<li>
<a href="#">Spaces</a>
</li>
<li class="active"> <strong>Space Name</strong>
</li>
</ol>
</div>
</div>
<!-- Page Title Row -->
<div class="row">
<div class="col-sm-12 page-header kie-page-header">
<div class="actions pull-right">
<button type="button" class="btn btn-default">Cancel</button>
<button type="button" class="btn btn-primary">Resolve</button>
</div>
<h1>Resolve conflicts</h1>
</div>
</div>
<!-- Tab nav row -->
<div class="row" >
<div class="col-xs-12">
<ul class="nav nav-tabs nav-tabs-pf">
<li class="active"><a href="#">Projects <span class="badge">0</span></a></li>
<li><a href="#">Contributors <span class="badge">12</span></a></li>
<li><a href="#">Metrics</a></li>
<li><a href="#">Settings</a></li>
</ul>
</div>
</div>
<!-- Content -->
<div class="row kie-row--tabcontent kie-row--inverse kie-row--topPadding">
<div class="col-xs-12 col-md-6 col-lg-4 " id="" >
<form role="form">
<div class="form-group">
<label for="kieSummaryInput">Summary</label>
<input type="text" class="form-control" id="kieSummaryInput">
</div>
<div class="form-group">
<label for="kieDescriptionInput">Description</label>
<textarea class="form-control" id="kieDescriptionInput"></textarea>
</div>
</form>
</div>
<div class="col-xs-12 col-md-6 col-lg-8 " id="" >
<label for="">2 files changed with 140 deletions</label>
<div class="panel-group kie__panel-group">
<div class="panel kie__panel">
<div class="panel-heading kie-panel-header">
<div class="panel-title ">
<a data-toggle="collapse" data-target="#kieFile1"
href="#kieFile1">First File Name</a>
</div>
</div>
<div id="kieFile1" class="panel-collapse collapse in">
<div class="panel-body kie__panel-body">
<table class="kie-table--codeview">
<tr>
<td class="kie-table--codeview__linenumber">1</td>
<td class="kie-table--codeview__code"><!doctype html></td>
</tr>
<tr>
<td class="kie-table--codeview__linenumber">2</td>
<td class="kie-table--codeview__code"><html lang="en"></td>
</tr>
<tr>
<td class="kie-table--codeview__linenumber">3</td>
<td class="kie-table--codeview__code"><head></td>
</tr>
<tr class="">
<td class="kie-table--codeview__linenumber">4</td>
<td class="kie-table--codeview__code"> <meta charset="utf-8"></td>
</tr>
<tr class="">
<td class="kie-table--codeview__linenumber">5</td>
<td class="kie-table--codeview__code"> <title></title></td>
</tr>
<tr class="kie-table--codeview__line--deleted">
<td class="kie-table--codeview__linenumber">7</td>
<td class="kie-table--codeview__code"></head></td>
</tr>
<tr class="kie-table--codeview__line--added">
<td class="kie-table--codeview__linenumber">6</td>
<td class="kie-table--codeview__code"> <link rel="stylesheet" href="css/style.css"></td>
</tr>
<tr class="kie-table--codeview__line--added">
<td class="kie-table--codeview__linenumber">7</td>
<td class="kie-table--codeview__code"></head></td>
</tr>
<tr>
<td class="kie-table--codeview__linenumber">8</td>
<td class="kie-table--codeview__code"><body></td>
</tr>
<tr>
<td class="kie-table--codeview__linenumber">9</td>
<td class="kie-table--codeview__code"> <header></header></td>
</tr>
<tr>
<td class="kie-table--codeview__linenumber">10</td>
<td class="kie-table--codeview__code"> <div role="main"></div></td>
</tr>
<tr>
<td class="kie-table--codeview__linenumber">11</td>
<td class="kie-table--codeview__code"> <footer></footer></td>
</tr>
<tr class="kie-table--codeview__line--added">
<td class="kie-table--codeview__linenumber">12</td>
<td class="kie-table--codeview__code"> <script src="js/script.js"></script></td>
</tr>
<tr>
<td class="kie-table--codeview__linenumber">13</td>
<td class="kie-table--codeview__code"></body></td>
</tr>
<tr>
<td class="kie-table--codeview__linenumber">14000</td>
<td class="kie-table--codeview__code"></html></td>
</tr>
</table>
</div>
</div>
</div>
</div>
<div class="panel-group kie__panel-group">
<div class="panel kie__panel">
<div class="panel-heading kie-panel-header">
<div class="panel-title ">
<a data-toggle="collapse" data-target="#kieFile2"
href="#kieFile2">Second File Name</a>
</div>
</div>
<div id="kieFile2" class="panel-collapse collapse in">
<div class="panel-body kie__panel-body">
<div style="overflow:auto;max-width:100%;"><img src="images/example_diagram.png" alt="" style="overflow:auto;"/></div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</main>
</div><!-- kie-page -->
<!-- Help modal -->
<div class="modal fade" id="help">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
<span class="pficon pficon-close"></span>
</button>
<h4 class="modal-title">Help</h4>
</div>
<div class="modal-body">
<div><img src="img/help.png" alt="" style="width: 568px;"/></div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
</div>
</div>
</div>
</div>
<!-- About Modal -->
<div class="modal fade" id="about" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content about-modal-pf">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
<span class="pficon pficon-close"></span>
</button>
</div>
<div class="modal-body">
<h1 id="aboutModalTitle">
<img class="kie-brand-icon" src="images/jbpm_logo_noshadow_100px.png" alt="JBoss BPM Suite"/>
</h1>
<div class="product-versions-pf">
<ul class="list-unstyled" id="aboutModalVersions">
<li><strong>Version</strong> 0.0</li>
</ul>
</div>
<div class="trademark-pf">
jBPM is open source software, released under the <br>
<strong>Apache Software License 2.0</strong>.
</div>
</div>
</div>
</div>
</div>
<!-- Preferences modal -->
<div class="modal fade" id="preferences">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
<span class="pficon pficon-close"></span>
</button>
<h4 class="modal-title">Preferences</h4>
</div>
<div class="modal-body">
<div class="form-group">
<label class="control-label">Language</label>
<select class="form-control">
<option value="default">English</option>
<option value="de">German</option>
<option value="es">Spanish</option>
<option value="fr">French</option>
<option value="ja">Japanese</option>
<option value="pt_BR">Portuguese</option>
<option value="zh_CN">Chinese (Simplified)</option>
</select>
</div>
<div class="form-group">
<label class="control-label">View Mode</label>
<div class="radio">
<label><input type="radio" name="optradio">Basic</label>
</div>
<div class="radio">
<label><input type="radio" name="optradio">Compact</label>
</div>
<div class="radio">
<label><input type="radio" name="optradio">Advanced</label>
</div>
</div>
<div class="form-group">
<label class="control-label">Layouts</label>
<p><a href="#">Reset Perspective Layouts</a></p>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
<button type="button" class="btn btn-primary" data-dismiss="modal">OK</button>
</div>
</div>
</div>
</div>
</body>
</html>