From 8a59f0070d9eb5536a7c50f3a93bfc5274d605b3 Mon Sep 17 00:00:00 2001 From: Nicolas Le Goff Date: Mon, 13 May 2013 09:52:23 +0200 Subject: [PATCH] Adressed PR comment's --- .../Phrasea/Controller/Admin/Fields.php | 4 +- templates/web/admin/fields/index.html.twig | 15 +-- .../web/admin/fields/templates.html.twig | 127 +++++++++--------- www/scripts/apps/admin/fields/main.js | 2 +- www/scripts/apps/admin/fields/views/add.js | 51 ------- www/scripts/apps/admin/fields/views/alert.js | 2 +- .../apps/admin/fields/views/dcField.js | 5 +- www/scripts/apps/admin/fields/views/edit.js | 24 ++-- www/scripts/apps/admin/fields/views/list.js | 13 +- www/scripts/apps/admin/fields/views/modal.js | 1 - www/skins/admin/css/fields.css | 65 ++++++++- 11 files changed, 147 insertions(+), 162 deletions(-) delete mode 100644 www/scripts/apps/admin/fields/views/add.js diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Fields.php b/lib/Alchemy/Phrasea/Controller/Admin/Fields.php index fc62bd5901..81e2de8af7 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/Fields.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/Fields.php @@ -146,7 +146,7 @@ class Fields implements ControllerProviderInterface continue; } - $res[$tagname] = array( + $res[] = array( 'id' => $namespace . '/' . $tagname, 'label' => $datas['namespace'] . ' / ' . $datas['tagname'], 'value' => $datas['namespace'] . ':' . $datas['tagname'], @@ -155,8 +155,6 @@ class Fields implements ControllerProviderInterface } } - ksort($res); - return $app->json($res); } diff --git a/templates/web/admin/fields/index.html.twig b/templates/web/admin/fields/index.html.twig index f7bbb11eae..a4c3eda609 100644 --- a/templates/web/admin/fields/index.html.twig +++ b/templates/web/admin/fields/index.html.twig @@ -1,6 +1,3 @@ -{# empty Twig template #} - - {% include 'admin/fields/templates.html.twig' %}
@@ -14,14 +11,10 @@
-
- -
-
- -
+
+
- +{# bootstrap admin field application #} - \ No newline at end of file + diff --git a/templates/web/admin/fields/templates.html.twig b/templates/web/admin/fields/templates.html.twig index fe6a31cd28..479137c158 100644 --- a/templates/web/admin/fields/templates.html.twig +++ b/templates/web/admin/fields/templates.html.twig @@ -14,66 +14,62 @@