diff --git a/common/js/xml_handler.js b/common/js/xml_handler.js index bdf7e1560..c8656c237 100644 --- a/common/js/xml_handler.js +++ b/common/js/xml_handler.js @@ -375,11 +375,15 @@ $.exec_json = function(action,data,func){ ,data:$.param(data) ,success : function(data){ $(".wfsr").hide().trigger('cancel_confirm'); - if(data.error > 0) alert(data.message); - if(data.error == -1 && data.message == 'msg_is_not_administrator'){ - alert('You are not logged in as an administrator'); -// window.location.reload(); - return; + if(data.error != 0){ + if(data.error == -1 && data.message == 'msg_is_not_administrator'){ + alert('You are not logged in as an administrator'); + // window.location.reload(); + return; + }else{ + alert(data.message); + return; + } } if($.isFunction(func)) func(data); } diff --git a/modules/admin/lang/lang.xml b/modules/admin/lang/lang.xml index 147e6ed63..12b46624c 100644 --- a/modules/admin/lang/lang.xml +++ b/modules/admin/lang/lang.xml @@ -1499,4 +1499,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/modules/admin/tpl/index.html b/modules/admin/tpl/index.html index ed449e80a..b5918d0ba 100644 --- a/modules/admin/tpl/index.html +++ b/modules/admin/tpl/index.html @@ -1,4 +1,15 @@ + + + + + + +

{$lang->control_panel} {$lang->help}

@@ -35,11 +46,12 @@
+

{$lang->uv}

-
<!-- Graph here -->
+

{$lang->pv}

-
<!-- Graph here -->
+
diff --git a/modules/admin/tpl/js/admin.js b/modules/admin/tpl/js/admin.js index 52c91c383..ff5918b32 100644 --- a/modules/admin/tpl/js/admin.js +++ b/modules/admin/tpl/js/admin.js @@ -2284,9 +2284,11 @@ jQuery(function($){ var nLen = aSiteList.length; if(nLen <= 1){ // leave the site selector hidden + $SiteSelector.hide(); }else{ // show and fill in $SiteSelector = $('.x_modal._common .site_selector'); + $SiteSelector.html(""); for(var i=0; i").val(aSiteList[i].site_srl).html(aSiteList[i].domain)); }