diff --git a/cosmos_search/settings.py b/cosmos_search/settings.py index e5d9ad0..5426420 100644 --- a/cosmos_search/settings.py +++ b/cosmos_search/settings.py @@ -25,7 +25,8 @@ SECRET_KEY = config('SECRET_KEY') # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = config('DEBUG', cast=bool) +# DEBUG = config('DEBUG', cast=bool) +DEBUG = True ALLOWED_HOSTS = config('ALLOWED_HOSTS', cast=Csv()) diff --git a/requirements.txt b/requirements.txt index 7f81d2d..aebcc54 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,4 +12,7 @@ smmap2==2.0.3 urllib3==1.22 pep8==1.7.1 python-decouple==3.1 +wikiapi google-api-python-client +beautifulsoup4 + diff --git a/search/templates/cosmos/header.html b/search/templates/cosmos/header.html index 40f2717..56cbe7a 100644 --- a/search/templates/cosmos/header.html +++ b/search/templates/cosmos/header.html @@ -1,4 +1,4 @@ - + {% load static %} @@ -52,7 +52,26 @@ line-height: 1.2 !important; } - .stylish-input-group .input-group-addon { + + #myDIV { + width: 100%; + padding: 50px 0; + text-align: center; + background-color: floralwhite; + margin-top: 20px; + display: none !important; + } + .ff { + display: block !important; + } + .hd{ + display: none !important; + } + + .stylish-input-group .input-group-addon{ + + + background: white !important; } @@ -72,7 +91,19 @@ border-width: 2px; border-color: grey; } + + .bootstrap-iso .form-control{border-width: 2px; border-color: grey;} + + + {% block style %} {% endblock %} diff --git a/search/templates/cosmos/searchresults.html b/search/templates/cosmos/searchresults.html index 6310546..3563d55 100644 --- a/search/templates/cosmos/searchresults.html +++ b/search/templates/cosmos/searchresults.html @@ -1,31 +1,31 @@ {% extends 'cosmos/header.html' %} {% load staticfiles %} {% block head %} -"{{ title }}" | cosmos-search + "{{ title }}" | cosmos-search {% endblock %} {% block body %} -
-
-
+
+
+
{% if amount > 1 %} - Showing - {{ amount }} results for: - {{ query }} + Showing + {{ amount }} results for: + {{ query }} {% elif result_val and not result %} - Showing result for expression: {{ query }} = {{ result_val }} + Showing result for expression: {{ query }} = {{ result_val }} {% elif amount is 1 %} - Showing - {{ amount }} result for: - {{ query }} + Showing + {{ amount }} result for: + {{ query }} {% endif %} - +
-
- -
-
-
-
- + +
+
+ +
+
+ +
-
-
+
-
+
-