Adding width fix for jqgrid tables see BT#2020

skala
Julio Montoya 15 years ago
parent fd29df6069
commit eca96dd193
  1. 4
      main/admin/careers.php
  2. 4
      main/admin/promotions.php
  3. 14
      main/admin/usergroups.php
  4. 10
      main/inc/lib/display.lib.php

@ -64,10 +64,10 @@ $action_links = 'function action_formatter(cellvalue, options, rowObject) {
}';
?>
<script>
$(function() {
$(function() {
<?php
// grid definition see the $career->display() function
echo Display::grid_js('careers', $url,$columns,$column_model,$extra_params, array(), $action_links);
echo Display::grid_js('careers', $url,$columns,$column_model,$extra_params, array(), $action_links,true);
?>
});
</script>

@ -58,9 +58,9 @@ $action_links = 'function action_formatter (cellvalue, options, rowObject) {
?>
<script>
$(function() {
$(function() {
<?php
echo Display::grid_js('promotions', $url,$columns,$column_model,$extra_params,array(), $action_links);
echo Display::grid_js('promotions', $url,$columns,$column_model,$extra_params,array(), $action_links, true);
?>
});

@ -46,12 +46,12 @@ $columns = array(get_lang('Name'), get_lang('Users'), get_lang('Courses')
//Column config
$column_model = array(
array('name'=>'name', 'index'=>'name', 'width'=>'80', 'align'=>'left'),
array('name'=>'name', 'index'=>'name', 'width'=>'35', 'align'=>'left'),
//array('name'=>'description', 'index'=>'description', 'width'=>'500', 'align'=>'left'),
array('name'=>'users', 'index'=>'users', 'width'=>'200', 'align'=>'left'),
array('name'=>'courses', 'index'=>'courses', 'width'=>'200', 'align'=>'left'),
array('name'=>'sessions', 'index'=>'sessions', 'width'=>'200', 'align'=>'left'),
array('name'=>'actions', 'index'=>'actions', 'formatter'=>'action_formatter','width'=>'100', 'align'=>'left','sortable'=>'false'),
array('name'=>'users', 'index'=>'users', 'width'=>'15', 'align'=>'left'),
array('name'=>'courses', 'index'=>'courses', 'width'=>'15', 'align'=>'left'),
array('name'=>'sessions', 'index'=>'sessions', 'width'=>'15', 'align'=>'left'),
array('name'=>'actions', 'index'=>'actions', 'width'=>'20', 'align'=>'left','sortable'=>'false','formatter'=>'action_formatter'),
);
//Autowidth
$extra_params['autowidth'] = 'true';
@ -68,10 +68,10 @@ $action_links = 'function action_formatter (cellvalue, options, rowObject) {
}';
?>
<script>
$(function() {
$(function() {
<?php
// grid definition see the $usergroup>display() function
echo Display::grid_js('usergroups', $url,$columns,$column_model,$extra_params, array(), $action_links);
echo Display::grid_js('usergroups', $url,$columns,$column_model,$extra_params, array(), $action_links,true);
?>
});
</script>

@ -838,7 +838,7 @@ class Display {
* @return string the js code
*
*/
public static function grid_js($div_id, $url, $column_names, $column_model, $extra_params, $data = array(), $formatter = '') {
public static function grid_js($div_id, $url, $column_names, $column_model, $extra_params, $data = array(), $formatter = '', $width_fix = false) {
$obj = new stdClass();
if (!empty($url))
@ -908,8 +908,14 @@ class Display {
//Fixing true/false js values that doesn't need the ""
$json_encode = str_replace(':"true"',':true',$json_encode);
$json_encode = str_replace(':"false"',':false',$json_encode);
$json_encode = str_replace('"formatter":"action_formatter"','formatter:action_formatter',$json_encode);
if ($width_fix) {
//see BT#2020
$json .= "$(window).bind('resize', function() {
$('#".$div_id."').setGridWidth($(window).width() - 150);
}).trigger('resize');";
}
//Creating the jqgrid element
$json .= '$("#'.$div_id.'").jqGrid(';

Loading…
Cancel
Save