From ef1ead9c4bfb6a68cc6c0f8727c4af8d99206eb8 Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Fri, 26 Sep 2014 23:29:14 +0200
Subject: oscar template: add directory in which are messages stored

---
 searx/templates/oscar/messages/js_disabled.html               | 4 ++++
 searx/templates/oscar/messages/save_settings_successfull.html | 8 ++++++++
 searx/templates/oscar/messages/unknow_error.html              | 8 ++++++++
 3 files changed, 20 insertions(+)
 create mode 100644 searx/templates/oscar/messages/js_disabled.html
 create mode 100644 searx/templates/oscar/messages/save_settings_successfull.html
 create mode 100644 searx/templates/oscar/messages/unknow_error.html

(limited to 'searx/templates/oscar/messages')

diff --git a/searx/templates/oscar/messages/js_disabled.html b/searx/templates/oscar/messages/js_disabled.html
new file mode 100644
index 000000000..e160edc1c
--- /dev/null
+++ b/searx/templates/oscar/messages/js_disabled.html
@@ -0,0 +1,4 @@
+<div class="alert alert-warning" role="alert">
+    <strong>{{ _('Warning!') }}</strong>
+    {{ _('Please enable JavaScript to use full functionality of this site.') }}
+</div>
diff --git a/searx/templates/oscar/messages/save_settings_successfull.html b/searx/templates/oscar/messages/save_settings_successfull.html
new file mode 100644
index 000000000..f9a421f0c
--- /dev/null
+++ b/searx/templates/oscar/messages/save_settings_successfull.html
@@ -0,0 +1,8 @@
+<div class="alert alert-success fade in" role="alert">
+    <button class="close" data-dismiss="alert" type="button">
+        <span aria-hidden="true">×</span>
+        <span class="sr-only">Close</span>
+    </button>
+    <strong>{{ _('Well done!') }}</strong>
+    {{ _('Settings saved successfully.') }}
+</div>
diff --git a/searx/templates/oscar/messages/unknow_error.html b/searx/templates/oscar/messages/unknow_error.html
new file mode 100644
index 000000000..e4736b1ea
--- /dev/null
+++ b/searx/templates/oscar/messages/unknow_error.html
@@ -0,0 +1,8 @@
+<div class="alert alert-danger fade in" role="alert">
+    <button class="close" data-dismiss="alert" type="button">
+        <span aria-hidden="true">×</span>
+        <span class="sr-only">Close</span>
+    </button>
+    <strong>{{ _('Oh snap!') }}</strong>
+    {{ _('Something went wrong.') }}
+</div>
-- 
cgit v1.2.3


From 915857105997357f24db86b9fcc6739fd816e98e Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Sat, 27 Sep 2014 11:51:31 +0200
Subject: oscar template: update messages

---
 searx/templates/oscar/messages/first_time.html                | 8 ++++++++
 searx/templates/oscar/messages/js_disabled.html               | 2 +-
 searx/templates/oscar/messages/no_data_available.html         | 5 +++++
 searx/templates/oscar/messages/save_settings_successfull.html | 3 ++-
 searx/templates/oscar/messages/unknow_error.html              | 3 ++-
 5 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 searx/templates/oscar/messages/first_time.html
 create mode 100644 searx/templates/oscar/messages/no_data_available.html

(limited to 'searx/templates/oscar/messages')

diff --git a/searx/templates/oscar/messages/first_time.html b/searx/templates/oscar/messages/first_time.html
new file mode 100644
index 000000000..34e7e8956
--- /dev/null
+++ b/searx/templates/oscar/messages/first_time.html
@@ -0,0 +1,8 @@
+<div class="alert alert-info fade in" role="alert">
+    <button class="close" data-dismiss="alert" type="button">
+        <span aria-hidden="true">×</span>
+        <span class="sr-only">Close</span>
+    </button>
+    <strong class="lead">{{ icon('info-sign') }} {{ _('Heads up!') }}</strong>
+    {{ _('It look like you are using searx first time.') }}
+</div>
diff --git a/searx/templates/oscar/messages/js_disabled.html b/searx/templates/oscar/messages/js_disabled.html
index e160edc1c..8baaf1e4c 100644
--- a/searx/templates/oscar/messages/js_disabled.html
+++ b/searx/templates/oscar/messages/js_disabled.html
@@ -1,4 +1,4 @@
 <div class="alert alert-warning" role="alert">
-    <strong>{{ _('Warning!') }}</strong>
+    <strong class="lead">{{ _('Warning!') }}</strong>
     {{ _('Please enable JavaScript to use full functionality of this site.') }}
 </div>
diff --git a/searx/templates/oscar/messages/no_data_available.html b/searx/templates/oscar/messages/no_data_available.html
new file mode 100644
index 000000000..aee791766
--- /dev/null
+++ b/searx/templates/oscar/messages/no_data_available.html
@@ -0,0 +1,5 @@
+{% from 'oscar/macros.html' import icon %}
+<div class="alert alert-info fade in" role="alert">
+    <strong class="lead">{{ icon('info-sign') }} {{ _('Heads up!') }}</strong>
+    {{ _('There is currently no data available. ') }}
+</div>
diff --git a/searx/templates/oscar/messages/save_settings_successfull.html b/searx/templates/oscar/messages/save_settings_successfull.html
index f9a421f0c..0771440e8 100644
--- a/searx/templates/oscar/messages/save_settings_successfull.html
+++ b/searx/templates/oscar/messages/save_settings_successfull.html
@@ -1,8 +1,9 @@
+{% from 'oscar/macros.html' import icon %}
 <div class="alert alert-success fade in" role="alert">
     <button class="close" data-dismiss="alert" type="button">
         <span aria-hidden="true">×</span>
         <span class="sr-only">Close</span>
     </button>
-    <strong>{{ _('Well done!') }}</strong>
+    <strong class="lead">{{ icon('ok-sign') }} {{ _('Well done!') }}</strong>
     {{ _('Settings saved successfully.') }}
 </div>
diff --git a/searx/templates/oscar/messages/unknow_error.html b/searx/templates/oscar/messages/unknow_error.html
index e4736b1ea..40f323f42 100644
--- a/searx/templates/oscar/messages/unknow_error.html
+++ b/searx/templates/oscar/messages/unknow_error.html
@@ -1,8 +1,9 @@
+{% from 'oscar/macros.html' import icon %}
 <div class="alert alert-danger fade in" role="alert">
     <button class="close" data-dismiss="alert" type="button">
         <span aria-hidden="true">×</span>
         <span class="sr-only">Close</span>
     </button>
-    <strong>{{ _('Oh snap!') }}</strong>
+    <strong class="lead">{{ icon('exclamation-sign') }} {{ _('Oh snap!') }}</strong>
     {{ _('Something went wrong.') }}
 </div>
-- 
cgit v1.2.3


From 451586f09f819c5a099eac7389522acd8a554466 Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Mon, 29 Sep 2014 16:31:32 +0200
Subject: oscar template: update translation files

---
 searx/templates/oscar/messages/first_time.html                | 2 +-
 searx/templates/oscar/messages/save_settings_successfull.html | 2 +-
 searx/templates/oscar/messages/unknow_error.html              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'searx/templates/oscar/messages')

diff --git a/searx/templates/oscar/messages/first_time.html b/searx/templates/oscar/messages/first_time.html
index 34e7e8956..38db62bdf 100644
--- a/searx/templates/oscar/messages/first_time.html
+++ b/searx/templates/oscar/messages/first_time.html
@@ -1,7 +1,7 @@
 <div class="alert alert-info fade in" role="alert">
     <button class="close" data-dismiss="alert" type="button">
         <span aria-hidden="true">×</span>
-        <span class="sr-only">Close</span>
+        <span class="sr-only">{{ _('Close') }}</span>
     </button>
     <strong class="lead">{{ icon('info-sign') }} {{ _('Heads up!') }}</strong>
     {{ _('It look like you are using searx first time.') }}
diff --git a/searx/templates/oscar/messages/save_settings_successfull.html b/searx/templates/oscar/messages/save_settings_successfull.html
index 0771440e8..63e578c70 100644
--- a/searx/templates/oscar/messages/save_settings_successfull.html
+++ b/searx/templates/oscar/messages/save_settings_successfull.html
@@ -2,7 +2,7 @@
 <div class="alert alert-success fade in" role="alert">
     <button class="close" data-dismiss="alert" type="button">
         <span aria-hidden="true">×</span>
-        <span class="sr-only">Close</span>
+        <span class="sr-only">{{ _('Close') }}</span>
     </button>
     <strong class="lead">{{ icon('ok-sign') }} {{ _('Well done!') }}</strong>
     {{ _('Settings saved successfully.') }}
diff --git a/searx/templates/oscar/messages/unknow_error.html b/searx/templates/oscar/messages/unknow_error.html
index 40f323f42..3c4c9c15d 100644
--- a/searx/templates/oscar/messages/unknow_error.html
+++ b/searx/templates/oscar/messages/unknow_error.html
@@ -2,7 +2,7 @@
 <div class="alert alert-danger fade in" role="alert">
     <button class="close" data-dismiss="alert" type="button">
         <span aria-hidden="true">×</span>
-        <span class="sr-only">Close</span>
+        <span class="sr-only">{{ _('Close') }}</span>
     </button>
     <strong class="lead">{{ icon('exclamation-sign') }} {{ _('Oh snap!') }}</strong>
     {{ _('Something went wrong.') }}
-- 
cgit v1.2.3


From c25aab73b72087a9a56d86c155a166bfcf018822 Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Wed, 1 Oct 2014 19:46:29 +0200
Subject: oscar template: add no result message

---
 searx/templates/oscar/messages/no_results.html | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 searx/templates/oscar/messages/no_results.html

(limited to 'searx/templates/oscar/messages')

diff --git a/searx/templates/oscar/messages/no_results.html b/searx/templates/oscar/messages/no_results.html
new file mode 100644
index 000000000..ac3705eb8
--- /dev/null
+++ b/searx/templates/oscar/messages/no_results.html
@@ -0,0 +1,9 @@
+{% from 'oscar/macros.html' import icon %}
+<div class="alert alert-info fade in" role="alert">
+    <button class="close" data-dismiss="alert" type="button">
+        <span aria-hidden="true">×</span>
+        <span class="sr-only">{{ _('Close') }}</span>
+    </button>
+    <strong class="lead">{{ icon('info-sign') }} {{ _('Sorry!') }}</strong>
+    {{ _('we didn\'t find any results. Please use another query or search in more categories.') }}
+</div>
-- 
cgit v1.2.3