Fixes #872: Refactored code to provide license checkbox required to continue import

layouts/v7/modules/Settings/ModuleManager/ImportUserModuleStep2.tpl

@@ -48,34 +48,31 @@
 									<small>{vtranslate('LBL_REQ_VTIGER_VERSION', $QUALIFIED_MODULE)} : {$MODULEIMPORT_DEP_VTVERSION}</small>
 								</p>
 							</div>
-							{assign var="need_license_agreement" value="false"}
-							{if $MODULEIMPORT_LICENSE}
-								{assign var="need_license_agreement" value="true"}
-								<div class="col-lg-12">
-									<p>{vtranslate('LBL_LICENSE', $QUALIFIED_MODULE)}</p>
-								</div>
-								<div class="col-lg-12">
-									<div style="background: #eee;padding: 20px;box-sizing: border-box;height: 150px;overflow-y: scroll;">
-										<p>{$MODULEIMPORT_LICENSE|nl2br}</p>
-									</div>
-								</div>
-							{/if}
-							<br>
 							<div class="col-lg-12">
 								{if $MODULEIMPORT_EXISTS eq 'true' || $MODULEIMPORT_DIR_EXISTS eq 'true'}
 									{if $MODULEIMPORT_EXISTS eq 'true'}
 										<input type="hidden" name="module_import_file" value="{$MODULEIMPORT_FILE}">
 										<input type="hidden" name="module_import_type" value="{$MODULEIMPORT_TYPE}">
 										<input type="hidden" name="module_import_name" value="{$MODULEIMPORT_NAME}">
-
-										{if $need_license_agreement eq 'true'}
-											<input type="checkbox" class="acceptLicense"> {vtranslate('LBL_LICENSE_ACCEPT_AGREEMENT', $QUALIFIED_MODULE)}
-										{/if}
-
 									{else}
 										<br><br><span class="alert-info" style="padding: 4px 10px;">{vtranslate('LBL_DELETE_EXIST_DIRECTORY', $QUALIFIED_MODULE)}</span>
 									{/if}
 								{else}
+									{assign var="need_license_agreement" value="false"}
+									{if $MODULEIMPORT_LICENSE}
+										{assign var="need_license_agreement" value="true"}
+										<div class="col-lg-12">
+											<p>{vtranslate('LBL_LICENSE', $QUALIFIED_MODULE)}</p>
+										</div>
+										<div class="col-lg-12">
+											<textarea readonly="" rows="15" style="width: 100%;font-family: monospace;">{$MODULEIMPORT_LICENSE}</textarea>
+										</div>
+									{/if}
+									{if $need_license_agreement eq 'true'}
+										<div class="col-lg-12">
+											<input type="checkbox" class="acceptLicense"> {vtranslate('LBL_LICENSE_ACCEPT_AGREEMENT', $QUALIFIED_MODULE)}
+										</div>
+									{/if}
 									<input type="hidden" name="module_import_file" value="{$MODULEIMPORT_FILE}">
 									<input type="hidden" name="module_import_type" value="{$MODULEIMPORT_TYPE}">
 									<input type="hidden" name="module_import_name" value="{$MODULEIMPORT_NAME}">