Skip to content

Commit

Permalink
Finished File Entity Renaming process
Browse files Browse the repository at this point in the history
  • Loading branch information
johnnyq committed Feb 5, 2022
1 parent 559d055 commit 278b243
Show file tree
Hide file tree
Showing 123 changed files with 114 additions and 207 deletions.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions accounts.php
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
</tr>

<?php
include("edit_account_modal.php");
include("account_edit_modal.php");
}
?>

Expand All @@ -135,7 +135,7 @@

<?php

include("add_account_modal.php");
include("account_add_modal.php");

include("footer.php");

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions calendar_events.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

<?php

include("add_calendar_event_modal.php");
include("add_calendar_modal.php");
include("calendar_event_add_modal.php");
include("calendar_add_modal.php");
include("add_quick_modal.php");

?>
Expand All @@ -35,7 +35,7 @@
$calendar_color = $row['calendar_color'];
$client_id = $row['event_client_id'];

include("edit_calendar_event_modal.php");
include("calendar_event_edit_modal.php");

}

Expand Down
4 changes: 2 additions & 2 deletions categories.php
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@

//$colors_diff = array_diff($colors_array,$colors_used_array);

include("edit_category_modal.php");
include("category_edit_modal.php");

}

Expand All @@ -155,7 +155,7 @@

<?php

include("add_category_modal.php");
include("category_add_modal.php");

include("footer.php");

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion client.php
Original file line number Diff line number Diff line change
Expand Up @@ -261,8 +261,8 @@

include("client_routes.php");
include("client_edit_modal.php");
include("add_quick_modal.php");
include("client_delete_modal.php");
include("category_quick_add_modal.php");

}

Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion add_asset_csv_modal.php → client_asset_import_modal.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="modal" id="addAssetCSVModal" tabindex="-1">
<div class="modal" id="importAssetModal" tabindex="-1">
<div class="modal-dialog">
<div class="modal-content bg-dark">
<div class="modal-header">
Expand Down
8 changes: 4 additions & 4 deletions client_assets.php
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
<div class="col-md-2">
<div class="float-right">
<a href="post.php?export_client_<?php echo $_GET['tab']; ?>_csv=<?php echo $client_id; ?>" class="btn btn-default"><i class="fa fa-fw fa-download"></i> Export</a>
<button type="button" class="btn btn-default" data-toggle="modal" data-target="#addAssetCSVModal"><i class="fa fa-fw fa-upload"></i> Import</button>
<button type="button" class="btn btn-default" data-toggle="modal" data-target="#importAssetModal"><i class="fa fa-fw fa-upload"></i> Import</button>
</div>
</div>

Expand Down Expand Up @@ -344,7 +344,7 @@

<?php

include("edit_asset_modal.php");
include("client_asset_edit_modal.php");
}

?>
Expand All @@ -357,6 +357,6 @@
</div>

<?php
include("add_asset_modal.php");
include("add_asset_csv_modal.php");
include("client_asset_add_modal.php");
include("client_asset_import_modal.php");
?>
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions client_certificates.php
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@

<?php

include("edit_certificate_modal.php");
include("client_certificate_edit_modal.php");
}

?>
Expand All @@ -136,7 +136,7 @@
</div>
</div>

<?php include("add_certificate_modal.php"); ?>
<?php include("client_certificate_add_modal.php"); ?>

<script type="text/javascript">
function fetchSSL()
Expand Down
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions client_contacts.php
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@

<?php

include("edit_contact_modal.php");
include("client_contact_edit_modal.php");

}

Expand All @@ -201,4 +201,4 @@
</div>
</div>

<?php include("add_contact_modal.php"); ?>
<?php include("client_contact_add_modal.php"); ?>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
8 changes: 4 additions & 4 deletions client_documents.php
Original file line number Diff line number Diff line change
Expand Up @@ -169,13 +169,13 @@
<a class="dropdown-item text-danger" href="post.php?delete_document=<?php echo $document_id; ?>">Delete</a>
</div>
</div>
<?php include("view_document_modal.php"); ?>
<?php include("client_document_view_modal.php"); ?>
</td>
</tr>

<?php

include("edit_document_modal.php");
include("client_document_edit_modal.php");
}

?>
Expand All @@ -187,5 +187,5 @@
</div>
</div>

<?php include("add_document_modal.php"); ?>
<?php include("manage_document_tags_modal.php"); ?>
<?php include("client_document_add_modal.php"); ?>
<?php include("client_document_tags_modal.php"); ?>
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions client_domains.php
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@

<?php

include("edit_domain_modal.php");
include("client_domain_edit_modal.php");
}

?>
Expand All @@ -145,4 +145,4 @@
</div>
</div>

<?php include("add_domain_modal.php"); ?>
<?php include("client_domain_add_modal.php"); ?>
6 changes: 3 additions & 3 deletions client_events.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<div id='calendar'></div>
</div>

<?php include("add_calendar_event_modal.php"); ?>
<?php include("add_calendar_modal.php"); ?>
<?php include("calendar_event_add_modal.php"); ?>
<?php include("calendar_add_modal.php"); ?>

<?php
?>
Expand All @@ -32,7 +32,7 @@
$calendar_name = $row['calendar_name'];
$calendar_color = $row['calendar_color'];

include("edit_calendar_event_modal.php");
include("calendar_event_edit_modal.php");

}

Expand Down
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions client_files.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
</div>

<?php
include("view_file_modal.php");
include("client_file_view_modal.php");
}
?>
</div>
Expand Down Expand Up @@ -101,4 +101,4 @@
</div>
</div>

<?php include("add_file_modal.php"); ?>
<?php include("client_file_add_modal.php"); ?>
6 changes: 3 additions & 3 deletions client_invoices.php
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,8 @@

<?php

include("add_invoice_copy_modal.php");
include("edit_invoice_modal.php");
include("invoice_copy_modal.php");
include("invoice_edit_modal.php");
}

?>
Expand All @@ -186,4 +186,4 @@
</div>
</div>

<?php include("add_invoice_modal.php"); ?>
<?php include("invoice_add_modal.php"); ?>
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions client_locations.php
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
<a class="dropdown-item text-danger" href="post.php?delete_location=<?php echo $location_id; ?>">Delete</a>
</div>
</div>
<?php include("edit_location_modal.php"); ?>
<?php include("client_location_edit_modal.php"); ?>
</td>
</tr>

Expand All @@ -162,4 +162,4 @@
</div>
</div>

<?php include("add_location_modal.php"); ?>
<?php include("client_location_add_modal.php"); ?>
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions client_logins.php
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@

<?php

include("edit_login_modal.php");
include("client_login_edit_modal.php");
}

?>
Expand All @@ -167,4 +167,4 @@
</div>
</div>

<?php include("add_login_modal.php"); ?>
<?php include("client_login_add_modal.php"); ?>
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions client_networks.php
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@

<?php

include("edit_network_modal.php");
include("client_network_edit_modal.php");
}

?>
Expand All @@ -160,4 +160,4 @@
</div>
</div>

<?php include("add_network_modal.php"); ?>
<?php include("client_network_add_modal.php"); ?>
6 changes: 3 additions & 3 deletions client_quotes.php
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,8 @@

<?php

include("edit_quote_modal.php");
include("add_quote_copy_modal.php");
include("quote_edit_modal.php");
include("quote_copy_modal.php");
}

?>
Expand All @@ -176,4 +176,4 @@
</div>
</div>

<?php include("add_quote_modal.php"); ?>
<?php include("quote_add_modal.php"); ?>
4 changes: 2 additions & 2 deletions client_recurring.php → client_recurring_invoices.php
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
</tr>

<?php
include("edit_recurring_modal.php");
include("recurring_invoice_edit_modal.php");
}

?>
Expand All @@ -165,4 +165,4 @@
</div>
</div>

<?php include("add_recurring_modal.php"); ?>
<?php include("recurring_invoice_add_modal.php"); ?>
4 changes: 2 additions & 2 deletions client_routes.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
elseif($_GET['tab'] == "invoices"){
include("client_invoices.php");
}
elseif($_GET['tab'] == "recurring"){
include("client_recurring.php");
elseif($_GET['tab'] == "recurring_invoices"){
include("client_recurring_invoices.php");
}
elseif($_GET['tab'] == "payments"){
include("client_payments.php");
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions client_services.php
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@
ON service_documents.document_id = documents.document_id
WHERE service_id = '$service_id'");

include("service_edit_modal.php");
include("service_view_modal.php");
include("client_service_edit_modal.php");
include("client_service_view_modal.php");

}
?>
Expand All @@ -158,4 +158,4 @@
</div>
</div>

<?php include("service_add_modal.php"); ?>
<?php include("client_service_add_modal.php"); ?>
2 changes: 1 addition & 1 deletion client_side_nav.php
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@
</li>

<li class="nav-item">
<a href="?client_id=<?php echo $client_id; ?>&tab=recurring" class="nav-link <?php if($_GET['tab'] == "recurring") { echo "active"; } ?>">
<a href="?client_id=<?php echo $client_id; ?>&tab=recurring_invoices" class="nav-link <?php if($_GET['tab'] == "recurring_invoices") { echo "active"; } ?>">
<i class="nav-icon fas fa-sync-alt"></i>
<p>
Recurring
Expand Down
4 changes: 2 additions & 2 deletions client_software.php
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@

<?php

include("edit_software_modal.php");
include("client_software_edit_modal.php");
}

?>
Expand All @@ -183,4 +183,4 @@
</div>
</div>

<?php include("add_software_modal.php"); ?>
<?php include("client_software_add_modal.php"); ?>
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions client_trips.php
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@

<?php

include("add_trip_copy_modal.php");
include("edit_trip_modal.php");
include("trip_copy_modal.php");
include("trip_edit_modal.php");
}

?>
Expand All @@ -161,4 +161,4 @@
</div>
</div>

<?php include("add_trip_modal.php"); ?>
<?php include("trip_add_modal.php"); ?>
Loading

0 comments on commit 278b243

Please sign in to comment.