Download as
Browse Code »

Commit eb3a4dca94b4ce0a50f3d9a9a7179bb18065ef98

Authored by Matheus Figueiredo
1 parent 8781ee0c
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

Applying css to home.html and base.html 

First test at home.html using bootstrap
Showing 3 changed files with 98 additions and 78 deletions   Show diff stats
src/colab/deprecated/templates/base.html
  Diff comments   View file @eb3a4dc
... ... @@ -8,7 +8,9 @@
8 8  
9 9 <link rel="stylesheet" href="{{ STATIC_URL }}third-party/converse.js/converse.css" type="text/css" media="screen, projection" />
10 10  
11   - <script data-main="{{ STATIC_URL }}third-party/dist/css/bootstrap.js" src="{{ STATIC_URL }}third-party/converse.js/Libraries/require-jquery.js"></script>
  11 + <link rel="stylesheet" href="{{ STATIC_URL }}css/screen.css" type="text/css" media="screen, projection" />
  12 +
  13 + <script src="{{ STATIC_URL }}third-party/dist/css/bootstrap.js"></script>
12 14  
13 15 <script data-main="{{ STATIC_URL }}third-party/converse.js/main" src="{{ STATIC_URL }}third-party/converse.js/Libraries/require-jquery.js"></script>
14 16  
... ... @@ -36,31 +38,33 @@
36 38 </head>
37 39  
38 40 <body>
39   - <div>
40   - <div>
  41 + <div class="container">
  42 + <div class="row">
  43 + <div class="col-lg-12">
41 44 {% if not user.is_authenticated %}
42   - <span>
  45 + <span class="col-lg-2 col-lg-offset-9 text-right">
43 46 <a href="{% url 'signup' %}">{% trans "Sign up" %}</a>
44 47 </span>
45   - <span>
  48 + <span class="col-lg-1 text-center">
46 49 <a href="{% url 'login' %}?next={{ request.path }}">{% trans "Login" %}</a>
47 50 </span>
48 51 {% else %}
49   - <span>
  52 + <span class="col-lg-10 text-right">
50 53 {% trans "authenticated as" %} <b>{{ user.username }}</b>
51 54 </span>
52   - <span>
  55 + <span class="col-lg-1 text-center">
53 56 <a href="{% url 'user_profile' user.username %}">
54 57 {% trans "My Profile" %}
55 58 </a>
56 59 </span>
57   - <span>
  60 + <span class="col-lg-1 text-center">
58 61 <a href="{% url 'logout' %}">
59 62 {% trans "Logout" %}
60 63 </a>
61 64 </span>
62 65 {% endif %}
63 66 </div>
  67 + </div>
64 68  
65 69 {% block header %}
66 70 <h1><span>{% trans "COLAB" %}</span>
... ... @@ -69,35 +73,34 @@
69 73 </h1>
70 74 {% endblock %}
71 75  
72   - <div>
  76 + <div class="row vertical-center">
73 77  
74   - <span>
  78 + <span class="col-lg-1 text-center">
75 79 <a href="{% url 'thread_list' %}">{% trans "Discussions" %}</a>
76 80 </span>
77   - <span>
  81 + <span class="col-lg-1 text-center">
78 82 <a href="http://colab.interlegis.gov.br/wiki" target="_blank">{% trans "Wiki" %}</a>
79 83 </span>
80   - <span>
  84 + <span class="col-lg-1 text-center">
81 85 <a href="http://listas.interlegis.gov.br/mailman/listinfo/"
82 86 target="_blank">{% trans "Contribute" %}</a>
83 87 </span>
84   - <span>
  88 + <span class="col-lg-2 text-center">
85 89 <a href="http://colab.interlegis.leg.br/newticket"
86 90 target="_blank">{% trans "Report a problem" %}</a>
87 91 </span>
88   - <span>
  92 + <span class="col-lg-1 text-center">
89 93 <a href="{% url "feedzilla_index" %}">{% trans "Planet" %}</a>
90 94 </span>
91 95  
92   - <span>
  96 + <span class="col-lg-4 col-lg-offset-2 text-right">
93 97 <form action="/search/" method="GET">
94   - <input name="q" id="header-searchbox" value="{{ request.GET.q }}"
  98 + <input name="q" class="col-lg-9" value="{{ request.GET.q }}"
95 99 type="text" placeholder="{% trans 'Search here...' %}" />
96 100 <input type="submit" value="{% trans 'Search' %}"></input>
97 101 </form>
98 102 </span>
99 103 </div>
100   - </div>
101 104  
102 105 <hr/>
103 106  
... ... @@ -107,11 +110,16 @@
107 110  
108 111 <hr/>
109 112  
110   - <div>
  113 + <div class="row">
111 114 {% block footer %}
112   - <p><a href="{% url 'opendata' %}"><img src="{{ STATIC_URL }}img/opendata3.png"/></a></p>
113   - <p>{% trans "The contents of this site is published under license" %} <a
114   - href="http://creativecommons.org/licenses/by-nc-sa/2.0/br/">{% trans "Creative Commons - attribution, non-commercial" %}</a>
  115 + <p class="col-lg-12 text-center"><a href="{% url 'opendata' %}"><img src="{{ STATIC_URL }}img/opendata3.png"/></a></p>
  116 + </div>
  117 + <div class="row">
  118 + <p class="col-lg-12 text-center">
  119 + {% trans "The contents of this site is published under license" %}
  120 + <a href="http://creativecommons.org/licenses/by-nc-sa/2.0/br/">
  121 + {% trans "Creative Commons - attribution, non-commercial" %}
  122 + </a>
115 123 </p>
116 124 {% endblock %}
117 125 </div>
... ... @@ -140,6 +148,6 @@
140 148 });
141 149 </script>
142 150  
143   -
  151 + </div>
144 152 </body>
145 153 </html>
... ...
src/colab/deprecated/templates/home.html
  Diff comments   View file @eb3a4dc
... ... @@ -6,74 +6,86 @@
6 6 {% endblock %}
7 7  
8 8 {% block header %}
9   - <div id="header-logo" class="span-24">
10   - <img class="center" src="{{ STATIC_URL }}img/logo.png" />
  9 + <div class="row">
  10 + <div class="col-lg-2 col-lg-offset-5">
  11 + <img class="text-center" src="{{ STATIC_URL }}img/logo.png" />
  12 + </div>
11 13 </div>
12 14  
13   - <hr class="space"/>
14   -
15   - <h2 class="span-24 center">{% trans "INTERLEGIS COMMUNITIES" %}</h2>
  15 + <h3 class="text-center"><strong>{% trans "INTERLEGIS COMMUNITIES" %}</strong></h3>
16 16 {% endblock %}
17 17  
18 18 {% block main-content %}
19 19  
20   - <div class="span-12 colborder">
21   - <h3>{% trans "Latest collaborations" %}<a class="rss" target="_blank"
22   - href="{% url 'rss_latest_colab' %}"
23   - title="{% trans 'RSS - Latest collaborations' %}">
  20 + <div class="row">
  21 + <div class="col-lg-6">
  22 + <h3>
  23 + <span class="col-lg-11">{% trans "Latest collaborations" %}</span>
  24 + <a class="col-lg-1" target="_blank"
  25 + href="{% url 'rss_latest_colab' %}"
  26 + title="{% trans 'RSS - Latest collaborations' %}">
24 27 <img src="{{ STATIC_URL }}img/rss.png" alt="{% trans 'RSS' %}"/></a>
25   - </h3>
26   - <ul>
27   - {% for doc in latest_docs %}
28   - {% include "message-preview.html" %}
29   - {% endfor %}
30   - </ul>
31   - <hr class="space"/>
32   - <a class="right" href="{% url 'search' %}?o=modified+desc">
33   - {% trans "View more collaborations..." %}
34   - </a>
35   - </div>
36   -
37   - <div class="span-11 last">
38   - <h3>{% trans "Distribution of Collaborations" %}</h3>
39   - <div id="collabs"></div>
  28 + </h3>
  29 + <ul>
  30 + {% for doc in latest_docs %}
  31 + {% include "message-preview.html" %}
  32 + {% endfor %}
  33 + </ul>
  34 + <hr />
  35 + <a class="col-lg-8 col-lg-offset-4 text-right"
  36 + href="{% url 'search' %}?o=modified+desc">
  37 + {% trans "View more collaborations..." %}
  38 + </a>
  39 + </div>
  40 +
  41 + <div class="col-lg-6">
  42 + <h3>{% trans "Distribution of Collaborations" %}</h3>
  43 + <div></div>
  44 + </div>
40 45 </div>
41 46  
42   - <hr class="space"/>
43   - <hr/>
  47 + <hr />
44 48  
45   - <div class="span-12 colborder">
46   - <h3>{% trans "Discussions Most Relevance" %}<a class="rss" target="_blank"
47   - href="{% url 'rss_hottest_threads' %}"
48   - title="{% trans "RSS - Discussions Most Relevance" %}">
  49 + <div class="row">
  50 + <div class="col-lg-6">
  51 + <h3>
  52 + <span class="col-lg-11">{% trans "Discussions Most Relevance" %}</span>
  53 + <a class="col-lg-1" target="_blank"
  54 + href="{% url 'rss_hottest_threads' %}"
  55 + title="{% trans "RSS - Discussions Most Relevance" %}">
49 56 <img src="{{ STATIC_URL }}img/rss.png" alt="{% trans 'RSS' %}"/></a>
50   - </h3>
51   - <ul>
52   - {% for thread in hottest_threads %}
53   - {% include "message-preview.html" with doc=thread.latest_message %}
54   - {% endfor %}
55   - </ul>
56   - <hr class="space"/>
57   - <a class="right" href="{% url 'thread_list' %}?order=hottest">
58   - {% trans "View more discussions relevance..." %}
59   - </a>
60   - </div>
61   -
62   - <div class="span-11 last">
63   - <h3>{% trans "Latest Discussions" %}<a class="rss" target="_blank"
64   - href="{% url 'rss_latest_threads' %}"
65   - title="{% trans "RSS - Latest Discussions" %}">
  57 + </h3>
  58 + <ul>
  59 + {% for thread in hottest_threads %}
  60 + {% include "message-preview.html" with doc=thread.latest_message %}
  61 + {% endfor %}
  62 + </ul>
  63 + <hr />
  64 + <a class="col-lg-8 col-lg-offset-4 text-right"
  65 + href="{% url 'thread_list' %}?order=hottest">
  66 + {% trans "View more discussions relevance..." %}
  67 + </a>
  68 + </div>
  69 +
  70 + <div class="col-lg-6">
  71 + <h3>
  72 + <span class="col-lg-11">{% trans "Latest Discussions" %}</span>
  73 + <a class="col-lg-1" target="_blank"
  74 + href="{% url 'rss_latest_threads' %}"
  75 + title="{% trans "RSS - Latest Discussions" %}">
66 76 <img src="{{ STATIC_URL }}img/rss.png" alt="{% trans 'RSS' %}"/></a>
67   - </h3>
68   - <ul>
69   - {% for thread in latest_threads %}
70   - {% include "message-preview.html" with doc=thread.latest_message %}
71   - {% endfor %}
72   - </ul>
73   - <hr class="space"/>
74   - <a class="right" href="{% url 'thread_list' %}">
75   - {% trans "View more discussions..." %}
76   - </a>
  77 + </h3>
  78 + <ul>
  79 + {% for thread in latest_threads %}
  80 + {% include "message-preview.html" with doc=thread.latest_message %}
  81 + {% endfor %}
  82 + </ul>
  83 + <hr />
  84 + <a class="col-lg-8 col-lg-offset-4 text-right"
  85 + href="{% url 'thread_list' %}">
  86 + {% trans "View more discussions..." %}
  87 + </a>
  88 + </div>
77 89 </div>
78 90  
79 91 {% endblock %}
... ...
src/colab/static/css/screen.css 0 → 100644
  Diff comments   View file @eb3a4dc