diff --git a/ChangeLog b/ChangeLog index 633d481373..f70eae5870 100644 --- a/ChangeLog +++ b/ChangeLog @@ -43,6 +43,10 @@ phpMyAdmin - ChangeLog + AJAX for table Operations copy table - bug #3380946 [export] no uid Query result export (Suhosin limit) + Grid editing in browse mode (replaces row inline edit) ++ Zoom-search in table Search ++ [interface] Editor for GIS data ++ [import] Import GIS data from ESRI Shapefiles ++ [interface] 'Function based search' for GIS data 3.4.5.0 (not yet released) - bug #3375325 [interface] Page list in navigation frame looks odd diff --git a/Documentation.html b/Documentation.html index 8f7e66f871..758a2bc90f 100644 --- a/Documentation.html +++ b/Documentation.html @@ -2088,9 +2088,10 @@ $cfg['TrustedProxies'] = The name of the directory where temporary files can be stored.

- This is needed to work around limitations of open_basedir - for uploaded files, see - FAQ + This is needed for importing ESRI Shapefiles, see + FAQ + 6.30 and to work around limitations of open_basedir for uploaded + files, see FAQ 1.11.

@@ -4373,6 +4374,41 @@ INSERT INTO REL_towns VALUES ('M', 'Montréal');

Not every table can be put to the chart. Only tables with one, two or three columns can be visualised as a chart. Moreover the table must be in a special format for chart script to understand it. Currently supported formats can be found in the wiki.

+

+ 6.30 Import: How can I import ESRI Shapefiles

+ +

+ An ESRI Shapefile is actually a set of several files, where .shp file contains + geometry data and .dbf file contains data related to those geometry data. + To read data from .dbf file you need to have PHP compiled with the dBase extension + (--enable-dbase). Otherwise only geometry data will be imported. +

+ +

To upload these set of files you can use either of the following methods:

+ +

phpMyAdmin project

diff --git a/build.xml b/build.xml index 5365747755..d898a83f44 100644 --- a/build.xml +++ b/build.xml @@ -38,7 +38,7 @@ @@ -50,6 +50,7 @@ --exclude build --exclude libraries/tcpdf --exclude libraries/php-gettext + --exclude libraries/bfShapeFiles ${source}" /> @@ -61,6 +62,7 @@ --exclude build --exclude libraries/tcpdf --exclude libraries/php-gettext + --exclude libraries/bfShapeFiles ${source}" /> @@ -68,7 +70,7 @@ generateParams($_REQUEST['value'])); +} + +// Generate Well Known Text +$srid = (isset($gis_data['srid']) && $gis_data['srid'] != '') ? htmlspecialchars($gis_data['srid']) : 0; +$wkt = $gis_obj->generateWkt($gis_data, 0); +$wkt_with_zero = $gis_obj->generateWkt($gis_data, 0, '0'); +$result = "'" . $wkt . "'," . $srid; + +// Gererate PNG or SVG based visualization +$format = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER <= 8) ? 'png' : 'svg'; +$visualizationSettings = array('width' => 450, 'height' => 300, 'spatialColumn' => 'wkt'); +$data = array(array('wkt' => $wkt_with_zero, 'srid' => $srid)); +$visualization = PMA_GIS_visualizationResults($data, $visualizationSettings, $format); +$open_layers = PMA_GIS_visualizationResults($data, $visualizationSettings, 'ol'); + +// If the call is to update the WKT and visualization make an AJAX response +if (isset($_REQUEST['generate']) && $_REQUEST['generate'] == true) { + $extra_data = array( + 'result' => $result, + 'visualization' => $visualization, + 'openLayers' => $open_layers, + ); + PMA_ajaxResponse(null, true, $extra_data); +} + +// If the call is to get the whole content, start buffering, skipping and tags +if (isset($_REQUEST['get_gis_editor']) && $_REQUEST['get_gis_editor'] == true) { + ob_start(); +} else { +?> + + + +
+ +
+

+ +'); + // The input field to which the final result should be added and corresponding null checkbox + if (isset($_REQUEST['input_name'])) { + echo(''); + } + echo PMA_generate_common_hidden_inputs(); +?> + +
+
+
+
+
+ /> + +
+ + + + +
+ + " /> + + +
+ + + +
+'); + } + for ($a = 0; $a < $geom_count; $a++) { + if ($geom_type == 'GEOMETRYCOLLECTION') { + echo('

'); echo __("Geometry"); echo($a + 1 . ':
'); + if (isset($gis_data[$a]['gis_type'])) { + $type = $gis_data[$a]['gis_type']; + } else { + $type = $gis_types[0]; + } + echo(''); + echo(''); + } else { + $type = $geom_type; + } + + if ($type == 'POINT') { + echo('
'); echo __("Point"); echo(' :'); +?> + + + +'); + + for ($i = 0; $i < $no_of_points; $i++) { + echo('
'); echo __("Point"); echo($i + 1 . ':'); +?> + + + + + "> +'); + + for ($i = 0; $i < $no_of_lines; $i++) { + echo('
'); + if ($type == 'MULTILINESTRING') { + echo __("Linestring"); echo($i + 1 . ':'); + } else { + if ($i == 0) { + echo __("Outer Ring:"); + } else { + echo __("Inner Ring"); echo($i . ':'); + } + } + + $no_of_points = isset($gis_data[$a][$type][$i]['no_of_points']) ? $gis_data[$a][$type][$i]['no_of_points'] : 2; + if ($type == 'MULTILINESTRING' && $no_of_points < 2) { + $no_of_points = 2; + } + if ($type == 'POLYGON' && $no_of_points < 4) { + $no_of_points = 4; + } + if (isset($gis_data[$a][$type][$i]['add_point'])) { + $no_of_points++; + } + echo(''); + + for ($j = 0; $j < $no_of_points; $j++) { + echo('
'); echo __("Point"); echo($j + 1 . ':'); +?> + + + + "> +
+'); + + for ($k = 0; $k < $no_of_polygons; $k++) { + echo('
'); echo __("Polygon"); echo($k + 1 . ':'); + $no_of_lines = isset($gis_data[$a][$type][$k]['no_of_lines']) ? $gis_data[$a][$type][$k]['no_of_lines'] : 1; + if ($no_of_lines < 1) { + $no_of_lines = 1; + } + if (isset($gis_data[$a][$type][$k]['add_line'])) { + $no_of_lines++; + } + echo(''); + + for ($i = 0; $i < $no_of_lines; $i++) { + echo('

'); + if ($i == 0) { + echo __("Outer Ring:"); + } else { + echo __("Inner Ring"); echo($i . ':'); + } + + $no_of_points = isset($gis_data[$a][$type][$k][$i]['no_of_points']) ? $gis_data[$a][$type][$k][$i]['no_of_points'] : 4; + if ($no_of_points < 4) { + $no_of_points = 4; + } + if (isset($gis_data[$a][$type][$k][$i]['add_point'])) { + $no_of_points++; + } + echo(''); + + for ($j = 0; $j < $no_of_points; $j++) { + echo('
'); echo __("Point"); echo($j + 1 . ':'); +?> + " value="" /> + + " value="" /> + " class="add addPoint" value=""> +
" class="add addLine" value="">
+
" class="add addPolygon" value=""> +

" /> +
+ + +
+
+

+

+ +
+
+
+ + + + \ No newline at end of file diff --git a/js/OpenStreetMap.js b/js/OpenStreetMap.js new file mode 100644 index 0000000000..aebfa65db0 --- /dev/null +++ b/js/OpenStreetMap.js @@ -0,0 +1,125 @@ +/** + * Namespace: Util.OSM + */ +OpenLayers.Util.OSM = {}; + +/** + * Constant: MISSING_TILE_URL + * {String} URL of image to display for missing tiles + */ +OpenLayers.Util.OSM.MISSING_TILE_URL = "http://www.openstreetmap.org/openlayers/img/404.png"; + +/** + * Property: originalOnImageLoadError + * {Function} Original onImageLoadError function. + */ +OpenLayers.Util.OSM.originalOnImageLoadError = OpenLayers.Util.onImageLoadError; + +/** + * Function: onImageLoadError + */ +OpenLayers.Util.onImageLoadError = function() { + if (this.src.match(/^http:\/\/[abc]\.[a-z]+\.openstreetmap\.org\//)) { + this.src = OpenLayers.Util.OSM.MISSING_TILE_URL; + } else if (this.src.match(/^http:\/\/[def]\.tah\.openstreetmap\.org\//)) { + // do nothing - this layer is transparent + } else { + OpenLayers.Util.OSM.originalOnImageLoadError; + } +}; + +/** + * Class: OpenLayers.Layer.OSM.Mapnik + * + * Inherits from: + * - + */ +OpenLayers.Layer.OSM.Mapnik = OpenLayers.Class(OpenLayers.Layer.OSM, { + /** + * Constructor: OpenLayers.Layer.OSM.Mapnik + * + * Parameters: + * name - {String} + * options - {Object} Hashtable of extra options to tag onto the layer + */ + initialize: function(name, options) { + var url = [ + "http://a.tile.openstreetmap.org/${z}/${x}/${y}.png", + "http://b.tile.openstreetmap.org/${z}/${x}/${y}.png", + "http://c.tile.openstreetmap.org/${z}/${x}/${y}.png" + ]; + options = OpenLayers.Util.extend({ + numZoomLevels: 19, + buffer: 0, + transitionEffect: "resize" + }, options); + var newArguments = [name, url, options]; + OpenLayers.Layer.OSM.prototype.initialize.apply(this, newArguments); + }, + + CLASS_NAME: "OpenLayers.Layer.OSM.Mapnik" +}); + +/** + * Class: OpenLayers.Layer.OSM.Osmarender + * + * Inherits from: + * - + */ +OpenLayers.Layer.OSM.Osmarender = OpenLayers.Class(OpenLayers.Layer.OSM, { + /** + * Constructor: OpenLayers.Layer.OSM.Osmarender + * + * Parameters: + * name - {String} + * options - {Object} Hashtable of extra options to tag onto the layer + */ + initialize: function(name, options) { + var url = [ + "http://a.tah.openstreetmap.org/Tiles/tile/${z}/${x}/${y}.png", + "http://b.tah.openstreetmap.org/Tiles/tile/${z}/${x}/${y}.png", + "http://c.tah.openstreetmap.org/Tiles/tile/${z}/${x}/${y}.png" + ]; + options = OpenLayers.Util.extend({ + numZoomLevels: 18, + buffer: 0, + transitionEffect: "resize" + }, options); + var newArguments = [name, url, options]; + OpenLayers.Layer.OSM.prototype.initialize.apply(this, newArguments); + }, + + CLASS_NAME: "OpenLayers.Layer.OSM.Osmarender" +}); + +/** + * Class: OpenLayers.Layer.OSM.CycleMap + * + * Inherits from: + * - + */ +OpenLayers.Layer.OSM.CycleMap = OpenLayers.Class(OpenLayers.Layer.OSM, { + /** + * Constructor: OpenLayers.Layer.OSM.CycleMap + * + * Parameters: + * name - {String} + * options - {Object} Hashtable of extra options to tag onto the layer + */ + initialize: function(name, options) { + var url = [ + "http://a.tile.opencyclemap.org/cycle/${z}/${x}/${y}.png", + "http://b.tile.opencyclemap.org/cycle/${z}/${x}/${y}.png", + "http://c.tile.opencyclemap.org/cycle/${z}/${x}/${y}.png" + ]; + options = OpenLayers.Util.extend({ + numZoomLevels: 19, + buffer: 0, + transitionEffect: "resize" + }, options); + var newArguments = [name, url, options]; + OpenLayers.Layer.OSM.prototype.initialize.apply(this, newArguments); + }, + + CLASS_NAME: "OpenLayers.Layer.OSM.CycleMap" +}); diff --git a/js/canvg/rgbcolor.js b/js/canvg/rgbcolor.js deleted file mode 100644 index 0338a1696d..0000000000 --- a/js/canvg/rgbcolor.js +++ /dev/null @@ -1,288 +0,0 @@ -/** - * A class to parse color values - * @author Stoyan Stefanov - * @link http://www.phpied.com/rgb-color-parser-in-javascript/ - * @license Use it if you like it - */ -function RGBColor(color_string) -{ - this.ok = false; - - // strip any leading # - if (color_string.charAt(0) == '#') { // remove # if any - color_string = color_string.substr(1,6); - } - - color_string = color_string.replace(/ /g,''); - color_string = color_string.toLowerCase(); - - // before getting into regexps, try simple matches - // and overwrite the input - var simple_colors = { - aliceblue: 'f0f8ff', - antiquewhite: 'faebd7', - aqua: '00ffff', - aquamarine: '7fffd4', - azure: 'f0ffff', - beige: 'f5f5dc', - bisque: 'ffe4c4', - black: '000000', - blanchedalmond: 'ffebcd', - blue: '0000ff', - blueviolet: '8a2be2', - brown: 'a52a2a', - burlywood: 'deb887', - cadetblue: '5f9ea0', - chartreuse: '7fff00', - chocolate: 'd2691e', - coral: 'ff7f50', - cornflowerblue: '6495ed', - cornsilk: 'fff8dc', - crimson: 'dc143c', - cyan: '00ffff', - darkblue: '00008b', - darkcyan: '008b8b', - darkgoldenrod: 'b8860b', - darkgray: 'a9a9a9', - darkgreen: '006400', - darkkhaki: 'bdb76b', - darkmagenta: '8b008b', - darkolivegreen: '556b2f', - darkorange: 'ff8c00', - darkorchid: '9932cc', - darkred: '8b0000', - darksalmon: 'e9967a', - darkseagreen: '8fbc8f', - darkslateblue: '483d8b', - darkslategray: '2f4f4f', - darkturquoise: '00ced1', - darkviolet: '9400d3', - deeppink: 'ff1493', - deepskyblue: '00bfff', - dimgray: '696969', - dodgerblue: '1e90ff', - feldspar: 'd19275', - firebrick: 'b22222', - floralwhite: 'fffaf0', - forestgreen: '228b22', - fuchsia: 'ff00ff', - gainsboro: 'dcdcdc', - ghostwhite: 'f8f8ff', - gold: 'ffd700', - goldenrod: 'daa520', - gray: '808080', - green: '008000', - greenyellow: 'adff2f', - honeydew: 'f0fff0', - hotpink: 'ff69b4', - indianred : 'cd5c5c', - indigo : '4b0082', - ivory: 'fffff0', - khaki: 'f0e68c', - lavender: 'e6e6fa', - lavenderblush: 'fff0f5', - lawngreen: '7cfc00', - lemonchiffon: 'fffacd', - lightblue: 'add8e6', - lightcoral: 'f08080', - lightcyan: 'e0ffff', - lightgoldenrodyellow: 'fafad2', - lightgrey: 'd3d3d3', - lightgreen: '90ee90', - lightpink: 'ffb6c1', - lightsalmon: 'ffa07a', - lightseagreen: '20b2aa', - lightskyblue: '87cefa', - lightslateblue: '8470ff', - lightslategray: '778899', - lightsteelblue: 'b0c4de', - lightyellow: 'ffffe0', - lime: '00ff00', - limegreen: '32cd32', - linen: 'faf0e6', - magenta: 'ff00ff', - maroon: '800000', - mediumaquamarine: '66cdaa', - mediumblue: '0000cd', - mediumorchid: 'ba55d3', - mediumpurple: '9370d8', - mediumseagreen: '3cb371', - mediumslateblue: '7b68ee', - mediumspringgreen: '00fa9a', - mediumturquoise: '48d1cc', - mediumvioletred: 'c71585', - midnightblue: '191970', - mintcream: 'f5fffa', - mistyrose: 'ffe4e1', - moccasin: 'ffe4b5', - navajowhite: 'ffdead', - navy: '000080', - oldlace: 'fdf5e6', - olive: '808000', - olivedrab: '6b8e23', - orange: 'ffa500', - orangered: 'ff4500', - orchid: 'da70d6', - palegoldenrod: 'eee8aa', - palegreen: '98fb98', - paleturquoise: 'afeeee', - palevioletred: 'd87093', - papayawhip: 'ffefd5', - peachpuff: 'ffdab9', - peru: 'cd853f', - pink: 'ffc0cb', - plum: 'dda0dd', - powderblue: 'b0e0e6', - purple: '800080', - red: 'ff0000', - rosybrown: 'bc8f8f', - royalblue: '4169e1', - saddlebrown: '8b4513', - salmon: 'fa8072', - sandybrown: 'f4a460', - seagreen: '2e8b57', - seashell: 'fff5ee', - sienna: 'a0522d', - silver: 'c0c0c0', - skyblue: '87ceeb', - slateblue: '6a5acd', - slategray: '708090', - snow: 'fffafa', - springgreen: '00ff7f', - steelblue: '4682b4', - tan: 'd2b48c', - teal: '008080', - thistle: 'd8bfd8', - tomato: 'ff6347', - turquoise: '40e0d0', - violet: 'ee82ee', - violetred: 'd02090', - wheat: 'f5deb3', - white: 'ffffff', - whitesmoke: 'f5f5f5', - yellow: 'ffff00', - yellowgreen: '9acd32' - }; - for (var key in simple_colors) { - if (color_string == key) { - color_string = simple_colors[key]; - } - } - // emd of simple type-in colors - - // array of color definition objects - var color_defs = [ - { - re: /^rgb\((\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})\)$/, - example: ['rgb(123, 234, 45)', 'rgb(255,234,245)'], - process: function (bits){ - return [ - parseInt(bits[1]), - parseInt(bits[2]), - parseInt(bits[3]) - ]; - } - }, - { - re: /^(\w{2})(\w{2})(\w{2})$/, - example: ['#00ff00', '336699'], - process: function (bits){ - return [ - parseInt(bits[1], 16), - parseInt(bits[2], 16), - parseInt(bits[3], 16) - ]; - } - }, - { - re: /^(\w{1})(\w{1})(\w{1})$/, - example: ['#fb0', 'f0f'], - process: function (bits){ - return [ - parseInt(bits[1] + bits[1], 16), - parseInt(bits[2] + bits[2], 16), - parseInt(bits[3] + bits[3], 16) - ]; - } - } - ]; - - // search through the definitions to find a match - for (var i = 0; i < color_defs.length; i++) { - var re = color_defs[i].re; - var processor = color_defs[i].process; - var bits = re.exec(color_string); - if (bits) { - channels = processor(bits); - this.r = channels[0]; - this.g = channels[1]; - this.b = channels[2]; - this.ok = true; - } - - } - - // validate/cleanup values - this.r = (this.r < 0 || isNaN(this.r)) ? 0 : ((this.r > 255) ? 255 : this.r); - this.g = (this.g < 0 || isNaN(this.g)) ? 0 : ((this.g > 255) ? 255 : this.g); - this.b = (this.b < 0 || isNaN(this.b)) ? 0 : ((this.b > 255) ? 255 : this.b); - - // some getters - this.toRGB = function () { - return 'rgb(' + this.r + ', ' + this.g + ', ' + this.b + ')'; - } - this.toHex = function () { - var r = this.r.toString(16); - var g = this.g.toString(16); - var b = this.b.toString(16); - if (r.length == 1) r = '0' + r; - if (g.length == 1) g = '0' + g; - if (b.length == 1) b = '0' + b; - return '#' + r + g + b; - } - - // help - this.getHelpXML = function () { - - var examples = new Array(); - // add regexps - for (var i = 0; i < color_defs.length; i++) { - var example = color_defs[i].example; - for (var j = 0; j < example.length; j++) { - examples[examples.length] = example[j]; - } - } - // add type-in colors - for (var sc in simple_colors) { - examples[examples.length] = sc; - } - - var xml = document.createElement('ul'); - xml.setAttribute('id', 'rgbcolor-examples'); - for (var i = 0; i < examples.length; i++) { - try { - var list_item = document.createElement('li'); - var list_color = new RGBColor(examples[i]); - var example_div = document.createElement('div'); - example_div.style.cssText = - 'margin: 3px; ' - + 'border: 1px solid black; ' - + 'background:' + list_color.toHex() + '; ' - + 'color:' + list_color.toHex() - ; - example_div.appendChild(document.createTextNode('test')); - var list_item_value = document.createTextNode( - ' ' + examples[i] + ' -> ' + list_color.toRGB() + ' -> ' + list_color.toHex() - ); - list_item.appendChild(example_div); - list_item.appendChild(list_item_value); - xml.appendChild(list_item); - - } catch(e){} - } - return xml; - - } - -} - diff --git a/js/functions.js b/js/functions.js index 58ad805911..54a08d5371 100644 --- a/js/functions.js +++ b/js/functions.js @@ -150,13 +150,15 @@ function PMA_addDatepicker($this_element, options) showOn: 'button', buttonImage: themeCalendarImage, // defined in js/messages.php buttonImageOnly: true, - duration: '', - time24h: true, stepMinutes: 1, stepHours: 1, - showTime: showTimeOption, + showSecond: true, + showTimepicker: showTimeOption, + showButtonPanel: false, dateFormat: 'yy-mm-dd', // yy means year with four digits - altTimeField: '', + timeFormat: 'hh:mm:ss', + altFieldTimeOnly: false, + showAnim: '', beforeShow: function(input, inst) { // Remember that we came from the datepicker; this is used // in tbl_change.js by verificationsAfterFieldChange() @@ -166,11 +168,10 @@ function PMA_addDatepicker($this_element, options) setTimeout(function() { $('#ui-timepicker-div').css('z-index',$('#ui-datepicker-div').css('z-index')) },0); - }, - constrainInput: false + } }; - $this_element.datepicker($.extend(defaultOptions, options)); + $this_element.datetimepicker($.extend(defaultOptions, options)); } /** @@ -611,7 +612,7 @@ $(document).ready(function() { var $tr = $(this); // make the table unselectable (to prevent default highlighting when shift+click) - $tr.parents('table').noSelect(); + //$tr.parents('table').noSelect(); if (!e.shiftKey || last_clicked_row == -1) { // usual click @@ -642,6 +643,7 @@ $(document).ready(function() { last_shift_clicked_row = -1; } else { // handle the shift click + PMA_clearSelection(); var start, end; // clear last shift click result @@ -683,10 +685,12 @@ $(document).ready(function() { /** * Add a date/time picker to each element that needs it */ - $('.datefield, .datetimefield').each(function() { - PMA_addDatepicker($(this)); - }); -}) + if ($.datetimepicker != undefined) { + $('.datefield, .datetimefield').each(function() { + PMA_addDatepicker($(this)); + }); + } +}); /** * True if last click is to check a row. @@ -902,26 +906,6 @@ function goToUrl(selObj, goToLocation) eval("document.location.href = '" + goToLocation + "pos=" + selObj.options[selObj.selectedIndex].value + "'"); } -/** - * getElement - */ -function getElement(e,f) -{ - if(document.layers){ - f=(f)?f:self; - if(f.document.layers[e]) { - return f.document.layers[e]; - } - for(W=0;W") + var $temp_div = $("
") $temp_div.html(data.error); - $error = $temp_div.find("code").addClass("error"); + var $error = $temp_div.find("code").addClass("error"); PMA_ajaxShowMessage($error); } }) // end $.post() @@ -2023,7 +2007,7 @@ $(document).ready(function() { **/ $("#copyTable.ajax input[name='submit_copy']").live('click', function(event) { event.preventDefault(); - $form = $("#copyTable"); + var $form = $("#copyTable"); if($form.find("input[name='switch_to_new']").attr('checked')) { $form.append(''); $form.removeClass('ajax'); @@ -2052,15 +2036,53 @@ $(document).ready(function() { window.parent.frame_navigation.location.reload(); } } else { - $temp_div = $("
") + var $temp_div = $("
"); $temp_div.html(data.error); - $error = $temp_div.find("code").addClass("error"); + var $error = $temp_div.find("code").addClass("error"); PMA_ajaxShowMessage($error); } }) // end $.post() } });//end of copyTable ajax submit + /** + *Ajax events for actions in the "Table maintenance" + **/ + $("#tbl_maintenance.ajax li a.maintain_action").live('click', function(event) { + event.preventDefault(); + var $link = $(this); + var href = $link.attr("href"); + href = href.split('?'); + if ($("#sqlqueryresults").length != 0) { + $("#sqlqueryresults").remove(); + } + if ($("#result_query").length != 0) { + $("#result_query").remove(); + } + //variables which stores the common attributes + $.post(href[0], href[1]+"&ajax_request=true", function(data) { + if (data.success == undefined) { + var $temp_div = $("
"); + $temp_div.html(data); + var $success = $temp_div.find("#result_query .success"); + PMA_ajaxShowMessage($success); + $("
").insertAfter("#topmenucontainer"); + $("#sqlqueryresults").html(data); + PMA_init_slider(); + $("#sqlqueryresults").children("fieldset").remove(); + } else if (data.success == true ) { + PMA_ajaxShowMessage(data.message); + $("
").insertAfter("#topmenucontainer"); + $("#sqlqueryresults").html(data.sql_query); + } else { + var $temp_div = $("
"); + $temp_div.html(data.error); + var $error = $temp_div.find("code").addClass("error"); + PMA_ajaxShowMessage($error); + } + }) // end $.post() + });//end of table maintanance ajax click + }, 'top.frame_content'); //end $(document).ready for 'Table operations' @@ -2983,7 +3005,7 @@ $(document).ready(function() { $("#drop_tbl_anchor").live('click', function(event) { event.preventDefault(); - //context is top.frame_content, so we need to use window.parent.db to access the db var + //context is top.frame_content, so we need to use window.parent.table to access the table var /** * @var question String containing the question to be asked for confirmation */ @@ -3011,10 +3033,10 @@ $(document).ready(function() { * @see $cfg['AjaxEnable'] */ $(document).ready(function() { - $("#truncate_tbl_anchor").live('click', function(event) { + $("#truncate_tbl_anchor.ajax").live('click', function(event) { event.preventDefault(); - //context is top.frame_content, so we need to use window.parent.db to access the db var + //context is top.frame_content, so we need to use window.parent.table to access the table var /** * @var question String containing the question to be asked for confirmation */ @@ -3024,13 +3046,26 @@ $(document).ready(function() { PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']); $.get(url, {'is_js_confirmed': '1', 'ajax_request': true}, function(data) { - //Database deleted successfully, refresh both the frames - window.parent.refreshNavigation(); - window.parent.refreshMain(); + if ($("#sqlqueryresults").length != 0) { + $("#sqlqueryresults").remove(); + } + if ($("#result_query").length != 0) { + $("#result_query").remove(); + } + if (data.success == true) { + PMA_ajaxShowMessage(data.message); + $("
").insertAfter("#topmenucontainer"); + $("#sqlqueryresults").html(data.sql_query); + } else { + var $temp_div = $("
") + $temp_div.html(data.error); + var $error = $temp_div.find("code").addClass("error"); + PMA_ajaxShowMessage($error); + } }) // end $.get() }); // end $.PMA_confirm() - }); //end of Drop Table Ajax action -}) // end of $(document).ready() for Drop Table + }); //end of Truncate Table Ajax action +}) // end of $(document).ready() for Truncate Table /** * Attach CodeMirror2 editor to SQL edit area. @@ -3174,3 +3209,16 @@ $(document).ready(function() { return true; }); }); + +/** + * Clear text selection + */ +function PMA_clearSelection() { + if(document.selection && document.selection.empty) { + document.selection.empty(); + } else if(window.getSelection) { + var sel = window.getSelection(); + if(sel.empty) sel.empty(); + if(sel.removeAllRanges) sel.removeAllRanges(); + } +} diff --git a/js/gis_data_editor.js b/js/gis_data_editor.js new file mode 100644 index 0000000000..b2bab89ba7 --- /dev/null +++ b/js/gis_data_editor.js @@ -0,0 +1,309 @@ +/** + * @fileoverview functions used in GIS data editor + * + * @requires jQuery + * + */ + +/** + * Closes the GIS data editor and perform necessary clean up work. + */ +function closeGISEditor(){ + $("#popup_background").fadeOut("fast"); + $("#gis_editor").fadeOut("fast"); + $("#gis_editor").html(''); +} + +/** + * Prepares the HTML recieved via AJAX. + */ +function prepareJSVersion() { + // Hide 'Go' buttons associated with the dropdowns + $('.go').hide(); + + // Change the text on the submit button + $("input[name='gis_data[save]']") + .attr('value', PMA_messages['strCopy']) + .insertAfter($('#gis_data_textarea')) + .before('

'); + + // Add close and cancel links + $('#gis_data_editor').prepend('' + PMA_messages['strClose'] + ''); + $(' ' + PMA_messages['strCancel'] + '') + .insertAfter($("input[name='gis_data[save]']")); + + // Remove the unnecessary text + $('div#gis_data_output p').remove(); + + // Remove 'add' buttons and add links + $('.add').each(function(e) { + var $button = $(this); + $button.addClass('addJs').removeClass('add'); + var classes = $button.attr('class'); + $button + .after('+ ' + $button.attr('value') + '') + .remove(); + }); +} + +/** + * Returns the HTML for a data point. + * + * @param pointNumber point number + * @param prefix prefix of the name + * @returns the HTML for a data point + */ +function addDataPoint(pointNumber, prefix) { + return '
' + PMA_messages['strPoint'] + (pointNumber + 1) + ':' + + '' + + '' + + '' + + ''; +} + +/** + * Initialize the visualization in the GIS data editor. + */ +function initGISEditorVisualization() { + // Loads either SVG or OSM visualization based on the choice + selectVisualization(); + // Adds necessary styles to the div that coontains the openStreetMap + styleOSM(); + // Loads the SVG element and make a reference to it + loadSVG(); + // Adds controllers for zooming and panning + addZoomPanControllers(); + zoomAndPan(); +} + +/** + * Opens up the GIS data editor. + * + * @param value current value of the geometry field + * @param field field name + * @param type geometry type + * @param input_name name of the input field + * @param token token + */ +function openGISEditor(value, field, type, input_name, token) { + // Center the popup + var windowWidth = document.documentElement.clientWidth; + var windowHeight = document.documentElement.clientHeight; + var popupWidth = windowWidth * 0.9; + var popupHeight = windowHeight * 0.9; + var popupOffsetTop = windowHeight / 2 - popupHeight / 2; + var popupOffsetLeft = windowWidth / 2 - popupWidth / 2; + var $gis_editor = $("#gis_editor"); + $gis_editor.css({"top": popupOffsetTop, "left": popupOffsetLeft, "width": popupWidth, "height": popupHeight}); + + $.post('gis_data_editor.php', { + 'field' : field, + 'value' : value, + 'type' : type, + 'input_name' : input_name, + 'get_gis_editor' : true, + 'token' : token + }, function(data) { + if(data.success == true) { + $gis_editor.html(data.gis_editor); + initGISEditorVisualization(); + prepareJSVersion(); + } else { + PMA_ajaxShowMessage(data.error); + } + }, 'json'); + + // Make it appear + $("#popup_background").css({"opacity":"0.7"}); + $("#popup_background").fadeIn("fast"); + $gis_editor.fadeIn("fast"); +} + +/** + * Prepare and insert the GIS data in Well Known Text format + * to the input field. + */ +function insertDataAndClose() { + var $form = $('form#gis_data_editor_form'); + var input_name = $form.find("input[name='input_name']").val(); + + $.post('gis_data_editor.php', $form.serialize() + "&generate=true", function(data) { + if(data.success == true) { + $("input[name='" + input_name + "']").val(data.result); + } else { + PMA_ajaxShowMessage(data.error); + } + }, 'json'); + closeGISEditor(); +} + +$(document).ready(function() { + + // Remove the class that is added due to the URL being too long. + $('.open_gis_editor a').removeClass('formLinkSubmit'); + + /** + * Prepares and insert the GIS data to the input field on clicking 'copy'. + */ + $("input[name='gis_data[save]']").live('click', function(event) { + event.preventDefault(); + insertDataAndClose(); + }); + + /** + * Prepares and insert the GIS data to the input field on pressing 'enter'. + */ + $('#gis_editor').live('submit', function(event) { + event.preventDefault(); + insertDataAndClose(); + }); + + /** + * Trigger asynchronous calls on data change and update the output. + */ + $('#gis_editor').find("input[type='text']").live('change', function() { + var $form = $('form#gis_data_editor_form'); + $.post('gis_data_editor.php', $form.serialize() + "&generate=true", function(data) { + if(data.success == true) { + $('#gis_data_textarea').val(data.result); + $('#placeholder').empty().removeClass('hasSVG').html(data.visualization); + $('#openlayersmap').empty(); + eval(data.openLayers); + initGISEditorVisualization(); + } else { + PMA_ajaxShowMessage(data.error); + } + }, 'json'); + }); + + /** + * Update the form on change of the GIS type. + */ + $(".gis_type").live('change', function(event) { + var $gis_editor = $("#gis_editor"); + var $form = $('form#gis_data_editor_form'); + + $.post('gis_data_editor.php', $form.serialize() + "&get_gis_editor=true", function(data) { + if(data.success == true) { + $gis_editor.html(data.gis_editor); + initGISEditorVisualization(); + prepareJSVersion(); + } else { + PMA_ajaxShowMessage(data.error); + } + }, 'json'); + }); + + /** + * Handles closing of the GIS data editor. + */ + $('.close_gis_editor, .cancel_gis_editor').live('click', function() { + closeGISEditor(); + }); + + /** + * Handles adding data points + */ + $('.addJs.addPoint').live('click', function() { + var $a = $(this); + var name = $a.attr('name'); + // Eg. name = gis_data[0][MULTIPOINT][add_point] => prefix = gis_data[0][MULTIPOINT] + var prefix = name.substr(0, name.length - 11); + // Find the number of points + var $noOfPointsInput = $("input[name='" + prefix + "[no_of_points]" + "']"); + var noOfPoints = parseInt($noOfPointsInput.attr('value')); + // Add the new data point + var html = addDataPoint(noOfPoints, prefix); + $a.before(html); + $noOfPointsInput.attr('value', noOfPoints + 1); + }); + + /** + * Handles adding linestrings and inner rings + */ + $('.addLine.addJs').live('click', function() { + var $a = $(this); + var name = $a.attr('name'); + + // Eg. name = gis_data[0][MULTILINESTRING][add_line] => prefix = gis_data[0][MULTILINESTRING] + var prefix = name.substr(0, name.length - 10); + var type = prefix.slice(prefix.lastIndexOf('[') + 1, prefix.lastIndexOf(']')); + + // Find the number of lines + var $noOfLinesInput = $("input[name='" + prefix + "[no_of_lines]" + "']"); + var noOfLines = parseInt($noOfLinesInput.attr('value')); + + // Add the new linesting of inner ring based on the type + var html = '
'; + if (type == 'MULTILINESTRING') { + html += PMA_messages['strLineString'] + (noOfLines + 1) + ':'; + var noOfPoints = 2; + } else { + html += PMA_messages['strInnerRing'] + noOfLines + ':'; + var noOfPoints = 4; + } + html += ''; + for (i = 0; i < noOfPoints; i++) { + html += addDataPoint(i, (prefix + '[' + noOfLines + ']')); + } + html += '+ ' + + PMA_messages['strAddPoint'] + '
'; + + $a.before(html); + $noOfLinesInput.attr('value', noOfLines + 1); + }); + + /** + * Handles adding polygons + */ + $('.addJs.addPolygon').live('click', function() { + var $a = $(this); + var name = $a.attr('name'); + // Eg. name = gis_data[0][MULTIPOLYGON][add_polygon] => prefix = gis_data[0][MULTIPOLYGON] + var prefix = name.substr(0, name.length - 13); + // Find the number of polygons + var $noOfPolygonsInput = $("input[name='" + prefix + "[no_of_polygons]" + "']"); + var noOfPolygons = parseInt($noOfPolygonsInput.attr('value')); + + // Add the new polygon + var html = PMA_messages['strPolygon'] + (noOfPolygons + 1) + ':
'; + html += ''; + + '
' + PMA_messages['strOuterRing'] + ':'; + + ''; + for (i = 0; i < 4; i++) { + html += addDataPoint(i, (prefix + '[' + noOfPolygons + '][0]')); + } + html += '+ ' + + PMA_messages['strAddPoint'] + '
' + + '+ ' + + PMA_messages['strAddInnerRing'] + '

'; + + $a.before(html); + $noOfPolygonsInput.attr('value', noOfPolygons + 1); + }); + + /** + * Handles adding geoms + */ + $('.addJs.addGeom').live('click', function() { + var $a = $(this); + var prefix = 'gis_data[GEOMETRYCOLLECTION]'; + // Find the number of geoms + var $noOfGeomsInput = $("input[name='" + prefix + "[geom_count]" + "']"); + var noOfGeoms = parseInt($noOfGeomsInput.attr('value')); + + var html1 = PMA_messages['strGeometry'] + (noOfGeoms + 1) + ':
'; + var $geomType = $("select[name='gis_data[" + (noOfGeoms - 1) + "][gis_type]']").clone(); + $geomType.attr('name', 'gis_data[' + noOfGeoms + '][gis_type]').val('POINT'); + var html2 = '
' + PMA_messages['strPoint'] + ' :' + + '' + + '' + + '' + + '' + + '

'; + + $a.before(html1); $geomType.insertBefore($a); $a.before(html2); + $noOfGeomsInput.attr('value', noOfGeoms + 1); + }); +}); diff --git a/js/jquery/jquery.tablesorter.js b/js/jquery/jquery.tablesorter.js index e8e2323489..909d947425 100644 --- a/js/jquery/jquery.tablesorter.js +++ b/js/jquery/jquery.tablesorter.js @@ -826,9 +826,11 @@ // if user has supplied a sort list to constructor. if (config.sortList.length > 0) { $this.trigger("sorton", [config.sortList]); + } else { + // appendToTable used in sorton event already calls applyWidget + // apply widgets + applyWidget(this); } - // apply widgets - applyWidget(this); }); }; this.addParser = function (parser) { diff --git a/js/jquery/timepicker.js b/js/jquery/timepicker.js index 4d1845ec43..41e3ea005d 100644 --- a/js/jquery/timepicker.js +++ b/js/jquery/timepicker.js @@ -1,480 +1,1060 @@ -/*! - * jQuery UI Timepicker 0.2.1 - * - * Copyright (c) 2009 Martin Milesich (http://milesich.com/) - * - * Some parts are - * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about) - * - * $Id: timepicker.js 28 2009-08-11 20:31:23Z majlo $ - * - * Depends: - * ui.core.js - * ui.datepicker.js - * ui.slider.js - */ -(function($) { - -/** - * Extending default values - */ -$.extend($.datepicker._defaults, { - 'dateFormat': 'yy-mm-dd', - 'changeMonth': true, - 'changeYear': true, - 'stepSeconds': 1, // Number of seconds to step up/down - 'stepMinutes': 1, // Number of minutes to step up/down - 'stepHours': 1, // Number of hours to step up/down - 'time24h': false, // True if 24h time - 'showTime': false, // Show timepicker with datepicker - 'altTimeField': '', // Selector for an alternate field to store time into - 'hourText': 'Hour', - 'minuteText': 'Minute', - 'secondText': 'Second' -}); -$.extend($.datepicker.regional[''], { - 'hourText': 'Hour', - 'minuteText': 'Minute', - 'secondText': 'Second' -}); - -/** - * _hideDatepicker must be called with null - */ -$.datepicker._connectDatepickerOverride = $.datepicker._connectDatepicker; -$.datepicker._connectDatepicker = function(target, inst) { - $.datepicker._connectDatepickerOverride(target, inst); - - // showButtonPanel is required with timepicker - if (this._get(inst, 'showTime')) { - inst.settings['showButtonPanel'] = true; - } - - var showOn = this._get(inst, 'showOn'); - - if (showOn == 'button' || showOn == 'both') { - // Unbind all click events - inst.trigger.unbind('click'); - - // Bind new click event - inst.trigger.click(function() { - if ($.datepicker._datepickerShowing && $.datepicker._lastInput == target) - $.datepicker._hideDatepicker(null); // This override is all about the "null" - else - $.datepicker._showDatepicker(target); - return false; - }); - } -}; - -/** - * Datepicker does not have an onShow event so I need to create it. - * What I actually doing here is copying original _showDatepicker - * method to _showDatepickerOverload method. - */ -$.datepicker._showDatepickerOverride = $.datepicker._showDatepicker; -$.datepicker._showDatepicker = function (input) { - // Call the original method which will show the datepicker - $.datepicker._showDatepickerOverride(input); - - input = input.target || input; - - // find from button/image trigger - if (input.nodeName.toLowerCase() != 'input') input = $('input', input.parentNode)[0]; - - // Do not show timepicker if datepicker is disabled - if ($.datepicker._isDisabledDatepicker(input)) return; - - // Get instance to datepicker - var inst = $.datepicker._getInst(input); - - var showTime = $.datepicker._get(inst, 'showTime'); - - // If showTime = True show the timepicker - if (showTime) $.timepicker.show(input); -}; - -/** - * Same as above. Here I need to extend the _checkExternalClick method - * because I don't want to close the datepicker when the sliders get focus. - */ -$.datepicker._checkExternalClickOverride = $.datepicker._checkExternalClick; -$.datepicker._checkExternalClick = function (event) { - if (!$.datepicker._curInst) return; - var $target = $(event.target); - - if (($target.parents('#' + $.timepicker._mainDivId).length == 0)) { - $.datepicker._checkExternalClickOverride(event); - } -}; - -/** - * Datepicker has onHide event but I just want to make it simple for you - * so I hide the timepicker when datepicker hides. - */ -$.datepicker._hideDatepickerOverride = $.datepicker._hideDatepicker; -$.datepicker._hideDatepicker = function(input, duration) { - // Some lines from the original method - var inst = this._curInst; - - if (!inst || (input && inst != $.data(input, PROP_NAME))) return; - - // Get the value of showTime property - var showTime = this._get(inst, 'showTime'); - - if (input === undefined && showTime) { - if (inst.input) { - inst.input.val(this._formatDate(inst)); - inst.input.trigger('change'); // fire the change event - } - - this._updateAlternate(inst); - - if (showTime) $.timepicker.update(this._formatDate(inst)); - } - - // Hide datepicker - $.datepicker._hideDatepickerOverride(input, duration); - - // Hide the timepicker if enabled - if (showTime) { - $.timepicker.hide(); - } -}; - -/** - * This is a complete replacement of the _selectDate method. - * If showed with timepicker do not close when date is selected. - */ -$.datepicker._selectDate = function(id, dateStr) { - var target = $(id); - var inst = this._getInst(target[0]); - var showTime = this._get(inst, 'showTime'); - dateStr = (dateStr != null ? dateStr : this._formatDate(inst)); - if (!showTime) { - if (inst.input) - inst.input.val(dateStr); - this._updateAlternate(inst); - } - var onSelect = this._get(inst, 'onSelect'); - if (onSelect) - onSelect.apply((inst.input ? inst.input[0] : null), [dateStr, inst]); // trigger custom callback - else if (inst.input && !showTime) - inst.input.trigger('change'); // fire the change event - if (inst.inline) - this._updateDatepicker(inst); - else if (!inst.stayOpen) { - if (showTime) { - this._updateDatepicker(inst); - } else { - this._hideDatepicker(null, this._get(inst, 'duration')); - this._lastInput = inst.input[0]; - if (typeof(inst.input[0]) != 'object') - inst.input[0].focus(); // restore focus - this._lastInput = null; - } - } -}; - -/** - * We need to resize the timepicker when the datepicker has been changed. - */ -$.datepicker._updateDatepickerOverride = $.datepicker._updateDatepicker; -$.datepicker._updateDatepicker = function(inst) { - $.datepicker._updateDatepickerOverride(inst); - $.timepicker.resize(); -}; - -function Timepicker() {} - -Timepicker.prototype = { - init: function() - { - this._mainDivId = 'ui-timepicker-div'; - this._inputId = null; - this._orgValue = null; - this._orgHour = null; - this._orgMinute = null; - this._orgSecond = null; - this._colonPos = -1; - this._scolonPos = -1; - this._visible = false; - this.tpDiv = $(''); - this._generateHtml(); - }, - - show: function (input) - { - // Get instance to datepicker - var inst = $.datepicker._getInst(input); - - this._time24h = $.datepicker._get(inst, 'time24h'); - this._altTimeField = $.datepicker._get(inst, 'altTimeField'); - - var stepSeconds = parseInt($.datepicker._get(inst, 'stepSeconds'), 10) || 1; - var stepMinutes = parseInt($.datepicker._get(inst, 'stepMinutes'), 10) || 1; - var stepHours = parseInt($.datepicker._get(inst, 'stepHours'), 10) || 1; - - if (60 % stepSeconds != 0) { stepSeconds = 1; } - if (60 % stepMinutes != 0) { stepMinutes = 1; } - if (24 % stepHours != 0) { stepHours = 1; } - - $('#hourSlider').slider('option', 'max', 24 - stepHours); - $('#hourSlider').slider('option', 'step', stepHours); - - $('#minuteSlider').slider('option', 'max', 60 - stepMinutes); - $('#minuteSlider').slider('option', 'step', stepMinutes); - - $('#secondSlider').slider('option', 'max', 60 - stepSeconds); - $('#secondSlider').slider('option', 'step', stepSeconds); - - $('.hour_text').html($.datepicker._get(inst, 'hourText')); - $('.minute_text').html($.datepicker._get(inst, 'minuteText')); - $('.second_text').html($.datepicker._get(inst, 'secondText')); - - this._inputId = input.id; - - if (!this._visible) { - this._parseTime(); - this._orgValue = $('#' + this._inputId).val(); - } - - this.resize(); - - $('#' + this._mainDivId).show(); - - this._visible = true; - - var dpDiv = $('#' + $.datepicker._mainDivId); - var dpDivPos = dpDiv.position(); - - var viewWidth = (window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth) + $(document).scrollLeft(); - var tpRight = this.tpDiv.offset().left + this.tpDiv.outerWidth(); - - if (tpRight > viewWidth) { - dpDiv.css('left', dpDivPos.left - (tpRight - viewWidth) - 5); - this.tpDiv.css('left', dpDiv.offset().left + dpDiv.outerWidth() + 'px'); - } - }, - - update: function (fd) - { - var curTime = $('#' + this._mainDivId + ' span.fragHours').text() - + ':' - + $('#' + this._mainDivId + ' span.fragMinutes').text() - + ':' - + $('#' + this._mainDivId + ' span.fragSeconds').text() - ; - - if (!this._time24h) { - curTime += ' ' + $('#' + this._mainDivId + ' span.fragAmpm').text(); - } - - var curDate = $('#' + this._inputId).val(); - - $('#' + this._inputId).val(fd + ' ' + curTime); - - if (this._altTimeField) { - $(this._altTimeField).each(function() { $(this).val(curTime); }); - } - }, - - hide: function () - { - this._visible = false; - $('#' + this._mainDivId).hide(); - }, - - resize: function () - { - var dpDiv = $('#' + $.datepicker._mainDivId); - var dpDivPos = dpDiv.position(); - - var hdrHeight = $('#' + $.datepicker._mainDivId + ' > div.ui-datepicker-header:first-child').height(); - - $('#' + this._mainDivId + ' > div.ui-datepicker-header:first-child').css('height', hdrHeight); - - this.tpDiv.css({ - 'height': dpDiv.height(), - 'top' : dpDivPos.top, - 'left' : dpDivPos.left + dpDiv.outerWidth() + 'px' - }); - - $('#hourSlider').css('height', this.tpDiv.height() - (3.5 * hdrHeight)); - $('#minuteSlider').css('height', this.tpDiv.height() - (3.5 * hdrHeight)); - $('#secondSlider').css('height', this.tpDiv.height() - (3.5 * hdrHeight)); - }, - - _generateHtml: function () - { - var html = ''; - - html += '
'; - html += '
'; - html += '08:45:45
'; - html += ''; - html += ''; - html += '
'; - html += 'Hour'; - html += ''; - html += 'Minute'; - html += ''; - html += 'Second'; - html += '
'; - - this.tpDiv.empty().append(html); - $('body').append(this.tpDiv); - - var self = this; - - $('#hourSlider').slider({ - orientation: "vertical", - range: 'min', - min: 0, - max: 23, - step: 1, - slide: function(event, ui) { - self._writeTime('hour', ui.value); - }, - stop: function(event, ui) { - $('#' + self._inputId).focus(); - } - }); - - $('#minuteSlider').slider({ - orientation: "vertical", - range: 'min', - min: 0, - max: 59, - step: 1, - slide: function(event, ui) { - self._writeTime('minute', ui.value); - }, - stop: function(event, ui) { - $('#' + self._inputId).focus(); - } - }); - - $('#secondSlider').slider({ - orientation: "vertical", - range: 'min', - min: 0, - max: 59, - step: 1, - slide: function(event, ui) { - self._writeTime('second', ui.value); - }, - stop: function(event, ui) { - $('#' + self._inputId).focus(); - } - }); - - $('#hourSlider > a').css('padding', 0); - $('#minuteSlider > a').css('padding', 0); - $('#secondSlider > a').css('padding', 0); - }, - - _writeTime: function (type, value) - { - if (type == 'hour') { - if (!this._time24h) { - if (value < 12) { - $('#' + this._mainDivId + ' span.fragAmpm').text('am'); - } else { - $('#' + this._mainDivId + ' span.fragAmpm').text('pm'); - value -= 12; - } - - if (value == 0) value = 12; - } else { - $('#' + this._mainDivId + ' span.fragAmpm').text(''); - } - - if (value < 10) value = '0' + value; - $('#' + this._mainDivId + ' span.fragHours').text(value); - } - - if (type == 'minute') { - if (value < 10) value = '0' + value; - $('#' + this._mainDivId + ' span.fragMinutes').text(value); - } - - if (type == 'second') { - if (value < 10) value = '0' + value; - $('#' + this._mainDivId + ' span.fragSeconds').text(value); - } - }, - - _parseTime: function () - { - var dt = $('#' + this._inputId).val(); - - this._colonPos = dt.search(':'); - - var m = 0, h = 0, s = 0, a = ''; - - if (this._colonPos != -1) { - this._scolonPos = dt.substring(this._colonPos + 1).search(':'); - h = parseInt(dt.substr(this._colonPos - 2, 2), 10); - m = parseInt(dt.substr(this._colonPos + 1, 2), 10); - if (this._scolonPos != -1) { - this._scolonPos += this._colonPos + 1; - s = parseInt(dt.substr(this._scolonPos + 1, 2), 10); - a = jQuery.trim(dt.substr(this._scolonPos + 3, 3)); - } else { - a = jQuery.trim(dt.substr(this._colonPos + 3, 3)); - } - } - - a = a.toLowerCase(); - - if (a != 'am' && a != 'pm') { - a = ''; - } - - if (h < 0) h = 0; - if (m < 0) m = 0; - - if (h > 23) h = 23; - if (m > 59) m = 59; - - if (a == 'pm' && h < 12) h += 12; - if (a == 'am' && h == 12) h = 0; - - this._setTime('hour', h); - this._setTime('minute', m); - this._setTime('second', s); - - this._orgHour = h; - this._orgMinute = m; - this._orgSecond = s; - }, - - _setTime: function (type, value) - { - if (isNaN(value)) value = 0; - if (value < 0) value = 0; - if (value > 23 && type == 'hour') value = 23; - if (value > 59 && type == 'minute') value = 59; - if (value > 59 && type == 'second') value = 59; - - if (type == 'hour') { - $('#hourSlider').slider('value', value); - } - - if (type == 'minute') { - $('#minuteSlider').slider('value', value); - } - - if (type == 'second') { - $('#secondSlider').slider('value', value); - } - - this._writeTime(type, value); - } -}; - -$.timepicker = new Timepicker(); -$('document').ready(function () {$.timepicker.init();}); - -})(jQuery); +/* +* jQuery timepicker addon +* By: Trent Richardson [http://trentrichardson.com] +* Version 0.9.6 +* Last Modified: 07/20/2011 +* +* Copyright 2011 Trent Richardson +* Dual licensed under the MIT and GPL licenses. +* http://trentrichardson.com/Impromptu/GPL-LICENSE.txt +* http://trentrichardson.com/Impromptu/MIT-LICENSE.txt +* +* HERES THE CSS: +* .ui-timepicker-div .ui-widget-header{ margin-bottom: 8px; } +* .ui-timepicker-div dl{ text-align: left; } +* .ui-timepicker-div dl dt{ height: 25px; } +* .ui-timepicker-div dl dd{ margin: -25px 10px 10px 65px; } +* .ui-timepicker-div td { font-size: 90%; } +*/ + +(function($) { + +$.extend($.ui, { timepicker: { version: "0.9.6" } }); + +/* Time picker manager. + Use the singleton instance of this class, $.timepicker, to interact with the time picker. + Settings for (groups of) time pickers are maintained in an instance object, + allowing multiple different settings on the same page. */ + +function Timepicker() { + this.regional = []; // Available regional settings, indexed by language code + this.regional[''] = { // Default regional settings + currentText: 'Now', + closeText: 'Done', + ampm: false, + timeFormat: 'hh:mm tt', + timeSuffix: '', + timeOnlyTitle: 'Choose Time', + timeText: 'Time', + hourText: 'Hour', + minuteText: 'Minute', + secondText: 'Second', + timezoneText: 'Time Zone' + }; + this._defaults = { // Global defaults for all the datetime picker instances + showButtonPanel: true, + timeOnly: false, + showHour: true, + showMinute: true, + showSecond: false, + showTimezone: false, + showTime: true, + stepHour: 0.05, + stepMinute: 0.05, + stepSecond: 0.05, + hour: 0, + minute: 0, + second: 0, + timezone: '+0000', + hourMin: 0, + minuteMin: 0, + secondMin: 0, + hourMax: 23, + minuteMax: 59, + secondMax: 59, + minDateTime: null, + maxDateTime: null, + hourGrid: 0, + minuteGrid: 0, + secondGrid: 0, + alwaysSetTime: true, + separator: ' ', + altFieldTimeOnly: true, + showTimepicker: true, + timezoneList: ["-1100", "-1000", "-0900", "-0800", "-0700", "-0600", + "-0500", "-0400", "-0300", "-0200", "-0100", "+0000", + "+0100", "+0200", "+0300", "+0400", "+0500", "+0600", + "+0700", "+0800", "+0900", "+1000", "+1100", "+1200"] + }; + $.extend(this._defaults, this.regional['']); +} + +$.extend(Timepicker.prototype, { + $input: null, + $altInput: null, + $timeObj: null, + inst: null, + hour_slider: null, + minute_slider: null, + second_slider: null, + timezone_select: null, + hour: 0, + minute: 0, + second: 0, + timezone: '+0000', + hourMinOriginal: null, + minuteMinOriginal: null, + secondMinOriginal: null, + hourMaxOriginal: null, + minuteMaxOriginal: null, + secondMaxOriginal: null, + ampm: '', + formattedDate: '', + formattedTime: '', + formattedDateTime: '', + timezoneList: ["-1100", "-1000", "-0900", "-0800", "-0700", "-0600", + "-0500", "-0400", "-0300", "-0200", "-0100", "+0000", + "+0100", "+0200", "+0300", "+0400", "+0500", "+0600", + "+0700", "+0800", "+0900", "+1000", "+1100", "+1200"], + + /* Override the default settings for all instances of the time picker. + @param settings object - the new settings to use as defaults (anonymous object) + @return the manager object */ + setDefaults: function(settings) { + extendRemove(this._defaults, settings || {}); + return this; + }, + + //######################################################################## + // Create a new Timepicker instance + //######################################################################## + _newInst: function($input, o) { + var tp_inst = new Timepicker(), + inlineSettings = {}; + + for (var attrName in this._defaults) { + var attrValue = $input.attr('time:' + attrName); + if (attrValue) { + try { + inlineSettings[attrName] = eval(attrValue); + } catch (err) { + inlineSettings[attrName] = attrValue; + } + } + } + tp_inst._defaults = $.extend({}, this._defaults, inlineSettings, o, { + beforeShow: function(input, dp_inst) { + if ($.isFunction(o.beforeShow)) + o.beforeShow(input, dp_inst, tp_inst); + }, + onChangeMonthYear: function(year, month, dp_inst) { + // Update the time as well : this prevents the time from disappearing from the $input field. + tp_inst._updateDateTime(dp_inst); + if ($.isFunction(o.onChangeMonthYear)) + o.onChangeMonthYear.call($input[0], year, month, dp_inst, tp_inst); + }, + onClose: function(dateText, dp_inst) { + if (tp_inst.timeDefined === true && $input.val() != '') + tp_inst._updateDateTime(dp_inst); + if ($.isFunction(o.onClose)) + o.onClose.call($input[0], dateText, dp_inst, tp_inst); + }, + timepicker: tp_inst // add timepicker as a property of datepicker: $.datepicker._get(dp_inst, 'timepicker'); + }); + + tp_inst.hour = tp_inst._defaults.hour; + tp_inst.minute = tp_inst._defaults.minute; + tp_inst.second = tp_inst._defaults.second; + tp_inst.ampm = ''; + tp_inst.$input = $input; + + if (o.altField) + tp_inst.$altInput = $(o.altField) + .css({ cursor: 'pointer' }) + .focus(function(){ $input.trigger("focus"); }); + + // datepicker needs minDate/maxDate, timepicker needs minDateTime/maxDateTime.. + if(tp_inst._defaults.minDate !== undefined && tp_inst._defaults.minDate instanceof Date) + tp_inst._defaults.minDateTime = new Date(tp_inst._defaults.minDate.getTime()); + if(tp_inst._defaults.minDateTime !== undefined && tp_inst._defaults.minDateTime instanceof Date) + tp_inst._defaults.minDate = new Date(tp_inst._defaults.minDateTime.getTime()); + if(tp_inst._defaults.maxDate !== undefined && tp_inst._defaults.maxDate instanceof Date) + tp_inst._defaults.maxDateTime = new Date(tp_inst._defaults.maxDate.getTime()); + if(tp_inst._defaults.maxDateTime !== undefined && tp_inst._defaults.maxDateTime instanceof Date) + tp_inst._defaults.maxDate = new Date(tp_inst._defaults.maxDateTime.getTime()); + + return tp_inst; + }, + + //######################################################################## + // add our sliders to the calendar + //######################################################################## + _addTimePicker: function(dp_inst) { + var currDT = (this.$altInput && this._defaults.altFieldTimeOnly) ? + this.$input.val() + ' ' + this.$altInput.val() : + this.$input.val(); + + this.timeDefined = this._parseTime(currDT); + this._limitMinMaxDateTime(dp_inst, false); + this._injectTimePicker(); + }, + + //######################################################################## + // parse the time string from input value or _setTime + //######################################################################## + _parseTime: function(timeString, withDate) { + var regstr = this._defaults.timeFormat.toString() + .replace(/h{1,2}/ig, '(\\d?\\d)') + .replace(/m{1,2}/ig, '(\\d?\\d)') + .replace(/s{1,2}/ig, '(\\d?\\d)') + .replace(/t{1,2}/ig, '(am|pm|a|p)?') + .replace(/z{1}/ig, '((\\+|-)\\d\\d\\d\\d)?') + .replace(/\s/g, '\\s?') + this._defaults.timeSuffix + '$', + order = this._getFormatPositions(), + treg; + + if (!this.inst) this.inst = $.datepicker._getInst(this.$input[0]); + + if (withDate || !this._defaults.timeOnly) { + // the time should come after x number of characters and a space. + // x = at least the length of text specified by the date format + var dp_dateFormat = $.datepicker._get(this.inst, 'dateFormat'); + // escape special regex characters in the seperator + var specials = new RegExp("[.*+?|()\\[\\]{}\\\\]", "g"); + regstr = '.{' + dp_dateFormat.length + ',}' + this._defaults.separator.replace(specials, "\\$&") + regstr; + } + + treg = timeString.match(new RegExp(regstr, 'i')); + + if (treg) { + if (order.t !== -1) + this.ampm = ((treg[order.t] === undefined || treg[order.t].length === 0) ? + '' : + (treg[order.t].charAt(0).toUpperCase() == 'A') ? 'AM' : 'PM').toUpperCase(); + + if (order.h !== -1) { + if (this.ampm == 'AM' && treg[order.h] == '12') + this.hour = 0; // 12am = 0 hour + else if (this.ampm == 'PM' && treg[order.h] != '12') + this.hour = (parseFloat(treg[order.h]) + 12).toFixed(0); // 12pm = 12 hour, any other pm = hour + 12 + else this.hour = Number(treg[order.h]); + } + + if (order.m !== -1) this.minute = Number(treg[order.m]); + if (order.s !== -1) this.second = Number(treg[order.s]); + if (order.z !== -1) this.timezone = treg[order.z]; + + return true; + + } + return false; + }, + + //######################################################################## + // figure out position of time elements.. cause js cant do named captures + //######################################################################## + _getFormatPositions: function() { + var finds = this._defaults.timeFormat.toLowerCase().match(/(h{1,2}|m{1,2}|s{1,2}|t{1,2}|z)/g), + orders = { h: -1, m: -1, s: -1, t: -1, z: -1 }; + + if (finds) + for (var i = 0; i < finds.length; i++) + if (orders[finds[i].toString().charAt(0)] == -1) + orders[finds[i].toString().charAt(0)] = i + 1; + + return orders; + }, + + //######################################################################## + // generate and inject html for timepicker into ui datepicker + //######################################################################## + _injectTimePicker: function() { + var $dp = this.inst.dpDiv, + o = this._defaults, + tp_inst = this, + // Added by Peter Medeiros: + // - Figure out what the hour/minute/second max should be based on the step values. + // - Example: if stepMinute is 15, then minMax is 45. + hourMax = (o.hourMax - (o.hourMax % o.stepHour)).toFixed(0), + minMax = (o.minuteMax - (o.minuteMax % o.stepMinute)).toFixed(0), + secMax = (o.secondMax - (o.secondMax % o.stepSecond)).toFixed(0), + dp_id = this.inst.id.toString().replace(/([^A-Za-z0-9_])/g, ''); + + // Prevent displaying twice + //if ($dp.find("div#ui-timepicker-div-"+ dp_id).length === 0) { + if ($dp.find("div#ui-timepicker-div-"+ dp_id).length === 0 && o.showTimepicker) { + var noDisplay = ' style="display:none;"', + html = '
' + + '
' + o.timeText + '
' + + '
' + + '
' + o.hourText + '
', + hourGridSize = 0, + minuteGridSize = 0, + secondGridSize = 0, + size; + + if (o.showHour && o.hourGrid > 0) { + html += '
' + + '
' + + '
'; + + for (var h = o.hourMin; h <= hourMax; h += o.hourGrid) { + hourGridSize++; + var tmph = (o.ampm && h > 12) ? h-12 : h; + if (tmph < 10) tmph = '0' + tmph; + if (o.ampm) { + if (h == 0) tmph = 12 +'a'; + else if (h < 12) tmph += 'a'; + else tmph += 'p'; + } + html += ''; + } + + html += '
' + tmph + '
' + + '
'; + } else html += '
'; + + html += '
' + o.minuteText + '
'; + + if (o.showMinute && o.minuteGrid > 0) { + html += '
' + + '
' + + '
'; + + for (var m = o.minuteMin; m <= minMax; m += o.minuteGrid) { + minuteGridSize++; + html += ''; + } + + html += '
' + ((m < 10) ? '0' : '') + m + '
' + + '
'; + } else html += '
'; + + html += '
' + o.secondText + '
'; + + if (o.showSecond && o.secondGrid > 0) { + html += '
' + + '
' + + '
'; + + for (var s = o.secondMin; s <= secMax; s += o.secondGrid) { + secondGridSize++; + html += ''; + } + + html += '
' + ((s < 10) ? '0' : '') + s + '
' + + '
'; + } else html += '
'; + + html += '
' + o.timezoneText + '
'; + html += '
'; + + html += '
'; + $tp = $(html); + + // if we only want time picker... + if (o.timeOnly === true) { + $tp.prepend( + '
' + + '
' + o.timeOnlyTitle + '
' + + '
'); + $dp.find('.ui-datepicker-header, .ui-datepicker-calendar').hide(); + } + + this.hour_slider = $tp.find('#ui_tpicker_hour_'+ dp_id).slider({ + orientation: "horizontal", + value: this.hour, + min: o.hourMin, + max: hourMax, + step: o.stepHour, + slide: function(event, ui) { + tp_inst.hour_slider.slider( "option", "value", ui.value); + tp_inst._onTimeChange(); + } + }); + + // Updated by Peter Medeiros: + // - Pass in Event and UI instance into slide function + this.minute_slider = $tp.find('#ui_tpicker_minute_'+ dp_id).slider({ + orientation: "horizontal", + value: this.minute, + min: o.minuteMin, + max: minMax, + step: o.stepMinute, + slide: function(event, ui) { + // update the global minute slider instance value with the current slider value + tp_inst.minute_slider.slider( "option", "value", ui.value); + tp_inst._onTimeChange(); + } + }); + + this.second_slider = $tp.find('#ui_tpicker_second_'+ dp_id).slider({ + orientation: "horizontal", + value: this.second, + min: o.secondMin, + max: secMax, + step: o.stepSecond, + slide: function(event, ui) { + tp_inst.second_slider.slider( "option", "value", ui.value); + tp_inst._onTimeChange(); + } + }); + + + this.timezone_select = $tp.find('#ui_tpicker_timezone_'+ dp_id).append('').find("select"); + $.fn.append.apply(this.timezone_select, + $.map(o.timezoneList, function(val, idx) { + return $("