Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Work on prootype for using datatable.

Browse Source
This commit is contained in:
Laurent Destailleur
2014-07-27 20:31:11 +02:00
parent 9681b9abad
commit 709bf20deb
7 changed files with 112 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/lib/functions.lib.php
View File

@@ -245,6 +245,8 @@ function dol_getprefix()
*/
function dol_include_once($relpath, $classname='')
{
global $conf,$langs,$user,$mysoc; // Do not remove this. They must be defined for files we include. Other globals var must be retreived with $GLOBALS['var']
$fullpath = dol_buildpath($relpath);
if (!file_exists($fullpath)) {

6
htdocs/main.inc.php
View File

@@ -717,8 +717,10 @@ if (GETPOST('dol_optimize_smallscreen') || ! empty($_SESSION['dol_optimize_small
if (GETPOST('dol_no_mouse_hover') || ! empty($_SESSION['dol_no_mouse_hover'])) $conf->dol_no_mouse_hover=1;
if (GETPOST('dol_use_jmobile') || ! empty($_SESSION['dol_use_jmobile'])) $conf->dol_use_jmobile=1;
if (! empty($conf->browser->phone)) $conf->dol_no_mouse_hover=1;
if ((! empty($_SESSION['dol_screenwidth']) && $_SESSION['dol_screenwidth'] < 400)
|| (! empty($_SESSION['dol_screenheight']) && $_SESSION['dol_screenheight'] < 400))
if (! empty($conf->browser->phone)
|| (! empty($_SESSION['dol_screenwidth']) && $_SESSION['dol_screenwidth'] < 400)
|| (! empty($_SESSION['dol_screenheight']) && $_SESSION['dol_screenheight'] < 400)
)
{
$conf->dol_optimize_smallscreen=1;
}

99
htdocs/public/test/test_arrays.php
View File

@@ -2,6 +2,7 @@
define("NOLOGIN",1); // This means this output page does not require to be logged.
define("NOCSRFCHECK",1); // We accept to go on this page from external web site.
require '../../main.inc.php';
if (!empty($conf->global->MAIN_FEATURES_LEVEL))
@@ -9,11 +10,18 @@ if (!empty($conf->global->MAIN_FEATURES_LEVEL))
print "Page available onto dev environment only";
exit;
}
?>
$usedolheader=0; // 1 = Test inside a dolibarr page, 0 = Use hard coded header
// HEADER
//--------
if (empty($usedolheader))
{
header("Content-type: text/html; charset=UTF8");
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta name="robots" content="noindex,nofollow" />
<meta name="author" content="Dolibarr Development Team">
@@ -31,20 +39,33 @@ if (!empty($conf->global->MAIN_FEATURES_LEVEL))
<script type="text/javascript" src="<?php echo DOL_URL_ROOT ?>/includes/jquery/plugins/mobile/jquery.mobile-latest.min.js"></script>
</head>
<body style="margin: 4px;">
<div data-role="page">
<?php
}
else
{
llxHeader();
}
// CONTENT
//---------
?>
<br>
This page is a sample of page using tables. To make test with<br>
- css (edit page to change)<br>
- jmobile (edit page to enable/disable)<br>
- dataTables<br>
- tablednd<br>
<br>
Example 0a : Table with div+div+div containg a select that should be overflowed and truncated<br>
<br><hr><br>Example 0a : Table with div+div+div containg a select that should be overflowed and truncated => Use this to align text or form<br>
<div class="tagtable centpercent">
<div class="tagtr">
<div class="tagtd" style="overflow: hidden; white-space: nowrap; max-width: 100px;"> <!-- If you remove max-width, the jmobile overflow does not work -->
@@ -55,7 +76,9 @@ Example 0a : Table with div+div+div containg a select that should be overflowed
</div>
</div>
</div>
Example 0b: Table with div+form+div containg a select that should be overflowed and truncated<br>
<br><hr><br>Example 0b: Table with div+form+div containg a select that should be overflowed and truncated => Use this to align text or form<br>
<div class="tagtable centpercent">
<form action="xxx" method="POST" class="tagtr">
<div class="tagtd maxwidthonsmartphone" style="overflow: hidden; white-space: nowrap;"> <!-- If you remove max-width, the jmobile overflow does not work -->
@@ -66,7 +89,9 @@ Example 0b: Table with div+form+div containg a select that should be overflowed
</div>
</form>
</div>
Example 0c: Table with table+tr+td containg a select that should be overflowed and truncated<br>
<br><hr><br>Example 0c: Table with table+tr+td containg a select that should be overflowed and truncated => Use this to align text or form<br>
<table class="centpercent">
<tr>
<td class="tagtd maxwidthonsmartphone" style="overflow: hidden; white-space: nowrap;"> <!-- If you remove max-width, the jmobile overflow does not work -->
@@ -80,8 +105,9 @@ Example 0c: Table with table+tr+td containg a select that should be overflowed a
<br>
Example 1 : Table using tags: div.tagtable+div.tagtr+div or div.tagtable+div.tagtr+div.tagtd<br>
<br><hr><br>Example 1 : Table using tags: div.tagtable+div.tagtr+div or div.tagtable+div.tagtr+div.tagtd => Use this for tables that are edited forms<br><br>
<?php
$tasksarray=array(1,2,3); // To force having several lines
$tagidfortablednd='tablelines';
@@ -124,19 +150,48 @@ Example 1 : Table using tags: div.tagtable+div.tagtr+div or div.tagtable+div.tag
<br><br>
<br><hr><br>Example 2 : Table using tags: table/thead/tbody/tr/td + dataTable => Use this for long result tables<br>
Example 2 : Table using tags: table/thead/tbody/tr/td + dataTable<br>
<script type="text/javascript">
$(document).ready(function(){
$('#idtableexample2').dataTable();
$('#idtableexample2').dataTable( {
"sPaginationType": "full_numbers",
"aLengthMenu": [[10, 25, 50, 100, -1], [10, 25, 50, 100, "Tous"]],
"oLanguage": {
"sLengthMenu": "Voir _MENU_ lignes",
"sSearch": "Recherche:",
"sZeroRecords": "Aucune ligne &agrave; afficher",
"sInfoEmpty": "Aucune ligne &agrave; afficher",
"sInfoFiltered": "(Filtrer sur _MAX_ Total de lignes)",
"sInfo": "Afficher _START_ &agrave; _END_ sur les _TOTAL_ lignes &agrave; afficher",
"oPaginate": {
"sFirst": "Début",
"sLast": "Fin",
"sPrevious": "Précédent",
"sNext": "Suivant"
}
},
"aaSorting": [[0,'desc']],
"sDom": 'T<"clear">lfrtip',
/* To get flash tools
"oTableTools": {
"sSwfPath": "<?php echo DOL_URL_ROOT.'/includes/jquery/plugins/datatables/extras/TableTools/swf/copy_csv_xls_pdf.swf'; ?>"
}
*/
/* To use in ajax mode
"bProcessing": true, // Show "processing message"
"bServerSide": true,
"bJQueryUI": true,
"sAjaxSource": "../ajaxlist.php"
*/
})
});
/*
// counts total number of td in a head so that we can can use it for label extraction
// counts total number of td in a head so that we can use it for label extraction
var head_col_count = $('xxxthead td').size();
// loop which replaces td
for ( i=0; i <= head_col_count; i++ ) {
@@ -176,7 +231,7 @@ $('xxxth').replaceWith(
*/
</script>
<table id="idtableexample2">
<table id="idtableexample2" class="centpercent">
<thead>
<tr>
<th>snake</th>
@@ -249,12 +304,9 @@ $('xxxth').replaceWith(
</table>
<br><br>
<br><hr><br>Example 3 : Standard table => Use this if you need the drag and drop for lines<br>
<br>
Example 3 : Standard table<br>
<?php
$tasksarray=array(1,2,3); // To force having several lines
$tagidfortablednd='tablelines3';
@@ -269,6 +321,13 @@ Example 3 : Standard table<br>
<br>
<?php
if (! empty($usedolheader))
{
llxFooter();
} else { ?>
</div>
</body>
<?php } ?>
</html>

5
htdocs/theme/auguria/style.css.php
View File

@@ -2296,6 +2296,11 @@ div.ecmjqft {
{
text-decoration: underline !important;
}
.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled, .paginate_button_disabled {
opacity: .35;
filter: Alpha(Opacity=35);
background-image: none;
}
/* ============================================================================== */

9
htdocs/theme/bureau2crea/style.css.php
View File

@@ -384,7 +384,6 @@ div.tmenu {
border-left: 0px;
padding: 0px;
margin: 5px 0px 10px 0px;
font-size: 13px;
background-image : url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_mainNav.jpg',1); ?>);
background-repeat: no-repeat;
background-color: #996644;
@@ -408,7 +407,7 @@ div.mainmenu {
/* Do not load menu img if hidden to save bandwidth */
<?php if (empty($dol_hide_topmenu)) { ?>
<?php if (empty($dol_hide_topmenu)) {
// Add here more div for other menu entries. moduletomainmenu=array('module name'=>'name of class for div')
@@ -784,6 +783,7 @@ div.blockvmenusearch div.menu_titre {
#blockvmenusearch form
{
clear: both;
margin-bottom: 14px;
}
div.blockvmenubookmarks
@@ -2482,6 +2482,11 @@ div.ecmjqft {
{
text-decoration: underline !important;
}
.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled, .paginate_button_disabled {
opacity: .35;
filter: Alpha(Opacity=35);
background-image: none;
}
/* ============================================================================== */

7
htdocs/theme/cameleo/style.css.php
View File

@@ -859,6 +859,7 @@ div.blockvmenusearch div.menu_titre {
#blockvmenusearch form
{
clear: both;
margin-bottom: 14px;
}
div.blockvmenubookmarks
@@ -2376,7 +2377,11 @@ div.ecmjqft {
{
text-decoration: underline !important;
}
.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled, .paginate_button_disabled {
opacity: .35;
filter: Alpha(Opacity=35);
background-image: none;
}
/* ============================================================================== */
/* JMobile */

13
htdocs/theme/eldy/style.css.php
View File

@@ -1645,11 +1645,10 @@ table.noborder, table.formdoc, div.noborder {
border-bottom-style: solid;
margin: 0px 0px 2px 0px;
/*padding: 1px 2px 1px 2px;*/
-moz-box-shadow: 3px 3px 4px #DDD;
-webkit-box-shadow: 3px 3px 4px #DDD;
box-shadow: 3px 3px 4px #DDD;
-moz-box-shadow: 2px 2px 4px #DDD;
-webkit-box-shadow: 2px 2px 4px #DDD;
box-shadow: 2px 2px 4px #DDD;
-moz-border-radius: 0.2em;
-webkit-border-radius: 0.2em;
@@ -2703,6 +2702,12 @@ div.dolEventError h1, div.dolEventError h2 {
/* Disable this. It breaks wrapping of boxes
.ui-corner-all { white-space: nowrap; } */
.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled, .paginate_button_disabled {
opacity: .35;
filter: Alpha(Opacity=35);
background-image: none;
}
/* ============================================================================== */
/* JMobile */