Author: pari
Date: Thu Jun 7 15:43:45 2007
New Revision: 1066
URL: http://svn.digium.com/view/asterisk-gui?view=rev&am
p;rev=1066
Log:
Merged revisions 1061,1064 via svnmerge from
htt
ps://origsvn.digium.com/svn/asterisk-gui/trunk
........
r1061 | pari | 2007-06-07 14:57:15 -0500 (Thu, 07 Jun 2007)
| 1 line
lame svn diff
........
r1064 | pari | 2007-06-07 15:40:51 -0500 (Thu, 07 Jun 2007)
| 1 line
fixing the height of mainscreen
........
Modified:
branches/aadk/ (props changed)
branches/aadk/config/cfgbasic.html
branches/aadk/config/options.html
Propchange: branches/aadk/
------------------------------------------------------------
------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jun 7 15:43:45 2007
 -1,1
+1,1
-/trunk:1-430,433-449,489-501,505-506,508-510,512-540,542-55
7,559,561-577,580-586,588-616,618-767,769-1056
+/trunk:1-430,433-449,489-501,505-506,508-510,512-540,542-55
7,559,561-577,580-586,588-616,618-767,769-1065
Modified: branches/aadk/config/cfgbasic.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aa
dk/config/cfgbasic.html?view=diff&rev=1066&r1=1065&a
mp;r2=1066
============================================================
==================
--- branches/aadk/config/cfgbasic.html (original)
+++ branches/aadk/config/cfgbasic.html Thu Jun 7 15:43:45
2007
-37,19
+37,19
function fit_toScreen(){
var t = ASTGUI.displayHeight();
+ var minimumheight = 60;
var c =_$('configpanel');
c.WIH = t;
- _$('mainscreen').style.height = (t - 70);
_$('TOP_MAINTABLE').rows[1].cells[0].height = (t - 70) ;
var pnameheight = 22;
c.pnameheight = pnameheight;
var panels = returnpanels();
var pheight = (( t - 70) - (pnameheight*panels.length) )
;
- if(pheight > 0){
+ if(pheight > minimumheight){
c.pheight = pheight;
}else{
- pheight = 0;
- c.pheight = 0 ;
+ pheight = minimumheight;
+ c.pheight = minimumheight ;
}
if( c.childNodes.length ){
-61,6
+61,8
}
}
}
+
+ setTimeout( function(){_$('mainscreen').style.height =
(panels.length * 22) + pheight ;}, 1500 );
}
function createpanels(){
Modified: branches/aadk/config/options.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aad
k/config/options.html?view=diff&rev=1066&r1=1065&
;r2=1066
============================================================
==================
--- branches/aadk/config/options.html (original)
+++ branches/aadk/config/options.html Thu Jun 7 15:43:45
2007
-40,7
+40,7
return true;
}
- var acs = build_action('update', 0, current_username,
"secret",'', _newpass.value ) ;
+ var acs = build_action('update', 0, current_username,
"secret",_newpass.value,'') ;
makerequest('u', 'manager.conf',acs,
function(t){
if ( t.match("Success") ) {
_______________________________________________
asterisk-gui-commits mailing list
asterisk-gui-commitslists.digium.com
http://lists.digium.com/mailman/listinfo/asterisk-g
ui-commits
|