general layout fixing

This commit is contained in:
2024-10-08 16:17:47 +02:00
parent 836eb5881f
commit c3ddf47a7e
6 changed files with 302 additions and 295 deletions
@@ -84,7 +84,11 @@ $arr_his = $importify_his->Results;
font-size: 12px; font-size: 12px;
} }
table.table-bordered.dataTable tbody th, table.table-bordered.dataTable thead td, table.table-bordered.dataTable tbody td, table.table-bordered.dataTable th, table.table-bordered.dataTable td { table.table-bordered.dataTable tbody th,
table.table-bordered.dataTable thead td,
table.table-bordered.dataTable tbody td,
table.table-bordered.dataTable th,
table.table-bordered.dataTable td {
text-align: center !important; text-align: center !important;
} }
@@ -148,6 +152,8 @@ $arr_his = $importify_his->Results;
<div class="card-body"> <div class="card-body">
<h5 class="header-title pb-3 mt-0">Importify: History Import</h5> <h5 class="header-title pb-3 mt-0">Importify: History Import</h5>
<a href="importifydashboard.php"><button type="button" class="btn btn-pink w-md waves-effect waves-light">Importify Dasboard</button></a>
<a href="../index.php"><button type="button" class="btn btn-danger w-md waves-effect waves-light">Reportify Dasboard</button></a>
<br><br> <br><br>
<div class="table-responsive"> <div class="table-responsive">
@@ -257,19 +263,33 @@ $arr_his = $importify_his->Results;
"lengthChange": true, "lengthChange": true,
"lengthMenu": [10, 20, 50, 100], "lengthMenu": [10, 20, 50, 100],
"pageLength": 10, "pageLength": 10,
"columns": [ "columns": [{
{"orderable": true}, "orderable": true
{"orderable": true}, },
{"orderable": true}, {
{"orderable": true}, "orderable": true
{"orderable": false}, },
{
"orderable": true
},
{
"orderable": true
},
{
"orderable": false
},
], ],
oLanguage: { oLanguage: {
oAria: { oAria: {
sSortAscending: ": activate to sort column ascending", sSortAscending: ": activate to sort column ascending",
sSortDescending: ": activate to sort column descending" sSortDescending: ": activate to sort column descending"
}, },
oPaginate: {sFirst: "First", sLast: "Last", sNext: "Next", sPrevious: "Previous"}, oPaginate: {
sFirst: "First",
sLast: "Last",
sNext: "Next",
sPrevious: "Previous"
},
sEmptyTable: "No data available in table", sEmptyTable: "No data available in table",
sInfo: "Showing _START_ to _END_ of _TOTAL_ entries", sInfo: "Showing _START_ to _END_ of _TOTAL_ entries",
sInfoEmpty: "Showing 0 to 0 of 0 entries", sInfoEmpty: "Showing 0 to 0 of 0 entries",
@@ -343,4 +363,5 @@ $arr_his = $importify_his->Results;
</script> </script>
</body> </body>
</html> </html>
@@ -158,10 +158,8 @@
<div class="card-body"> <div class="card-body">
<h5 class="header-title pb-3 mt-0">Importify: <?php echo $dashboard; ?></h5> <h5 class="header-title pb-3 mt-0">Importify: <?php echo $dashboard; ?></h5>
<a class="btn btn-primary" href="insert-importifytemplate.php" role="button">Insert new template</a> <a class="btn btn-primary" href="insert-importifytemplate.php" role="button">Insert new template</a>
<a class="btn btn-success" href="rsl-category.php" role="button">Import File</a>
<a href="history_importify.php"><button type="button" class="btn btn-info w-md waves-effect waves-light">Hystory Import</button></a> <a href="history_importify.php"><button type="button" class="btn btn-info w-md waves-effect waves-light">Hystory Import</button></a>
<a href="importifydashboard.php"><button type="button" class="btn btn-pink w-md waves-effect waves-light">Importify Dasboard</button></a> <a href="../index.php"><button type="button" class="btn btn-danger w-md waves-effect waves-light">Reportify Dasboard</button></a>
<a href="dashboard.php"><button type="button" class="btn btn-danger w-md waves-effect waves-light">Reportify Dasboard</button></a>
<br><br> <br><br>
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped table-sm sm-0"> <table class="table table-striped table-sm sm-0">
@@ -360,6 +358,7 @@
let tmp_analyvoc_idx = 0; let tmp_analyvoc_idx = 0;
let arr_total_compundsvoc = Array(); let arr_total_compundsvoc = Array();
let tmp_compundsvoc_idx = 0; let tmp_compundsvoc_idx = 0;
function show_analysis_add_pop() { function show_analysis_add_pop() {
if (tmp_analyvoc_idx < arr_total_analysisvoc.length) { if (tmp_analyvoc_idx < arr_total_analysisvoc.length) {
show_analysis_add_popup(arr_total_analysisvoc[tmp_analyvoc_idx], function() { show_analysis_add_popup(arr_total_analysisvoc[tmp_analyvoc_idx], function() {
@@ -383,6 +382,7 @@
} }
let tmp_str_arr_kind_option = ''; let tmp_str_arr_kind_option = '';
function show_analysis_add_popup(voc_info, callback) { function show_analysis_add_popup(voc_info, callback) {
let str_word = voc_info['word']; let str_word = voc_info['word'];
let arr_similary = voc_info['arr_similary']; let arr_similary = voc_info['arr_similary'];
@@ -473,6 +473,7 @@
} }
let tmp_str_arr_compunds_kind_option = ''; let tmp_str_arr_compunds_kind_option = '';
function show_compunds_add_popup(voc_info, callback) { function show_compunds_add_popup(voc_info, callback) {
let str_word = voc_info['word']; let str_word = voc_info['word'];
let str_analysis_word = voc_info['anaysis_word']; let str_analysis_word = voc_info['anaysis_word'];
+1 -1
View File
@@ -1,3 +1,3 @@
<footer class="footer"> <footer class="footer">
© 2020 Reportify by CEsoft. © 2024 Reportify by CEsoft.
</footer> </footer>
+17 -20
View File
@@ -41,7 +41,7 @@
</a> </a>
</li> </li>
<li class="has_sub"> <li class="has_sub">
<a href="javascript:void(0);" class="waves-effect"><i class="mdi mdi-bag-checked"></i> <span> <?php echo $mycompany; ?> </span> <span class="float-right"><i class="mdi mdi-chevron-right"></i></span></a> <a href="javascript:void(0);" class="waves-effect"><i class="far fa-building"></i> <span> <?php echo $mycompany; ?> </span> <span class="float-right"><i class="mdi mdi-chevron-right"></i></span></a>
<ul class="list-unstyled"> <ul class="list-unstyled">
<li><a href="<?php echo USERAREA_PATH; ?>general/mycompany.php"><?php echo $mycompany; ?></a></li> <li><a href="<?php echo USERAREA_PATH; ?>general/mycompany.php"><?php echo $mycompany; ?></a></li>
<li><a href="<?php echo USERAREA_PATH; ?>general/department.php"><?php echo $department; ?></a></li> <li><a href="<?php echo USERAREA_PATH; ?>general/department.php"><?php echo $department; ?></a></li>
@@ -76,30 +76,29 @@
<?php if (in_array(6, $activemod)) { ?> <?php if (in_array(6, $activemod)) { ?>
<li class="has_sub"> <li class="has_sub">
<a href="javascript:void(0);" class="waves-effect"><i class="bx bxl-product-hunt"></i> <span> Importify </span> <span class="float-right"><i class="mdi mdi-chevron-right"></i></span></a> <a href="javascript:void(0);" class="waves-effect"><i class="fas fa-upload"></i> <span> Importify </span> <span class="float-right"><i class="mdi mdi-chevron-right"></i></span></a>
<ul class="list-unstyled"> <ul class="list-unstyled">
<li><a href="<?php echo USERAREA_PATH; ?>importify/importifydashboard.php">Importify Dashboard</a></li> <li><a href="<?php echo USERAREA_PATH; ?>importify/importifydashboard.php">Importify Dashboard</a></li>
<li><a href="<?php echo USERAREA_PATH; ?>importify/insert-importifytemplate.php">New Import Templates</a></li> <li><a href="<?php echo USERAREA_PATH; ?>importify/insert-importifytemplate.php">New Import Templates</a></li>
<li><a href="">Import files</a></li> <li><a href="<?php echo USERAREA_PATH; ?>importify/history_importify.php">Import History</a></li>
<li><a href="">Import History</a></li>
</ul> </ul>
</li> </li>
<?php } ?> <?php } ?>
<?php if (in_array(4, $activemod)) { ?> <?php if (in_array(4, $activemod)) { ?>
<li class="has_sub"> <li class="has_sub">
<a href="javascript:void(0);" class="waves-effect"><i class="bx bxl-product-hunt"></i> <span> <?php echo $products; ?> </span> <span class="float-right"><i class="mdi mdi-chevron-right"></i></span></a> <a href="javascript:void(0);" class="waves-effect"><i class="fas fa-tshirt"></i> <span> <?php echo $products; ?> </span> <span class="float-right"><i class="mdi mdi-chevron-right"></i></span></a>
<ul class="list-unstyled"> <ul class="list-unstyled">
<li><a href="<?php echo USERAREA_PATH; ?>products/products.php"><?php echo $products; ?></a></li> <li><a href="<?php echo USERAREA_PATH; ?>products/products.php"><?php echo $products; ?></a></li>
<li><a href="email-read.html"><?php echo $bom; ?></a></li> <!-- <li><a href="email-read.html"><?php echo $bom; ?></a></li>
<li><a href="email-read.html"><?php echo $metadata; ?></a></li> <li><a href="email-read.html"><?php echo $metadata; ?></a></li> -->
</ul> </ul>
</li> </li>
<?php } ?> <?php } ?>
<?php if (in_array(5, $activemod)) { ?> <?php if (in_array(5, $activemod)) { ?>
<li class="has_sub"> <li class="has_sub">
<a href="javascript:void(0);" class="waves-effect"><i class="mdi mdi-human-queue"></i> <span> <?php echo $extcompanies; ?> </span> <span class="float-right"><i class="mdi mdi-chevron-right"></i></span></a> <a href="javascript:void(0);" class="waves-effect"><i class="fas fa-building"></i> <span> <?php echo $extcompanies; ?> </span> <span class="float-right"><i class="mdi mdi-chevron-right"></i></span></a>
<ul class="list-unstyled"> <ul class="list-unstyled">
<li><a href="email-inbox.html"><?php echo $extcompanies; ?></a></li> <li><a href="email-inbox.html"><?php echo $extcompanies; ?></a></li>
<li><a href="email-read.html"><?php echo $companiescontactlist; ?></a></li> <li><a href="email-read.html"><?php echo $companiescontactlist; ?></a></li>
@@ -110,32 +109,30 @@
<?php if (in_array(2, $activemod)) { ?> <?php if (in_array(2, $activemod)) { ?>
<li class="has_sub"> <li class="has_sub">
<a href="javascript:void(0);" class="waves-effect"><i class="fas fa-chart-bar"></i> <span> <?php echo $statistictitle; ?> </span> <span class="float-right"><i class="mdi mdi-chevron-right"></i></span></a> <a href="javascript:void(0);" class="waves-effect"><i class="fas fa-chart-bar"></i> <span> StatKPI </span> <span class="float-right"><i class="mdi mdi-chevron-right"></i></span></a>
<ul class="list-unstyled"> <ul class="list-unstyled">
<li><a href="stats-levelone.php">StatKPI</a></li> <li><a href="<?php echo USERAREA_PATH; ?>statkpi/statkpi.php">StatKPI</a></li>
<li><a href="email-read.html"><?php echo $companiescontactlist; ?></a></li>
<li><a href="email-read.html"><?php echo $categorycompanies; ?></a></li>
</ul> </ul>
</li> </li>
<?php } ?> <?php } ?>
<?php if (in_array(1, $activemod)) { ?> <?php if (in_array(1, $activemod)) { ?>
<li class="has_sub"> <li class="has_sub">
<a href="javascript:void(0);" class="waves-effect"><i class="fas fa-chart-bar"></i> <span> Rate&Go </span> <span class="float-right"><i class="mdi mdi-chevron-right"></i></span></a> <a href="javascript:void(0);" class="waves-effect"><i class="far fa-star"></i></i> <span> Rate&Go </span> <span class="float-right"><i class="mdi mdi-chevron-right"></i></span></a>
<ul class="list-unstyled"> <ul class="list-unstyled">
<li><a href="stats-ratego.php">Rate&GO</a></li> <li><a href="stats-ratego.php">Rate&GO</a></li>
<li><a href="email-read.html"><?php echo $companiescontactlist; ?></a></li>
<li><a href="email-read.html"><?php echo $categorycompanies; ?></a></li>
</ul> </ul>
</li> </li>
<?php } ?> <?php } ?>
<li class="has_sub"> <li class="has_sub">
<a href="tables-basic.html" class="waves-effect"><i class="dripicons-copy"></i><span> <?php echo $contactus; ?> </span> <span class="float-right"><i class="mdi mdi-chevron-right"></i></span></a> <a href="tables-basic.html" class="waves-effect"><i class="far fa-question-circle"></i><span> <?php echo $contactus; ?> </span> <span class="float-right"><i class="mdi mdi-chevron-right"></i></span></a>
<ul class="list-unstyled"> <ul class="list-unstyled">
<li><a href="pages-blank.html"><?php echo $contactusform; ?></a></li> <li><a href="https://cesoft.io/contactus"><?php echo $contactusform; ?></a></li>
<li><a href="pages-blank.html"><?php echo $supportticket; ?></a></li> <li><a href="https://support.cesoft.io/login"><?php echo $supportticket; ?></a></li>
</ul> </ul>
</li> </li>
@@ -143,7 +140,7 @@
<li class="menu-title">Extra</li> <li class="menu-title">Extra</li>
<?php if ((Auth::user()->hasRole('Admin'))) : ?>
<li class="has_sub"> <li class="has_sub">
<a href="tables-basic.html" class="waves-effect"><i class="dripicons-copy"></i><span> Template </span> <span class="float-right"><i class="mdi mdi-chevron-right"></i></span></a> <a href="tables-basic.html" class="waves-effect"><i class="dripicons-copy"></i><span> Template </span> <span class="float-right"><i class="mdi mdi-chevron-right"></i></span></a>
<ul class="list-unstyled"> <ul class="list-unstyled">
@@ -152,7 +149,7 @@
</ul> </ul>
</li> </li>
<?php endif; ?>
</ul> </ul>
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
+2 -2
View File
@@ -29,7 +29,7 @@ $conn->close();
<ul class="list-inline float-right mb-0"> <ul class="list-inline float-right mb-0">
<!-- language--> <!-- language-->
<li class="list-inline-item dropdown notification-list hide-phone"> <!-- <li class="list-inline-item dropdown notification-list hide-phone">
<a class="nav-link dropdown-toggle arrow-none waves-effect text-white" data-toggle="dropdown" href="#" role="button" aria-haspopup="false" aria-expanded="false"> <a class="nav-link dropdown-toggle arrow-none waves-effect text-white" data-toggle="dropdown" href="#" role="button" aria-haspopup="false" aria-expanded="false">
English <img src="<?php echo USERAREA_PATH; ?>assets/images/flags/us_flag.jpg" class="ml-2" height="16" alt="" /> English <img src="<?php echo USERAREA_PATH; ?>assets/images/flags/us_flag.jpg" class="ml-2" height="16" alt="" />
</a> </a>
@@ -39,7 +39,7 @@ $conn->close();
<a class="dropdown-item" href="#"><img src="<?php echo USERAREA_PATH; ?>assets/images/flags/spain_flag.jpg" alt="" height="16" /><span> Spanish </span></a> <a class="dropdown-item" href="#"><img src="<?php echo USERAREA_PATH; ?>assets/images/flags/spain_flag.jpg" alt="" height="16" /><span> Spanish </span></a>
<a class="dropdown-item" href="#"><img src="<?php echo USERAREA_PATH; ?>assets/images/flags/russia_flag.jpg" alt="" height="16" /><span> Russian </span></a> <a class="dropdown-item" href="#"><img src="<?php echo USERAREA_PATH; ?>assets/images/flags/russia_flag.jpg" alt="" height="16" /><span> Russian </span></a>
</div> </div>
</li> </li> -->
<li class="list-inline-item dropdown notification-list"> <li class="list-inline-item dropdown notification-list">
<a class="nav-link dropdown-toggle arrow-none waves-effect" data-toggle="dropdown" href="#" role="button" aria-haspopup="false" aria-expanded="false"> <a class="nav-link dropdown-toggle arrow-none waves-effect" data-toggle="dropdown" href="#" role="button" aria-haspopup="false" aria-expanded="false">
<i class="dripicons-mail noti-icon"></i> <i class="dripicons-mail noti-icon"></i>
-12
View File
@@ -267,19 +267,7 @@ while ($row = $result->fetch_assoc()) {
</div> </div>
<div class="row">
<div class="col-xl-12">
<div class="card">
<div class="card-body">
<h5 class="header-title pb-3 mt-0"><?php echo $dashboard; ?></h5>
<div class="table-responsive">
</div><!--end table-responsive-->
</div>
</div>
</div>
</div>
<!-- end row --> <!-- end row -->
</div><!-- container --> </div><!-- container -->