Merge branch 'ghub_rvdras_master' into ghub_master

restcomm/restcomm.rvd/src/main/webapp/templates/packaging/form.html

@@ -109,10 +109,12 @@ <h4>Application services parameters</h4>
 				<button ng-show="!optionExists('instanceToken')" class="btn btn-primary" ng-click="addConfigurationOption('instanceToken')">Add <em>Instance Token</em> parameter</button>
 				&nbsp;<button ng-show="!optionExists('backendRootURL')" class="btn btn-primary" ng-click="addConfigurationOption('backendRootURL')">Add <em>Backend root URL</em> parameter</button>
 
+	<!--
 				<div>
 					<br/>
 					Allow user to create new instance on the backend &nbsp;&nbsp; <input type='checkbox'  ng-model='rapp.config.allowInstanceCreation'>
 				</div>
+	-->
 
 			</div>
 				{{watchFormStatus(packagingForm.$valid)}}

restcomm/restcomm.ui/src/main/webapp/modules/rappmanager-config.html

@@ -33,20 +33,24 @@ <h4>External Services parameters and backend</h4>
 						<div ng-switch-when="instanceToken">
 							<label>{{option.label}}</label><abbr title="RVD variable syntax"><code>${{option.name}}</code></abbr> <small ng-show="option.required" class="text-muted">(required)</small>
 							<div class="row">
-								<div class="col-md-10">
+								<div class="col-md-12">
 									<input ng-model="option.value" name="instanceToken" type="text" class="form-control" ng-required="option.required"> 
 								</div>
+								<!--
 								<div class="col-md-2">
 									<button ng-click="generateNewInstanceToken(option)" class="btn btn-primary pull-right">Generate</button>
 								</div>		
+								-->
 							</div>						 
 							<span class="help-block">{{option.description}}</span>
+							<!--
 							<span class="help-block">For multitenant applications a unique identifier and security token is used. This token is usually provided by the vendor of the application or can be automatically generated by you if the vendor permits it. You can create a new instanceToken by clicking generate. Make sure you keep it in a safe place. Losing this token effectively means you won't be able to access your backend data.</span>
 							<div ng-show="rappConfig.allowInstanceCreation">
 								<h5 style="margin-top:20px"><strong>Create new instance</strong></h5>
 								<span ng-show="rappConfig.allowInstanceCreation" class="help-block">Paste the following URL in your browser to create a new instance (make sure you have the correct values in <em>Backend Root URL</em> and <em>Instance Token</em> parameters first).</span>
 								<span ng-show="rappConfig.allowInstanceCreation" class="help-block">{{getOptionByName("backendRootURL",rappConfig.options).value}}/provisioning/spawnInstance.php?instanceToken={{getOptionByName("instanceToken",rappConfig.options).value}}</span>							
 							</div>
+							-->
 							<div>
 								<h5 style="margin-top:20px"><strong>Accessing instance backend</strong></h5>
 								<span class="help-block">You can access the instance backend UI in the following address (make sure you have the correct values in <em>Backend Root URL</em> and <em>Instance Token</em> parameters first): </span>