Merge branch 'seeddms-4.3.1' into develop

This commit is contained in:
Uwe Steinmann 2013-09-05 22:55:13 +02:00
commit 76c7033313
2 changed files with 2 additions and 2 deletions

View File

@ -962,7 +962,7 @@ function clearFilename<?php print $formName ?>() {
$this->contentStart();
print "<div class=\"alert alert-error\">";
print "<h4>Error!</h4>";
print "<h4>".getMLText('error')."!</h4>";
print htmlspecialchars($error);
print "</div>";
print "<div><button class=\"btn\" onclick=\"window.history.back();\">".getMLText('back')."</button></div>";

View File

@ -131,7 +131,7 @@ class SeedDMS_View_LogManagement extends SeedDMS_Bootstrap_Style {
<p>Please wait, until document tree is loaded </p>
</div>
<div class="modal-footer">
<button class="btn btn-primary" data-dismiss="modal" aria-hidden="true">Close</button>
<button class="btn btn-primary" data-dismiss="modal" aria-hidden="true"><?php print getMLText("close"); ?></button>
</div>
</div>
<?php