Merge branch 'stable-3.1'

Marius Burkard

2016-07-10 e1ceb050e19c7574bca146a8da7047ee4ff456b5

 interface/web/tools/templates/import_ispconfig.htm

@@ -3,15 +3,13 @@
</div>
<p><tmpl_var name="list_desc_txt"></p>

<div class="panel panel_language_import">
<div class="panel panel_language_import" style="padding:20px;">
  
    <div class="pnl_formsarea">
        <legend>{tmpl_var name="legend_txt"}</legend>
            <div class="form-group">
                <label class="col-sm-3 control-label">Remote API URL</label>
                <div class="col-sm-9">
                    <div class="col-sm-6"><input class="form-control" type="text" id="remote_server" value="{tmpl_var name='remote_server'}" name="remote_server" /></div><div class="col-sm-3 input-sm"> (e.g. https://www.example.com:8080/remote/ )
                </div></div>
                <div class="col-sm-9"><input class="form-control" type="text" id="remote_server" value="{tmpl_var name='remote_server'}" placeholder="https://www.example.com:8080/remote/" name="remote_server" /></div>
            </div>
            <div class="form-group">
                <label class="col-sm-3 control-label">Remote User</label>
@@ -70,19 +68,19 @@
        <div id="OKMsg"><p><tmpl_var name="msg"></p></div>
    </tmpl_if>
    <tmpl_if name="error">
        <div id="errorMsg"><h3>ERROR</h3><ol><tmpl_var name="error"></ol></div>
        <div id="errorMsg"><h3><tmpl_var name="error_txt"></h3><ol><tmpl_var name="error"></ol></div>
    </tmpl_if>
   
    <input type="hidden" name="remote_session_id" value="{tmpl_var name='remote_session_id'}">
    <input type="hidden" name="connected" value="{tmpl_var name='connected'}">
    <tmpl_if name="connected">
        <div class="clear"><div class="right">
            <button class="btn btn-default formbutton-success" type="button" value="Import" onClick="submitForm('pageForm','tools/import_ispconfig.php');">{tmpl_var name="btn_start_txt"}</button>
            <button class="btn btn-default formbutton-success" type="button" value="Import" data-submit-form="pageForm" data-form-action="tools/import_ispconfig.php">{tmpl_var name="btn_start_txt"}</button>
            <button class="btn btn-default formbutton-default" type="button" value="Cancel" data-load-content="tools/index.php">{tmpl_var name="btn_cancel_txt"}</button>
        </div></div>
    <tmpl_else>
        <div class="clear"><div class="right">
            <button class="btn btn-default formbutton-success" type="button" value="Import" onClick="submitForm('pageForm','tools/import_ispconfig.php');">{tmpl_var name="btn_connect_txt"}</button>
            <button class="btn btn-default formbutton-success" type="button" value="Import" data-submit-form="pageForm" data-form-action="tools/import_ispconfig.php">{tmpl_var name="btn_connect_txt"}</button>
            <button class="btn btn-default formbutton-default" type="button" value="Cancel" data-load-content="tools/index.php">{tmpl_var name="btn_cancel_txt"}</button>
        </div></div>
    </tmpl_if>