| Index: trunk/extensions/OpenStackManager/special/SpecialNovaInstance.php |
| — | — | @@ -247,6 +247,8 @@ |
| 248 | 248 | |
| 249 | 249 | $instanceForm = new SpecialNovaInstanceForm( $instanceInfo, 'openstackmanager-novainstance' ); |
| 250 | 250 | $instanceForm->setTitle( SpecialPage::getTitleFor( 'NovaInstance' ) ); |
| | 251 | + $instanceForm->addHeaderText( wfMsg( 'openstackmanager-createinstancepuppetwarning' ) . '<div class="mw-collapsible mw-collapsed">', 'puppetinfo' ); |
| | 252 | + $instanceForm->addFooterText( '</div>', 'puppetinfo' ); |
| 251 | 253 | $instanceForm->setSubmitID( 'openstackmanager-novainstance-createinstancesubmit' ); |
| 252 | 254 | $instanceForm->setSubmitCallback( array( $this, 'tryCreateSubmit' ) ); |
| 253 | 255 | $instanceForm->show(); |
| — | — | @@ -309,13 +311,6 @@ |
| 310 | 312 | } |
| 311 | 313 | |
| 312 | 314 | function setPuppetInfo( &$instanceInfo, $puppetinfo=array() ) { |
| 313 | | - if ( !$puppetinfo ) { |
| 314 | | - $instanceInfo["warning"] = array( |
| 315 | | - 'type' => 'info', |
| 316 | | - 'section' => "puppetinfo", |
| 317 | | - 'default' => wfMsg( 'openstackmanager-createinstancepuppetwarning' ), |
| 318 | | - ); |
| 319 | | - } |
| 320 | 315 | $project = $instanceInfo['project']['default']; |
| 321 | 316 | $projectGroups = OpenStackNovaPuppetGroup::getGroupList( $project ); |
| 322 | 317 | $this->setPuppetInfoByGroups( $instanceInfo, $puppetinfo, $projectGroups ); |