bkruse: branch asterisknow r1570 - in /branches/asterisknow: ./ config/

[SVN commits to the Asterisk-GUI project]

Author: bkruse
Date: Mon Sep 10 15:18:34 2007
New Revision: 1570

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=1570
Log:
Merged revisions 1568 via svnmerge from 
https://origsvn.digium.com/svn/asterisk-gui/branches/1.4

........
r1568 | bkruse | 2007-09-10 15:17:04 -0500 (Mon, 10 Sep 2007) | 4 lines

Another awesome commit. Now it will actually 
show you the settings applied, instead of starting
fresh each time.

........

Modified:
    branches/asterisknow/   (props changed)
    branches/asterisknow/config/digital.html
    branches/asterisknow/config/timerules.html

Propchange: branches/asterisknow/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Sep 10 15:18:34 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-1296,1316,1326,1332,1336-1338,1342,1346,1356,1362,1381,1384,1395,1399,1402,1413,1416,1426,1432,1435,1439,1442,1455,1465,1475,1478,1481,1488,1491,1494,1497,1500,1504,1507,1510,1513,1516,1520,1530,1534,1540,1544,1548,1552,1556,1564
+/branches/1.4:1-1296,1316,1326,1332,1336-1338,1342,1346,1356,1362,1381,1384,1395,1399,1402,1413,1416,1426,1432,1435,1439,1442,1455,1465,1475,1478,1481,1488,1491,1494,1497,1500,1504,1507,1510,1513,1516,1520,1530,1534,1540,1544,1548,1552,1556,1564,1568

Modified: branches/asterisknow/config/digital.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/digital.html?view=diff&rev=1570&r1=1569&r2=1570
==============================================================================
--- branches/asterisknow/config/digital.html (original)
+++ branches/asterisknow/config/digital.html Mon Sep 10 15:18:34 2007
@@ -336,10 +336,10 @@
 				_class = 0;
 			}
 			/* if alarms is red, make cell red, else make cell green/yellow etc. */
+			SPANS[l].en = new Array;
 			for(var i=0; i < fieldnames.length; i++) {
 				var td = document.createElement("td");
 				/* save our information for global use... */
-				SPANS[l].en = new Array;
 				SPANS[l].en[fieldnames[i]] = n[l][fieldnames[i]];
 				/* dumb hack because we cannot use multidimentional arrays */
 				if(fieldnames[i] == 'lbo' && n[l][fieldnames[i]] == "NODEF") {
@@ -472,21 +472,25 @@
 
 /* function to select the proper framing/coding || lbo and sync source as specified */
 function select_correct_index() {
+	var find_index = function(el,val,sec) {
+		for(var t=0; t < el.options.length; t++) {
+			if(sec == 'fac') {
+				var l = val.toLowerCase();
+				l = l.replace('/', ',');
+				if(el.options[t].value == l) { el.selectedIndex = t; return; }
+			} else {
+				if(el.options[t].value == val) { el.selectedIndex = t; return; }
+			}
+		}
+	}
+
 	for(var i=1; i < (total_spans + 1); i++ ){
 		for(var x=0; x < fieldnames_clickable.length; x++) {
 			var tmp_id = i+'-'+fieldnames_clickable[x]+'-sel';
-			var ofid = _$(tmp_id);
-			if(ofid) {
-				for(var w=0; w < fieldnames.length; w++) {
-				alert(ofid.options[w].value + SPAN[i].en['fac']);
-					if(ofid.options[w].value.length) {
-						if(ofid.options[w].value == SPAN[i].en['fac'])
-							alert("zomgz");
-					}
-				}
+			find_index(_$(tmp_id), SPANS[i].en[fieldnames_clickable[x]], fieldnames_clickable[x]);
 			}
 		}
-	}	
+	return true;
 }
 function save_changes() {
 	/* function to grab the values of fields, and call the bash script to apply the changes and run ztcfg */

Modified: branches/asterisknow/config/timerules.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/timerules.html?view=diff&rev=1570&r1=1569&r2=1570
==============================================================================
--- branches/asterisknow/config/timerules.html (original)
+++ branches/asterisknow/config/timerules.html Mon Sep 10 15:18:34 2007
@@ -446,6 +446,7 @@
 	_$('endtime_minute').selectedIndex = tm;
 
 	var find_index = function(el,val){
+		alert("el is " + el + " val is " + val);
 		for(var t=0; t< el.options.length; t++){
 			if( el.options[t].value == val){ el.selectedIndex = t; return; }
 		}