Project

General

Profile

« Previous | Next » 

Revision 57326

ui

View differences:

relations.html
34 34
						<td class="pl-3"><a href="#!/metadata/{{r.relatedOrgId}}" title="{{r.relatedOrgId}}">{{r.relatedOrgName}}</a></td>
35 35
						<td>{{r.type}}</td>
36 36
						<td class="text-right">
37
							<button type="button" class="btn btn-sm  btn-outline-danger" ng-click="deleteRelation(r.relatedOrgId, r.type)">delete</button>
37
							<button type="button" class="btn btn-sm  btn-outline-danger" ng-click="deleteRelation(r.relatedOrgId, r.type)"><i class="fa fa-trash"></i></button>
38 38
						</td>
39 39
					</tr>
40 40
				</tbody>
......
42 42
		
43 43
			<div class="card-footer">
44 44
				<div class="input-group input-group-sm">
45
				<div class="input-group-prepend">
46
					<div class="input-group-text">New relation</div>
47
				</div>
48
					<select class="custom-select" ng-model="newRelType">
45
					<div class="input-group-prepend">
46
						<div class="input-group-text">New relation</div>
47
					</div>
48
					<input type="text" class="form-control" style="background-color: white; color: #007bff;"
49
						placeholder="organization..." 
50
						ng-model="newRelation.name" 
51
						readonly="readonly"  
52
						data-toggle="modal" data-target="#selectRelatedOrgModal"/>
53
					<select class="custom-select" ng-model="newRelType" data-toggle="modal" data-target="#selectRelatedOrgModal">
49 54
						<option disabled="disabled" value=''>type...</option>
50 55
						<option ng-repeat="t in vocabularies.relTypes">{{t}}</option>
51 56
					</select>
52 57
					<div class="input-group-append">
53
						<button type="button" class="btn btn-outline-success" ng-disabled="!newRelType" data-toggle="modal" data-target="#selectRelatedOrgModal">add</button>
58
						<button type="button" class="btn btn-outline-success" ng-disabled="!newRelType || !newRelation.id" ng-click="addRelation()"><i class="fa fa-plus"></i></button>
54 59
					</div>
55 60
				</div>
56 61
			</div>	
......
63 68
	<div class="modal-dialog modal-xl" role="document">
64 69
		<div class="modal-content">
65 70
			<div class="modal-header">
66
				<h5 class="modal-title">Select Organization ({{newRelType}})</h5>
71
				<h5 class="modal-title">Select Organization</h5>
67 72
				<button type="button" class="close" data-dismiss="modal">&times;</button>
68 73
			</div>
69 74
			<div class="modal-body" style="min-height: 300px">
......
92 97
								<tr class="d-flex">
93 98
									<th class="col-6">Organization name</th>
94 99
									<th class="col-3">Place</th>
95
									<th class="col-1 text-center">Acronyms</th>
96
									<th class="col-1 text-center">Types</th>
97
									<th class="col-1"></th>
100
									<th class="col-2 text-center">Acronyms</th>
101
									<th class="col-1 text-center">Type</th>
98 102
								</tr>
99 103
							</thead>
100 104
							<tbody>
101
								<tr ng-repeat="o in searchOrgs.content" class="d-flex" title="{{o.id}}">
105
								<tr ng-repeat="o in searchOrgs.content" class="d-flex" title="{{o.id}}" ng-click="prepareNewRelation(o)" data-dismiss="modal" style="cursor: pointer;">
102 106
									<td class="col-6">{{o.name}}</td>
103 107
									<td class="col-3"><img ng-src="resources/images/flags/{{o.country}}.gif" /> {{o.city}}, {{o.country}}</td>
104
									<td class="col-1 text-center">{{o.acronyms.join()}}</td>
105
									<td class="col-1 text-center">{{o.types.join()}}</td>
106
									<td class="col-1 text-right"><button type="button" class="btn btn-sm btn-outline-primary" ng-click="addRelation(o.id)" data-dismiss="modal">add</button></td>
108
									<td class="col-2 text-center">{{o.acronyms.join()}}</td>
109
									<td class="col-1 text-center">{{o.type}}</td>
107 110
								</tr>
108 111
							</tbody>
109 112
						</table>

Also available in: Unified diff