From c1a1180d1f43a430b38450cb0b64bcd74487b4ae Mon Sep 17 00:00:00 2001 From: Igor Scheller Date: Mon, 10 Sep 2018 17:22:05 +0200 Subject: Moved frontend, templates and lang to resources --- includes/engelsystem.php | 2 +- includes/pages/guest_credits.php | 2 +- includes/pages/user_shifts.php | 2 +- includes/sys_template.php | 55 +++++++++++++++++++++++++--------------- 4 files changed, 38 insertions(+), 23 deletions(-) (limited to 'includes') diff --git a/includes/engelsystem.php b/includes/engelsystem.php index 4c096b43..a5dee186 100644 --- a/includes/engelsystem.php +++ b/includes/engelsystem.php @@ -16,7 +16,7 @@ require __DIR__ . '/includes.php'; * Check for maintenance */ if ($app->get('config')->get('maintenance')) { - echo file_get_contents(__DIR__ . '/../templates/layouts/maintenance.html'); + echo file_get_contents(__DIR__ . '/../resources/views/layouts/maintenance.html'); die(); } diff --git a/includes/pages/guest_credits.php b/includes/pages/guest_credits.php index ecfa8f7c..308e6c94 100644 --- a/includes/pages/guest_credits.php +++ b/includes/pages/guest_credits.php @@ -13,5 +13,5 @@ function credits_title() */ function guest_credits() { - return view(__DIR__ . '/../../templates/pages/credits.html'); + return view(__DIR__ . '/../../resources/views/pages/credits.html'); } diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php index 020cfe54..06a77591 100644 --- a/includes/pages/user_shifts.php +++ b/includes/pages/user_shifts.php @@ -224,7 +224,7 @@ function view_user_shifts() return page([ div('col-md-12', [ msg(), - view(__DIR__ . '/../../templates/pages/user-shifts.html', [ + view(__DIR__ . '/../../resources/views/pages/user-shifts.html', [ 'title' => shifts_title(), 'room_select' => make_select($rooms, $shiftsFilter->getRooms(), 'rooms', _('Rooms')), 'start_select' => html_select_key( diff --git a/includes/sys_template.php b/includes/sys_template.php index 986270b5..19b0c2fa 100644 --- a/includes/sys_template.php +++ b/includes/sys_template.php @@ -1,5 +1,7 @@ 0, and success if number == 0. @@ -450,26 +452,39 @@ function table_body($array) */ function ReplaceSmilies($msg) { - $msg = str_replace(';o))', '', $msg); - $msg = str_replace(':-))', '', $msg); - $msg = str_replace(';o)', '', $msg); - $msg = str_replace(':)', '', $msg); - $msg = str_replace(':-)', '', $msg); - $msg = str_replace(':(', '', $msg); - $msg = str_replace(':-(', '', $msg); - $msg = str_replace(':o(', '', $msg); - $msg = str_replace(':o)', '', $msg); - $msg = str_replace(';o(', '', $msg); - $msg = str_replace(';(', '', $msg); - $msg = str_replace(';-(', '', $msg); - $msg = str_replace('8)', '', $msg); - $msg = str_replace('8o)', '', $msg); - $msg = str_replace(':P', '', $msg); - $msg = str_replace(':-P', '', $msg); - $msg = str_replace(':oP', '', $msg); - $msg = str_replace(';P', '', $msg); - $msg = str_replace(';oP', '', $msg); - $msg = str_replace('?)', '', $msg); + /** @var Assets $assets */ + $assets = app('twig.extension.assets'); + + foreach ( + [ + ';o))' => 'redface', + ':-))' => 'redface', + ';o)' => 'wind', + ':)' => 'smile', + ':-)' => 'smile', + ':(' => 'sad', + ':-(' => 'sad', + ':o(' => 'sad', + ':o)' => 'lol', + ':D' => 'lol', + ';o(' => 'cry', + ';(' => 'cry', + ';-(' => 'cry', + '8)' => 'rolleyes', + '8o)' => 'rolleyes', + ':P' => 'evil', + ':-P' => 'evil', + ':oP' => 'evil', + ';P' => 'mad', + ';oP' => 'mad', + '?)' => 'question', + ] as $search => $replace + ) { + $msg = str_ireplace($search, sprintf( + '', + sprintf($assets->getAsset('emojis/%s.gif'), $replace) + ), $msg); + } return $msg; } -- cgit v1.2.3-54-g00ecf