From 7ee850acc840e654eb22f1c74011ec2e97056d2f Mon Sep 17 00:00:00 2001 From: Gonzalo Bellver Date: Tue, 11 Oct 2011 16:55:13 -0300 Subject: [PATCH] Some internationzalization and UI pagination --- wise-webapp/src/main/webapp/html/css/styles.less | 4 ++++ wise-webapp/src/main/webapp/html/css/table.less | 11 +++++------ wise-webapp/src/main/webapp/html/workspace.html | 10 ++++++---- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/wise-webapp/src/main/webapp/html/css/styles.less b/wise-webapp/src/main/webapp/html/css/styles.less index 18d41303..c2bd1e58 100644 --- a/wise-webapp/src/main/webapp/html/css/styles.less +++ b/wise-webapp/src/main/webapp/html/css/styles.less @@ -86,7 +86,11 @@ body { #map-table { width: 100% !important; display: inline-block; +} +input#selectAll { + position: relative; + left: 4px; } /* ----------------------------- Toolbar -------------------------------- */ diff --git a/wise-webapp/src/main/webapp/html/css/table.less b/wise-webapp/src/main/webapp/html/css/table.less index 03d52cab..9cf3aaa9 100644 --- a/wise-webapp/src/main/webapp/html/css/table.less +++ b/wise-webapp/src/main/webapp/html/css/table.less @@ -7,6 +7,7 @@ @red: #FF0000; @base-border-size: 1px; @base-color: #111; +@base-margin: 10px; @th-background-color: #FFFFFF; @@ -40,25 +41,26 @@ } .dataTables_length { - width: 40%; - float: left; + float: right; margin-bottom: 10px; } .dataTables_filter { text-align: right; - margin-bottom: 10px; + margin-bottom: @base-margin; } .dataTables_info { width: 60%; float: left; + margin-top: @base-margin; } .dataTables_paginate { width: 44px; float: right; text-align: right; + margin-top: @base-margin; } /* Pagination nested */ @@ -170,9 +172,6 @@ tr.even { margin-top: -1px; } -.top, .bottom { -} - .top .dataTables_info { float: none; } diff --git a/wise-webapp/src/main/webapp/html/workspace.html b/wise-webapp/src/main/webapp/html/workspace.html index 1e728dcb..11524877 100644 --- a/wise-webapp/src/main/webapp/html/workspace.html +++ b/wise-webapp/src/main/webapp/html/workspace.html @@ -73,15 +73,17 @@ ], "bAutoWidth" : false, - "bLengthChange": false, - "bInfo": false, - "bPaginate": false, +// "bLengthChange": false, +// "bInfo": false, +// "bPaginate": false, "oLanguage" : { - "sSearch" : "Rechercher" + "sSearch" : "Rechercher", + "sInfo" : "Affichage de _START_ à _END_ de _TOTAL_ entrées" } }); $('#maps_filter').appendTo("#toolbar"); + $("#maps_length").appendTo("#buttons"); $('input:checkbox[id="selectAll"]').click(function() { $("#maps").dataTableExt.selectAllMaps();