pari: trunk r202 - /trunk/config/setup/2.html

asterisk-gui-commits at lists.digium.com asterisk-gui-commits at lists.digium.com
Thu Dec 28 17:29:48 MST 2006


Author: pari
Date: Thu Dec 28 18:29:48 2006
New Revision: 202

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=202
Log:
Fix related to previous commit: setup wizard -> 'date & time' was looking for /etc/asterisk/gui_sysinfo.conf which no longer exists 

Modified:
    trunk/config/setup/2.html

Modified: trunk/config/setup/2.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/setup/2.html?view=diff&rev=202&r1=201&r2=202
==============================================================================
--- trunk/config/setup/2.html (original)
+++ trunk/config/setup/2.html Thu Dec 28 18:29:48 2006
@@ -54,23 +54,27 @@
 
 function update_sysinfo(){
 	parent.astmanEngine.run_tool("sh /etc/asterisk/gui_sysinfo", onSuccess = function() { 
-					parent.astmanEngine.config2list("gui_sysinfo.conf", $('sysinfo'), new Array(), sysinfocallbacks);
-				}
-	);
+			var opt = {
+				method: 'get',
+				asynchronous: true,
+				onComplete: function(originalRequest){
+					$('sysinfo').innerHTML = originalRequest.responseText;
+					today = $('si_date').innerHTML;
+					sysinfocallbacks_loaded();
+				},
+				onFailure: function(t) {
+					alert("Config Error: " + t.status + ": " + t.statusText);
+				}
+			};
+			opt.parameters="";
+			var tmp = new Ajax.Request("../bkps/sysinfo_output.html", opt);
+			return true;
+	});
 	return;
 }
 
-sysinfocallbacks.format = function(t, x) {
-			if ( t.name == 'today' && x==undefined ){	 				// if is a category
-				return t.name;
-			}else if( t.name == 'today' ){	 // if is a subcategory
-				today =  t.fields[x] ; 
-			}else{	
-				return false;
-			}
-}
-
-sysinfocallbacks.loaded = function(){
+
+function sysinfocallbacks_loaded(){
 		var temp = today.split(" ");
 			if(temp[2] == ""){ temp.splice(2,1) ; }
 		var dayofweek = temp[0]; // Fri
@@ -148,9 +152,6 @@
 			window.location.href="3.html"; 
 		};
 }
-
-sysinfocallbacks.eachline = true;
-sysinfocallbacks.includecats = true;
 
 function update_systemdate(){
 	var opt = {
@@ -209,7 +210,7 @@
 			</td>
 			<td valign=top align=center>
 			<!--  this page -->
-				<select id='sysinfo' style="display:none"></select>
+				<div id='sysinfo' style="display:none"></div>
 				<div class="heading">Step 2 of <script>document.write(parent.numberofsteps);</script>&nbsp;&nbsp;- Date & Time Settings</div>
 				<div class="subheading">Current System Time </div>
 					 <TABLE cellpadding=6 cellspacing=1 border=0 class="timeinfo">



More information about the asterisk-gui-commits mailing list