Merge branch 'stable-3.1'

Marius Burkard

2016-07-01 49441bdd0f3ff75d5092d5b832b97ea722a66363

 interface/web/themes/default/templates/main_login.tpl.htm

@@ -27,7 +27,7 @@
  <div class="row" style="margin: auto; width:100%;">
       <div class="col-md-4 col-md-offset-4">
          <div class="panel panel-default">
              <div class="panel-heading" style="background: linear-gradient(to bottom, white, #eef0f2);">
              <div class="panel-heading" style="background: linear-gradient(to bottom, white, #eef0f2);text-align:center;">
               <img src="{tmpl_var name='base64_logo_txt'}">
             </div>
              <div class="panel-body">
@@ -41,7 +41,7 @@
  <script type="text/javascript" src="../js/jquery.min.js"></script>
  <script src='../themes/<tmpl_var name='current_theme'>/assets/javascripts/bootstrap.min.js'></script>
  <script src='../themes/<tmpl_var name='current_theme'>/assets/javascripts/bootstrap-datetimepicker.min.js'></script>
  <script src='../themes/<tmpl_var name='current_theme'>/assets/javascripts/ispconfig.min.js'></script>
  <script src='../themes/<tmpl_var name='current_theme'>/assets/javascripts/ispconfig.js'></script>
  <script src='../themes/<tmpl_var name='current_theme'>/assets/javascripts/modernizr.custom.min.js'></script>
  <script src='../themes/<tmpl_var name='current_theme'>/assets/javascripts/pushy.min.js'></script>
  <script src='../themes/<tmpl_var name='current_theme'>/assets/javascripts/responsive.min.js'></script>