Commit 3ff0d9eab39c0d3c42998ac741cc3b800d83daf9
Exists in
master
and in
39 other branches
Merge branch 'master' of github.com:TracyWebTech/colab
Showing
2 changed files
with
12 additions
and
3 deletions
Show diff stats
puppet/modules/colab/templates/nginx/site_default.erb
... | ... | @@ -4,9 +4,15 @@ upstream django { |
4 | 4 | |
5 | 5 | server { |
6 | 6 | listen 80 default_server; |
7 | + server_name _; | |
8 | + return 444; | |
9 | +} | |
10 | + | |
11 | +server { | |
12 | + listen 80 default_server; | |
7 | 13 | |
8 | 14 | root /; |
9 | - server_name localhost colab.interlegis.leg.br colab.interlegis.gov.br; | |
15 | + server_name colab.interlegis.leg.br colab.interlegis.gov.br colab-demo.tracy.com.br; | |
10 | 16 | |
11 | 17 | location @django { |
12 | 18 | proxy_hide_header Vary; |
... | ... | @@ -28,4 +34,4 @@ server { |
28 | 34 | location /static { |
29 | 35 | try_files /home/colab/colab/www$uri @django; |
30 | 36 | } |
31 | -} | |
32 | 37 | \ No newline at end of file |
38 | +} | ... | ... |
src/templates/search/search.html
... | ... | @@ -26,8 +26,11 @@ |
26 | 26 | |
27 | 27 | {% block main-content %} |
28 | 28 | <div class="row"> |
29 | - <div class="col-lg-12"> | |
29 | + <div class="col-xs-6 col-sm-4 col-md-2 col-lg-2"> | |
30 | 30 | <h2>{% trans "Search" %}</h2> |
31 | + </div> | |
32 | + <div class="col-xs-6 col-sm-8 col-md-10 col-lg-10"> | |
33 | + <br/><br/> | |
31 | 34 | <p class="text-right quiet"> |
32 | 35 | {{ page.paginator.count }} {% trans "documents found" %} |
33 | 36 | </p> | ... | ... |