Download as
Browse Code »

Commit 3ff0d9eab39c0d3c42998ac741cc3b800d83daf9

Authored by Luan
2 parents ad93470b 3ff0bb0d
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

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
  Diff comments   View file @3ff0d9e
@@ -4,9 +4,15 @@ upstream django { @@ -4,9 +4,15 @@ upstream django {
4 4
5 server { 5 server {
6 listen 80 default_server; 6 listen 80 default_server;
  7 + server_name _;
  8 + return 444;
  9 +}
  10 +
  11 +server {
  12 + listen 80 default_server;
7 13
8 root /; 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 location @django { 17 location @django {
12 proxy_hide_header Vary; 18 proxy_hide_header Vary;
@@ -28,4 +34,4 @@ server { @@ -28,4 +34,4 @@ server {
28 location /static { 34 location /static {
29 try_files /home/colab/colab/www$uri @django; 35 try_files /home/colab/colab/www$uri @django;
30 } 36 }
31 -}  
32 \ No newline at end of file 37 \ No newline at end of file
  38 +}
src/templates/search/search.html
  Diff comments   View file @3ff0d9e
@@ -26,8 +26,11 @@ @@ -26,8 +26,11 @@
26 26
27 {% block main-content %} 27 {% block main-content %}
28 <div class="row"> 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 <h2>{% trans "Search" %}</h2> 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 <p class="text-right quiet"> 34 <p class="text-right quiet">
32 {{ page.paginator.count }} {% trans "documents found" %} 35 {{ page.paginator.count }} {% trans "documents found" %}
33 </p> 36 </p>