diff --git a/kallithea/controllers/admin/settings.py b/kallithea/controllers/admin/settings.py
--- a/kallithea/controllers/admin/settings.py
+++ b/kallithea/controllers/admin/settings.py
@@ -431,7 +431,7 @@ class SettingsController(BaseController)
_update_url = defaults.get('update_url', '')
_update_url = "" # FIXME: disabled
- _err = lambda s: '
%s
' % (s)
+ _err = lambda s: '%s
' % (s)
try:
import kallithea
ver = kallithea.__version__
diff --git a/kallithea/public/css/style.css b/kallithea/public/css/style.css
--- a/kallithea/public/css/style.css
+++ b/kallithea/public/css/style.css
@@ -3153,6 +3153,37 @@ label.disabled {
font-weight: bold;
}
+.alert {
+ padding: 15px;
+ margin: 20px 0;
+ border: 1px solid transparent;
+ border-radius: 4px;
+}
+
+.alert-success {
+ color: #3c763d;
+ background-color: #dff0d8;
+ border-color: #d6e9c6;
+}
+
+.alert-info {
+ color: #31708f;
+ background-color: #d9edf7;
+ border-color: #bce8f1;
+}
+
+.alert-warning {
+ color: #8a6d3b;
+ background-color: #fcf8e3;
+ border-color: #faebcc;
+}
+
+.alert-danger {
+ color: #a94442;
+ background-color: #f2dede;
+ border-color: #ebccd1;
+}
+
ins, div.options a:hover {
text-decoration: none;
}
diff --git a/kallithea/templates/admin/repos/repo_creating.html b/kallithea/templates/admin/repos/repo_creating.html
--- a/kallithea/templates/admin/repos/repo_creating.html
+++ b/kallithea/templates/admin/repos/repo_creating.html
@@ -35,7 +35,7 @@
-
+
${_("We're sorry but error occurred during this operation. Please check your Kallithea server logs, or contact administrator.")}
diff --git a/kallithea/templates/admin/settings/settings_system_update.html b/kallithea/templates/admin/settings/settings_system_update.html
--- a/kallithea/templates/admin/settings/settings_system_update.html
+++ b/kallithea/templates/admin/settings/settings_system_update.html
@@ -17,11 +17,13 @@
% if c.should_upgrade and c.important_notices:
-
Important notes for this release:
+
+ Important notes for this release:
% for notice in c.important_notices:
- - ${notice}
% endfor
+
% endif
diff --git a/kallithea/templates/password_reset.html b/kallithea/templates/password_reset.html
--- a/kallithea/templates/password_reset.html
+++ b/kallithea/templates/password_reset.html
@@ -40,9 +40,12 @@
+
+
+ ${_('A password reset link will be sent to the specified email address if it is registered in the system.')}
+
${h.end_form()}