Project

General

Profile

« Previous | Next » 

Revision 58243

Added by Michele Artini about 4 years ago

partial implementation of merge orgs modal

View differences:

all_conflicts.html
23 23 
			<tr ng-repeat="o in w">
24 24 
				<th style="width:40px" class="text-center">#{{$index+1}}</th>
25 25 
				<td><a href="#!/edit/0/{{o.id}}" title="{{o.id}}">{{o.name}}</a></td>
26 
				<td style="width:200px"><img ng-src="resources/images/flags/{{o.country}}.gif" /> {{o.city}}, {{o.country}}</td>
26 
				<td style="width:250px"><img ng-src="resources/images/flags/{{o.country}}.gif" /> {{o.city}}, {{o.country}}</td>
27 27 
				<td style="width:80px" class="text-right">{{o.type}}</td>
28 28 
			</tr>
29 29 
		</table>
30 30 
		<div class="card-footer bg-secondary py-1">
31 
			<button type="button" class="btn btn-sm btn-primary">merge</button>
31 
			<button type="button"
32 
				class="btn btn-sm btn-primary"
33 
				data-toggle="modal" data-target="#resolveConflictsModal"
34 
				ng-click="prepareConflictsModal(w)">resolve</button>
32 35 
		</div>
33 36 
	</div>
34 
</div>
37 

  		




  
  38
  
    
</div>


  		




  
  39
  
    

  		




  
  40
  
    
<resolve-conflicts-modal modal-id="resolveConflictsModal" orgs="orgs"></resolve-conflicts-modal>


  		












Also available in:  Unified diff