Project-Name-Here/assetflow
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Moved nav items to right place.

Browse Source 
- Applied conventions.
This commit is contained in:
Leon Meier 2023-05-13 01:02:11 +02:00
parent d7794da74b
commit 55ae8d4c8f
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontend/manage/imports/csvImport.eta.html
View File

@ -1,5 +1,5 @@
<%~ E.includeFile("../../partials/head.eta.html", {"title": "Importer - CSV" }) %> <%~ E.includeFile("../../partials/head.eta.html", {"title": "Importer - CSV" }) %>
<%~ E.includeFile("../../partials/controls.eta.html", {"active": "CSV_import" }) %> <%~ E.includeFile("../../partials/controls.eta.html", {"active": "SETT_CSV_IMPORT" }) %>
<h1>Import A CSV File</h1> <h1>Import A CSV File</h1>
Upload a CSV file to import into the database. The CSV file must have the following columns: Upload a CSV file to import into the database. The CSV file must have the following columns:

21
src/frontend/partials/controls.eta.html
View File

@ -63,7 +63,7 @@
<li class="nav-item"> <li class="nav-item">
<a class="nav-link <%= it.active == 'AllItems' ? 'active' : ''%>" href="/items"> <i class="bi bi-list-ul"></i> Items </a> <a class="nav-link <%= it.active == 'AllItems' ? 'active' : ''%>" href="/items"> <i class="bi bi-list-ul"></i> Items </a>
</li> </li>
<!-- <li class="nav-item"> <!-- <li class="nav-item">
<a class="nav-link <%= it.active == 'placeholder' ? 'active' : ''%>" href="#"> Products </a> <a class="nav-link <%= it.active == 'placeholder' ? 'active' : ''%>" href="#"> Products </a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
@ -77,18 +77,6 @@
</li> --> </li> -->
</ul> </ul>
<h6 class="sidebar-heading d-flex justify-content-between align-items-center px-3 mt-4 mb-1 text-muted">
<span>Importer</span>
<a class="link-secondary" href="#" aria-label="Add a new report"> </a>
</h6>
<ul class="nav flex-column mb-2">
<li class="nav-item">
<a class="nav-link <%= it.active == 'CSV_import' ? 'active' : ''%>" href="/manage/import/csv"><i class="bi bi-filetype-csv"></i> CSV Import </a>
</li>
<li class="nav-item">
<a class="nav-link <%= it.active == 'json_import' ? 'active' : ''%>" href="/manage/import/json"> <i class="bi bi-filetype-json"></i>JSON Import </a>
</li>
</ul>
<h6 class="sidebar-heading d-flex justify-content-between align-items-center px-3 mt-4 mb-1 text-muted"> <h6 class="sidebar-heading d-flex justify-content-between align-items-center px-3 mt-4 mb-1 text-muted">
<span>Settings</span> <span>Settings</span>
</h6> </h6>
@ -117,6 +105,13 @@
<li class="nav-item"> <li class="nav-item">
<a class="nav-link <%= it.active == 'SETT_CAT' ? 'active' : ''%>" href="/manage/categories"><i class="bi bi-tag"></i> Manage categories </a> <a class="nav-link <%= it.active == 'SETT_CAT' ? 'active' : ''%>" href="/manage/categories"><i class="bi bi-tag"></i> Manage categories </a>
</li> </li>
<li class="nav-item">
<a class="nav-link <%= it.active == 'SETT_CSV_IMPORT' ? 'active' : ''%>" href="/manage/import/csv"><i class="bi bi-filetype-csv"></i> CSV Import </a>
</li>
<li class="nav-item">
<a class="nav-link <%= it.active == 'SETT_JSON_IMPORT' ? 'active' : ''%>" href="/manage/import/json"> <i class="bi bi-filetype-json"></i> JSON Import</a>
</li>
</ul> </ul>
</div> </div>
</nav> </nav>