Merge remote-tracking branch 'ispc/master'

Marius Cramer

2015-05-21 6b1fde7e9a450ae8e4835f7e8c2ba1f398e78c1f

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

@@ -1,8 +1,9 @@
<div class="uniForm">
    <div id="errorMsg">
        <h3>Error</h3>
        <ol>
            <li>###ERRORMSG###</li>
        </ol>
    </div>
</div>
<div class='alert alert-danger clear'>
  <div class='alert-label'><strong><tmpl_var name="error_txt"></strong></div>
  <div class='alert-content'>
   <ol>
      <li>###ERRORMSG###</li>
   </ol>
   <div>TODO: WRONG HTML ELEMENTS</div>
  </div>
</div>