tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2011-08-08 Sergio Martin <sergio.martin@artica.es> 

* include/config_process.php
	operation/users/user_edit.php
	godmode/setup/setup_visuals.php: Fixed global block size
	edition and user config default block size setting
	for bug 3388207



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4679 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2011-08-08 11:20:56 +00:00
parent 0688693eb9
commit 5e495dc653
4 changed files with 45 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -1,3 +1,11 @@
2011-08-08 Sergio Martin <sergio.martin@artica.es>
* include/config_process.php
operation/users/user_edit.php
godmode/setup/setup_visuals.php: Fixed global block size
edition and user config default block size setting
for bug 3388207
2011-08-08 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* images/skin/skin_default/include/styles/pandora.css
include/styles/pandora.css: pagination margin is very small in some

2
pandora_console/godmode/setup/setup_visuals.php
View File

@ -64,7 +64,7 @@ $table->data[6][0] = __('Style template');
$table->data[6][1] = html_print_select (themes_get_css (), 'style', $config["style"].'.css', '', '', '', true);
$table->data[7][0] = __('Block size for pagination');
$table->data[7][1] = html_print_input_text ('block_size', $config["block_size"], '', 5, 5, true);
$table->data[7][1] = html_print_input_text ('block_size', $config["global_block_size"], '', 5, 5, true);
$table->data[8][0] = __('Use round corners');
$table->data[8][1] = __('Yes').'&nbsp;'.html_print_radio_button ('round_corner', 1, '', $config["round_corner"], true).'&nbsp;&nbsp;';

3
pandora_console/include/config_process.php
View File

@ -95,6 +95,9 @@ if ((!isset($config["timezone"])) OR ($config["timezone"] == "")){
date_default_timezone_set($config["timezone"]);
// Save the global block size
$config["global_block_size"] = $config["block_size"];
if (isset ($config['id_user'])){
$userinfo = get_user_info ($config['id_user']);

34
pandora_console/operation/users/user_edit.php
View File

@ -57,6 +57,11 @@ if (isset ($_GET["modified"]) && !$view_mode) {
$upd_info["language"] = get_parameter_post ("language", $user_info["language"]);
$upd_info["id_skin"] = get_parameter ("skin", $user_info["id_skin"]);
$upd_info["block_size"] = get_parameter ("block_size", $config["block_size"]);
$default_block_size = get_parameter ("default_block_size", 0);
if($default_block_size) {
$upd_info["block_size"] = 0;
}
$upd_info["flash_chart"] = get_parameter ("flash_charts", $config["flash_charts"]);
if ( !empty ($password_new)) {
@ -164,7 +169,16 @@ echo '</td></tr><tr><td class="datos">'.__('Flash charts').'</td><td class="dato
$values = array(-1 => __('Default'),1 => __('Yes'),0 => __('No'));
echo html_print_select($values, 'flash_charts', $user_info["flash_chart"], '', '', -1, true, false, false);
echo '</td></tr><tr><td class="datos">'.__('Block size for pagination').'</td><td class="datos2">';
echo html_print_input_text ('block_size', $user_info["block_size"], '', 5, 5, true);
if($user_info["block_size"] == 0) {
$block_size = $config["global_block_size"];
}
else {
$block_size = $user_info["block_size"];
}
echo html_print_input_text ('block_size', $block_size, '', 5, 5, true);
echo html_print_checkbox('default_block_size', 1, $user_info["block_size"] == 0, true);
echo __('Default').' ('.$config["global_block_size"].')';
echo '</td></tr></table>';
@ -209,3 +223,21 @@ if (!empty ($table->data)) {
echo '<div class="nf">'.__('This user doesn\'t have any assigned profile/group').'</div>';
}
?>
<script language="javascript" type="text/javascript">
$(document).ready (function () {
check_default_block_size()
$("#checkbox-default_block_size").change(function() {
check_default_block_size();
});
function check_default_block_size() {
if($("#checkbox-default_block_size").attr('checked')) {
$("#text-block_size").attr('disabled', true);
}
else {
$("#text-block_size").removeAttr('disabled');
}
}
});
</script>