From a35f8798f484d60c1b533661ff978833309e3557 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Wed, 3 May 2017 13:06:01 -0300 Subject: [PATCH 1/2] Port some templates to Twig MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- libraries/Template.php | 2 ++ libraries/twig/SanitizeExtension.php | 35 +++++++++++++++++++ libraries/twig/UtilExtension.php | 28 ++++++++++----- scripts/generate-twig-cache | 2 ++ .../column_adjust_privileges.phtml | 18 ---------- .../column_adjust_privileges.twig | 16 +++++++++ .../column_auto_increment.phtml | 8 ----- .../column_auto_increment.twig | 7 ++++ .../columns_definitions/column_extra.phtml | 7 ---- .../columns_definitions/column_extra.twig | 7 ++++ .../columns_definitions/column_indexes.phtml | 30 ---------------- .../columns_definitions/column_indexes.twig | 24 +++++++++++++ .../columns_definitions/column_length.phtml | 11 ------ .../columns_definitions/column_length.twig | 11 ++++++ .../columns_definitions/column_null.phtml | 8 ----- .../columns_definitions/column_null.twig | 8 +++++ .../columns_definitions/column_type.phtml | 8 ----- .../columns_definitions/column_type.twig | 8 +++++ .../transformation_option.phtml | 9 ----- .../transformation_option.twig | 9 +++++ ...panel.phtml => aggregate_query_panel.twig} | 19 +++++----- .../designer/{canvas.phtml => canvas.twig} | 2 +- ...panel.phtml => delete_relation_panel.twig} | 10 +++--- ...ry_panel.phtml => having_query_panel.twig} | 21 +++++------ ...on_panel.phtml => new_relation_panel.twig} | 10 +++--- ...options_panel.phtml => options_panel.twig} | 34 +++++++++--------- ...me_to_panel.phtml => rename_to_panel.twig} | 16 ++++----- ...ery_panel.phtml => where_query_panel.twig} | 16 +++++---- .../database/structure/browse_table.phtml | 3 -- .../database/structure/browse_table.twig | 3 ++ .../structure/browse_table_label.phtml | 3 -- .../structure/browse_table_label.twig | 3 ++ .../database/structure/empty_table.phtml | 3 -- templates/database/structure/empty_table.twig | 4 +++ .../print_view_data_dictionary_link.phtml | 7 ---- .../print_view_data_dictionary_link.twig | 8 +++++ .../database/structure/search_table.phtml | 3 -- .../database/structure/search_table.twig | 3 ++ .../database/structure/tracking_icon.phtml | 11 ------ .../database/structure/tracking_icon.twig | 7 ++++ templates/header_location.phtml | 32 ----------------- templates/header_location.twig | 22 ++++++++++++ 42 files changed, 267 insertions(+), 229 deletions(-) create mode 100644 libraries/twig/SanitizeExtension.php delete mode 100644 templates/columns_definitions/column_adjust_privileges.phtml create mode 100644 templates/columns_definitions/column_adjust_privileges.twig delete mode 100644 templates/columns_definitions/column_auto_increment.phtml create mode 100644 templates/columns_definitions/column_auto_increment.twig delete mode 100644 templates/columns_definitions/column_extra.phtml create mode 100644 templates/columns_definitions/column_extra.twig delete mode 100644 templates/columns_definitions/column_indexes.phtml create mode 100644 templates/columns_definitions/column_indexes.twig delete mode 100644 templates/columns_definitions/column_length.phtml create mode 100644 templates/columns_definitions/column_length.twig delete mode 100644 templates/columns_definitions/column_null.phtml create mode 100644 templates/columns_definitions/column_null.twig delete mode 100644 templates/columns_definitions/column_type.phtml create mode 100644 templates/columns_definitions/column_type.twig delete mode 100644 templates/columns_definitions/transformation_option.phtml create mode 100644 templates/columns_definitions/transformation_option.twig rename templates/database/designer/{aggregate_query_panel.phtml => aggregate_query_panel.twig} (82%) rename templates/database/designer/{canvas.phtml => canvas.twig} (92%) rename templates/database/designer/{delete_relation_panel.phtml => delete_relation_panel.twig} (84%) rename templates/database/designer/{having_query_panel.phtml => having_query_panel.twig} (89%) rename templates/database/designer/{new_relation_panel.phtml => new_relation_panel.twig} (93%) rename templates/database/designer/{options_panel.phtml => options_panel.twig} (91%) rename templates/database/designer/{rename_to_panel.phtml => rename_to_panel.twig} (79%) rename templates/database/designer/{where_query_panel.phtml => where_query_panel.twig} (86%) delete mode 100644 templates/database/structure/browse_table.phtml create mode 100644 templates/database/structure/browse_table.twig delete mode 100644 templates/database/structure/browse_table_label.phtml create mode 100644 templates/database/structure/browse_table_label.twig delete mode 100644 templates/database/structure/empty_table.phtml create mode 100644 templates/database/structure/empty_table.twig delete mode 100644 templates/database/structure/print_view_data_dictionary_link.phtml create mode 100644 templates/database/structure/print_view_data_dictionary_link.twig delete mode 100644 templates/database/structure/search_table.phtml create mode 100644 templates/database/structure/search_table.twig delete mode 100644 templates/database/structure/tracking_icon.phtml create mode 100644 templates/database/structure/tracking_icon.twig delete mode 100644 templates/header_location.phtml create mode 100644 templates/header_location.twig diff --git a/libraries/Template.php b/libraries/Template.php index 363e63536c..a7e1e203e4 100644 --- a/libraries/Template.php +++ b/libraries/Template.php @@ -10,6 +10,7 @@ namespace PMA\libraries; use Twig_Environment; use Twig_Loader_Filesystem; use PMA\libraries\twig\I18nExtension; +use PMA\libraries\twig\SanitizeExtension; use PMA\libraries\twig\UrlExtension; use PMA\libraries\twig\UtilExtension; @@ -64,6 +65,7 @@ class Template 'debug' => false, )); $this->twig->addExtension(new I18nExtension()); + $this->twig->addExtension(new SanitizeExtension()); $this->twig->addExtension(new UrlExtension()); $this->twig->addExtension(new UtilExtension()); } diff --git a/libraries/twig/SanitizeExtension.php b/libraries/twig/SanitizeExtension.php new file mode 100644 index 0000000000..277c14082c --- /dev/null +++ b/libraries/twig/SanitizeExtension.php @@ -0,0 +1,35 @@ + array('html')) + ), + ); + } +} diff --git a/libraries/twig/UtilExtension.php b/libraries/twig/UtilExtension.php index 68e727e2b5..24ff82fbfc 100644 --- a/libraries/twig/UtilExtension.php +++ b/libraries/twig/UtilExtension.php @@ -25,15 +25,6 @@ class UtilExtension extends Twig_Extension public function getFunctions() { return array( - new Twig_SimpleFunction( - 'Util_showIcons', - 'PMA\libraries\Util::showIcons' - ), - new Twig_SimpleFunction( - 'Util_getImage', - 'PMA\libraries\Util::getImage', - array('is_safe' => array('html')) - ), new Twig_SimpleFunction( 'Util_formatSql', 'PMA\libraries\Util::formatSql', @@ -44,6 +35,25 @@ class UtilExtension extends Twig_Extension 'PMA\libraries\Util::getHtmlTab', array('is_safe' => array('html')) ), + new Twig_SimpleFunction( + 'Util_getIcon', + 'PMA\libraries\Util::getIcon', + array('is_safe' => array('html')) + ), + new Twig_SimpleFunction( + 'Util_getImage', + 'PMA\libraries\Util::getImage', + array('is_safe' => array('html')) + ), + new Twig_SimpleFunction( + 'Util_getSupportedDatatypes', + 'PMA\libraries\Util::getSupportedDatatypes', + array('is_safe' => array('html')) + ), + new Twig_SimpleFunction( + 'Util_showIcons', + 'PMA\libraries\Util::showIcons' + ), ); } } diff --git a/scripts/generate-twig-cache b/scripts/generate-twig-cache index 74cc014821..269f2d0938 100644 --- a/scripts/generate-twig-cache +++ b/scripts/generate-twig-cache @@ -5,6 +5,7 @@ require_once 'vendor/autoload.php'; require_once 'libraries/vendor_config.php'; use PMA\libraries\twig\I18nExtension; +use PMA\libraries\twig\SanitizeExtension; use PMA\libraries\twig\UrlExtension; use PMA\libraries\twig\UtilExtension; @@ -18,6 +19,7 @@ $twig = new Twig_Environment($loader, array( 'auto_reload' => true )); $twig->addExtension(new I18nExtension()); +$twig->addExtension(new SanitizeExtension()); $twig->addExtension(new UrlExtension()); $twig->addExtension(new UtilExtension()); diff --git a/templates/columns_definitions/column_adjust_privileges.phtml b/templates/columns_definitions/column_adjust_privileges.phtml deleted file mode 100644 index 265fe9e2e6..0000000000 --- a/templates/columns_definitions/column_adjust_privileges.phtml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/templates/columns_definitions/column_adjust_privileges.twig b/templates/columns_definitions/column_adjust_privileges.twig new file mode 100644 index 0000000000..e316dae606 --- /dev/null +++ b/templates/columns_definitions/column_adjust_privileges.twig @@ -0,0 +1,16 @@ +{% if privs_available %} + +{% else %} + +{% endif %} diff --git a/templates/columns_definitions/column_auto_increment.phtml b/templates/columns_definitions/column_auto_increment.phtml deleted file mode 100644 index e688ff6e7a..0000000000 --- a/templates/columns_definitions/column_auto_increment.phtml +++ /dev/null @@ -1,8 +0,0 @@ - - checked="checked" - - type="checkbox" - value="AUTO_INCREMENT" /> \ No newline at end of file diff --git a/templates/columns_definitions/column_auto_increment.twig b/templates/columns_definitions/column_auto_increment.twig new file mode 100644 index 0000000000..2729c838f0 --- /dev/null +++ b/templates/columns_definitions/column_auto_increment.twig @@ -0,0 +1,7 @@ + diff --git a/templates/columns_definitions/column_extra.phtml b/templates/columns_definitions/column_extra.phtml deleted file mode 100644 index d39268f535..0000000000 --- a/templates/columns_definitions/column_extra.phtml +++ /dev/null @@ -1,7 +0,0 @@ - - checked="checked" - - type="checkbox" - value="auto_increment" /> \ No newline at end of file diff --git a/templates/columns_definitions/column_extra.twig b/templates/columns_definitions/column_extra.twig new file mode 100644 index 0000000000..769d9f0337 --- /dev/null +++ b/templates/columns_definitions/column_extra.twig @@ -0,0 +1,7 @@ + diff --git a/templates/columns_definitions/column_indexes.phtml b/templates/columns_definitions/column_indexes.phtml deleted file mode 100644 index 94cf03aab2..0000000000 --- a/templates/columns_definitions/column_indexes.phtml +++ /dev/null @@ -1,30 +0,0 @@ - \ No newline at end of file diff --git a/templates/columns_definitions/column_indexes.twig b/templates/columns_definitions/column_indexes.twig new file mode 100644 index 0000000000..99b5244948 --- /dev/null +++ b/templates/columns_definitions/column_indexes.twig @@ -0,0 +1,24 @@ + diff --git a/templates/columns_definitions/column_length.phtml b/templates/columns_definitions/column_length.phtml deleted file mode 100644 index dafd5d7b41..0000000000 --- a/templates/columns_definitions/column_length.phtml +++ /dev/null @@ -1,11 +0,0 @@ - -

- - - -

\ No newline at end of file diff --git a/templates/columns_definitions/column_length.twig b/templates/columns_definitions/column_length.twig new file mode 100644 index 0000000000..0d967a5397 --- /dev/null +++ b/templates/columns_definitions/column_length.twig @@ -0,0 +1,11 @@ + +

+ + {% trans 'Edit ENUM/SET values' %} + +

diff --git a/templates/columns_definitions/column_null.phtml b/templates/columns_definitions/column_null.phtml deleted file mode 100644 index 72134ed310..0000000000 --- a/templates/columns_definitions/column_null.phtml +++ /dev/null @@ -1,8 +0,0 @@ - - checked="checked" - - type="checkbox" - value="NULL" - class="allow_null"/> \ No newline at end of file diff --git a/templates/columns_definitions/column_null.twig b/templates/columns_definitions/column_null.twig new file mode 100644 index 0000000000..78eba4bdcc --- /dev/null +++ b/templates/columns_definitions/column_null.twig @@ -0,0 +1,8 @@ + diff --git a/templates/columns_definitions/column_type.phtml b/templates/columns_definitions/column_type.phtml deleted file mode 100644 index ae2527ea7c..0000000000 --- a/templates/columns_definitions/column_type.phtml +++ /dev/null @@ -1,8 +0,0 @@ - \ No newline at end of file diff --git a/templates/columns_definitions/column_type.twig b/templates/columns_definitions/column_type.twig new file mode 100644 index 0000000000..83f4f500d0 --- /dev/null +++ b/templates/columns_definitions/column_type.twig @@ -0,0 +1,8 @@ + diff --git a/templates/columns_definitions/transformation_option.phtml b/templates/columns_definitions/transformation_option.phtml deleted file mode 100644 index bb19e3f0b9..0000000000 --- a/templates/columns_definitions/transformation_option.phtml +++ /dev/null @@ -1,9 +0,0 @@ - - diff --git a/templates/columns_definitions/transformation_option.twig b/templates/columns_definitions/transformation_option.twig new file mode 100644 index 0000000000..27cbb49b04 --- /dev/null +++ b/templates/columns_definitions/transformation_option.twig @@ -0,0 +1,9 @@ +{% set options_key = type_prefix ~ 'transformation_options' %} + diff --git a/templates/database/designer/aggregate_query_panel.phtml b/templates/database/designer/aggregate_query_panel.twig similarity index 82% rename from templates/database/designer/aggregate_query_panel.phtml rename to templates/database/designer/aggregate_query_panel.twig index ec00ee917c..2b486027e9 100644 --- a/templates/database/designer/aggregate_query_panel.phtml +++ b/templates/database/designer/aggregate_query_panel.twig @@ -1,4 +1,4 @@ - + @@ -27,7 +27,7 @@ @@ -81,4 +82,4 @@ - \ No newline at end of file + diff --git a/templates/database/designer/canvas.phtml b/templates/database/designer/canvas.twig similarity index 92% rename from templates/database/designer/canvas.phtml rename to templates/database/designer/canvas.twig index 5110ccc0a7..f81e7887b8 100644 --- a/templates/database/designer/canvas.phtml +++ b/templates/database/designer/canvas.twig @@ -1,3 +1,3 @@
-
\ No newline at end of file + diff --git a/templates/database/designer/delete_relation_panel.phtml b/templates/database/designer/delete_relation_panel.twig similarity index 84% rename from templates/database/designer/delete_relation_panel.phtml rename to templates/database/designer/delete_relation_panel.twig index 970baea359..84be755bef 100644 --- a/templates/database/designer/delete_relation_panel.phtml +++ b/templates/database/designer/delete_relation_panel.twig @@ -18,14 +18,16 @@ - + {% trans 'Delete relationship' %} - - + + @@ -44,4 +46,4 @@ - \ No newline at end of file + diff --git a/templates/database/designer/having_query_panel.phtml b/templates/database/designer/having_query_panel.twig similarity index 89% rename from templates/database/designer/having_query_panel.phtml rename to templates/database/designer/having_query_panel.twig index 963d50d942..c5828a8acc 100644 --- a/templates/database/designer/having_query_panel.phtml +++ b/templates/database/designer/having_query_panel.twig @@ -27,7 +27,7 @@ - + {% trans 'Operator' %} @@ -87,7 +87,7 @@ IN