Moved frontend, templates and lang to resources

4 files changed, 38 insertions, 23 deletions

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 @@
 <?php
 
+use Engelsystem\Renderer\Twig\Extensions\Assets;
+
 /**
  * Render a stat for dashborad (big number with label).
  * If no style given, style is danger if number > 0, and success if number == 0.
@@ -450,26 +452,39 @@ function table_body($array)
  */
 function ReplaceSmilies($msg)
 {
-    $msg = str_replace(';o))', '<img src="pic/smiles/icon_redface.gif">', $msg);
-    $msg = str_replace(':-))', '<img src="pic/smiles/icon_redface.gif">', $msg);
-    $msg = str_replace(';o)', '<img src="pic/smiles/icon_wind.gif">', $msg);
-    $msg = str_replace(':)', '<img src="pic/smiles/icon_smile.gif">', $msg);
-    $msg = str_replace(':-)', '<img src="pic/smiles/icon_smile.gif">', $msg);
-    $msg = str_replace(':(', '<img src="pic/smiles/icon_sad.gif">', $msg);
-    $msg = str_replace(':-(', '<img src="pic/smiles/icon_sad.gif">', $msg);
-    $msg = str_replace(':o(', '<img src="pic/smiles/icon_sad.gif">', $msg);
-    $msg = str_replace(':o)', '<img src="pic/smiles/icon_lol.gif">', $msg);
-    $msg = str_replace(';o(', '<img src="pic/smiles/icon_cry.gif">', $msg);
-    $msg = str_replace(';(', '<img src="pic/smiles/icon_cry.gif">', $msg);
-    $msg = str_replace(';-(', '<img src="pic/smiles/icon_cry.gif">', $msg);
-    $msg = str_replace('8)', '<img src="pic/smiles/icon_rolleyes.gif">', $msg);
-    $msg = str_replace('8o)', '<img src="pic/smiles/icon_rolleyes.gif">', $msg);
-    $msg = str_replace(':P', '<img src="pic/smiles/icon_evil.gif">', $msg);
-    $msg = str_replace(':-P', '<img src="pic/smiles/icon_evil.gif">', $msg);
-    $msg = str_replace(':oP', '<img src="pic/smiles/icon_evil.gif">', $msg);
-    $msg = str_replace(';P', '<img src="pic/smiles/icon_mad.gif">', $msg);
-    $msg = str_replace(';oP', '<img src="pic/smiles/icon_mad.gif">', $msg);
-    $msg = str_replace('?)', '<img src="pic/smiles/icon_question.gif">', $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(
+            '<img src="%s">',
+            sprintf($assets->getAsset('emojis/%s.gif'), $replace)
+        ), $msg);
+    }
 
     return $msg;
 }