| Index: trunk/extensions/OpenStackManager/special/SpecialNovaInstance.php |
| — | — | @@ -92,7 +92,7 @@ |
| 93 | 93 | 'label-message' => 'openstackmanager-instancename', |
| 94 | 94 | 'validation-callback' => array( $this, 'validateText' ), |
| 95 | 95 | 'default' => '', |
| 96 | | - 'section' => 'instance/info', |
| | 96 | + 'section' => 'info', |
| 97 | 97 | 'name' => 'instancename', |
| 98 | 98 | ); |
| 99 | 99 | |
| — | — | @@ -109,7 +109,7 @@ |
| 110 | 110 | $instanceInfo['instanceType'] = array( |
| 111 | 111 | 'type' => 'select', |
| 112 | 112 | 'label-message' => 'openstackmanager-instancetype', |
| 113 | | - 'section' => 'instance/info', |
| | 113 | + 'section' => 'info', |
| 114 | 114 | 'options' => $instanceType_keys, |
| 115 | 115 | 'name' => 'instanceType', |
| 116 | 116 | ); |
| — | — | @@ -123,7 +123,7 @@ |
| 124 | 124 | } |
| 125 | 125 | $instanceInfo['availabilityZone'] = array( |
| 126 | 126 | 'type' => 'select', |
| 127 | | - 'section' => 'instance/info', |
| | 127 | + 'section' => 'info', |
| 128 | 128 | 'options' => $availabilityZone_keys, |
| 129 | 129 | 'label-message' => 'openstackmanager-availabilityzone', |
| 130 | 130 | 'name' => 'availabilityZone', |
| — | — | @@ -159,7 +159,7 @@ |
| 160 | 160 | } |
| 161 | 161 | $instanceInfo['imageType'] = array( |
| 162 | 162 | 'type' => 'select', |
| 163 | | - 'section' => 'instance/info', |
| | 163 | + 'section' => 'info', |
| 164 | 164 | 'options' => $image_keys, |
| 165 | 165 | 'default' => $default, |
| 166 | 166 | 'label-message' => 'openstackmanager-imagetype', |
| — | — | @@ -176,7 +176,7 @@ |
| 177 | 177 | # } |
| 178 | 178 | # $instanceInfo['keypair'] = array( |
| 179 | 179 | # 'type' => 'select', |
| 180 | | - # 'section' => 'instance/info', |
| | 180 | + # 'section' => 'info', |
| 181 | 181 | # 'options' => $keypair_keys, |
| 182 | 182 | # 'label-message' => 'keypair', |
| 183 | 183 | # ); |
| — | — | @@ -189,7 +189,7 @@ |
| 190 | 190 | } |
| 191 | 191 | $instanceInfo['domain'] = array( |
| 192 | 192 | 'type' => 'select', |
| 193 | | - 'section' => 'instance/info', |
| | 193 | + 'section' => 'info', |
| 194 | 194 | 'options' => $domain_keys, |
| 195 | 195 | 'label-message' => 'openstackmanager-dnsdomain', |
| 196 | 196 | 'name' => 'domain', |
| — | — | @@ -209,7 +209,7 @@ |
| 210 | 210 | } |
| 211 | 211 | $instanceInfo['groups'] = array( |
| 212 | 212 | 'type' => 'multiselect', |
| 213 | | - 'section' => 'instance/info', |
| | 213 | + 'section' => 'info', |
| 214 | 214 | 'options' => $group_keys, |
| 215 | 215 | 'default' => $defaults, |
| 216 | 216 | 'label-message' => 'openstackmanager-securitygroups', |
| — | — | @@ -299,7 +299,7 @@ |
| 300 | 300 | if ( !$puppetinfo ) { |
| 301 | 301 | $instanceInfo["warning"] = array( |
| 302 | 302 | 'type' => 'info', |
| 303 | | - 'section' => "instance/puppetinfo", |
| | 303 | + 'section' => "puppetinfo", |
| 304 | 304 | 'default' => wfMsg( 'openstackmanager-createinstancepuppetwarning' ), |
| 305 | 305 | ); |
| 306 | 306 | } |
| — | — | @@ -317,9 +317,9 @@ |
| 318 | 318 | $puppetgroupname = $puppetGroup->getName(); |
| 319 | 319 | $puppetgroupproject = $puppetGroup->getProject(); |
| 320 | 320 | if ( $puppetgroupproject ) { |
| 321 | | - $section = 'instance/puppetinfo/project'; |
| | 321 | + $section = 'puppetinfo/project'; |
| 322 | 322 | } else { |
| 323 | | - $section = 'instance/puppetinfo/global'; |
| | 323 | + $section = 'puppetinfo/global'; |
| 324 | 324 | } |
| 325 | 325 | foreach ( $puppetGroup->getClasses() as $class ) { |
| 326 | 326 | $classname = $class["name"]; |
| Index: trunk/extensions/OpenStackManager/OpenStackManager.i18n.php |
| — | — | @@ -77,7 +77,6 @@ |
| 78 | 78 | 'openstackmanager-dnsdomain' => 'DNS domain', |
| 79 | 79 | 'openstackmanager-puppetclasses' => 'Classes', |
| 80 | 80 | 'openstackmanager-novainstance-info' => 'Instance information', |
| 81 | | - 'openstackmanager-novainstance-puppetinfo' => 'Puppet information', |
| 82 | 81 | 'openstackmanager-novainstance-project' => 'Project specific groups', |
| 83 | 82 | 'openstackmanager-novainstance-global' => 'Global groups', |
| 84 | 83 | |