Changeset 194
- Timestamp:
- 01/23/07 16:03:55 (2 years ago)
- Files:
-
- trunk/webmin/lbs_common/css/maketable.css (added)
- trunk/webmin/lbs_common/css/tabs.css (modified) (1 diff)
- trunk/webmin/lbs_common/debian/changelog (modified) (1 diff)
- trunk/webmin/lbs_common/lbs_common.php (modified) (1 diff)
- trunk/webmin/lbs_common/lbs_common.pl (modified) (8 diffs)
- trunk/webmin/lbs_common/module.info (modified) (1 diff)
- trunk/webmin/lbs_common/php/sshtest.php (modified) (1 diff)
- trunk/webmin/lbs_common/tmpl/mainlist.tpl (modified) (1 diff)
- trunk/webmin/lbs_common/tmpl/tabs.tpl (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/webmin/lbs_common/css/tabs.css
r3 r194 95 95 clear : left; 96 96 } 97 98 /* 99 * Profiles tab 100 */ 101 102 ul#lrsprofils { 103 list-style-type : none; 104 padding-left : 5px; 105 padding-bottom : 25px; 106 border-bottom : 1px solid #EF4D21; 107 margin : 0px; 108 } 109 110 ul#lrsprofils li { 111 float : left; 112 height : 21px; 113 background-color : #FCF7F5; 114 margin : 3px 3px 0px 3px; 115 border : 1px solid #EF4D21; 116 } 117 118 119 #lrsprofils a { 120 font : normal 0.8em sans-serif; 121 background-color : #FCD3C2; 122 display : block; 123 text-decoration : none; 124 margin : 0px; 125 padding : 6px; 126 padding-top : 2px; 127 padding-bottom : 5px; 128 } 129 130 ul#lrsprofils a.profil_selected { 131 border-bottom : 1px solid #FCE5DB; 132 background-color : #FCF7F5; 133 } 134 135 #lrsprofils a.profil_selected:hover { 136 color : darkgray; 137 padding-bottom : 4px; 138 border-bottom : 1px dashed #EF4D21; 139 } 140 141 #lrsprofils a.profil_unselected:hover { 142 color : darkgray; 143 background-color : #FCF7F5; 144 padding-bottom : 4px; 145 border-bottom : 1px dashed #EF4D21; 146 } 147 148 div.groups { 149 border : 1px solid #EF4D21; 150 border-top-width : 0px; 151 padding : 0px; 152 margin : 0px; 153 clear : left; 154 } 155 156 td.normalcell { 157 border-width : 0px; 158 border-left : 1px solid #FCD3C2; 159 padding-left : 1em; 160 padding-right : 1em; 161 } 162 163 td.firstcell { 164 border-width : 0px; 165 padding-left : 1em; 166 padding-right : 1em; 167 } 168 169 td.topcell { 170 border : 0px solid #EF4D21; 171 font-size : 10px; 172 } 173 trunk/webmin/lbs_common/debian/changelog
r149 r194 1 webmin-lbs-common (1.4.1 0) stable; urgency=low1 webmin-lbs-common (1.4.11) stable; urgency=low 2 2 3 3 * New release. See SVN logs for details trunk/webmin/lbs_common/lbs_common.php
r110 r194 448 448 } 449 449 450 # 451 # Return the string to source ssh-agent variables if available 452 # 453 function get_keychain() 454 { 455 $out = ""; 456 exec("uname -n", $out); 457 if (file_exists("/root/.keychain/$out[0]-sh")) { 458 $lines = file("/root/.keychain/$out[0]-sh"); 459 $line = explode(";", $lines[0]); 460 return("env $line[0]"); 461 } 462 return(""); 463 } 464 450 465 ?> trunk/webmin/lbs_common/lbs_common.pl
r163 r194 28 28 ############ WEBMIN INCLUDING ############ 29 29 # doing some other init due to "strict" mode 30 use vars qw '%gconfig $module_root_directory %access ';30 use vars qw '%gconfig $module_root_directory %access %tconfig'; 31 31 $gconfig{'referers'} = "" unless $gconfig{'referers'}; 32 32 … … 88 88 our $VERSION ='$Rev$'; # REVISION 89 89 $VERSION =~ s/\$Rev: (\d+) \$/$module_info{version} (r.$1)/; 90 our $LRS_HERE = -d "/tftpboot/revoboot"; # are we in LRS ?90 our $LRS_HERE = 0; # are we in LRS ? 91 91 our $LINBOX_URL = 'http://www.linbox.com'; 92 92 our $BIGLOGO_URL= '/lbs_common/images/logo-big.gif'; 93 our @LRS_MODULES= qw 'lbs_common lbs backuppc lbs-inventory lrs-inventory l bs-cd rsync lsc lbs-vnc lrs-proxy lbs/at '; # every modules93 our @LRS_MODULES= qw 'lbs_common lbs backuppc lbs-inventory lrs-inventory lrs-ipmi lbs-cd rsync lsc lbs-vnc lrs-proxy lbs/at '; # every modules 94 94 #our @LRS_MODULES= qw 'lbs_common lbs'; # every modules 95 95 our $REALPATH = 'readlink'; … … 393 393 $version = $VERSION unless $version; 394 394 395 header($title , "", $help, 1, 1, undef, "<a href=' $url' style='text-decoration: none;'><img src='$image' style='border: none;'/></a>", "", "", "<font size='-2'>v. $version</font>");395 header($title , "", $help, 1, 1, undef, "<a href='http://www.linbox.com'>Linbox home</a>", "", "", "<font size='-2'>v. $version</font>"); 396 396 397 397 return 0; … … 469 469 my $out = "" ; 470 470 471 my $col_tr_header = $att_tr_header; # remove that stupid bgcolor= attribute 472 my $col_tr_body = $att_tr_body; 473 $col_tr_header =~ s/bgcolor=//i; 474 $col_tr_body =~ s/bgcolor=//i; 475 476 471 477 my $oddorevenline=0; # to distinguish odd and even lines 472 478 … … 479 485 $_ = "<td $att_tr_header><b>$_</b></td>" 480 486 } 481 } @{$top} ;487 } @{$top}; 482 488 483 489 foreach (@{$lol}) { # each content of $lol become a cell … … 487 493 $_ = "<td style=\" 488 494 padding-left: .5em; 489 padding-right: .5em; border: 0px solid white; border-left: solid 1px #FCD3C2\">$_</td>"495 padding-right: .5em; border: 0px solid white; border-left: solid 1px $col_tr_header\">$_</td>" 490 496 } else { 491 497 $firstcell = 1; … … 500 506 501 507 $out .= "<b><font size=+1>$title</font><br><br></b>" if ! ($title eq ""); 502 $out .= "<table style='border: 1px solid #EA4F26'";508 $out .= "<table class='mht'"; 503 509 $out .= " width='100%' " if ($att_center); 504 510 $out .= "$att_border>\n" ; # table's heading … … 1289 1295 $$lineisoddref = !$$lineisoddref; 1290 1296 1291 return "#F 0F0F0" if ($$lineisoddref);1292 return "# F9F9F9";1297 return "#FFFFFF" if ($$lineisoddref); 1298 return "#$tconfig{'cs_table'}"; 1293 1299 } 1294 1300 trunk/webmin/lbs_common/module.info
r149 r194 5 5 name=lbs_common 6 6 depends=0.94 7 version=1.4.1 07 version=1.4.11 trunk/webmin/lbs_common/php/sshtest.php
r110 r194 51 51 $random = rand(1024, 65500); 52 52 53 $cmd = escapeshellcmd("ssh -i $this->key -L $random:127.0.0.1:5900 $this->sshopts -n $this->user@$this->ip echo =SSHOK="); 53 $keychain = get_keychain(); 54 $cmd = escapeshellcmd("$keychain ssh -i $this->key -L $random:127.0.0.1:5900 $this->sshopts -n $this->user@$this->ip echo =SSHOK="); 54 55 exec($cmd." 2>&1", $output, $ret); 55 56 trunk/webmin/lbs_common/tmpl/mainlist.tpl
r3 r194 19 19 20 20 <!-- BEGIN profils --> 21 <style type="text/css" media='screen'><!--22 ul#lrsprofils {23 list-style-type : none;24 padding-left : 5px;25 padding-bottom : 25px;26 border-bottom : 1px solid #EF4D21;27 margin : 0px;28 }29 30 ul#lrsprofils li {31 float : left;32 height : 21px;33 background-color : #FCF7F5;34 margin : 3px 3px 0px 3px;35 border : 1px solid #EF4D21;36 }37 38 ul#lrsprofils li.profil_selected {39 border-bottom : 1px solid #FCD3C2;40 background-color : #FCD3C2;41 }42 43 44 #lrsprofils a {45 font : normal 12px fixed;46 display : block;47 text-decoration : none;48 margin : 0px;49 padding : 6px;50 padding-top : 2px;51 padding-bottom : 5px;52 }53 54 #lrsprofils a.profil_selected:hover {55 color : darkgray;56 padding-bottom : 4px;57 border-bottom : 1px dashed #EF4D21;58 }59 60 #lrsprofils a.profil_unselected:hover {61 color : darkgray;62 background-color : #FCD3C2;63 padding-bottom : 4px;64 border-bottom : 1px dashed #EF4D21;65 }66 67 div.groups {68 border : 1px solid #EF4D21;69 border-top-width : 0px;70 padding : 0px;71 margin : 0px;72 clear : left;73 }74 75 td.normalcell {76 border-width : 0px;77 border-left : 1px solid #FCD3C2;78 padding-left : 1em;79 padding-right : 1em;80 }81 82 td.firstcell {83 border-width : 0px;84 padding-left : 1em;85 padding-right : 1em;86 }87 88 td.topcell {89 border : 0px solid #EF4D21;90 font-size : 10px;91 }92 93 --></style>94 21 <ul id="lrsprofils"> 95 22 <!-- BEGIN profil --> trunk/webmin/lbs_common/tmpl/tabs.tpl
r3 r194 2 2 <style type="text/css"> 3 3 @import url("/lbs_common/css/tabs.css"); 4 @import url("/lbs_common/css/maketable.css"); 4 5 </style> 5 6 <!-- BEGIN ligne -->
