Changed datatables language to english and removed datatables css fro…

…m default-layout
spring-attic · May 12, 2016 · 8244066 · 8244066
1 parent dee6a45
commit 8244066
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 19 deletions.
diff --git a/...org/springframework/roo/addon/web/mvc/thymeleaf/addon/static/js/datatables-defaults-en.js b/...org/springframework/roo/addon/web/mvc/thymeleaf/addon/static/js/datatables-defaults-en.js
@@ -0,0 +1,19 @@
+// Definiciones de textos multiidioma añadiendo algunas a las ya proporcionadas
+// por defecto de Datatables
+$.extend( $.fn.dataTable.defaults, {
+	'language': {
+		'buttons': {
+			'add': 'Add',
+			'colvis': 'Columns',
+			'pageLength': 'Show %d rows'	
+		},
+		'select': {
+            'rows': {
+                _: "%d selected rows",
+                0: "",
+                1: "1 selected row"
+            }
+        },		
+		'url': "//cdn.datatables.net/plug-ins/1.10.11/i18n/Spanish.json",
+	}
+} );
diff --git a/...rg/springframework/roo/addon/web/mvc/thymeleaf/addon/templates/layouts/default-layout.ftl b/...rg/springframework/roo/addon/web/mvc/thymeleaf/addon/templates/layouts/default-layout.ftl
@@ -25,23 +25,6 @@
 
     <link rel="stylesheet" type="text/css"
         href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap-theme.css"></link>      
-
-    <!-- Datatables -->  
-
-    <link rel="stylesheet" type="text/css" 
-        href="//cdn.datatables.net/1.10.11/css/jquery.dataTables.css"></link>
-
-    <link rel="stylesheet" type="text/css" 
-        href="https://cdn.datatables.net/1.10.11/css/dataTables.bootstrap.css"></link>
-
-    <link rel="stylesheet" type="text/css" 
-        href="https://cdn.datatables.net/responsive/2.0.2/css/responsive.bootstrap.css"></link>
-
-    <link rel="stylesheet" type="text/css" 
-        href="https://cdn.datatables.net/buttons/1.1.2/css/buttons.bootstrap.css"></link>
-
-    <link rel="stylesheet" type="text/css" 
-        href="https://cdn.datatables.net/select/1.1.2/css/select.bootstrap.css"></link>
 
     <!-- Select2 -->
     <link rel="stylesheet" type="text/css"

diff --git a/...c/main/resources/org/springframework/roo/addon/web/mvc/thymeleaf/addon/templates/list.ftl b/...c/main/resources/org/springframework/roo/addon/web/mvc/thymeleaf/addon/templates/list.ftl
@@ -327,7 +327,7 @@
     <script type="text/javascript" charset="utf8" src="https://cdn.datatables.net/select/1.1.2/js/dataTables.select.js"></script>
     <!-- Datatables application defaults -->
     <script type="text/javascript" charset="utf8" src="../../static/public/js/datatables-defaults.js" data-th-src="@{/public/js/datatables-defaults.js}"></script>
-    <script type="text/javascript" charset="utf8" src="../../static/public/js/datatables-defaults-es.js" data-th-src="@{/public/js/datatables-defaults-es.js}"></script>
+    <script type="text/javascript" charset="utf8" src="../../static/public/js/datatables-defaults-en.js" data-th-src="@{/public/js/datatables-defaults-en.js}"></script>
 
 
     <!-- Datatables page configs -->

diff --git a/...c/main/resources/org/springframework/roo/addon/web/mvc/thymeleaf/addon/templates/show.ftl b/...c/main/resources/org/springframework/roo/addon/web/mvc/thymeleaf/addon/templates/show.ftl
@@ -244,7 +244,7 @@
     <script type="text/javascript" charset="utf8" src="https://cdn.datatables.net/select/1.1.2/js/dataTables.select.js"></script>
     <!-- Datatables application defaults -->
     <script type="text/javascript" charset="utf8" src="../../static/public/js/datatables-defaults.js" data-th-src="@{/public/js/datatables-defaults.js}"></script>
-    <script type="text/javascript" charset="utf8" src="../../static/public/js/datatables-defaults-es.js" data-th-src="@{/public/js/datatables-defaults-es.js}"></script>
+    <script type="text/javascript" charset="utf8" src="../../static/public/js/datatables-defaults-en.js" data-th-src="@{/public/js/datatables-defaults-en.js}"></script>
 
 
     <!-- Datatables page configs -->