Skip to content

Commit

Permalink
fix db install
Browse files Browse the repository at this point in the history
  • Loading branch information
@ClicShopping
ClicShopping committed Mar 8, 2022
1 parent 8a59f18 commit 6bd9bd5
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 62 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
Version 3.317
fix db install
remove info application size

-------------
Version 3.316
Expand Down
107 changes: 49 additions & 58 deletions includes/Module/Hooks/ClicShoppingAdmin/Dashboard/ActionInformation.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,84 +44,75 @@ public function execute()

$output = '
<div class="separator"></div>
<div class="col-md-12">
<div class="row">
<div class="col-md-11 mainTable">
<div class="form-group row">
<label for="' . CLICSHOPPING::getDef('title_web_site_size') . '" class="col-9 col-form-label">' . CLICSHOPPING::getDef('title_web_site_size') . '</label>
<div class="col-md-3">
' . IndexAdmin::getSizeReadable(IndexAdmin::getDirSize('.')) . '
<div class="col-md-12">
<div class="row">
<div class="col-md-11 mainTable">
<div class="form-group row">
<label for="' . CLICSHOPPING::getDef('title_db_index') . '" class="col-9 col-form-label">' . CLICSHOPPING::getDef('title_db_index') . '</label>
<div class="col-md-3">
' . DB::sizeDb() . ' MB
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-11 mainTable">
<div class="form-group row">
<label for="' . CLICSHOPPING::getDef('title_db_index') . '" class="col-9 col-form-label">' . CLICSHOPPING::getDef('title_db_index') . '</label>
<div class="col-md-3">
' . DB::sizeDb() . ' MB
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-11 mainTable">
<div class="form-group row">
<label for="System Memory" class="col-9 col-form-label">' . CLICSHOPPING::getDef('title_system_memory') . '</label>
<div class="col-md-3">
' . $memory . ' MB
<div class="row">
<div class="col-md-11 mainTable">
<div class="form-group row">
<label for="System Memory" class="col-9 col-form-label">' . CLICSHOPPING::getDef('title_system_memory') . '</label>
<div class="col-md-3">
' . $memory . ' MB
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-11 mainTable">
<div class="form-group row">
<label for="Bootstrap Core Memory Usage" class="col-9 col-form-label">' . CLICSHOPPING::getDef('title_core_memory') . '</label>
<div class="col-md-3">
<div class="separator"></div>
<div class="progress">
<div class="progress-bar progress-bar-danger progress-bar-striped" role="progressbar" aria-valuenow="' . $valuenow . '" aria-valuemin="0" aria-valuemax="100" style="width: '. $valuenow . '%;">
<strong>' . $valuenow . '%</strong>
</div>
</div>
<div class="row">
<div class="col-md-11 mainTable">
<div class="form-group row">
<label for="Bootstrap Core Memory Usage" class="col-9 col-form-label">' . CLICSHOPPING::getDef('title_core_memory') . '</label>
<div class="col-md-3">
<div class="separator"></div>
<div class="progress">
<div class="progress-bar progress-bar-danger progress-bar-striped" role="progressbar" aria-valuenow="' . $valuenow . '" aria-valuemin="0" aria-valuemax="100" style="width: '. $valuenow . '%;">
<strong>' . $valuenow . '%</strong>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-11 mainTable">
<div class="form-group row">
<label for="' . CLICSHOPPING::getDef('space') . '" class="col-9 col-form-label">' . CLICSHOPPING::getDef('space') . '</label>
<div class="col-md-3">
' . $space_disk . '
<div class="row">
<div class="col-md-11 mainTable">
<div class="form-group row">
<label for="' . CLICSHOPPING::getDef('space') . '" class="col-9 col-form-label">' . CLICSHOPPING::getDef('space') . '</label>
<div class="col-md-3">
' . $space_disk . '
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-11 mainTable">
<div class="form-group row">
<label for="' . CLICSHOPPING::getDef('bandwith') . '" class="col-9 col-form-label">' . CLICSHOPPING::getDef('bandwith') . '</label>
<div class="col-md-3">
' . $bandwidth . '
<div class="row">
<div class="col-md-11 mainTable">
<div class="form-group row">
<label for="' . CLICSHOPPING::getDef('bandwith') . '" class="col-9 col-form-label">' . CLICSHOPPING::getDef('bandwith') . '</label>
<div class="col-md-3">
' . $bandwidth . '
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-11 mainTable">
<div class="form-group row">
<label for="' . CLICSHOPPING::getDef('backup_site') . '" class="col-9 col-form-label">' . CLICSHOPPING::getDef('backup_site') . '</label>
<div class="col-md-3">
' . $backup . '
<div class="row">
<div class="col-md-11 mainTable">
<div class="form-group row">
<label for="' . CLICSHOPPING::getDef('backup_site') . '" class="col-9 col-form-label">' . CLICSHOPPING::getDef('backup_site') . '</label>
<div class="col-md-3">
' . $backup . '
</div>
</div>
</div>
</div>
</div>
</div>
';

return $output;
}
}
4 changes: 2 additions & 2 deletions install/clicshopping_en.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -518,8 +518,8 @@ INSERT INTO administrator_menu_description VALUES(780, 'Featured products', 1);
INSERT INTO administrator_menu_description VALUES(780, 'Produits sélectionnés', 2);
INSERT INTO administrator_menu_description VALUES(781, 'Featured products', 1);
INSERT INTO administrator_menu_description VALUES(781, 'Produits sélectionnés', 2);
INSERT INTO administrator_menu_description VALUES(782, ''Technical documents'', 1);
INSERT INTO administrator_menu_description VALUES(782, ''Documents Techniques'', 2);
INSERT INTO administrator_menu_description VALUES(782, 'Technical documents', 1);
INSERT INTO administrator_menu_description VALUES(782, 'Documents Techniques', 2);


INSERT INTO banners VALUES(1, 'Logo', '', 'logos/others/logo_clicshopping.webp', 'Default_multi_template_logo', '_self', '', 0, NULL, NULL, '2018-07-30 18:11:20', NULL, 1, 0, 99, 'Logo');
Expand Down
4 changes: 2 additions & 2 deletions install/demo_clicshopping_en.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -519,8 +519,8 @@ INSERT INTO administrator_menu_description VALUES(780, 'Featured products', 1);
INSERT INTO administrator_menu_description VALUES(780, 'Produits sélectionnés', 2);
INSERT INTO administrator_menu_description VALUES(781, 'Featured products', 1);
INSERT INTO administrator_menu_description VALUES(781, 'Produits sélectionnés', 2);
INSERT INTO administrator_menu_description VALUES(782, ''Technical documents'', 1);
INSERT INTO administrator_menu_description VALUES(782, ''Documents Techniques'', 2);
INSERT INTO administrator_menu_description VALUES(782, 'Technical documents', 1);
INSERT INTO administrator_menu_description VALUES(782, 'Documents Techniques', 2);


INSERT INTO banners VALUES(1, 'Logo', '', 'logos/others/logo_clicshopping.webp', 'Default_multi_template_logo', '_self', '', NULL, NULL, NULL, '2018-07-26 11:47:52', NULL, 1, 0, 99, 'Logo');
Expand Down

0 comments on commit 6bd9bd5

Please sign in to comment.