Merge branch 'stable-3.1'

Marius Burkard

2016-05-04 c3189ce6c7301c3ec17878fd3918f31d0d3cb18a

 interface/web/admin/templates/server_config_rescue_edit.htm

@@ -1,45 +1,49 @@
<h2><tmpl_var name="list_head_txt"></h2>
<div class='page-header'>
   <h1><tmpl_var name="list_head_txt"></h1>
</div>
<p><tmpl_var name="list_desc_txt"></p>

<div class="panel panel_server_config">

  <div class="pnl_formsarea">
    <fieldset class="inlineLabels"><legend>Rescue</legend>
      <div class="ctrlHolder">
            <p class="label" style="width:300px">{tmpl_var name='try_rescue_txt'}</p>
               <div class="multiField" style="width:100px">
                  {tmpl_var name='try_rescue'}
               </div>
         </div>
      <div class="ctrlHolder">
            <p class="label" style="width:300px">{tmpl_var name='do_not_try_rescue_apache_txt'}</p>
               <div class="multiField" style="width:100px">
                  {tmpl_var name='do_not_try_rescue_apache'}
               </div>
         </div>
      <div class="ctrlHolder">
            <p class="label" style="width:300px">{tmpl_var name='do_not_try_rescue_mysql_txt'}</p>
               <div class="multiField" style="width:100px">
                  {tmpl_var name='do_not_try_rescue_mysql'}
               </div>
         </div>
      <div class="ctrlHolder">
            <p class="label" style="width:300px">{tmpl_var name='do_not_try_rescue_mail_txt'}</p>
               <div class="multiField" style="width:100px">
                  {tmpl_var name='do_not_try_rescue_mail'}
               </div>
         </div>
    </fieldset>
	  
     Information: If you want to shut down mysql you have to disable "rescue mysql" and then wait 2-3 minutes.<br>
     if you do not wait 2-3 minutes, rescue will try to restart mysql!
        <legend>Rescue</legend>
            <div class="form-group">
                <label class="col-sm-3 control-label">{tmpl_var name='try_rescue_txt'}</label>
                <div class="col-sm-9">
                    {tmpl_var name='try_rescue'}
                </div>
            </div>
            <div class="form-group">
                <label class="col-sm-3 control-label">{tmpl_var name='do_not_try_rescue_httpd_txt'}</label>
                <div class="col-sm-9">
                    {tmpl_var name='do_not_try_rescue_httpd'}
                </div>
            </div>
<!--
            <div class="form-group">
                <label class="col-sm-3 control-label">{tmpl_var name='do_not_try_rescue_mongodb_txt'}</label>
                <div class="col-sm-9">
                    {tmpl_var name='do_not_try_rescue_mongodb'}
                </div>
            </div>
-->
            <div class="form-group">
                <label class="col-sm-3 control-label">{tmpl_var name='do_not_try_rescue_mysql_txt'}</label>
                <div class="col-sm-9">
                    {tmpl_var name='do_not_try_rescue_mysql'}
                </div>
            </div>
            <div class="form-group">
                <label class="col-sm-3 control-label">{tmpl_var name='do_not_try_rescue_mail_txt'}</label>
                <div class="col-sm-9">
                    {tmpl_var name='do_not_try_rescue_mail'}
                </div>
            </div>
        

    <input type="hidden" name="id" value="{tmpl_var name='id'}">
        <tmpl_var name="rescue_description_txt">

    <div class="buttonHolder buttons">
      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/server_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
    </div>
  </div>
  
</div>
            <input type="hidden" name="id" value="{tmpl_var name='id'}">

            <div class="clear"><div class="right">
                <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/server_config_edit.php">{tmpl_var name='btn_save_txt'}</button>
                <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/server_config_list.php">{tmpl_var name='btn_cancel_txt'}</button>
            </div></div>