Explorar el Código

Restore "Actions" button for locations page

Alan Lam hace 6 años
padre
commit
dff71a0904
Se han modificado 2 ficheros con 28 adiciones y 30 borrados
  1. 4 6
      public/js/app-locations.js
  2. 24 24
      views/locations.php

+ 4 - 6
public/js/app-locations.js

@@ -82,16 +82,12 @@ function initialiseLocations() {
 
 
 		displayInfoWindow(marker);
 		displayInfoWindow(marker);
 
 
-		const method = (exportIds.length > 0) ? "removeClass" : "addClass";
-
-		$("#location-actions")[method]("d-none");
-
+		$createProjectButton.prop("disabled", (exportIds.length === 0));
 	});
 	});
 
 
 	$("#export-csv-button, #export-kml-button").on("click", function(event) {
 	$("#export-csv-button, #export-kml-button").on("click", function(event) {
 
 
 		event.preventDefault();
 		event.preventDefault();
-		if(exportIds.length === 0) return;
 
 
 		const $form = $("#locations-export-form");
 		const $form = $("#locations-export-form");
 		const action = $(event.currentTarget).attr("data-action");
 		const action = $(event.currentTarget).attr("data-action");
@@ -108,7 +104,9 @@ function initialiseLocations() {
 		$form.trigger("submit");
 		$form.trigger("submit");
 	});
 	});
 
 
-	$("#create-project-button").on("click", function(event) {
+	const $createProjectButton = $("#create-project-button");
+
+	$createProjectButton.on("click", function(event) {
 		event.preventDefault();
 		event.preventDefault();
 		if(exportIds.length === 0) return;
 		if(exportIds.length === 0) return;
 
 

+ 24 - 24
views/locations.php

@@ -19,40 +19,40 @@ var customerId = <?=$customer->id?>;
 
 
 <div class="container mt-3 py-4">
 <div class="container mt-3 py-4">
 	<div class="row">
 	<div class="row">
-		<div class="col">
+		<div class="col-lg">
 			<h2>
 			<h2>
 				<?=htmlspecialchars($customer->name)?> Locations
 				<?=htmlspecialchars($customer->name)?> Locations
 				<span class="badge badge-pill badge-primary"><?=number_format(count($locations))?></span>
 				<span class="badge badge-pill badge-primary"><?=number_format(count($locations))?></span>
 			</h2>
 			</h2>
 		</div>
 		</div>
-		<div class="col-auto">
-			<button type="button" class="btn btn-outline-primary" data-toggle="collapse" data-target="#project-filters">
-				Toggle Filters
-				<?php
-				if($filter_count > 0) {
-					?>
-					<span class="badge badge-pill badge-danger"><?=$filter_count?></span>
+		<div class="col-lg-auto">
+			<div class="form-group">
+				<button type="button" class="btn btn-primary" data-toggle="collapse" data-target="#project-filters">
+					Toggle Filters
 					<?php
 					<?php
-				}
-				?>
-			</button>
-		</div>
-		<div class="col-auto d-none" id="location-actions">
-			<div class="dropdown">
-				<button class="btn btn-primary dropdown-toggle" type="button" id="location-actions-button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-					Location Actions
+					if($filter_count > 0) {
+						?>
+						<span class="badge badge-pill badge-danger"><?=$filter_count?></span>
+						<?php
+					}
+					?>
 				</button>
 				</button>
-				<div class="dropdown-menu dropdown-menu-right" aria-labelledby="location-actions-button">
-					<a id="create-project-button" href="#" class="dropdown-item">Create Project...</a>
-					<div class="dropdown-divider"></div>
-					<a id="export-csv-button" class="dropdown-item" href="/account/locations?customer_id=<?=$customer->id?>&amp;action=export" data-action="export">Export CSV</a>
-					<a id="export-kml-button" class="dropdown-item" href="/account/locations?customer_id=<?=$customer->id?>&amp;action=export-kml" data-action="export-kml">Export KML</a>
+
+				<div class="dropdown d-inline-block">
+					<button class="btn btn-primary dropdown-toggle" type="button" id="location-actions-button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+						Actions
+					</button>
+					<div class="dropdown-menu dropdown-menu-right" aria-labelledby="location-actions-button">
+						<button id="create-project-button" class="dropdown-item" disabled>Create Project...</button>
+						<div class="dropdown-divider"></div>
+						<a id="export-csv-button" class="dropdown-item" href="/account/locations?customer_id=<?=$customer->id?>&amp;action=export" data-action="export">Export CSV</a>
+						<a id="export-kml-button" class="dropdown-item" href="/account/locations?customer_id=<?=$customer->id?>&amp;action=export-kml" data-action="export-kml">Export KML</a>
+					</div>
 				</div>
 				</div>
+
+				<a class="btn btn-success" href="/account/locations/add?customer_id=<?=$customer->id?>">Add Location</a>
 			</div>
 			</div>
 		</div>
 		</div>
-		<div class="col-auto">
-			<a class="btn btn-success" href="/account/locations/add?customer_id=<?=$customer->id?>">Add Location</a>
-		</div>
 	</div>
 	</div>
 
 
 	<?php
 	<?php