pari: branch appliance r296 - in /branches/appliance/config: ./ setup/

Thu Jan 25 14:13:40 MST 2007

Author: pari
Date: Thu Jan 25 15:13:39 2007
New Revision: 296

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=296
Log:
Fixes for errors generated during the previous svnmerge

Modified:
    branches/appliance/config/setup/3.html
    branches/appliance/config/sysinfo.html

Modified: branches/appliance/config/setup/3.html
URL: http://svn.digium.com/view/asterisk-gui/branches/appliance/config/setup/3.html?view=diff&rev=296&r1=295&r2=296
==============================================================================

--- branches/appliance/config/setup/3.html (original)
+++ branches/appliance/config/setup/3.html Thu Jan 25 15:13:39 2007
@@ -110,8 +110,6 @@
 	parent.localextenlength = $('localextenlength').value ;
 }
 
-<<<<<<< .working
-=======
 function update_spae(){
 		if(	$('localextenlength').value == $('userbase').value.length ) return;
 		if(	$('localextenlength').value < $('userbase').value.length ){
@@ -124,7 +122,6 @@
 				}
 		}
 }
->>>>>>> .merge-right.r292
 //-->
 </SCRIPT>
 <BODY bgcolor="#FFFFFF" onload="localinit()" topmargin=0 leftmargin=0  onunload="store_extlength()">

Modified: branches/appliance/config/sysinfo.html
URL: http://svn.digium.com/view/asterisk-gui/branches/appliance/config/sysinfo.html?view=diff&rev=296&r1=295&r2=296
==============================================================================
--- branches/appliance/config/sysinfo.html (original)
+++ branches/appliance/config/sysinfo.html Thu Jan 25 15:13:39 2007
@@ -29,47 +29,6 @@
 var tabs = new Array('tab1', 'tab2', 'tab3');
 var divs_tohide = new Array('osversion_div', 'uptime_div', 'asterisk_div', 'today_div','hostname_div','ifconfig_div','df_div','memory_div');
 
-<<<<<<< .working
-=======
-function thisday_log(){
-	$('status_message').style.display="block";
-	if($('log_day').value < 10 ){
-		var tmp_command = "/bin/grep /var/log/asterisk/messages -e '" + $('log_month').value + "  " + $('log_day').value + " ' > /var/lib/asterisk/static-http/config/bkps/today_log.html";
-	}else{
-		var tmp_command = "/bin/grep /var/log/asterisk/messages -e '" + $('log_month').value + " " + $('log_day').value + " ' > /var/lib/asterisk/static-http/config/bkps/today_log.html";
-	}
-	parent.astmanEngine.run_tool( tmp_command , onSuccess = function() { 
-					$('status_message').style.display='none';
-					load_todayslog();
-				}
-	);
-
-}
-
-function 	load_todayslog(){
-		$('status_message').style.display='block';
-		var opt = {
-			method: 'get',
-			asynchronous: true,
-			onComplete: function(originalRequest){
-				$('status_message').style.display='none';
-				if(originalRequest.responseText.length==0){
-					$('todaylog').innerHTML = "No log messages found on this Day" ;
-				}else{
-					$('todaylog').innerHTML = originalRequest.responseText.escapeHTML() ;
-				}
-			},
-			onFailure: function(t) {
-				$('status_message').style.display='none';
-				alert("Config Error: " + t.status + ": " + t.statusText);
-			}
-		};
-		opt.parameters="";
-		var tmp = new Ajax.Request("./bkps/today_log.html", opt);
-		return true;
-}
-
->>>>>>> .merge-right.r292
 function show_window(x){
 		for(i=0; i < tabs.length ; i++){
 			document.getElementById(tabs[i]).style.background = '#DDDDEE';
@@ -152,9 +111,6 @@
 
 function localajaxinit(){
 	// call the tool (sysinfo)
-	var date = new Date() ; 
-	$('log_month').selectedIndex = date.getMonth() ;
-	$('log_day').selectedIndex = date.getDate()  - 1 ;
 	$('status_message').style.display="block";
 	$('message_text').innerHTML = "Loading system Information ...";
 	parent.loadscreen(this);

