diff --git a/.gitattributes b/.gitattributes index aa3bd0c4..7f7f4d62 100644 --- a/.gitattributes +++ b/.gitattributes @@ -177,6 +177,7 @@ bureau/admin/icon/winresize.gif -text bureau/admin/icon/xls.png -text bureau/admin/icon/zip.png -text bureau/admin/images/admin.png -text +bureau/admin/images/asc.gif -text bureau/admin/images/bgborder.gif -text bureau/admin/images/blank.gif -text bureau/admin/images/check_no.png -text @@ -186,6 +187,7 @@ bureau/admin/images/config.png -text bureau/admin/images/copyrights.txt -text bureau/admin/images/danger.png -text bureau/admin/images/delete.png -text +bureau/admin/images/desc.gif -text bureau/admin/images/dom.png -text bureau/admin/images/edit.png -text bureau/admin/images/exit.png -text @@ -252,6 +254,7 @@ bureau/admin/index.php -text bureau/admin/ip_main.php -text bureau/admin/js/alternc.js -text bureau/admin/js/jquery.min_embedded.js -text +bureau/admin/js/jquery.tablesorter.min.js -text bureau/admin/js/jquery_ui/css/redmond/images/animated-overlay.gif -text bureau/admin/js/jquery_ui/css/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png -text bureau/admin/js/jquery_ui/css/redmond/images/ui-bg_flat_55_fbec88_40x100.png -text diff --git a/bureau/admin/dom_edit.php b/bureau/admin/dom_edit.php index 2cd0ca24..5d1bc31b 100644 --- a/bureau/admin/dom_edit.php +++ b/bureau/admin/dom_edit.php @@ -126,8 +126,10 @@ if ($r['dns_action']=='UPDATE') {?>

- +
+ +domains_type_lst(); for($i=0;$i<$r["nsub"];$i++) { @@ -271,6 +273,7 @@ if (!$r['noerase']) { + @@ -306,6 +309,17 @@ function update_dns_content(){ } } +function force_update_dns_content(){ + get_dns_content = 1; + $("#divdumpdns").html('In progress...'); + update_dns_content(); +} + +$(document).ready(function() + { + $("#dom_edit_table").tablesorter(); + } +); diff --git a/bureau/admin/ftp_list.php b/bureau/admin/ftp_list.php index e3c47eca..87ba07d9 100644 --- a/bureau/admin/ftp_list.php +++ b/bureau/admin/ftp_list.php @@ -68,8 +68,10 @@ if (isset($error) && $error && !$noftp) { ?> -
+
+ + @@ -80,11 +82,12 @@ while (list($key,$val)=each($r)) { ?> ').css('width',$(this).width()));});$(table).prepend(colgroup);};}function updateHeaderSortCount(table,sortList){var c=table.config,l=sortList.length;for(var i=0;i b["+i+"]) ? 1 : 0));";};function makeSortTextDesc(i){return"((b["+i+"] < a["+i+"]) ? -1 : ((b["+i+"] > a["+i+"]) ? 1 : 0));";};function makeSortNumeric(i){return"a["+i+"]-b["+i+"];";};function makeSortNumericDesc(i){return"b["+i+"]-a["+i+"];";};function sortText(a,b){if(table.config.sortLocaleCompare)return a.localeCompare(b);return((ab)?1:0));};function sortTextDesc(a,b){if(table.config.sortLocaleCompare)return b.localeCompare(a);return((ba)?1:0));};function sortNumeric(a,b){return a-b;};function sortNumericDesc(a,b){return b-a;};function getCachedSortType(parsers,i){return parsers[i].type;};this.construct=function(settings){return this.each(function(){if(!this.tHead||!this.tBodies)return;var $this,$document,$headers,cache,config,shiftDown=0,sortOrder;this.config={};config=$.extend(this.config,$.tablesorter.defaults,settings);$this=$(this);$.data(this,"tablesorter",config);$headers=buildHeaders(this);this.config.parsers=buildParserCache(this,$headers);cache=buildCache(this);var sortCSS=[config.cssDesc,config.cssAsc];fixColumnWidth(this);$headers.click(function(e){var totalRows=($this[0].tBodies[0]&&$this[0].tBodies[0].rows.length)||0;if(!this.sortDisabled&&totalRows>0){$this.trigger("sortStart");var $cell=$(this);var i=this.column;this.order=this.count++%2;if(this.lockedOrder)this.order=this.lockedOrder;if(!e[config.sortMultiSortKey]){config.sortList=[];if(config.sortForce!=null){var a=config.sortForce;for(var j=0;j0){$this.trigger("sorton",[config.sortList]);}applyWidget(this);});};this.addParser=function(parser){var l=parsers.length,a=true;for(var i=0;i
' onClick='return confirm("");'>"; + echo "ENABLED"; // for tablesorter } else { echo "\""._("Disabled")."\"/"; + echo "DISABLED"; // for tablesorter } - ?> ]' value='' /> @@ -117,4 +120,13 @@ if ( $val['enabled']) { show_help("ftp_list"); ?> + + diff --git a/bureau/admin/head.php b/bureau/admin/head.php index 66a9c65f..ff39a518 100644 --- a/bureau/admin/head.php +++ b/bureau/admin/head.php @@ -50,6 +50,8 @@ if (file_exists("styles/style-custom.css") ) { + + 1){arr=arr.concat(checkCellColSpan(table,headerArr,row++));}else{if(table.tHead.length==1||(cell.rowSpan>1||!r[row+1])){arr.push(cell);}}}return arr;};function checkHeaderMetadata(cell){if(($.metadata)&&($(cell).metadata().sorter===false)){return true;};return false;}function checkHeaderOptions(table,i){if((table.config.headers[i])&&(table.config.headers[i].sorter===false)){return true;};return false;}function checkHeaderOptionsSortingLocked(table,i){if((table.config.headers[i])&&(table.config.headers[i].lockedOrder))return table.config.headers[i].lockedOrder;return false;}function applyWidget(table){var c=table.config.widgets;var l=c.length;for(var i=0;i');$("tr:first td",table.tBodies[0]).each(function(){colgroup.append($('