September 2011 - Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5RC1-19176-g1ff9618
by Madhura Jayaratne 17 Sep '11

17 Sep '11

The branch, master has been updated via 1ff96183cb3031b3cacfd54169fff39717ed8982 (commit) via 4581e53735ac67e609ac4f4ff06db25e4b70849d (commit) via 7b4bb1c8657c1de0f9564fd0929ca0a0eaa515b3 (commit) from dad70b66d913ee1b0cac4ce3e7bd8bbff1728ada (commit) - Log ----------------------------------------------------------------- commit 1ff96183cb3031b3cacfd54169fff39717ed8982 Merge: 4581e53 dad70b6 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Sep 17 22:00:01 2011 +0530 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 4581e53735ac67e609ac4f4ff06db25e4b70849d Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Sep 17 21:57:10 2011 +0530 bug #3410984 - Zoom search, checkboxes and fields not being reset commit 7b4bb1c8657c1de0f9564fd0929ca0a0eaa515b3 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Sep 17 21:46:57 2011 +0530 Coding style improvements ----------------------------------------------------------------------- Summary of changes: js/tbl_zoom_plot.js | 4 +- tbl_zoom_select.php | 200 ++++++++++++++++++++++++++++++--------------------- 2 files changed, 122 insertions(+), 82 deletions(-) diff --git a/js/tbl_zoom_plot.js b/js/tbl_zoom_plot.js index 788ca63..df73c3c 100644 --- a/js/tbl_zoom_plot.js +++ b/js/tbl_zoom_plot.js @@ -469,10 +469,12 @@ $(document).ready(function() { }; $.post('tbl_zoom_select.php', post_params, function(data) { // Row is contained in data.row_info, now fill the displayResultForm with row values - for ( key in data.row_info) { + for (key in data.row_info) { if (data.row_info[key] == null) { $('#fields_null_id_' + fid).attr('checked', true); + $('#fieldID_' + fid).val(''); } else { + $('#fields_null_id_' + fid).attr('checked', false); $('#fieldID_' + fid).val(data.row_info[key]); } fid++; diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php index cf8a64f..a110ace 100644 --- a/tbl_zoom_select.php +++ b/tbl_zoom_select.php @@ -37,13 +37,14 @@ $GLOBALS['js_include'][] = 'jquery/timepicker.js'; if (isset($_REQUEST['get_data_row']) && $_REQUEST['get_data_row'] == true) { $extra_data = array(); - $row_info_query = 'SELECT * FROM `' . $_REQUEST['db'] . '`.`' . $_REQUEST['table'] . '` WHERE ' . $_REQUEST['where_clause']; - $result = PMA_DBI_query( $row_info_query . ";" , null, PMA_DBI_QUERY_STORE); + $row_info_query = 'SELECT * FROM `' . $_REQUEST['db'] . '`.`' + . $_REQUEST['table'] . '` WHERE ' . $_REQUEST['where_clause']; + $result = PMA_DBI_query($row_info_query . ";", null, PMA_DBI_QUERY_STORE); $fields_meta = PMA_DBI_get_fields_meta($result); while ($row = PMA_DBI_fetch_assoc($result)) { $extra_data['row_info'] = $row; } - PMA_ajaxResponse(NULL, true, $extra_data); + PMA_ajaxResponse(null, true, $extra_data); } $titles['Browse'] = PMA_tbl_setTitle($GLOBALS['cfg']['PropertiesIconic'], $pmaThemeImage); @@ -83,7 +84,7 @@ $foreigners = PMA_getForeigners($db, $table); $flag = 1; $tbl_fields_type = $tbl_fields_collation = $tbl_fields_null = array(); if (! isset($zoom_submit) && ! isset($inputs)) { - $dataLabel = PMA_getDisplayField($db,$table); + $dataLabel = PMA_getDisplayField($db, $table); } ?> <div id="sqlqueryresults"></div> @@ -114,7 +115,8 @@ if (isset($inputs) && ($inputs[0] != 'pma_null' || $inputs[1] != 'pma_null')) { */ ?> -<form method="post" action="tbl_zoom_select.php" name="insertForm" id="zoom_search_form" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : ''); ?>> +<form method="post" action="tbl_zoom_select.php" name="insertForm" id="zoom_search_form" + <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : ''); ?>> <?php echo PMA_generate_common_hidden_inputs($db, $table); ?> <input type="hidden" name="goto" value="<?php echo $goto; ?>" /> <input type="hidden" name="back" value="tbl_zoom_select.php" /> @@ -135,28 +137,29 @@ for ($i = 0; $i < 4; $i++) { echo __("Additional search criteria"); echo "</td></tr>"; } -?> + ?> <tr class="noclick <?php echo $odd_row ? 'odd' : 'even'; $odd_row = ! $odd_row; ?>"> <th><select name="inputs[]" id="<?php echo 'tableid_' . $i; ?>" > - <option value="<?php echo 'pma_null'; ?>"><?php echo __('None'); ?> </option> + <option value="<?php echo 'pma_null'; ?>"><?php echo __('None'); ?></option> <?php for ($j = 0 ; $j < $fields_cnt ; $j++) { if (isset($inputs[$i]) && $inputs[$i] == htmlspecialchars($fields_list[$j])) {?> - <option value="<?php echo htmlspecialchars($fields_list[$j]);?>" selected="selected"><?php echo htmlspecialchars($fields_list[$j]);?></option> + <option value="<?php echo htmlspecialchars($fields_list[$j]);?>" selected="selected"> + <?php echo htmlspecialchars($fields_list[$j]);?></option> <?php } else { ?> - <option value="<?php echo htmlspecialchars($fields_list[$j]);?>"><?php echo htmlspecialchars($fields_list[$j]);?></option> + <option value="<?php echo htmlspecialchars($fields_list[$j]);?>"> + <?php echo htmlspecialchars($fields_list[$j]);?></option> <?php } } ?> </select></th> - <td><?php if(isset($tbl_fields_type[$i]))echo $tbl_fields_type[$i]; ?></td> - <td><?php if(isset($tbl_fields_collation[$i]))echo $tbl_fields_collation[$i]; ?></td> - -<td> -<?php + <td><?php if (isset($tbl_fields_type[$i])) echo $tbl_fields_type[$i]; ?></td> + <td><?php if (isset($tbl_fields_collation[$i])) echo $tbl_fields_collation[$i]; ?></td> + <td> + <?php if (isset($inputs) && $inputs[$i] != 'pma_null') { ?> - <select name="zoomFunc[]"> + <select name="zoomFunc[]"> <?php if (strncasecmp($tbl_fields_type[$i], 'enum', 4) == 0) { foreach ($GLOBALS['cfg']['EnumOperators'] as $fc) { @@ -209,34 +212,41 @@ for ($i = 0; $i < 4; $i++) { } } } - ?> - </select> - </td> - <td> - <?php + ?> + </select> + </td> + <td> + <?php $field = $inputs[$i]; $foreignData = PMA_getForeignData($foreigners, $field, false, '', ''); if (isset($fields)) { - echo PMA_getForeignFields_Values($foreigners, $foreignData, $field, $tbl_fields_type, $i ,$db, $table, $titles, $GLOBALS['cfg']['ForeignKeyMaxLimit'], $fields); + echo PMA_getForeignFields_Values( + $foreigners, $foreignData, $field, $tbl_fields_type, $i, $db, + $table, $titles, $GLOBALS['cfg']['ForeignKeyMaxLimit'], $fields + ); } else { - echo PMA_getForeignFields_Values($foreigners, $foreignData, $field, $tbl_fields_type, $i ,$db, $table, $titles, $GLOBALS['cfg']['ForeignKeyMaxLimit'], ''); + echo PMA_getForeignFields_Values( + $foreigners, $foreignData, $field, $tbl_fields_type, $i, $db, + $table, $titles, $GLOBALS['cfg']['ForeignKeyMaxLimit'], '' + ); } } else { ?> - </td><td></td> + </td><td></td> <?php } ?> </tr> - - <tr><td><input type="hidden" name="types[<?php echo $i; ?>]" id="types_<?php echo $i; ?>" + <tr><td> + <input type="hidden" name="types[<?php echo $i; ?>]" id="types_<?php echo $i; ?>" value="<?php if(isset($tbl_fields_type[$i]))echo $tbl_fields_type[$i]; ?>" /> - <input type="hidden" name="collations[<?php echo $i; ?>]" - value="<?php if(isset($tbl_fields_collation[$i]))echo $tbl_fields_collation[$i]; ?>" /></td></tr> + <input type="hidden" name="collations[<?php echo $i; ?>]" + value="<?php if(isset($tbl_fields_collation[$i]))echo $tbl_fields_collation[$i]; ?>" /> + </td></tr> -<?php + <?php }//end for ?> </tbody> @@ -250,7 +260,7 @@ for ($i = 0; $i < 4; $i++) { //Set default datalabel if not selected if (isset($zoom_submit) && $inputs[0] != 'pma_null' && $inputs[1] != 'pma_null') { if ($dataLabel == '') { - $dataLabel = PMA_getDisplayField($db,$table); + $dataLabel = PMA_getDisplayField($db, $table); } } ?> @@ -261,13 +271,15 @@ if (isset($zoom_submit) && $inputs[0] != 'pma_null' && $inputs[1] != 'pma_null') <?php for ($j = 0; $j < $fields_cnt; $j++) { if (isset($dataLabel) && $dataLabel == htmlspecialchars($fields_list[$j])) { -?> - <option value="<?php echo htmlspecialchars($fields_list[$j]);?>" selected="selected"> <?php echo htmlspecialchars($fields_list[$j]);?></option> -<?php + ?> + <option value="<?php echo htmlspecialchars($fields_list[$j]);?>" selected="selected"> + <?php echo htmlspecialchars($fields_list[$j]);?></option> + <?php } else { -?> - <option value="<?php echo htmlspecialchars($fields_list[$j]);?>" > <?php echo htmlspecialchars($fields_list[$j]);?></option> -<?php + ?> + <option value="<?php echo htmlspecialchars($fields_list[$j]);?>" > + <?php echo htmlspecialchars($fields_list[$j]);?></option> + <?php } } ?> @@ -321,8 +333,14 @@ if (isset($zoom_submit) && $inputs[0] != 'pma_null' && $inputs[1] != 'pma_null' $cnt_func = count($zoomFunc[$i]); $func_type = $zoomFunc[$i]; list($charsets[$i]) = explode('_', $collations[$i]); - $unaryFlag = (isset($GLOBALS['cfg']['UnaryOperators'][$func_type]) && $GLOBALS['cfg']['UnaryOperators'][$func_type] == 1) ? true : false; - $whereClause = PMA_tbl_search_getWhereClause($fields[$i],$inputs[$i], $types[$i], $collations[$i], $func_type, $unaryFlag); + $unaryFlag = (isset($GLOBALS['cfg']['UnaryOperators'][$func_type]) + && $GLOBALS['cfg']['UnaryOperators'][$func_type] == 1) + ? true + : false; + $whereClause = PMA_tbl_search_getWhereClause( + $fields[$i], $inputs[$i], $types[$i], + $collations[$i], $func_type, $unaryFlag + ); if ($whereClause) { $w[] = $whereClause; } @@ -335,7 +353,7 @@ if (isset($zoom_submit) && $inputs[0] != 'pma_null' && $inputs[1] != 'pma_null' /* * Query execution part */ - $result = PMA_DBI_query($sql_query . ";" , null, PMA_DBI_QUERY_STORE); + $result = PMA_DBI_query($sql_query . ";", null, PMA_DBI_QUERY_STORE); $fields_meta = PMA_DBI_get_fields_meta($result); while ($row = PMA_DBI_fetch_assoc($result)) { //Need a row with indexes as 0,1,2 for the PMA_getUniqueCondition hence using a temporary array @@ -349,81 +367,101 @@ if (isset($zoom_submit) && $inputs[0] != 'pma_null' && $inputs[1] != 'pma_null' //Append it to row array as where_clause $row['where_clause'] = $uniqueCondition[0]; if ($dataLabel == $inputs[0] || $dataLabel == $inputs[1]) { - $data[] = array($inputs[0] => $row[$inputs[0]], $inputs[1] => $row[$inputs[1]], 'where_clause' => $uniqueCondition[0]); + $data[] = array( + $inputs[0] => $row[$inputs[0]], + $inputs[1] => $row[$inputs[1]], + 'where_clause' => $uniqueCondition[0] + ); } elseif ($dataLabel) { - $data[] = array($inputs[0] => $row[$inputs[0]], $inputs[1] => $row[$inputs[1]], $dataLabel => $row[$dataLabel], 'where_clause' => $uniqueCondition[0]); + $data[] = array( + $inputs[0] => $row[$inputs[0]], + $inputs[1] => $row[$inputs[1]], + $dataLabel => $row[$dataLabel], + 'where_clause' => $uniqueCondition[0] + ); } else { - $data[] = array($inputs[0] => $row[$inputs[0]], $inputs[1] => $row[$inputs[1]], $dataLabel => '', 'where_clause' => $uniqueCondition[0]); + $data[] = array( + $inputs[0] => $row[$inputs[0]], + $inputs[1] => $row[$inputs[1]], + $dataLabel => '', + 'where_clause' => $uniqueCondition[0] + ); } } /* * Form for displaying point data and also the scatter plot */ -?> - <form method="post" action="tbl_zoom_select.php" name="displayResultForm" id="zoom_display_form" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : ''); ?>> + ?> + <form method="post" action="tbl_zoom_select.php" name="displayResultForm" id="zoom_display_form" + <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : ''); ?>> <?php echo PMA_generate_common_hidden_inputs($db, $table); ?> <input type="hidden" name="goto" value="<?php echo $goto; ?>" /> <input type="hidden" name="back" value="tbl_zoom_select.php" /> <fieldset id="displaySection"> - <legend><?php echo __('Browse/Edit the points') ?></legend> -<center> -<?php + <legend><?php echo __('Browse/Edit the points') ?></legend> + <center> + <?php //JSON encode the data(query result) if (isset($zoom_submit) && ! empty($data)) { -?> - <div id='resizer' style="width:600px;height:400px"> -<center> <a href="#" onClick="displayHelp();"><?php echo __('How to use'); ?></a> </center> - <div id="querydata" style="display:none"> -<?php + ?> + <div id='resizer' style="width:600px;height:400px"> + <center><a href="#" onClick="displayHelp();"><?php echo __('How to use'); ?></a></center> + <div id="querydata" style="display:none"> + <?php echo json_encode($data); -?> - </div> - <div id="querychart" style="float:right"></div> - </div> - <?php + ?> + </div> + <div id="querychart" style="float:right"></div> + </div> + <?php } -?> - </center> - <fieldset id='dataDisplay' style="display:none"> + ?> + </center> + <fieldset id='dataDisplay' style="display:none"> <fieldset> <table class="data"> - <thead> - <tr> -<th> <?php echo __('Column'); ?> </th> -<th> <?php echo __('Null'); ?> </th> - <th> <?php echo __('Value'); ?> </th> -</tr> - </thead> - <tbody> -<?php + <thead> + <tr> + <th> <?php echo __('Column'); ?> </th> + <th> <?php echo __('Null'); ?> </th> + <th> <?php echo __('Value'); ?> </th> + </tr> + </thead> + <tbody> + <?php $odd_row = true; for ($i = 4; $i < $fields_cnt + 4; $i++) { $tbl_fields_type[$i] = $fields_type[$i - 4]; $fieldpopup = $fields_list[$i - 4]; $foreignData = PMA_getForeignData($foreigners, $fieldpopup, false, '', ''); -?> - <tr class="noclick <?php echo $odd_row ? 'odd' : 'even'; $odd_row = ! $odd_row; ?>"> - <th><?php echo htmlspecialchars($fields_list[$i - 4]); ?></th> - <th><?php echo '<input type="checkbox" class="checkbox_null" name="fields_null[ ' . $i . ' ]" id="fields_null_id_' . $i . '" />'; ?></th> - <th><?php echo PMA_getForeignFields_Values($foreigners, $foreignData, $fieldpopup, $tbl_fields_type, $i, $db, $table, $titles,$GLOBALS['cfg']['ForeignKeyMaxLimit'], '' ); ?> </th> - </tr> -<?php + ?> + <tr class="noclick <?php echo $odd_row ? 'odd' : 'even'; $odd_row = ! $odd_row; ?>"> + <th><?php echo htmlspecialchars($fields_list[$i - 4]); ?></th> + <th><?php echo '<input type="checkbox" class="checkbox_null" name="fields_null[ ' + . $i . ' ]" id="fields_null_id_' . $i . '" />'; ?> + </th> + <th> <?php + echo PMA_getForeignFields_Values( + $foreigners, $foreignData, $fieldpopup, $tbl_fields_type, + $i, $db, $table, $titles, $GLOBALS['cfg']['ForeignKeyMaxLimit'], '' + ); ?> + </th> + </tr> + <?php } -?> - </tbody> + ?> + </tbody> </table> </fieldset> <fieldset class="tblFooters"> <input type="submit" id="submitForm" name="edit_point" value="<?php echo __('Submit'); ?>" /> </fieldset> - </fieldset> - + </fieldset> </fieldset> <input type="hidden" id="queryID" name="sql_query" /> </form> - </fieldset> -<?php + <?php } require './libraries/footer.inc.php'; ?> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5RC1-19173-gdad70b6
by Rouslan Placella 17 Sep '11

17 Sep '11

The branch, master has been updated via dad70b66d913ee1b0cac4ce3e7bd8bbff1728ada (commit) from d01bb41213b9241e0d45b5a3f63b6869bb85a071 (commit) - Log ----------------------------------------------------------------- commit dad70b66d913ee1b0cac4ce3e7bd8bbff1728ada Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Sep 17 15:54:27 2011 +0100 Fixed broken retreival of triggers for a specific table ----------------------------------------------------------------------- Summary of changes: libraries/database_interface.lib.php | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index 709e15f..f0520a7 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -1603,12 +1603,12 @@ function PMA_DBI_get_triggers($db, $table = '', $delimiter = '//') // Note: in http://dev.mysql.com/doc/refman/5.0/en/faqs-triggers.html // their example uses WHERE TRIGGER_SCHEMA='dbname' so let's use this // instead of WHERE EVENT_OBJECT_SCHEMA='dbname' - $query = "SELECT TRIGGER_SCHEMA, TRIGGER_NAME, EVENT_MANIPULATION, EVENT_OBJECT_TABLE, ACTION_TIMING, ACTION_STATEMENT, EVENT_OBJECT_SCHEMA, EVENT_OBJECT_TABLE, DEFINER FROM information_schema.TRIGGERS WHERE TRIGGER_SCHEMA= '" . PMA_sqlAddSlashes($db,true) . "';"; + $query = "SELECT TRIGGER_SCHEMA, TRIGGER_NAME, EVENT_MANIPULATION, EVENT_OBJECT_TABLE, ACTION_TIMING, ACTION_STATEMENT, EVENT_OBJECT_SCHEMA, EVENT_OBJECT_TABLE, DEFINER FROM information_schema.TRIGGERS WHERE TRIGGER_SCHEMA= '" . PMA_sqlAddSlashes($db) . "'"; if (! empty($table)) { - $query .= " AND EVENT_OBJECT_TABLE = '" . PMA_sqlAddSlashes($table, true) . "';"; + $query .= " AND EVENT_OBJECT_TABLE = '" . PMA_sqlAddSlashes($table) . "';"; } } else { - $query = "SHOW TRIGGERS FROM " . PMA_backquote(PMA_sqlAddSlashes($db,true)); + $query = "SHOW TRIGGERS FROM " . PMA_backquote($db); if (! empty($table)) { $query .= " LIKE '" . PMA_sqlAddSlashes($table, true) . "';"; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5RC1-19172-gd01bb41
by Rouslan Placella 17 Sep '11

17 Sep '11

The branch, master has been updated via d01bb41213b9241e0d45b5a3f63b6869bb85a071 (commit) via 3f5662ff11a16b7942a9a68ca3ceff4380bce7d4 (commit) via 82be0e66334190bfc0422270fe5bb422ac7aae65 (commit) via ad4fa3547b78cfe9e968c251d06a83b8fa1a9219 (commit) via af4e15b6ff3e3293d810f694a677b4a5b16ab4ce (commit) via 6dbab1fb38a97d3c6c88c382a9318e80fa2c5c2e (commit) via d39db8e3b604743489582c20f39456a83c3bb387 (commit) via 537c319abb815dfeaf01352df9ee1b93a3407868 (commit) via d47fdde6c0d40acdbb6b2b9d8e127a5278b552fb (commit) via dd566ec76c0e182f6367dcc157b1cb4eeb30ff29 (commit) from 85a990fabd4a3239f011f8d168be8558a802f96a (commit) - Log ----------------------------------------------------------------- commit d01bb41213b9241e0d45b5a3f63b6869bb85a071 Merge: 3f5662f 85a990f Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Sep 17 15:28:17 2011 +0100 Merge remote-tracking branch 'origin/master' commit 3f5662ff11a16b7942a9a68ca3ceff4380bce7d4 Merge: dc35ecf 82be0e6 Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Sep 17 15:21:53 2011 +0100 Merge branch 'ajax_message' commit 82be0e66334190bfc0422270fe5bb422ac7aae65 Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Sep 17 15:18:55 2011 +0100 Ajax message "Processing request" also should not disappear and should not be dismissable commit ad4fa3547b78cfe9e968c251d06a83b8fa1a9219 Author: Rouslan Placella <rouslan(a)placella.com> Date: Wed Sep 14 16:09:15 2011 +0100 Fixed comment commit af4e15b6ff3e3293d810f694a677b4a5b16ab4ce Merge: 6dbab1f abc1d3c Author: Rouslan Placella <rouslan(a)placella.com> Date: Wed Sep 14 15:58:04 2011 +0100 Merge branch 'master' into ajax_message commit 6dbab1fb38a97d3c6c88c382a9318e80fa2c5c2e Author: Rouslan Placella <rouslan(a)placella.com> Date: Wed Sep 14 15:28:30 2011 +0100 Prevent error notifications from disappearing in Routines, Triggers and Events implemetatations commit d39db8e3b604743489582c20f39456a83c3bb387 Author: Rouslan Placella <rouslan(a)placella.com> Date: Wed Sep 14 15:27:11 2011 +0100 Improved dismissable Ajax notifications, so that error messages don't disappear commit 537c319abb815dfeaf01352df9ee1b93a3407868 Merge: d47fdde 6b09880 Author: Rouslan Placella <rouslan(a)placella.com> Date: Wed Sep 14 13:00:03 2011 +0100 Merge branch 'master' into ajax_message commit d47fdde6c0d40acdbb6b2b9d8e127a5278b552fb Merge: dd566ec dd0b139 Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Sep 10 21:11:53 2011 +0100 Merge branch 'master' into ajax_message commit dd566ec76c0e182f6367dcc157b1cb4eeb30ff29 Author: Rouslan Placella <rouslan(a)placella.com> Date: Tue Aug 23 19:53:57 2011 +0100 Make ajax notifications dismissable ----------------------------------------------------------------------- Summary of changes: js/functions.js | 146 ++++++++++++++++++++++++++++++++++++++++++++-------- js/messages.php | 1 + js/rte/common.js | 8 ++-- js/rte/routines.js | 4 +- 4 files changed, 131 insertions(+), 28 deletions(-) diff --git a/js/functions.js b/js/functions.js index b0fc717..f67b6a9 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1291,62 +1291,136 @@ $(document).ready(function(){ /** * Show a message on the top of the page for an Ajax request * - * @param var message string containing the message to be shown. + * Sample usage: + * + * 1) var $msg = PMA_ajaxShowMessage(); + * This will show a message that reads "Loading...". Such a message will not + * disappear automatically and cannot be dismissed by the user. To remove this + * message either the PMA_ajaxRemoveMessage($msg) function must be called or + * another message must be show with PMA_ajaxShowMessage() function. + * + * 2) var $msg = PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']); + * This is a special case. The behaviour is same as above, + * just with a different message + * + * 3) var $msg = PMA_ajaxShowMessage('The operation was successful'); + * This will show a message that will disappear automatically and it can also + * be dismissed by the user. + * + * 4) var $msg = PMA_ajaxShowMessage('Some error', false); + * This will show a message that will not disappear automatically, but it + * can be dismissed by the user after he has finished reading it. + * + * @param string message string containing the message to be shown. * optional, defaults to 'Loading...' - * @param var timeout number of milliseconds for the message to be visible - * optional, defaults to 5000 + * @param mixed timeout number of milliseconds for the message to be visible + * optional, defaults to 5000. If set to 'false', the + * notification will never disappear * @return jQuery object jQuery Element that holds the message div + * this object can be passed to PMA_ajaxRemoveMessage() + * to remove the notification */ function PMA_ajaxShowMessage(message, timeout) { - - //Handle the case when a empty data.message is passed. We don't want the empty message + /** + * @var self_closing Whether the notification will automatically disappear + */ + var self_closing = true; + /** + * @var dismissable Whether the user will be able to remove + * the notification by clicking on it + */ + var dismissable = true; + // Handle the case when a empty data.message is passed. + // We don't want the empty message if (message == '') { return true; } else if (! message) { // If the message is undefined, show the default message = PMA_messages['strLoading']; - } - - /** - * @var timeout Number of milliseconds for which the message will be visible - * @default 5000 ms - */ - if (! timeout) { + dismissable = false; + self_closing = false; + } else if (message == PMA_messages['strProcessingRequest']) { + // This is another case where the message should not disappear + dismissable = false; + self_closing = false; + } + // Figure out whether (or after how long) to remove the notification + if (timeout == undefined) { timeout = 5000; + } else if (timeout === false) { + self_closing = false; } - // Create a parent element for the AJAX messages, if necessary if ($('#loading_parent').length == 0) { $('<div id="loading_parent"></div>') .insertBefore("#serverinfo"); } - // Update message count to create distinct message elements every time ajax_message_count++; - // Remove all old messages, if any $(".ajax_notification[id^=ajax_message_num]").remove(); - /** * @var $retval a jQuery object containing the reference * to the created AJAX message */ - var $retval = $('<span class="ajax_notification" id="ajax_message_num_' + ajax_message_count + '"></span>') - .hide() - .appendTo("#loading_parent") - .html(message) - .fadeIn('medium') + var $retval = $( + '<span class="ajax_notification" id="ajax_message_num_' + + ajax_message_count + + '"></span>' + ) + .hide() + .appendTo("#loading_parent") + .html(message) + .fadeIn('medium'); + // If the notification is self-closing we should create a callback to remove it + if (self_closing) { + $retval .delay(timeout) .fadeOut('medium', function() { + if ($(this).is('.dismissable')) { + // Here we should destroy the qtip instance, but + // due to a bug in qtip's implementation we can + // only hide it without throwing JS errors. + $(this).qtip('hide'); + } + // Remove the notification $(this).remove(); }); + } + // If the notification is dismissable we need to add the relevant class to it + // and add a tooltip so that the users know that it can be removed + if (dismissable) { + $retval.addClass('dismissable').css('cursor', 'pointer'); + /** + * @var qOpts Options for "Dismiss notification" tooltip + */ + var qOpts = { + show: { + effect: { length: 0 }, + delay: 0 + }, + hide: { + effect: { length: 0 }, + delay: 0 + } + }; + /** + * Add a tooltip to the notification to let the user know that (s)he + * can dismiss the ajax notification by clicking on it. + */ + PMA_createqTip($retval, PMA_messages['strDismiss'], qOpts); + } return $retval; } /** * Removes the message shown for an Ajax operation when it's completed + * + * @param jQuery object jQuery Element that holds the notification + * + * @return nothing */ function PMA_ajaxRemoveMessage($this_msgbox) { @@ -1354,9 +1428,37 @@ function PMA_ajaxRemoveMessage($this_msgbox) $this_msgbox .stop(true, true) .fadeOut('medium'); + if ($this_msgbox.is('.dismissable')) { + // Here we should destroy the qtip instance, but + // due to a bug in qtip's implementation we can + // only hide it without throwing JS errors. + $this_msgbox.qtip('hide'); + } } } +$(document).ready(function() { + /** + * Allows the user to dismiss a notification + * created with PMA_ajaxShowMessage() + */ + $('.ajax_notification.dismissable').live('click', function () { + PMA_ajaxRemoveMessage($(this)); + }); + /** + * The below two functions hide the "Dismiss notification" tooltip when a user + * is hovering a link or button that is inside an ajax message + */ + $('.ajax_notification a, .ajax_notification button, .ajax_notification input') + .live('mouseover', function () { + $(this).parents('.ajax_notification').qtip('hide'); + }); + $('.ajax_notification a, .ajax_notification button, .ajax_notification input') + .live('mouseout', function () { + $(this).parents('.ajax_notification').qtip('show'); + }); +}); + /** * Hides/shows the "Open in ENUM/SET editor" message, depending on the data type of the column currently selected */ @@ -2895,7 +2997,7 @@ var toggleButton = function ($obj) { } else { $(this).addClass('isActive'); } - var $msg = PMA_ajaxShowMessage(PMA_messages['strLoading']); + var $msg = PMA_ajaxShowMessage(); var $container = $(this); var callback = $('.callback', this).text(); // Perform the actual toggle diff --git a/js/messages.php b/js/messages.php index daed474..96f759b 100644 --- a/js/messages.php +++ b/js/messages.php @@ -214,6 +214,7 @@ $js_messages['strErrorProcessingRequest'] = __('Error in Processing Request'); $js_messages['strDroppingColumn'] = __('Dropping Column'); $js_messages['strAddingPrimaryKey'] = __('Adding Primary Key'); $js_messages['strOK'] = __('OK'); +$js_messages['strDismiss'] = __('Click to dismiss this notification'); /* For db_operations.js */ $js_messages['strRenamingDatabases'] = __('Renaming Databases'); diff --git a/js/rte/common.js b/js/rte/common.js index 8523459..842f325 100644 --- a/js/rte/common.js +++ b/js/rte/common.js @@ -198,7 +198,7 @@ $(document).ready(function () { }); } } else { - PMA_ajaxShowMessage(data.error); + PMA_ajaxShowMessage(data.error, false); } }); // end $.post() } // end "if (RTE.validate())" @@ -245,7 +245,7 @@ $(document).ready(function () { // Execute item-specific code RTE.postDialogShow(data); } else { - PMA_ajaxShowMessage(data.error); + PMA_ajaxShowMessage(data.error, false); } }); // end $.get() }); // end $.live() @@ -301,7 +301,7 @@ $(document).ready(function () { var opts = {lineNumbers: true, matchBrackets: true, indentUnit: 4, mode: "text/x-mysql"}; CodeMirror.fromTextArea($elm[0], opts); } else { - PMA_ajaxShowMessage(data.error); + PMA_ajaxShowMessage(data.error, false); } }); // end $.get() }); // end $.live() @@ -370,7 +370,7 @@ $(document).ready(function () { // Show the query that we just executed PMA_slidingMessage(data.sql_query); } else { - PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error); + PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error, false); } }); // end $.get() }); // end $.PMA_confirm() diff --git a/js/rte/routines.js b/js/rte/routines.js index ac7a291..087b9d6 100644 --- a/js/rte/routines.js +++ b/js/rte/routines.js @@ -357,7 +357,7 @@ $(document).ready(function () { PMA_slidingMessage(data.message); $ajaxDialog.dialog('close'); } else { - PMA_ajaxShowMessage(data.error); + PMA_ajaxShowMessage(data.error, false); } }); }; @@ -388,7 +388,7 @@ $(document).ready(function () { PMA_slidingMessage(data.message); } } else { - PMA_ajaxShowMessage(data.error); + PMA_ajaxShowMessage(data.error, false); } }); // end $.get() }); // end $.live() hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5RC1-19162-g85a990f
by Madhura Jayaratne 17 Sep '11

17 Sep '11

The branch, master has been updated via 85a990fabd4a3239f011f8d168be8558a802f96a (commit) via 1371398618fceb23db86e35252e1062c2c359bc7 (commit) via 472350cf97095c70c163d70539b5f963d4ce1cbb (commit) via edeba16cd76a6b48f22867dd6d6c2bbc9ed85d44 (commit) via 5643a33596f72a3a9b354a9ebd079ed36cd824ec (commit) via 5c03bd90e1466b2bad378e5400193a593535bb10 (commit) via b8815ca7669feddb50dfb670f97281e87c3d9b62 (commit) via 3936aab8804630a31afc98802afad3f7b27a28f7 (commit) via a61891560ff97a98a8339e1151330203dc0ccafd (commit) via fbcc3eb3a2d1f33f8a6d3e0f89f06ec82ab2d94c (commit) from dc35ecf227db206998ce20517b4e51ef05342f39 (commit) - Log ----------------------------------------------------------------- commit 85a990fabd4a3239f011f8d168be8558a802f96a Merge: 1371398 dc35ecf Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Sep 17 19:41:45 2011 +0530 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 1371398618fceb23db86e35252e1062c2c359bc7 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Sep 17 19:36:59 2011 +0530 Remove trailing white spaces commit 472350cf97095c70c163d70539b5f963d4ce1cbb Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Sep 17 19:28:35 2011 +0530 Spaces to make the code more readable commit edeba16cd76a6b48f22867dd6d6c2bbc9ed85d44 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Sep 17 19:06:18 2011 +0530 Proper indentation commit 5643a33596f72a3a9b354a9ebd079ed36cd824ec Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Sep 17 18:48:45 2011 +0530 Adding missing semicolons commit 5c03bd90e1466b2bad378e5400193a593535bb10 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Sep 17 18:46:09 2011 +0530 Fixing indentation commit b8815ca7669feddb50dfb670f97281e87c3d9b62 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Sep 17 18:30:46 2011 +0530 Always use curly braces with 'if' and 'else' commit 3936aab8804630a31afc98802afad3f7b27a28f7 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Sep 17 18:24:36 2011 +0530 More indentation problems fixed commit a61891560ff97a98a8339e1151330203dc0ccafd Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Sep 17 18:09:55 2011 +0530 Proper indentation commit fbcc3eb3a2d1f33f8a6d3e0f89f06ec82ab2d94c Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Sep 17 18:04:40 2011 +0530 Added missing semicolons ----------------------------------------------------------------------- Summary of changes: js/tbl_zoom_plot.js | 778 ++++++++++++++++++++++++++------------------------- 1 files changed, 391 insertions(+), 387 deletions(-) diff --git a/js/tbl_zoom_plot.js b/js/tbl_zoom_plot.js index b8c4259..788ca63 100644 --- a/js/tbl_zoom_plot.js +++ b/js/tbl_zoom_plot.js @@ -11,7 +11,7 @@ ** Display Help/Info **/ function displayHelp() { - var msgbox = PMA_ajaxShowMessage(PMA_messages['strDisplayHelp'],10000); + var msgbox = PMA_ajaxShowMessage(PMA_messages['strDisplayHelp'], 10000); msgbox.click(function() { PMA_ajaxRemoveMessage(msgbox); }); @@ -23,7 +23,7 @@ function displayHelp() { **/ Array.max = function (array) { return Math.max.apply( Math, array ); -} +}; /** ** Extend the array object for min function @@ -31,11 +31,11 @@ Array.max = function (array) { **/ Array.min = function (array) { return Math.min.apply( Math, array ); -} +}; /** ** Checks if a string contains only numeric value - ** @param n: String (to be checked) + ** @param n: String (to be checked) **/ function isNumeric(n) { return !isNaN(parseFloat(n)) && isFinite(n); @@ -43,7 +43,7 @@ function isNumeric(n) { /** ** Checks if an object is empty - ** @param n: Object (to be checked) + ** @param n: Object (to be checked) **/ function isEmpty(obj) { var name; @@ -58,16 +58,16 @@ function isEmpty(obj) { ** @param val Integer Timestamp ** @param type String Field type(datetime/timestamp/time/date) **/ -function getDate(val,type) { - if(type.toString().search(/datetime/i) != -1 || type.toString().search(/timestamp/i) != -1) { - return Highcharts.dateFormat('%Y-%m-%e %H:%M:%S', val) - } - else if(type.toString().search(/time/i) != -1) { - return Highcharts.dateFormat('%H:%M:%S', val) - } +function getDate(val, type) { + if (type.toString().search(/datetime/i) != -1 || type.toString().search(/timestamp/i) != -1) { + return Highcharts.dateFormat('%Y-%m-%e %H:%M:%S', val); + } + else if (type.toString().search(/time/i) != -1) { + return Highcharts.dateFormat('%H:%M:%S', val); + } else if (type.toString().search(/date/i) != -1) { - return Highcharts.dateFormat('%Y-%m-%e', val) - } + return Highcharts.dateFormat('%Y-%m-%e', val); + } } /** @@ -75,42 +75,42 @@ function getDate(val,type) { ** @param val String Date ** @param type Sring Field type(datetime/timestamp/time/date) **/ -function getTimeStamp(val,type) { - if(type.toString().search(/datetime/i) != -1 || type.toString().search(/timestamp/i) != -1) { - return getDateFromFormat(val,'yyyy-MM-dd HH:mm:ss', val) - } - else if(type.toString().search(/time/i) != -1) { - return getDateFromFormat('1970-01-01 ' + val,'yyyy-MM-dd HH:mm:ss') - } +function getTimeStamp(val, type) { + if (type.toString().search(/datetime/i) != -1 || type.toString().search(/timestamp/i) != -1) { + return getDateFromFormat(val, 'yyyy-MM-dd HH:mm:ss', val); + } + else if (type.toString().search(/time/i) != -1) { + return getDateFromFormat('1970-01-01 ' + val, 'yyyy-MM-dd HH:mm:ss'); + } else if (type.toString().search(/date/i) != -1) { - return getDateFromFormat(val,'yyyy-MM-dd') - } + return getDateFromFormat(val, 'yyyy-MM-dd'); + } } /** ** Classifies the field type into numeric,timeseries or text ** @param field: field type (as in database structure) - **/ + **/ function getType(field) { - if(field.toString().search(/int/i) != -1 || field.toString().search(/decimal/i) != -1 || field.toString().search(/year/i) != -1) + if (field.toString().search(/int/i) != -1 || field.toString().search(/decimal/i) != -1 || field.toString().search(/year/i) != -1) return 'numeric'; - else if(field.toString().search(/time/i) != -1 || field.toString().search(/date/i) != -1) + else if (field.toString().search(/time/i) != -1 || field.toString().search(/date/i) != -1) return 'time'; else return 'text'; } -/** +/** ** Converts a categorical array into numeric array ** @param array categorical values array **/ function getCord(arr) { var newCord = new Array(); - var original = $.extend(true,[],arr); + var original = $.extend(true, [], arr); var arr = jQuery.unique(arr).sort(); - $.each(original, function(index,value) { - newCord.push(jQuery.inArray(value,arr)); + $.each(original, function(index, value) { + newCord.push(jQuery.inArray(value, arr)); }); - return [newCord,arr,original]; + return [newCord, arr, original]; } /** @@ -140,23 +140,21 @@ function includePan(currentChart) { $('#querychart').mousemove(function(e) { if (mouseDown == 1) { if (e.pageX > lastX) { - var xExtremes = currentChart.xAxis[0].getExtremes(); + var xExtremes = currentChart.xAxis[0].getExtremes(); var diff = (e.pageX - lastX) * (xExtremes.max - xExtremes.min) / chartWidth; currentChart.xAxis[0].setExtremes(xExtremes.min - diff, xExtremes.max - diff); - } - else if (e.pageX < lastX) { - var xExtremes = currentChart.xAxis[0].getExtremes(); + } else if (e.pageX < lastX) { + var xExtremes = currentChart.xAxis[0].getExtremes(); var diff = (lastX - e.pageX) * (xExtremes.max - xExtremes.min) / chartWidth; currentChart.xAxis[0].setExtremes(xExtremes.min + diff, xExtremes.max + diff); } if (e.pageY > lastY) { - var yExtremes = currentChart.yAxis[0].getExtremes(); + var yExtremes = currentChart.yAxis[0].getExtremes(); var ydiff = 1.0 * (e.pageY - lastY) * (yExtremes.max - yExtremes.min) / chartHeight; currentChart.yAxis[0].setExtremes(yExtremes.min + ydiff, yExtremes.max + ydiff); - } - else if (e.pageY < lastY) { - var yExtremes = currentChart.yAxis[0].getExtremes(); + } else if (e.pageY < lastY) { + var yExtremes = currentChart.yAxis[0].getExtremes(); var ydiff = 1.0 * (lastY - e.pageY) * (yExtremes.max - yExtremes.min) / chartHeight; currentChart.yAxis[0].setExtremes(yExtremes.min - ydiff, yExtremes.max - ydiff); } @@ -176,7 +174,7 @@ $(document).ready(function() { cache: 'false' }); - var cursorMode = ($("input[name='mode']:checked").val() == 'edit') ? 'crosshair' : 'pointer'; + var cursorMode = ($("input[name='mode']:checked").val() == 'edit') ? 'crosshair' : 'pointer'; var currentChart = null; var currentData = null; var xLabel = $('#tableid_0').val(); @@ -189,7 +187,7 @@ $(document).ready(function() { var zoomRatio = 1; - // Get query result + // Get query result var data = jQuery.parseJSON($('#querydata').html()); /** @@ -197,38 +195,39 @@ $(document).ready(function() { **/ $('#tableid_0').change(function() { $('#zoom_search_form').submit(); - }) + }); $('#tableid_1').change(function() { $('#zoom_search_form').submit(); - }) + }); $('#tableid_2').change(function() { $('#zoom_search_form').submit(); - }) + }); $('#tableid_3').change(function() { $('#zoom_search_form').submit(); - }) + }); /** * Input form validation - **/ + **/ $('#inputFormSubmitId').click(function() { - if ($('#tableid_0').get(0).selectedIndex == 0 || $('#tableid_1').get(0).selectedIndex == 0) - PMA_ajaxShowMessage(PMA_messages['strInputNull']); - else if (xLabel == yLabel) + if ($('#tableid_0').get(0).selectedIndex == 0 || $('#tableid_1').get(0).selectedIndex == 0) { + PMA_ajaxShowMessage(PMA_messages['strInputNull']); + } else if (xLabel == yLabel) { PMA_ajaxShowMessage(PMA_messages['strSameInputs']); + } }); /** - ** Prepare a div containing a link, otherwise it's incorrectly displayed + ** Prepare a div containing a link, otherwise it's incorrectly displayed ** after a couple of clicks **/ $('<div id="togglesearchformdiv"><a id="togglesearchformlink"></a></div>') - .insertAfter('#zoom_search_form') - // don't show it until we have results on-screen - .hide(); + .insertAfter('#zoom_search_form') + // don't show it until we have results on-screen + .hide(); $('#togglesearchformlink') .html(PMA_messages['strShowSearchCriteria']) @@ -243,466 +242,471 @@ $(document).ready(function() { // avoid default click action return false; }); - - /** + + /** ** Set dialog properties for the data display form **/ $("#dataDisplay").dialog({ autoOpen: false, - title: 'Data point content', + title: 'Data point content', modal: false, //false otherwise other dialogues like timepicker may not function properly height: $('#dataDisplay').height() + 80, width: $('#dataDisplay').width() + 80 }); /* - * Handle submit of zoom_display_form + * Handle submit of zoom_display_form */ - + $("#submitForm").click(function(event) { - + //Prevent default submission of form event.preventDefault(); - - //Find changed values by comparing form values with selectedRow Object - var newValues = new Array();//Stores the values changed from original + + //Find changed values by comparing form values with selectedRow Object + var newValues = new Array();//Stores the values changed from original var it = 4; var xChange = false; var yChange = false; - for (key in selectedRow) { - if (key != 'where_clause'){ - var oldVal = selectedRow[key]; - var newVal = ($('#fields_null_id_' + it).attr('checked')) ? null : $('#fieldID_' + it).val(); - if (oldVal != newVal){ - selectedRow[key] = newVal; - newValues[key] = newVal; - if(key == xLabel) { - xChange = true; - data[currentData][xLabel] = newVal; - } - else if(key == yLabel) { - yChange = true; - data[currentData][yLabel] = newVal; + for (key in selectedRow) { + if (key != 'where_clause') { + var oldVal = selectedRow[key]; + var newVal = ($('#fields_null_id_' + it).attr('checked')) ? null : $('#fieldID_' + it).val(); + if (oldVal != newVal) { + selectedRow[key] = newVal; + newValues[key] = newVal; + if (key == xLabel) { + xChange = true; + data[currentData][xLabel] = newVal; + } else if (key == yLabel) { + yChange = true; + data[currentData][yLabel] = newVal; + } + } } - } - } - it++ - }//End data update - - //Update the chart series and replot + it++; + } //End data update + + //Update the chart series and replot if (xChange || yChange) { - var newSeries = new Array(); - newSeries[0] = new Object(); + var newSeries = new Array(); + newSeries[0] = new Object(); newSeries[0].marker = { symbol: 'circle' }; - //Logic similar to plot generation, replot only if xAxis changes or yAxis changes. Code includes a lot of checks so as to replot only when necessary - if(xChange) { - xCord[currentData] = selectedRow[xLabel]; - if(xType == 'numeric') { - currentChart.series[0].data[currentData].update({ x : selectedRow[xLabel] }); - currentChart.xAxis[0].setExtremes(Array.min(xCord) - 6,Array.max(xCord) + 6); - } - else if(xType == 'time') { - currentChart.series[0].data[currentData].update({ x : getTimeStamp(selectedRow[xLabel],$('#types_0').val())}); - } - else { - var tempX = getCord(xCord); - var tempY = getCord(yCord); - var i = 0; - newSeries[0].data = new Array(); - xCord = tempX[2]; - yCord = tempY[2]; - - $.each(data,function(key,value) { - if(yType != 'text') - newSeries[0].data.push({ name: value[dataLabel], x: tempX[0][i], y: value[yLabel], marker: {fillColor: colorCodes[i % 8]} , id: i } ); - else + //Logic similar to plot generation, replot only if xAxis changes or yAxis changes. Code includes a lot of checks so as to replot only when necessary + if (xChange) { + xCord[currentData] = selectedRow[xLabel]; + if (xType == 'numeric') { + currentChart.series[0].data[currentData].update({ x : selectedRow[xLabel] }); + currentChart.xAxis[0].setExtremes(Array.min(xCord) - 6, Array.max(xCord) + 6); + } else if (xType == 'time') { + currentChart.series[0].data[currentData].update({ x : getTimeStamp(selectedRow[xLabel], $('#types_0').val())}); + } else { + var tempX = getCord(xCord); + var tempY = getCord(yCord); + var i = 0; + newSeries[0].data = new Array(); + xCord = tempX[2]; + yCord = tempY[2]; + + $.each(data, function(key, value) { + if (yType != 'text') { + newSeries[0].data.push({ name: value[dataLabel], x: tempX[0][i], y: value[yLabel], marker: {fillColor: colorCodes[i % 8]} , id: i } ); + } else { newSeries[0].data.push({ name: value[dataLabel], x: tempX[0][i], y: tempY[0][i], marker: {fillColor: colorCodes[i % 8]} , id: i } ); - i++; + } + i++; }); - currentSettings.xAxis.labels = { formatter : function() { - if(tempX[1][this.value] && tempX[1][this.value].length > 10) - return tempX[1][this.value].substring(0,10) - else - return tempX[1][this.value]; + currentSettings.xAxis.labels = { + formatter : function() { + if (tempX[1][this.value] && tempX[1][this.value].length > 10) { + return tempX[1][this.value].substring(0, 10); + } else { + return tempX[1][this.value]; + } } - } - currentSettings.series = newSeries; - currentChart = PMA_createChart(currentSettings); - } - - } - if(yChange) { + }; + currentSettings.series = newSeries; + currentChart = PMA_createChart(currentSettings); + } - yCord[currentData] = selectedRow[yLabel]; - if(yType == 'numeric') { - currentChart.series[0].data[currentData].update({ y : selectedRow[yLabel] }); - currentChart.yAxis[0].setExtremes(Array.min(yCord) - 6,Array.max(yCord) + 6); - } - else if(yType =='time') { - currentChart.series[0].data[currentData].update({ y : getTimeStamp(selectedRow[yLabel],$('#types_1').val())}); - } - else { - var tempX = getCord(xCord); - var tempY = getCord(yCord); - var i = 0; - newSeries[0].data = new Array(); - xCord = tempX[2]; - yCord = tempY[2]; - - $.each(data,function(key,value) { - if(xType != 'text' ) + } + if (yChange) { + yCord[currentData] = selectedRow[yLabel]; + if (yType == 'numeric') { + currentChart.series[0].data[currentData].update({ y : selectedRow[yLabel] }); + currentChart.yAxis[0].setExtremes(Array.min(yCord) - 6, Array.max(yCord) + 6); + } else if (yType == 'time') { + currentChart.series[0].data[currentData].update({ y : getTimeStamp(selectedRow[yLabel], $('#types_1').val())}); + } else { + var tempX = getCord(xCord); + var tempY = getCord(yCord); + var i = 0; + newSeries[0].data = new Array(); + xCord = tempX[2]; + yCord = tempY[2]; + + $.each(data, function(key, value) { + if (xType != 'text' ) { newSeries[0].data.push({ name: value[dataLabel], x: value[xLabel], y: tempY[0][i], marker: {fillColor: colorCodes[i % 8]} , id: i } ); - else + } else { newSeries[0].data.push({ name: value[dataLabel], x: tempX[0][i], y: tempY[0][i], marker: {fillColor: colorCodes[i % 8]} , id: i } ); - i++; + } + i++; }); - currentSettings.yAxis.labels = { formatter : function() { - if(tempY[1][this.value] && tempY[1][this.value].length > 10) - return tempY[1][this.value].substring(0,10) - else - return tempY[1][this.value]; + currentSettings.yAxis.labels = { + formatter : function() { + if (tempY[1][this.value] && tempY[1][this.value].length > 10) { + return tempY[1][this.value].substring(0, 10); + } else { + return tempY[1][this.value]; + } } - } - currentSettings.series = newSeries; - currentChart = PMA_createChart(currentSettings); - } - } - currentChart.series[0].data[currentData].select(); - } - //End plot update + }; + currentSettings.series = newSeries; + currentChart = PMA_createChart(currentSettings); + } + } + currentChart.series[0].data[currentData].select(); + } //End plot update - //Generate SQL query for update - if (!isEmpty(newValues)) { + //Generate SQL query for update + if (!isEmpty(newValues)) { var sql_query = 'UPDATE `' + window.parent.table + '` SET '; - for (key in newValues) { - if(key != 'where_clause') { - sql_query += '`' + key + '`=' ; - var value = newValues[key]; - if(!isNumeric(value) && value != null) - sql_query += '\'' + value + '\' ,'; - else - sql_query += value + ' ,'; - } - } - sql_query = sql_query.substring(0, sql_query.length - 1); - sql_query += ' WHERE ' + PMA_urldecode(data[currentData]['where_clause']); - - //Post SQL query to sql.php - $.post('sql.php', { - 'token' : window.parent.token, - 'db' : window.parent.db, - 'ajax_request' : true, - 'sql_query' : sql_query, - 'inline_edit' : false - }, function(data) { - if(data.success == true) { - $('#sqlqueryresults').html(data.sql_query); - $("#sqlqueryresults").trigger('appendAnchor'); + for (key in newValues) { + if (key != 'where_clause') { + sql_query += '`' + key + '`=' ; + var value = newValues[key]; + if (!isNumeric(value) && value != null) { + sql_query += '\'' + value + '\' ,'; + } else { + sql_query += value + ' ,'; + } } - else - PMA_ajaxShowMessage(data.error); - })//End $.post - }//End database update - $("#dataDisplay").dialog("close"); - });//End submit handler + } + sql_query = sql_query.substring(0, sql_query.length - 1); + sql_query += ' WHERE ' + PMA_urldecode(data[currentData]['where_clause']); + + //Post SQL query to sql.php + $.post('sql.php', { + 'token' : window.parent.token, + 'db' : window.parent.db, + 'ajax_request' : true, + 'sql_query' : sql_query, + 'inline_edit' : false + }, function(data) { + if (data.success == true) { + $('#sqlqueryresults').html(data.sql_query); + $("#sqlqueryresults").trigger('appendAnchor'); + } else { + PMA_ajaxShowMessage(data.error); + } + }); //End $.post + }//End database update + $("#dataDisplay").dialog("close"); + });//End submit handler /* * Generate plot using Highcharts - */ + */ if (data != null) { $('#zoom_search_form') .slideToggle() .hide(); $('#togglesearchformlink') - .text(PMA_messages['strShowSearchCriteria']) - $('#togglesearchformdiv').show(); + .text(PMA_messages['strShowSearchCriteria']); + $('#togglesearchformdiv').show(); var selectedRow; - var colorCodes = ['#FF0000','#00FFFF','#0000FF','#0000A0','#FF0080','#800080','#FFFF00','#00FF00','#FF00FF']; + var colorCodes = ['#FF0000', '#00FFFF', '#0000FF', '#0000A0', '#FF0080', '#800080', '#FFFF00', '#00FF00', '#FF00FF']; var series = new Array(); var xCord = new Array(); var yCord = new Array(); - var tempX, tempY; + var tempX, tempY; var it = 0; - var xMax; // xAxis extreme max - var xMin; // xAxis extreme min - var yMax; // yAxis extreme max - var yMin; // yAxis extreme min + var xMax; // xAxis extreme max + var xMin; // xAxis extreme min + var yMax; // yAxis extreme max + var yMin; // yAxis extreme min // Set the basic plot settings var currentSettings = { chart: { renderTo: 'querychart', type: 'scatter', - //zoomType: 'xy', - width:$('#resizer').width() -3, - height:$('#resizer').height()-20 - }, - credits: { - enabled: false + //zoomType: 'xy', + width:$('#resizer').width() - 3, + height:$('#resizer').height() - 20 }, - exporting: { enabled: false }, + credits: { + enabled: false + }, + exporting: { enabled: false }, label: { text: $('#dataLabel').val() }, - plotOptions: { - series: { - allowPointSelect: true, + plotOptions: { + series: { + allowPointSelect: true, cursor: 'pointer', - showInLegend: false, + showInLegend: false, dataLabels: { - enabled: false, + enabled: false }, - point: { + point: { events: { click: function() { - var id = this.id; - var fid = 4; - currentData = id; - // Make AJAX request to tbl_zoom_select.php for getting the complete row info - var post_params = { + var id = this.id; + var fid = 4; + currentData = id; + // Make AJAX request to tbl_zoom_select.php for getting the complete row info + var post_params = { 'ajax_request' : true, 'get_data_row' : true, 'db' : window.parent.db, 'table' : window.parent.table, 'where_clause' : data[id]['where_clause'], - 'token' : window.parent.token, - } + 'token' : window.parent.token + }; $.post('tbl_zoom_select.php', post_params, function(data) { - // Row is contained in data.row_info, now fill the displayResultForm with row values - for ( key in data.row_info) { - if (data.row_info[key] == null) - $('#fields_null_id_' + fid).attr('checked', true); - else - $('#fieldID_' + fid).val(data.row_info[key]); - fid++; - } - selectedRow = new Object(); - selectedRow = data.row_info; + // Row is contained in data.row_info, now fill the displayResultForm with row values + for ( key in data.row_info) { + if (data.row_info[key] == null) { + $('#fields_null_id_' + fid).attr('checked', true); + } else { + $('#fieldID_' + fid).val(data.row_info[key]); + } + fid++; + } + selectedRow = new Object(); + selectedRow = data.row_info; }); - $("#dataDisplay").dialog("open"); - }, + $("#dataDisplay").dialog("open"); + } } + } } - } - }, - tooltip: { - formatter: function() { - return this.point.name; - } - }, + }, + tooltip: { + formatter: function() { + return this.point.name; + } + }, title: { text: 'Query Results' }, - xAxis: { - title: { text: $('#tableid_0').val() }, - events: { - setExtremes: function(e){ + xAxis: { + title: { text: $('#tableid_0').val() }, + events: { + setExtremes: function(e) { this.resetZoom.show(); } } }, yAxis: { - min: null, - title: { text: $('#tableid_1').val() }, - endOnTick: false, + min: null, + title: { text: $('#tableid_1').val() }, + endOnTick: false, startOnTick: false, - events: { - setExtremes: function(e){ + events: { + setExtremes: function(e) { this.resetZoom.show(); } } - }, - } + } + }; $('#resizer').resizable({ resize: function() { currentChart.setSize( - this.offsetWidth -3, - this.offsetHeight -20, + this.offsetWidth - 3, + this.offsetHeight - 20, false ); } }); - - // Classify types as either numeric,time,text - xType = getType(xType); - yType = getType(yType); - //Set the axis type based on the field - currentSettings.xAxis.type = (xType == 'time') ? 'datetime' : 'linear'; - currentSettings.yAxis.type = (yType == 'time') ? 'datetime' : 'linear'; + // Classify types as either numeric,time,text + xType = getType(xType); + yType = getType(yType); + + //Set the axis type based on the field + currentSettings.xAxis.type = (xType == 'time') ? 'datetime' : 'linear'; + currentSettings.yAxis.type = (yType == 'time') ? 'datetime' : 'linear'; // Formulate series data for plot series[0] = new Object(); series[0].data = new Array(); - series[0].marker = { + series[0].marker = { symbol: 'circle' }; - if (xType != 'text' && yType != 'text') { - $.each(data,function(key,value) { - var xVal = (xType == 'numeric') ? value[xLabel] : getTimeStamp(value[xLabel],$('#types_0').val()); - var yVal = (yType == 'numeric') ? value[yLabel] : getTimeStamp(value[yLabel],$('#types_1').val()); + if (xType != 'text' && yType != 'text') { + $.each(data, function(key, value) { + var xVal = (xType == 'numeric') ? value[xLabel] : getTimeStamp(value[xLabel], $('#types_0').val()); + var yVal = (yType == 'numeric') ? value[yLabel] : getTimeStamp(value[yLabel], $('#types_1').val()); series[0].data.push({ name: value[dataLabel], x: xVal, y: yVal, marker: {fillColor: colorCodes[it % 8]} , id: it } ); - xCord.push(value[xLabel]); - yCord.push(value[yLabel]); - it++; + xCord.push(value[xLabel]); + yCord.push(value[yLabel]); + it++; }); - if(xType == 'numeric') { - currentSettings.xAxis.max = Array.max(xCord) + 6 - currentSettings.xAxis.min = Array.min(xCord) - 6 - } - else { - currentSettings.xAxis.labels = { formatter : function() { - return getDate(this.value, $('#types_0').val()); - }} + if (xType == 'numeric') { + currentSettings.xAxis.max = Array.max(xCord) + 6; + currentSettings.xAxis.min = Array.min(xCord) - 6; + } else { + currentSettings.xAxis.labels = { formatter : function() { + return getDate(this.value, $('#types_0').val()); + }}; } - if(yType == 'numeric') { - currentSettings.yAxis.max = Array.max(yCord) + 6 - currentSettings.yAxis.min = Array.min(yCord) - 6 - } - else { - currentSettings.yAxis.labels = { formatter : function() { - return getDate(this.value, $('#types_1').val()); - }} + if (yType == 'numeric') { + currentSettings.yAxis.max = Array.max(yCord) + 6; + currentSettings.yAxis.min = Array.min(yCord) - 6; + } else { + currentSettings.yAxis.labels = { formatter : function() { + return getDate(this.value, $('#types_1').val()); + }}; } - } - - else if (xType =='text' && yType !='text') { - $.each(data,function(key,value) { - xCord.push(value[xLabel]); - yCord.push(value[yLabel]); - }); - - tempX = getCord(xCord); - $.each(data,function(key,value) { - var yVal = (yType == 'numeric') ? value[yLabel] : getTimeStamp(value[yLabel],$('#types_1').val()); + } else if (xType == 'text' && yType != 'text') { + $.each(data, function(key, value) { + xCord.push(value[xLabel]); + yCord.push(value[yLabel]); + }); + + tempX = getCord(xCord); + $.each(data, function(key, value) { + var yVal = (yType == 'numeric') ? value[yLabel] : getTimeStamp(value[yLabel], $('#types_1').val()); series[0].data.push({ name: value[dataLabel], x: tempX[0][it], y: yVal, marker: {fillColor: colorCodes[it % 8]} , id: it } ); - it++; + it++; }); - - currentSettings.xAxis.labels = { formatter : function() { - if(tempX[1][this.value] && tempX[1][this.value].length > 10) - return tempX[1][this.value].substring(0,10) - else - return tempX[1][this.value]; - } - } - if(yType == 'numeric') { - currentSettings.yAxis.max = Array.max(yCord) + 6 - currentSettings.yAxis.min = Array.min(yCord) - 6 - } - else { - currentSettings.yAxis.labels = { formatter : function() { - return getDate(this.value, $('#types_1').val()); - }} + + currentSettings.xAxis.labels = { + formatter : function() { + if (tempX[1][this.value] && tempX[1][this.value].length > 10) { + return tempX[1][this.value].substring(0, 10); + } else { + return tempX[1][this.value]; + } + } + }; + if (yType == 'numeric') { + currentSettings.yAxis.max = Array.max(yCord) + 6; + currentSettings.yAxis.min = Array.min(yCord) - 6; + } else { + currentSettings.yAxis.labels = { + formatter : function() { + return getDate(this.value, $('#types_1').val()); + } + }; } - xCord = tempX[2]; - } - - else if (xType !='text' && yType =='text') { - $.each(data,function(key,value) { - xCord.push(value[xLabel]); - yCord.push(value[yLabel]); - }); - tempY = getCord(yCord); - $.each(data,function(key,value) { - var xVal = (xType == 'numeric') ? value[xLabel] : getTimeStamp(value[xLabel],$('#types_0').val()); + xCord = tempX[2]; + + } else if (xType != 'text' && yType == 'text') { + $.each(data, function(key, value) { + xCord.push(value[xLabel]); + yCord.push(value[yLabel]); + }); + tempY = getCord(yCord); + $.each(data, function(key, value) { + var xVal = (xType == 'numeric') ? value[xLabel] : getTimeStamp(value[xLabel], $('#types_0').val()); series[0].data.push({ name: value[dataLabel], y: tempY[0][it], x: xVal, marker: {fillColor: colorCodes[it % 8]} , id: it } ); - it++; + it++; }); - if(xType == 'numeric') { - currentSettings.xAxis.max = Array.max(xCord) + 6 - currentSettings.xAxis.min = Array.min(xCord) - 6 - } - else { - currentSettings.xAxis.labels = { formatter : function() { - return getDate(this.value, $('#types_0').val()); - }} - } - currentSettings.yAxis.labels = { formatter : function() { - if(tempY[1][this.value] && tempY[1][this.value].length > 10) - return tempY[1][this.value].substring(0,10) - else - return tempY[1][this.value]; - } + if (xType == 'numeric') { + currentSettings.xAxis.max = Array.max(xCord) + 6; + currentSettings.xAxis.min = Array.min(xCord) - 6; + } else { + currentSettings.xAxis.labels = { + formatter : function() { + return getDate(this.value, $('#types_0').val()); + } + }; } - yCord = tempY[2]; - } - - else if (xType =='text' && yType =='text') { - $.each(data,function(key,value) { - xCord.push(value[xLabel]); - yCord.push(value[yLabel]); - }); - tempX = getCord(xCord); - tempY = getCord(yCord); - $.each(data,function(key,value) { + currentSettings.yAxis.labels = { + formatter : function() { + if (tempY[1][this.value] && tempY[1][this.value].length > 10) { + return tempY[1][this.value].substring(0, 10); + } else { + return tempY[1][this.value]; + } + } + }; + yCord = tempY[2]; + + } else if (xType == 'text' && yType == 'text') { + $.each(data, function(key, value) { + xCord.push(value[xLabel]); + yCord.push(value[yLabel]); + }); + tempX = getCord(xCord); + tempY = getCord(yCord); + $.each(data, function(key, value) { series[0].data.push({ name: value[dataLabel], x: tempX[0][it], y: tempY[0][it], marker: {fillColor: colorCodes[it % 8]} , id: it } ); - it++; + it++; }); - currentSettings.xAxis.labels = { formatter : function() { - if(tempX[1][this.value] && tempX[1][this.value].length > 10) - return tempX[1][this.value].substring(0,10) - else - return tempX[1][this.value]; - } - } - currentSettings.yAxis.labels = { formatter : function() { - if(tempY[1][this.value] && tempY[1][this.value].length > 10) - return tempY[1][this.value].substring(0,10) - else - return tempY[1][this.value]; - } + currentSettings.xAxis.labels = { + formatter : function() { + if (tempX[1][this.value] && tempX[1][this.value].length > 10) { + return tempX[1][this.value].substring(0, 10); + } else { + return tempX[1][this.value]; + } + } + }; + currentSettings.yAxis.labels = { + formatter : function() { + if (tempY[1][this.value] && tempY[1][this.value].length > 10) { + return tempY[1][this.value].substring(0, 10); + } else { + return tempY[1][this.value]; + } + } + }; + xCord = tempX[2]; + yCord = tempY[2]; } - xCord = tempX[2]; - yCord = tempY[2]; - } - - currentSettings.series = series; + currentSettings.series = series; currentChart = PMA_createChart(currentSettings); - xMin = currentChart.xAxis[0].getExtremes().min; + xMin = currentChart.xAxis[0].getExtremes().min; xMax = currentChart.xAxis[0].getExtremes().max; yMin = currentChart.yAxis[0].getExtremes().min; yMax = currentChart.yAxis[0].getExtremes().max; - includePan(currentChart); //Enable panning feature + includePan(currentChart); //Enable panning feature var setZoom = function() { - var newxm = xMin + (xMax - xMin) * (1 - zoomRatio) / 2; - var newxM = xMax - (xMax - xMin) * (1 - zoomRatio) / 2; - var newym = yMin + (yMax - yMin) * (1 - zoomRatio) / 2; - var newyM = yMax - (yMax - yMin) * (1 - zoomRatio) / 2; - currentChart.xAxis[0].setExtremes(newxm,newxM); - currentChart.yAxis[0].setExtremes(newym,newyM); - }; - //Enable zoom feature - $("#querychart").mousewheel(function(objEvent, intDelta) { + var newxm = xMin + (xMax - xMin) * (1 - zoomRatio) / 2; + var newxM = xMax - (xMax - xMin) * (1 - zoomRatio) / 2; + var newym = yMin + (yMax - yMin) * (1 - zoomRatio) / 2; + var newyM = yMax - (yMax - yMin) * (1 - zoomRatio) / 2; + currentChart.xAxis[0].setExtremes(newxm, newxM); + currentChart.yAxis[0].setExtremes(newym, newyM); + }; + + //Enable zoom feature + $("#querychart").mousewheel(function(objEvent, intDelta) { if (intDelta > 0) { if (zoomRatio > 0.1) { zoomRatio = zoomRatio - 0.1; setZoom(); } - } - else if (intDelta < 0) { + } else if (intDelta < 0) { zoomRatio = zoomRatio + 0.1; setZoom(); } }); + //Add reset zoom feature currentChart.yAxis[0].resetZoom = currentChart.xAxis[0].resetZoom = $('<a href="#">Reset zoom</a>') - .appendTo(currentChart.container) - .css({ - position: 'absolute', - top: 10, - right: 20, - display: 'none' - }) - .click(function(){ - currentChart.xAxis[0].setExtremes(null, null) - currentChart.yAxis[0].setExtremes(null, null) - this.style.display = 'none' - }); - scrollToChart(); + .appendTo(currentChart.container) + .css({ + position: 'absolute', + top: 10, + right: 20, + display: 'none' + }) + .click(function() { + currentChart.xAxis[0].setExtremes(null, null); + currentChart.yAxis[0].setExtremes(null, null); + this.style.display = 'none'; + }); + scrollToChart(); } }); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5RC1-19152-gdc35ecf
by Marc Delisle 17 Sep '11

17 Sep '11

The branch, master has been updated via dc35ecf227db206998ce20517b4e51ef05342f39 (commit) via 56a73a463ae9e02891eab15c6c28c1e757cb98b4 (commit) from 9d083bee677b5f2f0979f2633bc2c0f192824569 (commit) - Log ----------------------------------------------------------------- commit dc35ecf227db206998ce20517b4e51ef05342f39 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Sep 17 06:48:08 2011 -0400 XHTML problems commit 56a73a463ae9e02891eab15c6c28c1e757cb98b4 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Sep 17 06:38:49 2011 -0400 XHTML problems ----------------------------------------------------------------------- Summary of changes: tbl_zoom_select.php | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php index 11754b8..cf8a64f 100644 --- a/tbl_zoom_select.php +++ b/tbl_zoom_select.php @@ -133,7 +133,7 @@ for ($i = 0; $i < 4; $i++) { if ($i == 2) { echo "<tr><td>"; echo __("Additional search criteria"); - echo "</td><tr>"; + echo "</td></tr>"; } ?> <tr class="noclick <?php echo $odd_row ? 'odd' : 'even'; $odd_row = ! $odd_row; ?>"> @@ -229,17 +229,17 @@ for ($i = 0; $i < 4; $i++) { <?php } ?> - </td> </tr> - <input type="hidden" name="types[<?php echo $i; ?>]" id="types_<?php echo $i; ?>" + <tr><td><input type="hidden" name="types[<?php echo $i; ?>]" id="types_<?php echo $i; ?>" value="<?php if(isset($tbl_fields_type[$i]))echo $tbl_fields_type[$i]; ?>" /> <input type="hidden" name="collations[<?php echo $i; ?>]" - value="<?php if(isset($tbl_fields_collation[$i]))echo $tbl_fields_collation[$i]; ?>" /> + value="<?php if(isset($tbl_fields_collation[$i]))echo $tbl_fields_collation[$i]; ?>" /></td></tr> <?php }//end for ?> + </tbody> </table> <?php @@ -255,7 +255,7 @@ if (isset($zoom_submit) && $inputs[0] != 'pma_null' && $inputs[1] != 'pma_null') } ?> <table class="data"> - <tr><td><label for="dataLabel"><?php echo __("Data Label"); ?></label>&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp</td> + <tr><td><label for="dataLabel"><?php echo __("Data Label"); ?></label></td> <td><select name="dataLabel" id='dataLabel' > <option value = ''> <?php echo __('None'); ?> </option> <?php @@ -293,6 +293,7 @@ echo '" /></td></tr>'; <input type="submit" name="zoom_submit" id="inputFormSubmitId" value="<?php echo __('Go'); ?>" /> </fieldset> </form> +</fieldset> <?php hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5RC1-19150-g9d083be
by Madhura Jayaratne 17 Sep '11

17 Sep '11

The branch, master has been updated via 9d083bee677b5f2f0979f2633bc2c0f192824569 (commit) from 5d3735b3b4226e4b7c581d5015218a7dd35cf228 (commit) - Log ----------------------------------------------------------------- commit 9d083bee677b5f2f0979f2633bc2c0f192824569 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Sep 17 10:03:46 2011 +0530 Fix some broken paths to images ----------------------------------------------------------------------- Summary of changes: pmd_general.php | 52 ++++++++++++++++++++++++++-------------------------- 1 files changed, 26 insertions(+), 26 deletions(-) diff --git a/pmd_general.php b/pmd_general.php index 7423d54..73c6543 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -62,56 +62,56 @@ echo $script_tabs . $script_contr . $script_display_field; <a href="javascript:Show_left_menu(document.getElementById('key_Show_left_menu'));" onmousedown="return false;" class="M_butt first" target="_self"> <img id='key_Show_left_menu' title="<?php echo __('Show/Hide left menu'); ?>" - alt="v" src="pmd/images/downarrow2_m.png" /></a> + alt="v" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/downarrow2_m.png" /></a> <a href="javascript:Save2();" onmousedown="return false;" class="M_butt" target="_self" - ><img title="<?php echo __('Save position') ?>" src="pmd/images/save.png" alt="" + ><img title="<?php echo __('Save position') ?>" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/save.png" alt="" /></a><a href="javascript:Start_table_new();" onmousedown="return false;" class="M_butt" target="_self" - ><img title="<?php echo __('Create table')?>" src="pmd/images/table.png" alt="" + ><img title="<?php echo __('Create table')?>" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/table.png" alt="" /></a><a href="javascript:Start_relation();" onmousedown="return false;" class="M_butt" id="rel_button" target="_self" - ><img title="<?php echo __('Create relation') ?>" src="pmd/images/relation.png" alt="" + ><img title="<?php echo __('Create relation') ?>" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/relation.png" alt="" /></a><a href="javascript:Start_display_field();" onmousedown="return false;" class="M_butt" id="display_field_button" target="_self" - ><img title="<?php echo __('Choose column to display') ?>" src="pmd/images/display_field.png" alt="" + ><img title="<?php echo __('Choose column to display') ?>" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/display_field.png" alt="" /></a><a href="javascript:location.reload();" onmousedown="return false;" class="M_butt" target="_self" - ><img title="<?php echo __('Reload'); ?>" src="pmd/images/reload.png" alt="" + ><img title="<?php echo __('Reload'); ?>" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/reload.png" alt="" /></a><a href="Documentation.html#faq6_31" target="documentation" class="M_butt" target="_self" - ><img title="<?php echo __('Help'); ?>" src="pmd/images/help.png" alt="" - /></a><img class="M_bord" src="pmd/images/bord.png" alt="" + ><img title="<?php echo __('Help'); ?>" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/help.png" alt="" + /></a><img class="M_bord" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/bord.png" alt="" /><a href="javascript:Angular_direct();" onmousedown="return false;" class="M_butt" id="angular_direct_button" target="_self" ><img title="<?php echo __('Angular links') . ' / ' . __('Direct links'); ?>" - src="pmd/images/ang_direct.png" alt="" + src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/ang_direct.png" alt="" /></a><a href="javascript:Grid();" onmousedown="return false;" class="M_butt" id="grid_button" target="_self" - ><img title="<?php echo __('Snap to grid') ?>" src="pmd/images/grid.png" alt="" - /></a><img class="M_bord" src="pmd/images/bord.png" alt="" + ><img title="<?php echo __('Snap to grid') ?>" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/grid.png" alt="" + /></a><img class="M_bord" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/bord.png" alt="" /><a href="javascript:Small_tab_all(document.getElementById('key_SB_all'));" onmousedown="return false;" class="M_butt" target="_self" ><img id='key_SB_all' title="<?php echo __('Small/Big All'); ?>" alt="v" - src="pmd/images/downarrow1.png" + src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/downarrow1.png" /></a><a href="javascript:Small_tab_invert();" onmousedown="return false;" class="M_butt" target="_self" - ><img title="<?php echo __('Toggle small/big'); ?>" alt="key" src="pmd/images/bottom.png" - /></a><img class="M_bord" src="pmd/images/bord.png" alt="" + ><img title="<?php echo __('Toggle small/big'); ?>" alt="key" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/bottom.png" + /></a><img class="M_bord" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/bord.png" alt="" /><a href="javascript:PDF_save();" onmousedown="return false;" class="M_butt" target="_self" - ><img src="pmd/images/pdf.png" alt="key" width="20" height="20" + ><img src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/pdf.png" alt="key" width="20" height="20" title="<?php echo __('Import/Export coordinates for PDF schema'); ?>" /></a > <?php if (isset($_REQUEST['query'])) { echo '<a href="#" onClick="build_query(\'SQL Query on Database\', 0)" onmousedown="return false;" class="M_butt" target="_self">'; - echo '<img src="pmd/images/query_builder.png" alt="key" width="20" height="20" title="'; + echo '<img src="'. $GLOBALS['pmaThemeImage'] . 'pmd/query_builder.png" alt="key" width="20" height="20" title="'; echo __('Build Query'); echo '"/></a>'; }?> <a href="javascript:Top_menu_right(document.getElementById('key_Left_Right'));" onmousedown="return false;" class="M_butt last" target="_self"> - <img src="pmd/images/2rightarrow_m.png" id="key_Left_Right" alt=">" + <img src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/2rightarrow_m.png" id="key_Left_Right" alt=">" title="<?php echo __('Move Menu'); ?>" /></a> </div> @@ -124,11 +124,11 @@ echo $script_tabs . $script_contr . $script_display_field; <a href="javascript:Hide_tab_all(document.getElementById('key_HS_all'));" onmousedown="return false;" class="M_butt" target="_self"> <img title="<?php echo __('Hide/Show all'); ?>" alt="v" - src="pmd/images/downarrow1.png" id='key_HS_all' /></a> + src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/downarrow1.png" id='key_HS_all' /></a> <a href="javascript:No_have_constr(document.getElementById('key_HS'));" onmousedown="return false;" class="M_butt" target="_self"> <img title="<?php echo __('Hide/Show Tables with no relation'); ?>" alt="v" - src="pmd/images/downarrow2.png" id='key_HS' /></a> + src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/downarrow2.png" id='key_HS' /></a> </div> <div id="id_scroll_tab" class="scroll_tab"> @@ -141,7 +141,7 @@ for ($i = 0; $i < $name_cnt; $i++) { onmouseover="this.className='L_butt2_2'" onmouseout="this.className='L_butt2_1'"> <img onclick="Start_tab_upd('<?php echo $GLOBALS['PMD_URL']["TABLE_NAME_SMALL"][$i]; ?>');" - src="pmd/images/exec.png" alt="" /></td> + src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/exec.png" alt="" /></td> <td width="1px"> <input onclick="VisibleTab(this,'<?php echo $GLOBALS['PMD_URL']["TABLE_NAME"][$i]; ?>')" title="<?php echo __('Hide'); ?>" @@ -217,7 +217,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { <td class="small_tab_pref" onmouseover="this.className='small_tab_pref2';" onmouseout="this.className='small_tab_pref';" onclick="Start_tab_upd('<?php echo $GLOBALS['PMD_URL']["TABLE_NAME_SMALL"][$i]; ?>');"> - <img src="pmd/images/exec_small.png" alt="" /></td> + <img src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/exec_small.png" alt="" /></td> <td nowrap="nowrap" id="id_zag_<?php echo $t_n_url ?>" class="tab_zag" onmousedown="cur_click=document.getElementById('<?php echo $t_n_url ?>');"/ onmouseover="Table_onover('<?php echo $t_n_url ?>',0,<?php echo (isset($_REQUEST['query'])? 1 : 0 )?> )" @@ -314,7 +314,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { echo '<td class="small_tab_pref" onmouseover="this.className=\'small_tab_pref2\';"'; echo 'onmouseout="this.className=\'small_tab_pref\';"'; echo 'onclick="Click_option(\'pmd_optionse\',\''.urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]).'\',\''.$GLOBALS['PMD_OUT']["TABLE_NAME_SMALL"][$i].'\')" >'; - echo '<img src="pmd/images/exec_small.png" title="options" alt="" /></td> '; + echo '<img src="' . $GLOBALS['pmaThemeImage'] . 'pmd/exec_small.png" title="options" alt="" /></td> '; } ?> </tr> <?php @@ -817,9 +817,9 @@ if ($_REQUEST['query']) {  -<img src="pmd/images/2leftarrow_m.png" width="0" height="0" alt="" /> -<img src="pmd/images/rightarrow1.png" width="0" height="0" alt="" /> -<img src="pmd/images/rightarrow2.png" width="0" height="0" alt="" /> -<img src="pmd/images/uparrow2_m.png" width="0" height="0" alt="" /> +<img src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/2leftarrow_m.png" width="0" height="0" alt="" /> +<img src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/rightarrow1.png" width="0" height="0" alt="" /> +<img src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/rightarrow2.png" width="0" height="0" alt="" /> +<img src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/uparrow2_m.png" width="0" height="0" alt="" /> </body> </html> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5RC1-19149-g5d3735b
by Madhura Jayaratne 16 Sep '11

16 Sep '11

The branch, master has been updated via 5d3735b3b4226e4b7c581d5015218a7dd35cf228 (commit) via 5511ae8fbc577abb44206e35dd61a947dd60c814 (commit) from bee270dd400e34d1ee04d4696509f47b322aa319 (commit) - Log ----------------------------------------------------------------- commit 5d3735b3b4226e4b7c581d5015218a7dd35cf228 Merge: bee270d 5511ae8 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Fri Sep 16 23:50:47 2011 +0530 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/config/messages.inc.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1ce49af..b0d3206 100644 --- a/ChangeLog +++ b/ChangeLog @@ -55,6 +55,7 @@ phpMyAdmin - ChangeLog - bug #3403165 [interface] Collation not displayed for long enum fields - bug #3399951 [export] Config for export compression not used - bug #3400690 [privileges] DB-specific privileges won't submit +- bug #3410604 [config] Configuration storage incorrect suggested table name 3.4.5.0 (2011-09-14) - bug #3375325 [interface] Page list in navigation frame looks odd diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php index 77f5370..3c55558 100644 --- a/libraries/config/messages.inc.php +++ b/libraries/config/messages.inc.php @@ -440,7 +440,7 @@ $strConfigServers_tracking_desc = __('Leave blank for no SQL query tracking supp $strConfigServers_tracking_name = __('SQL query tracking table'); $strConfigServers_tracking_version_auto_create_desc = __('Whether the tracking mechanism creates versions for tables and views automatically.'); $strConfigServers_tracking_version_auto_create_name = __('Automatically create versions'); -$strConfigServers_userconfig_desc = __('Leave blank for no user preferences storage in database, suggested: [kbd]pma_config[/kbd]'); +$strConfigServers_userconfig_desc = __('Leave blank for no user preferences storage in database, suggested: [kbd]pma_userconfig[/kbd]'); $strConfigServers_userconfig_name = __('User preferences storage table'); $strConfigServers_user_desc = __('Leave empty if not using config auth'); $strConfigServers_user_name = __('User for config auth'); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_5RC1-12-g5511ae8
by Madhura Jayaratne 16 Sep '11

16 Sep '11

The branch, QA_3_4 has been updated via 5511ae8fbc577abb44206e35dd61a947dd60c814 (commit) from d3bd40b56d619f0672e323844095cc8b36e9e49e (commit) - Log ----------------------------------------------------------------- commit 5511ae8fbc577abb44206e35dd61a947dd60c814 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Fri Sep 16 23:45:36 2011 +0530 bug #3410604 [config] Configuration storage incorrect suggested table name ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/config/messages.inc.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 83aa38d..3287323 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ phpMyAdmin - ChangeLog - bug #3403165 [interface] Collation not displayed for long enum fields - bug #3399951 [export] Config for export compression not used - bug #3400690 [privileges] DB-specific privileges won't submit +- bug #3410604 [config] Configuration storage incorrect suggested table name 3.4.5.0 (2011-09-14) - bug #3375325 [interface] Page list in navigation frame looks odd diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php index 266bac7..97fc191 100644 --- a/libraries/config/messages.inc.php +++ b/libraries/config/messages.inc.php @@ -428,7 +428,7 @@ $strConfigServers_tracking_desc = __('Leave blank for no SQL query tracking supp $strConfigServers_tracking_name = __('SQL query tracking table'); $strConfigServers_tracking_version_auto_create_desc = __('Whether the tracking mechanism creates versions for tables and views automatically.'); $strConfigServers_tracking_version_auto_create_name = __('Automatically create versions'); -$strConfigServers_userconfig_desc = __('Leave blank for no user preferences storage in database, suggested: [kbd]pma_config[/kbd]'); +$strConfigServers_userconfig_desc = __('Leave blank for no user preferences storage in database, suggested: [kbd]pma_userconfig[/kbd]'); $strConfigServers_userconfig_name = __('User preferences storage table'); $strConfigServers_user_desc = __('Leave empty if not using config auth'); $strConfigServers_user_name = __('User for config auth'); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5RC1-19147-gbee270d
by Madhura Jayaratne 16 Sep '11

16 Sep '11

The branch, master has been updated via bee270dd400e34d1ee04d4696509f47b322aa319 (commit) from a8a63246efe931924c5cd91b93bae0c6bbcc18e3 (commit) - Log ----------------------------------------------------------------- commit bee270dd400e34d1ee04d4696509f47b322aa319 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Fri Sep 16 07:09:02 2011 +0530 It's better to force text next to these icons as well ----------------------------------------------------------------------- Summary of changes: tbl_structure.php | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tbl_structure.php b/tbl_structure.php index 1577111..a0bec5d 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -603,13 +603,13 @@ if ($tbl_is_view) { 'show_query' => '1', ) ), - PMA_getIcon('b_edit.png', __('Edit view')) + PMA_getIcon('b_edit.png', __('Edit view'), true) ); } ?> <a href="tbl_printview.php?<?php echo $url_query; ?>"><?php -echo PMA_getIcon('b_print.png', __('Print view')); +echo PMA_getIcon('b_print.png', __('Print view'), true); ?></a> <?php @@ -620,7 +620,7 @@ if (! $tbl_is_view && ! $db_is_information_schema) { if ($cfgRelation['relwork'] || PMA_foreignkey_supported($tbl_type)) { ?> <a href="tbl_relation.php?<?php echo $url_query; ?>"><?php - echo PMA_getIcon('b_relations.png', __('Relation view')); + echo PMA_getIcon('b_relations.png', __('Relation view'), true); ?></a> <?php } @@ -628,14 +628,14 @@ if (! $tbl_is_view && ! $db_is_information_schema) { if (!PMA_DRIZZLE) { ?> <a href="sql.php?<?php echo $url_query; ?>&session_max_rows=all&sql_query=<?php echo urlencode('SELECT * FROM ' . PMA_backquote($table) . ' PROCEDURE ANALYSE()'); ?>"><?php - echo PMA_getIcon('b_tblanalyse.png', __('Propose table structure')); + echo PMA_getIcon('b_tblanalyse.png', __('Propose table structure'), true); ?></a><?php echo PMA_showMySQLDocu('Extending_MySQL', 'procedure_analyse') . "\n"; } if (PMA_Tracker::isActive()) { echo '<a href="tbl_tracking.php?' . $url_query . '">'; - echo PMA_getIcon('eye.png', __('Track table')); + echo PMA_getIcon('eye.png', __('Track table'), true); echo '</a>'; } ?> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5RC1-19146-ga8a6324
by Madhura Jayaratne 15 Sep '11

15 Sep '11

The branch, master has been updated via a8a63246efe931924c5cd91b93bae0c6bbcc18e3 (commit) from 464a4159314e9de3fc8d43ba33b4869d9e657a92 (commit) - Log ----------------------------------------------------------------- commit a8a63246efe931924c5cd91b93bae0c6bbcc18e3 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Thu Sep 15 23:37:21 2011 +0530 Revert changes made by 464a4159314e9de3fc8d43ba33b4869d9e657a92 and a similar instance. ----------------------------------------------------------------------- Summary of changes: db_operations.php | 27 ++++++++++++++++++++++----- 1 files changed, 22 insertions(+), 5 deletions(-) diff --git a/db_operations.php b/db_operations.php index 6c7df59..512c894 100644 --- a/db_operations.php +++ b/db_operations.php @@ -357,7 +357,12 @@ if (!$is_information_schema) { <?php echo PMA_generate_common_hidden_inputs($db); ?> <fieldset> <legend> - <?php echo PMA_getIcon('b_comment.png', __('Database comment: '), true); ?> + <?php + if ($cfg['PropertiesIconic']) { + echo '<img class="icon ic_b_comment" src="themes/dot.gif" alt="" />'; + } + echo __('Database comment: '); + ?> </legend> <input type="text" name="comment" class="textfield" size="30" value="<?php @@ -395,7 +400,10 @@ if ($db != 'mysql') { <fieldset> <legend> <?php - echo PMA_getIcon('b_edit.png', __('Rename database to'), true) . ':'; + if ($cfg['PropertiesIconic']) { + echo '<img class="icon ic_b_edit" src="themes/dot.gif" alt="" />'; + } + echo __('Rename database to') . ':'; ?> </legend> <input id="new_db_name" type="text" name="newname" size="30" class="textfield" value="" /> @@ -418,7 +426,10 @@ if (($is_superuser || $GLOBALS['cfg']['AllowUserDropDatabase']) <div class="operations_half_width"> <fieldset class="caution"> <legend><?php -echo PMA_getIcon('b_deltbl.png', __('Remove database'), true); +if ($cfg['PropertiesIconic']) { + echo '<img class="icon ic_b_deltbl" src="themes/dot.gif" alt="" />'; +} +echo __('Remove database'); ?></legend> <ul> @@ -461,7 +472,10 @@ echo PMA_getIcon('b_deltbl.png', __('Remove database'), true); <fieldset> <legend> <?php - echo PMA_getIcon('b_edit.png', __('Copy database to'), true) . ':'; + if ($cfg['PropertiesIconic']) { + echo '<img class="icon ic_b_edit" src="themes/dot.gif" alt="" />'; + } + echo __('Copy database to') . ':'; $drop_clause = 'DROP TABLE / DROP VIEW'; ?> </legend> @@ -522,7 +536,10 @@ echo PMA_getIcon('b_deltbl.png', __('Remove database'), true); . PMA_generate_common_hidden_inputs($db, $table) . '<fieldset>' . "\n" . ' <legend>'; - echo PMA_getIcon('s_asci.png', __('Collation'), true) . ':' + if ($cfg['PropertiesIconic']) { + echo '<img class="icon ic_s_asci" src="themes/dot.gif" alt="" />'; + } + echo ' <label for="select_db_collation">' . __('Collation') . ':</label>' . "\n" . ' </legend>' . "\n" . PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_COLLATION, 'db_collation', 'select_db_collation', $db_collation, false, 3) hooks/post-receive -- phpMyAdmin

1 0