Skip to content

Commit

Permalink
Timeline Module added, code & design improvements
Browse files Browse the repository at this point in the history
You can now create your own Timeline with a lot of flexibility.

Showcase frontned: https://streamable.com/q6brfn
Showcase backend: https://streamable.com/7gbpqu
  • Loading branch information
yesilmen-vm committed Aug 16, 2022
1 parent 419ac51 commit 717f2ce
Show file tree
Hide file tree
Showing 153 changed files with 2,086 additions and 314 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ composer.lock

#IDE
.idea/*
phpstorm.php

# PHPUnit
/app/phpunit.xml
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ In addition to the existing features of BlizzCMS, some of the added features are

- Functioning vMaNGOS server (on same/another host)
- OS (**Including Windows**)
- PHP 7.2+
- PHP 7.2+ (including 8.1.x - beta)
- Composer
- Web-server (Tested on Nginx, Apache and IIS)
- Database (MySQL/MariaDB)
Expand Down
2 changes: 1 addition & 1 deletion application/config/migration.php
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
| be upgraded / downgraded to.
|
*/
$config['migration_version'] = 41;
$config['migration_version'] = 42;

/*
|--------------------------------------------------------------------------
Expand Down
20 changes: 16 additions & 4 deletions application/config/routes.php
Original file line number Diff line number Diff line change
Expand Up @@ -189,11 +189,11 @@
* Armory
* Information about player, items or guild.
*/
$route[$lang . '/armory'] = 'armory';
$route[$lang . '/armory/search'] = 'armory/search';
$route[$lang . '/armory/result'] = 'armory/result';
$route[$lang . '/armory'] = 'armory';
$route[$lang . '/armory/search'] = 'armory/search';
$route[$lang . '/armory/result'] = 'armory/result';
$route[$lang . '/armory/character/(:num)/(:num)'] = 'armory/character/$2/$3';
$route[$lang . '/armory/guild/(:num)/(:num)'] = 'armory/guild/$2/$3';
$route[$lang . '/armory/guild/(:num)/(:num)'] = 'armory/guild/$2/$3';

/*
* Api
Expand Down Expand Up @@ -393,3 +393,15 @@
* To check the soap connection
*/
$route[$lang . '/admin/checksoap'] = 'admin/checkSoap';

/*
* Timeline
*/
$route[$lang . '/admin/timeline'] = 'admin/manage_timeline';
$route[$lang . '/admin/timeline/create'] = 'admin/create_timeline';
$route[$lang . '/admin/timeline/edit/(:num)'] = 'admin/edit_timeline/$2';
$route[$lang . '/admin/timeline/add'] = 'admin/add_timeline';
$route[$lang . '/admin/timeline/update'] = 'admin/update_timeline';
$route[$lang . '/admin/timeline/delete'] = 'admin/delete_timeline';

$route[$lang . '/timeline'] = 'timeline/index';
2 changes: 1 addition & 1 deletion application/controllers/General.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
defined('BASEPATH') or exit('No direct script access allowed');

/**
* @property $template
* @property Template $template
*/
class General extends CI_Controller
{
Expand Down
14 changes: 14 additions & 0 deletions application/helpers/modules_helper.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,20 @@ function secondsToTime($inputSeconds): string
return implode(', ', $timeParts);
}

/**
* @param $string
* @param int $chars
*
* @return mixed|string
*/
function truncateString($string, int $chars = 100)
{
preg_match('/^.{0,' . $chars . '}(?:.*?)\b/iu', $string, $matches);
$new_string = $matches[0] ?? '';

return ($new_string === $string) ? $string : $new_string . '…';
}

/**
* @param $class
* @param $race
Expand Down
10 changes: 10 additions & 0 deletions application/language/english/admin_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
$lang['admin_nav_download'] = 'Download';
$lang['admin_nav_Tickets'] = 'Tickets';
$lang['admin_nav_manage_tickets'] = 'Manage Tickets';
$lang['admin_nav_timeline'] = 'Timeline';

/*Sections Lang*/
$lang['section_general_settings'] = 'General Settings';
Expand Down Expand Up @@ -75,6 +76,10 @@
$lang['table_header_guid'] = 'Guid';
$lang['table_header_information'] = 'Information';
$lang['table_header_value'] = 'Value';
$lang['table_header_patch'] = 'Patch';
$lang['table_header_date'] = 'Date';
$lang['table_header_image'] = 'Image';
$lang['table_header_order'] = 'Order';

/*Input Placeholder Lang*/
$lang['placeholder_manage_account'] = 'Manage Account';
Expand Down Expand Up @@ -107,6 +112,8 @@
$lang['placeholder_create_download'] = 'Create Download';
$lang['placeholder_edit_download'] = 'Edit Download';
$lang['placeholder_upload_image'] = 'Upload Image';
$lang['placeholder_create_timeline'] = 'Create Timeline Item';
$lang['placeholder_edit_timeline'] = 'Edit Timeline Item';
$lang['placeholder_icon_name'] = 'Icon Name';
$lang['placeholder_category'] = 'Category';
$lang['placeholder_name'] = 'Name';
Expand Down Expand Up @@ -137,6 +144,8 @@
$lang['placeholder_emulator'] = 'Emulator';
$lang['placeholder_size'] = 'Size';
$lang['placeholder_select_type'] = 'Select a Type';
$lang['placeholder_patch'] = 'Select Patch';
$lang['placeholder_date'] = 'Select Date';

/*Config Lang*/
$lang['conf_website_name'] = 'Website Name';
Expand Down Expand Up @@ -189,6 +198,7 @@
$lang['option_disabled'] = 'Disabled';
$lang['option_ssl'] = 'SSL';
$lang['option_tls'] = 'TLS';
$lang['option_none'] = 'None';
$lang['option_everyone'] = 'Everyone';
$lang['option_staff'] = 'STAFF';
$lang['option_all'] = 'STAFF - Everyone';
Expand Down
6 changes: 6 additions & 0 deletions application/language/english/general_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -256,3 +256,9 @@
$lang['email_password_recovery_p1'] = 'Password Recovery Confirmation';
$lang['email_password_recovery_p2'] = 'Password Recovery';
$lang['email_account_activation'] = 'Activate Your %s Account';

/*Timeline Lang*/
$lang['timeline_subtitle'] = 'Content Release Timeline';
$lang['timeline_general'] = 'General';
$lang['timeline_pve'] = 'PvE';
$lang['timeline_pvp'] = 'PvP';
7 changes: 5 additions & 2 deletions application/language/english/notification_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
$lang['notification_name_empty'] = 'Name is empty';
$lang['notification_id_empty'] = 'id is empty';
$lang['notification_reply_empty'] = 'Reply is empty';
$lang['notification_general_error'] = 'Something went wrong.';
$lang['notification_reply_created'] = 'Reply has been sended.';
$lang['notification_reply_updated'] = 'Reply has been updated.';
$lang['notification_reply_deleted'] = 'Reply has been deleted.';
Expand Down Expand Up @@ -112,8 +113,10 @@
$lang['notification_topsite_created'] = 'The topsite has been created.';
$lang['notification_topsite_edited'] = 'The topsite has been edited.';
$lang['notification_topsite_deleted'] = 'The topsite has been deleted.';

$lang['notification_settings_updated'] = 'The settings has been updated.<br>Page will reload now.';
$lang['notification_timeline_created'] = 'The Timeline item has been created.';
$lang['notification_timeline_edited'] = 'The Timeline item has been edited.';
$lang['notification_timeline_deleted'] = 'The Timeline item has been deleted.';
$lang['notification_settings_updated'] = 'The settings have been updated.<br>Page will reload now.';
$lang['notification_module_enabled'] = 'The module has been enabled.';
$lang['notification_module_disabled'] = 'The module has been disabled.';
$lang['notification_migration'] = 'The settings have been set.';
Expand Down
10 changes: 10 additions & 0 deletions application/language/french/admin_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
$lang['admin_nav_download'] = 'Téléchargement';
$lang['admin_nav_Tickets'] = 'Tickets';
$lang['admin_nav_manage_tickets'] = 'Gérer le Tickets';
$lang['admin_nav_timeline'] = 'Timeline';

/*Sections Lang*/
$lang['section_general_settings'] = 'Réglages Généraux';
Expand Down Expand Up @@ -75,6 +76,10 @@
$lang['table_header_guid'] = 'Guid';
$lang['table_header_information'] = 'Information';
$lang['table_header_value'] = 'Valeur';
$lang['table_header_patch'] = 'Patch';
$lang['table_header_date'] = 'Date';
$lang['table_header_image'] = 'Image';
$lang['table_header_order'] = 'Order';

/*Input Placeholder Lang*/
$lang['placeholder_manage_account'] = 'Gérer les Comptes';
Expand Down Expand Up @@ -107,6 +112,8 @@
$lang['placeholder_create_download'] = 'Créer un Téléchargement';
$lang['placeholder_edit_download'] = 'Editer un Téléchargement';
$lang['placeholder_upload_image'] = 'Upload une Image';
$lang['placeholder_create_timeline'] = 'Create Timeline Item';
$lang['placeholder_edit_timeline'] = 'Edit Timeline Item';
$lang['placeholder_icon_name'] = 'Nom d\'Icon';
$lang['placeholder_category'] = 'Categorie';
$lang['placeholder_name'] = 'Nom';
Expand Down Expand Up @@ -137,6 +144,8 @@
$lang['placeholder_emulator'] = 'Emulateur';
$lang['placeholder_size'] = 'Taille';
$lang['placeholder_select_type'] = 'Sélectionner un Type';
$lang['placeholder_patch'] = 'Select Patch';
$lang['placeholder_date'] = 'Select Date';

/*Config Lang*/
$lang['conf_website_name'] = 'Nom du Site';
Expand Down Expand Up @@ -189,6 +198,7 @@
$lang['option_disabled'] = 'Désactivé';
$lang['option_ssl'] = 'SSL';
$lang['option_tls'] = 'TLS';
$lang['option_none'] = 'None';
$lang['option_everyone'] = 'Tout le monde';
$lang['option_staff'] = 'STAFF';
$lang['option_all'] = 'STAFF - Tout le monde';
Expand Down
6 changes: 6 additions & 0 deletions application/language/french/general_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -256,3 +256,9 @@
$lang['email_password_recovery_p1'] = 'Password Recovery Confirmation';
$lang['email_password_recovery_p2'] = 'Password Recovery';
$lang['email_account_activation'] = 'Activate Your %s Account';

/*Timeline Lang*/
$lang['timeline_subtitle'] = 'Content Release Timeline';
$lang['timeline_general'] = 'General';
$lang['timeline_pve'] = 'PvE';
$lang['timeline_pvp'] = 'PvP';
5 changes: 4 additions & 1 deletion application/language/french/notification_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
$lang['notification_name_empty'] = 'Le nom est vide';
$lang['notification_id_empty'] = 'L\'identifiant est vide';
$lang['notification_reply_empty'] = 'La réponse est vide';
$lang['notification_general_error'] = 'Something went wrong.';
$lang['notification_reply_created'] = 'La réponse a été envoyée.';
$lang['notification_reply_updated'] = 'Reply has been updated.';
$lang['notification_reply_deleted'] = 'La réponse a été supprimée.';
Expand Down Expand Up @@ -112,7 +113,9 @@
$lang['notification_topsite_created'] = 'Le topsite a été créée';
$lang['notification_topsite_edited'] = 'Le topsite a été modifié';
$lang['notification_topsite_deleted'] = 'Le topsite a été supprimé';

$lang['notification_timeline_created'] = 'The Timeline item has been created.';
$lang['notification_timeline_edited'] = 'The Timeline item has been edited.';
$lang['notification_timeline_deleted'] = 'The Timeline item has been deleted.';
$lang['notification_settings_updated'] = 'Les paramètres ont été mis à jour.';
$lang['notification_module_enabled'] = 'Le module a été activé.';
$lang['notification_module_disabled'] = 'Le module a été désactivé.';
Expand Down
10 changes: 10 additions & 0 deletions application/language/german/admin_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
$lang['admin_nav_download'] = 'Download';
$lang['admin_nav_Tickets'] = 'Tickets';
$lang['admin_nav_manage_tickets'] = 'Tickets bearbeiten';
$lang['admin_nav_timeline'] = 'Timeline';

/*Sections Lang*/
$lang['section_general_settings'] = 'Allgemeine Einstellungen';
Expand Down Expand Up @@ -75,6 +76,10 @@
$lang['table_header_guid'] = 'Guid';
$lang['table_header_information'] = 'Information';
$lang['table_header_value'] = 'Mänge';
$lang['table_header_patch'] = 'Patch';
$lang['table_header_date'] = 'Date';
$lang['table_header_image'] = 'Image';
$lang['table_header_order'] = 'Order';

/*Input Placeholder Lang*/
$lang['placeholder_manage_account'] = 'Account verwalten';
Expand Down Expand Up @@ -107,6 +112,8 @@
$lang['placeholder_create_download'] = 'Create Download';
$lang['placeholder_edit_download'] = 'Edit Download';
$lang['placeholder_upload_image'] = 'Bild hochladen';
$lang['placeholder_create_timeline'] = 'Create Timeline Item';
$lang['placeholder_edit_timeline'] = 'Edit Timeline Item';
$lang['placeholder_icon_name'] = 'Icon Name';
$lang['placeholder_category'] = 'Kategorie';
$lang['placeholder_name'] = 'Name';
Expand Down Expand Up @@ -137,6 +144,8 @@
$lang['placeholder_emulator'] = 'Emulator';
$lang['placeholder_size'] = 'Size';
$lang['placeholder_select_type'] = 'Select a Type';
$lang['placeholder_patch'] = 'Select Patch';
$lang['placeholder_date'] = 'Select Date';

/*Config Lang*/
$lang['conf_website_name'] = 'Website Name';
Expand Down Expand Up @@ -189,6 +198,7 @@
$lang['option_disabled'] = 'Deaktiviert';
$lang['option_ssl'] = 'SSL';
$lang['option_tls'] = 'TLS';
$lang['option_none'] = 'None';
$lang['option_everyone'] = 'Alle';
$lang['option_staff'] = 'Nur Team';
$lang['option_all'] = 'Nur Team - Alle';
Expand Down
6 changes: 6 additions & 0 deletions application/language/german/general_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -256,3 +256,9 @@
$lang['email_password_recovery_p1'] = 'Password Recovery Confirmation';
$lang['email_password_recovery_p2'] = 'Password Recovery';
$lang['email_account_activation'] = 'Activate Your %s Account';

/*Timeline Lang*/
$lang['timeline_subtitle'] = 'Content Release Timeline';
$lang['timeline_general'] = 'General';
$lang['timeline_pve'] = 'PvE';
$lang['timeline_pvp'] = 'PvP';
5 changes: 4 additions & 1 deletion application/language/german/notification_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
$lang['notification_name_empty'] = 'Name ist nicht ausgefüllt';
$lang['notification_id_empty'] = 'Id ist nicht ausgefüllt';
$lang['notification_reply_empty'] = 'Antwort ist nicht ausgefüllt';
$lang['notification_general_error'] = 'Something went wrong.';
$lang['notification_reply_created'] = 'Antwort wurde gesendet.';
$lang['notification_reply_updated'] = 'Reply has been updated.';
$lang['notification_reply_deleted'] = 'antwort wurde gelöscht.';
Expand Down Expand Up @@ -112,7 +113,9 @@
$lang['notification_topsite_created'] = 'Die Topseite wurde erstellt.';
$lang['notification_topsite_edited'] = 'Die Topseite wurde bearbeitet.';
$lang['notification_topsite_deleted'] = 'Die Topseite wurde gelöscht.';

$lang['notification_timeline_created'] = 'The Timeline item has been created.';
$lang['notification_timeline_edited'] = 'The Timeline item has been edited.';
$lang['notification_timeline_deleted'] = 'The Timeline item has been deleted.';
$lang['notification_settings_updated'] = 'Die Einstellungen wurden aktuallisiert.';
$lang['notification_module_enabled'] = 'Das Modul wurde aktiviert.';
$lang['notification_module_disabled'] = 'Das Modul wurde deaktiviert.';
Expand Down
10 changes: 10 additions & 0 deletions application/language/spanish/admin_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
$lang['admin_nav_download'] = 'Descargas';
$lang['admin_nav_Tickets'] = 'Tickets';
$lang['admin_nav_manage_tickets'] = 'Administrar Tickets';
$lang['admin_nav_timeline'] = 'Timeline';

/*Sections Lang*/
$lang['section_general_settings'] = 'Configuración General';
Expand Down Expand Up @@ -75,6 +76,10 @@
$lang['table_header_guid'] = 'Guid';
$lang['table_header_information'] = 'Información';
$lang['table_header_value'] = 'Valor';
$lang['table_header_patch'] = 'Patch';
$lang['table_header_date'] = 'Date';
$lang['table_header_image'] = 'Image';
$lang['table_header_order'] = 'Order';

/*Input Placeholder Lang*/
$lang['placeholder_manage_account'] = 'Administrar Cuenta';
Expand Down Expand Up @@ -107,6 +112,8 @@
$lang['placeholder_create_download'] = 'Crear una Descarga';
$lang['placeholder_edit_download'] = 'Editar Descarga';
$lang['placeholder_upload_image'] = 'Cargar imagen';
$lang['placeholder_create_timeline'] = 'Create Timeline Item';
$lang['placeholder_edit_timeline'] = 'Edit Timeline Item';
$lang['placeholder_icon_name'] = 'Nombre del icono';
$lang['placeholder_category'] = 'Categoría';
$lang['placeholder_name'] = 'Nombre';
Expand Down Expand Up @@ -137,6 +144,8 @@
$lang['placeholder_emulator'] = 'Emulador';
$lang['placeholder_size'] = 'Tamaño';
$lang['placeholder_select_type'] = 'Selecciona un Tipo';
$lang['placeholder_patch'] = 'Select Patch';
$lang['placeholder_date'] = 'Select Date';

/*Config Lang*/
$lang['conf_website_name'] = 'Nombre del Sitio Web';
Expand Down Expand Up @@ -189,6 +198,7 @@
$lang['option_disabled'] = 'Deshabilitado';
$lang['option_ssl'] = 'SSL';
$lang['option_tls'] = 'TLS';
$lang['option_none'] = 'None';
$lang['option_everyone'] = 'Todos';
$lang['option_staff'] = 'STAFF';
$lang['option_all'] = 'STAFF - Todos';
Expand Down
6 changes: 6 additions & 0 deletions application/language/spanish/general_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -256,3 +256,9 @@
$lang['email_password_recovery_p1'] = 'Password Recovery Confirmation';
$lang['email_password_recovery_p2'] = 'Password Recovery';
$lang['email_account_activation'] = 'Activate Your %s Account';

/*Timeline Lang*/
$lang['timeline_subtitle'] = 'Content Release Timeline';
$lang['timeline_general'] = 'General';
$lang['timeline_pve'] = 'PvE';
$lang['timeline_pvp'] = 'PvP';
5 changes: 4 additions & 1 deletion application/language/spanish/notification_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
$lang['notification_name_empty'] = 'El nombre está vacío';
$lang['notification_id_empty'] = 'El id está vacío';
$lang['notification_reply_empty'] = 'La respuesta está vacía';
$lang['notification_general_error'] = 'Something went wrong.';
$lang['notification_reply_created'] = 'La respuesta ha sido enviada.';
$lang['notification_reply_updated'] = 'Reply has been updated.';
$lang['notification_reply_deleted'] = 'Se ha eliminado la respuesta.';
Expand Down Expand Up @@ -112,7 +113,9 @@
$lang['notification_topsite_created'] = 'El topsite ha sido creado.';
$lang['notification_topsite_edited'] = 'El topsite ha sido editado.';
$lang['notification_topsite_deleted'] = 'El topsite ha sido eliminado.';

$lang['notification_timeline_created'] = 'The Timeline item has been created.';
$lang['notification_timeline_edited'] = 'The Timeline item has been edited.';
$lang['notification_timeline_deleted'] = 'The Timeline item has been deleted.';
$lang['notification_settings_updated'] = 'La configuración ha sido actualizada.';
$lang['notification_module_enabled'] = 'El módulo ha sido habilitado.';
$lang['notification_module_disabled'] = 'El módulo ha sido desactivado.';
Expand Down
Loading

0 comments on commit 717f2ce

Please sign in to comment.