pari: branch asterisknow r573 - in /branches: aadk/ aadk/config/ aadk/config/...

asterisk-gui-commits at lists.digium.com asterisk-gui-commits at lists.digium.com
Mon Apr 2 00:57:55 MST 2007 

Author: pari
Date: Mon Apr  2 02:57:54 2007
New Revision: 573

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=573
Log:
merging 572

Added:
    branches/aadk/config/images/1.gif
      - copied unchanged from r572, trunk/config/images/1.gif
    branches/asterisknow/config/images/1.gif
      - copied unchanged from r572, trunk/config/images/1.gif
Modified:
    branches/aadk/   (props changed)
    branches/aadk/config/stylesheets/schwing.css
    branches/aadk/config/trunks.html
    branches/asterisknow/   (props changed)
    branches/asterisknow/config/stylesheets/schwing.css
    branches/asterisknow/config/trunks.html

Propchange: branches/aadk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Apr  2 02:57:54 2007
@@ -1,1 +1,1 @@
-/trunk:1-430,433-448,501,505,512,519,532,536,538,543,545,547,549,551,553,555,561,563,567-568,570
+/trunk:1-430,433-448,501,505,512,519,532,536,538,543,545,547,549,551,553,555,561,563,567-568,570,572

Modified: branches/aadk/config/stylesheets/schwing.css
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/stylesheets/schwing.css?view=diff&rev=573&r1=572&r2=573
==============================================================================
--- branches/aadk/config/stylesheets/schwing.css (original)
+++ branches/aadk/config/stylesheets/schwing.css Mon Apr  2 02:57:54 2007
@@ -317,3 +317,17 @@
 	border-color: #000;
 	color:#000000;
 }
+
+
+span.downmenubutton {
+	font-size:12px;
+	background:#FFFFFF; 
+	border:1px solid #8A8A8A; 
+	padding:1px 5px 1px 5px;
+	text-decoration:none;
+}
+span.downmenubutton:hover {
+	background:#F3640D;
+	color:#FFFFFF;
+	text-decoration:none;
+}

Modified: branches/aadk/config/trunks.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/trunks.html?view=diff&rev=573&r1=572&r2=573
==============================================================================
--- branches/aadk/config/trunks.html (original)
+++ branches/aadk/config/trunks.html Mon Apr  2 02:57:54 2007
@@ -527,10 +527,8 @@
 	var _spt = _$('serviceproviderstable') ;
 	var sno = _spt.rows.length + 1;
 	var newRow = _spt.insertRow(-1);
-	newRow.id = "row" + sp_value; 
+	newRow.id ="row" + sp_value ;
 	newRow["sp_value"] = sp_value ;
-	newRow.onmouseover= function(){ this.style.backgroundColor='#F9F0D1'; };
-	newRow.onmouseout=function(){ this.style.backgroundColor='#FFFFFF'; };
 
 	var newCell0 = newRow.insertCell(0);
 	newCell0 .innerHTML = sno ;
@@ -556,50 +554,35 @@
 	}
 
 	var newCell3 = newRow.insertCell(3);
-	newCell3 .innerHTML = "<A href=\"#\" onclick=\"editSP('"+ sp_value +"');\" class=\"field_text9\">Edit</A>&nbsp;&nbsp;&nbsp;&nbsp;<A href=\"#\" onclick=\"deleteSP('"+ sp_value +"');\"  class=\"field_text9\">Delete</A>" ;
-	newCell3 .style.width = 120;
+	var _span_menu = "span" + sp_value;
+	newCell3 .innerHTML = "<span class=\"downmenubutton\" id='" + "span_" + sp_value  + "' onclick=\"show_downmenu( '"+ sp_value + "');\">Options&nbsp;&nbsp;<img src=images/1.gif></span>" ;
+	newCell3 .style.width = 90;
 	newCell3 .align = "center";
-
-	/* create menu and its actions */
-	newRow.oncontextmenu = show_mymenu ;
-	newRow.onclick = hide_mymenu ; 
-	/*  End of creating menu */
+}
+
+
+function show_downmenu( a ) {
+	var menu = document.getElementById('mymenu');
+	menu.sp_value = "";
+	menu.sp_value = a ;
+	
+	var tmp_left = _$("span_"+a).offsetLeft;
+	var tmp_top = _$("span_"+a).offsetTop + _$("span_"+a).offsetHeight;
+	var tmp_parent = _$("span_"+a);
+	while(tmp_parent.offsetParent != document.body){
+		tmp_parent = tmp_parent.offsetParent;
+		tmp_left += tmp_parent.offsetLeft;
+		tmp_top += tmp_parent.offsetTop;
+	}
+
+	menu.style.top =tmp_top ;
+	menu.style.left = tmp_left ;
+	setTimeout( function(){ _$('mymenu').style.display=""; } , 100 );
 }
 
 function hide_mymenu( ) {
 	document.getElementById('mymenu').style.display="none"; 
 }
-
-function show_mymenu(event) {
-	var menu = document.getElementById('mymenu');
-	menu.sp_value = "";
-
-	if(typeof window.scrollX != "undefined"){ //FF
-		var menu_top = event.clientY ;
-		var menu_left = event.clientX;
-		var f = event.target ; 
-	}else{ // IE
-		var menu_top = window.event.clientY ;
-		var menu_left = window.event.clientX;
-		try{ 
-			var f = window.event.srcElement; 
-		}catch(e){
-			menu.style.display = "none";
-			return false;			
-		}
-	}
-
-	if(f.parentNode.sp_value){
-		menu.sp_value = f.parentNode.sp_value ; 
-	}else if( f.parentNode.parentNode.sp_value ){
-		menu.sp_value = f.parentNode.parentNode.sp_value ; 
-	}
-	menu.style.top = menu_top;
-	menu.style.left = menu_left;
-	menu.style.display = "";
-	return false;
-}
-
 
 function preparemenus(){
 	var menu_div = document.getElementById('mymenu') ;
@@ -944,7 +927,7 @@
 	<tr>	<td width=40>S.No</td>
 		<td width="200">Service Provider</td>
 		<td>Type</td>
-		<td width="120" align="center">Options</td>
+		<td width="90" align="center"></td>
 	</tr>
 </table>
 <div style="width:500;height:250; overflow :auto;">

Propchange: branches/asterisknow/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Apr  2 02:57:54 2007
@@ -1,1 +1,1 @@
-/trunk:1-448,501-505,507,511-512,519,532,536,538,543,545,547,549,551,553,555,561,563,567-568,570
+/trunk:1-448,501-505,507,511-512,519,532,536,538,543,545,547,549,551,553,555,561,563,567-568,570,572

Modified: branches/asterisknow/config/stylesheets/schwing.css
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/stylesheets/schwing.css?view=diff&rev=573&r1=572&r2=573
==============================================================================
--- branches/asterisknow/config/stylesheets/schwing.css (original)
+++ branches/asterisknow/config/stylesheets/schwing.css Mon Apr  2 02:57:54 2007
@@ -317,3 +317,17 @@
 	border-color: #000;
 	color:#000000;
 }
+
+
+span.downmenubutton {
+	font-size:12px;
+	background:#FFFFFF; 
+	border:1px solid #8A8A8A; 
+	padding:1px 5px 1px 5px;
+	text-decoration:none;
+}
+span.downmenubutton:hover {
+	background:#F3640D;
+	color:#FFFFFF;
+	text-decoration:none;
+}

Modified: branches/asterisknow/config/trunks.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/trunks.html?view=diff&rev=573&r1=572&r2=573
==============================================================================
--- branches/asterisknow/config/trunks.html (original)
+++ branches/asterisknow/config/trunks.html Mon Apr  2 02:57:54 2007
@@ -527,10 +527,8 @@
 	var _spt = _$('serviceproviderstable') ;
 	var sno = _spt.rows.length + 1;
 	var newRow = _spt.insertRow(-1);
-	newRow.id = "row" + sp_value; 
+	newRow.id ="row" + sp_value ;
 	newRow["sp_value"] = sp_value ;
-	newRow.onmouseover= function(){ this.style.backgroundColor='#F9F0D1'; };
-	newRow.onmouseout=function(){ this.style.backgroundColor='#FFFFFF'; };
 
 	var newCell0 = newRow.insertCell(0);
 	newCell0 .innerHTML = sno ;
@@ -556,50 +554,35 @@
 	}
 
 	var newCell3 = newRow.insertCell(3);
-	newCell3 .innerHTML = "<A href=\"#\" onclick=\"editSP('"+ sp_value +"');\" class=\"field_text9\">Edit</A>&nbsp;&nbsp;&nbsp;&nbsp;<A href=\"#\" onclick=\"deleteSP('"+ sp_value +"');\"  class=\"field_text9\">Delete</A>" ;
-	newCell3 .style.width = 120;
+	var _span_menu = "span" + sp_value;
+	newCell3 .innerHTML = "<span class=\"downmenubutton\" id='" + "span_" + sp_value  + "' onclick=\"show_downmenu( '"+ sp_value + "');\">Options&nbsp;&nbsp;<img src=images/1.gif></span>" ;
+	newCell3 .style.width = 90;
 	newCell3 .align = "center";
-
-	/* create menu and its actions */
-	newRow.oncontextmenu = show_mymenu ;
-	newRow.onclick = hide_mymenu ; 
-	/*  End of creating menu */
+}
+
+
+function show_downmenu( a ) {
+	var menu = document.getElementById('mymenu');
+	menu.sp_value = "";
+	menu.sp_value = a ;
+	
+	var tmp_left = _$("span_"+a).offsetLeft;
+	var tmp_top = _$("span_"+a).offsetTop + _$("span_"+a).offsetHeight;
+	var tmp_parent = _$("span_"+a);
+	while(tmp_parent.offsetParent != document.body){
+		tmp_parent = tmp_parent.offsetParent;
+		tmp_left += tmp_parent.offsetLeft;
+		tmp_top += tmp_parent.offsetTop;
+	}
+
+	menu.style.top =tmp_top ;
+	menu.style.left = tmp_left ;
+	setTimeout( function(){ _$('mymenu').style.display=""; } , 100 );
 }
 
 function hide_mymenu( ) {
 	document.getElementById('mymenu').style.display="none"; 
 }
-
-function show_mymenu(event) {
-	var menu = document.getElementById('mymenu');
-	menu.sp_value = "";
-
-	if(typeof window.scrollX != "undefined"){ //FF
-		var menu_top = event.clientY ;
-		var menu_left = event.clientX;
-		var f = event.target ; 
-	}else{ // IE
-		var menu_top = window.event.clientY ;
-		var menu_left = window.event.clientX;
-		try{ 
-			var f = window.event.srcElement; 
-		}catch(e){
-			menu.style.display = "none";
-			return false;			
-		}
-	}
-
-	if(f.parentNode.sp_value){
-		menu.sp_value = f.parentNode.sp_value ; 
-	}else if( f.parentNode.parentNode.sp_value ){
-		menu.sp_value = f.parentNode.parentNode.sp_value ; 
-	}
-	menu.style.top = menu_top;
-	menu.style.left = menu_left;
-	menu.style.display = "";
-	return false;
-}
-
 
 function preparemenus(){
 	var menu_div = document.getElementById('mymenu') ;
@@ -944,7 +927,7 @@
 	<tr>	<td width=40>S.No</td>
 		<td width="200">Service Provider</td>
 		<td>Type</td>
-		<td width="120" align="center">Options</td>
+		<td width="90" align="center"></td>
 	</tr>
 </table>
 <div style="width:500;height:250; overflow :auto;">

More information about the asterisk-gui-commits mailing list