From 72ace63403e8a9388fa0c74d85da5c52f5d4d65b Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Tue, 23 Jul 2013 17:19:28 +0200
Subject: [PATCH] bug #2102: Change default datatable configuration (cherry
 picked from commit 00f64df2694946e247f5e2b4428e4dab09747c96)

---
 src/sunstone/public/sass/app.scss                        | 4 ++++
 .../javascripts/datatables.foundation.js                 | 9 ++++++---
 src/sunstone/views/index.erb                             | 2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/sunstone/public/sass/app.scss b/src/sunstone/public/sass/app.scss
index 842522872f..4ad58080ce 100644
--- a/src/sunstone/public/sass/app.scss
+++ b/src/sunstone/public/sass/app.scss
@@ -1041,3 +1041,7 @@ table.policies_table {
 .detach-vnc-icon:hover {
     color: #222;
 }
+
+.dataTables_length select {
+    margin-right: 8px;
+}
diff --git a/src/sunstone/public/vendor/4.0/foundation_datatables/javascripts/datatables.foundation.js b/src/sunstone/public/vendor/4.0/foundation_datatables/javascripts/datatables.foundation.js
index 5af02965c8..78cf7678b4 100644
--- a/src/sunstone/public/vendor/4.0/foundation_datatables/javascripts/datatables.foundation.js
+++ b/src/sunstone/public/vendor/4.0/foundation_datatables/javascripts/datatables.foundation.js
@@ -2,9 +2,12 @@
 $.extend( true, $.fn.dataTable.defaults, {
     "sDom": "<'H'>t<'row'<'eight columns'li><'four columns'p>>",
     "sPaginationType": "foundation",
-    "oLanguage": {
-        "sLengthMenu": '<select><option value="10">10</option><option value="25">25</option><option value="50">50</option><option value="100">100</option></select>&emsp;&emsp;'
-    }
+        "oLanguage": (datatable_lang != "") ?
+            {
+                sUrl: "locale/"+lang+"/"+datatable_lang,
+
+            } : "",
+
 } );
 
 
diff --git a/src/sunstone/views/index.erb b/src/sunstone/views/index.erb
index 506a2e161e..51887b7b7c 100644
--- a/src/sunstone/views/index.erb
+++ b/src/sunstone/views/index.erb
@@ -11,7 +11,6 @@
     <script src="vendor/4.0/foundation/modernizr.foundation.js" type="text/javascript"></script>
     <script src="vendor/4.0/datatables/jquery.dataTables.min.js" type="text/javascript"></script>
     <script src="vendor/4.0/foundation_datatables/responsive-tables.js" type="text/javascript"></script>
-    <script src="vendor/4.0/foundation_datatables/datatables.foundation.js" type="text/javascript"></script>
     <script src="vendor/flot/jquery.flot.min.js" type="text/javascript"></script>
     <script src="vendor/flot/jquery.flot.pie.min.js" type="text/javascript"></script>
     <script src="vendor/flot/jquery.flot.resize.min.js" type="text/javascript"></script>
@@ -31,6 +30,7 @@
     <% if session[:lang] %>
       <script src="locale/<%= session[:lang] %>/<%= session[:lang] %>.js" type="text/javascript"></script>
     <% end %>
+    <script src="vendor/4.0/foundation_datatables/datatables.foundation.js" type="text/javascript"></script>
     <link href="css/app.css" media="screen, projector, print" rel="stylesheet" type="text/css"></link>
     <script src="js/opennebula.js" type="text/javascript"></script>
     <script src="js/layout.js" type="text/javascript"></script>