From de5805ef521d24e037dfb1ab93f39c50bb4da6eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Mon, 13 Apr 2020 17:43:00 -0300
Subject: [PATCH] Move rte templates to database template directory
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 libraries/classes/Rte/Events.php                        | 8 ++++----
 libraries/classes/Rte/Routines.php                      | 8 ++++----
 libraries/classes/Rte/Triggers.php                      | 8 ++++----
 templates/{rte => database}/events/footer.twig          | 0
 templates/{rte => database}/events/list.twig            | 0
 templates/{rte => database}/events/row.twig             | 0
 templates/{rte => database}/routines/footer.twig        | 0
 templates/{rte => database}/routines/list.twig          | 0
 templates/{rte => database}/routines/parameter_row.twig | 0
 templates/{rte => database}/routines/row.twig           | 0
 templates/{rte => database}/triggers/footer.twig        | 0
 templates/{rte => database}/triggers/list.twig          | 0
 templates/{rte => database}/triggers/row.twig           | 0
 13 files changed, 12 insertions(+), 12 deletions(-)
 rename templates/{rte => database}/events/footer.twig (100%)
 rename templates/{rte => database}/events/list.twig (100%)
 rename templates/{rte => database}/events/row.twig (100%)
 rename templates/{rte => database}/routines/footer.twig (100%)
 rename templates/{rte => database}/routines/list.twig (100%)
 rename templates/{rte => database}/routines/parameter_row.twig (100%)
 rename templates/{rte => database}/routines/row.twig (100%)
 rename templates/{rte => database}/triggers/footer.twig (100%)
 rename templates/{rte => database}/triggers/list.twig (100%)
 rename templates/{rte => database}/triggers/row.twig (100%)

diff --git a/libraries/classes/Rte/Events.php b/libraries/classes/Rte/Events.php
index 09476139aa94..68a10242fe5e 100644
--- a/libraries/classes/Rte/Events.php
+++ b/libraries/classes/Rte/Events.php
@@ -118,7 +118,7 @@ public function main()
                 'DROP EVENT IF EXISTS %s',
                 Util::backquote($item['name'])
             );
-            $rows .= $this->template->render('rte/events/row', [
+            $rows .= $this->template->render('database/events/row', [
                 'db' => $db,
                 'table' => $table,
                 'event' => $item,
@@ -128,7 +128,7 @@ public function main()
             ]);
         }
 
-        echo $this->template->render('rte/events/list', [
+        echo $this->template->render('database/events/list', [
             'db' => $db,
             'table' => $table,
             'items' => $items,
@@ -136,7 +136,7 @@ public function main()
             'select_all_arrow_src' => $pmaThemeImage . 'arrow_' . $text_dir . '.png',
         ]);
 
-        echo $this->template->render('rte/events/footer', [
+        echo $this->template->render('database/events/footer', [
             'db' => $db,
             'table' => $table,
             'has_privilege' => Util::currentUserHasPrivilege('EVENT', $db, $table),
@@ -259,7 +259,7 @@ public function handleEditor()
                         );
                         $this->response->addJSON(
                             'new_row',
-                            $this->template->render('rte/events/row', [
+                            $this->template->render('database/events/row', [
                                 'db' => $db,
                                 'table' => $table,
                                 'event' => $event,
diff --git a/libraries/classes/Rte/Routines.php b/libraries/classes/Rte/Routines.php
index 7b6c4742d47f..79471ea2ffac 100644
--- a/libraries/classes/Rte/Routines.php
+++ b/libraries/classes/Rte/Routines.php
@@ -130,7 +130,7 @@ public function main($type)
             );
         }
 
-        echo $this->template->render('rte/routines/list', [
+        echo $this->template->render('database/routines/list', [
             'db' => $db,
             'table' => $table,
             'items' => $items,
@@ -138,7 +138,7 @@ public function main($type)
             'select_all_arrow_src' => $pmaThemeImage . 'arrow_' . $text_dir . '.png',
         ]);
 
-        echo $this->template->render('rte/routines/footer', [
+        echo $this->template->render('database/routines/footer', [
             'db' => $db,
             'table' => $table,
             'has_privilege' => Util::currentUserHasPrivilege('CREATE ROUTINE', $db, $table),
@@ -802,7 +802,7 @@ public function getParameterRow(array $routine = [], $index = null, $class = '')
             ];
         }
 
-        return $this->template->render('rte/routines/parameter_row', [
+        return $this->template->render('database/routines/parameter_row', [
             'class' => $class,
             'index' => $index,
             'param_directions' => $param_directions,
@@ -1819,7 +1819,7 @@ private function getRow(array $routine, $rowClass = '')
         $hasExportPrivilege = (Util::currentUserHasPrivilege('CREATE ROUTINE', $db)
             && $currentUser == $routineDefiner) || $this->dbi->isSuperuser();
 
-        return $this->template->render('rte/routines/row', [
+        return $this->template->render('database/routines/row', [
             'db' => $db,
             'table' => $table,
             'sql_drop' => $sqlDrop,
diff --git a/libraries/classes/Rte/Triggers.php b/libraries/classes/Rte/Triggers.php
index aa00f41dd5a8..43f0b31ba207 100644
--- a/libraries/classes/Rte/Triggers.php
+++ b/libraries/classes/Rte/Triggers.php
@@ -91,7 +91,7 @@ public function main()
 
         $rows = '';
         foreach ($items as $item) {
-            $rows .= $this->template->render('rte/triggers/row', [
+            $rows .= $this->template->render('database/triggers/row', [
                 'db' => $db,
                 'table' => $table,
                 'trigger' => $item,
@@ -101,7 +101,7 @@ public function main()
             ]);
         }
 
-        echo $this->template->render('rte/triggers/list', [
+        echo $this->template->render('database/triggers/list', [
             'db' => $db,
             'table' => $table,
             'items' => $items,
@@ -109,7 +109,7 @@ public function main()
             'select_all_arrow_src' => $pmaThemeImage . 'arrow_' . $text_dir . '.png',
         ]);
 
-        echo $this->template->render('rte/triggers/footer', [
+        echo $this->template->render('database/triggers/footer', [
             'db' => $db,
             'table' => $table,
             'has_privilege' => Util::currentUserHasPrivilege('TRIGGER', $db, $table),
@@ -226,7 +226,7 @@ public function handleEditor()
                         $insert = true;
                         $this->response->addJSON(
                             'new_row',
-                            $this->template->render('rte/triggers/row', [
+                            $this->template->render('database/triggers/row', [
                                 'db' => $db,
                                 'table' => $table,
                                 'trigger' => $trigger,
diff --git a/templates/rte/events/footer.twig b/templates/database/events/footer.twig
similarity index 100%
rename from templates/rte/events/footer.twig
rename to templates/database/events/footer.twig
diff --git a/templates/rte/events/list.twig b/templates/database/events/list.twig
similarity index 100%
rename from templates/rte/events/list.twig
rename to templates/database/events/list.twig
diff --git a/templates/rte/events/row.twig b/templates/database/events/row.twig
similarity index 100%
rename from templates/rte/events/row.twig
rename to templates/database/events/row.twig
diff --git a/templates/rte/routines/footer.twig b/templates/database/routines/footer.twig
similarity index 100%
rename from templates/rte/routines/footer.twig
rename to templates/database/routines/footer.twig
diff --git a/templates/rte/routines/list.twig b/templates/database/routines/list.twig
similarity index 100%
rename from templates/rte/routines/list.twig
rename to templates/database/routines/list.twig
diff --git a/templates/rte/routines/parameter_row.twig b/templates/database/routines/parameter_row.twig
similarity index 100%
rename from templates/rte/routines/parameter_row.twig
rename to templates/database/routines/parameter_row.twig
diff --git a/templates/rte/routines/row.twig b/templates/database/routines/row.twig
similarity index 100%
rename from templates/rte/routines/row.twig
rename to templates/database/routines/row.twig
diff --git a/templates/rte/triggers/footer.twig b/templates/database/triggers/footer.twig
similarity index 100%
rename from templates/rte/triggers/footer.twig
rename to templates/database/triggers/footer.twig
diff --git a/templates/rte/triggers/list.twig b/templates/database/triggers/list.twig
similarity index 100%
rename from templates/rte/triggers/list.twig
rename to templates/database/triggers/list.twig
diff --git a/templates/rte/triggers/row.twig b/templates/database/triggers/row.twig
similarity index 100%
rename from templates/rte/triggers/row.twig
rename to templates/database/triggers/row.twig