Download as
Browse Code »

Commit 65b2a60e9450a84ceb833ce8b1fa4ae60ca66682

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

Fixing some Grid and adding message-preview css

Showing 3 changed files with 113 additions and 39 deletions   Show diff stats
src/colab/deprecated/templates/base.html
  Diff comments   View file @65b2a60
... ... @@ -40,30 +40,28 @@
40 40 <body>
41 41 <div class="container">
42 42 <div class="row">
43   - <div class="col-lg-12">
44   - {% if not user.is_authenticated %}
45   - <span class="col-lg-2 col-lg-offset-9 text-right">
46   - <a href="{% url 'signup' %}">{% trans "Sign up" %}</a>
47   - </span>
48   - <span class="col-lg-1 text-center">
49   - <a href="{% url 'login' %}?next={{ request.path }}">{% trans "Login" %}</a>
50   - </span>
51   - {% else %}
52   - <span class="col-lg-10 text-right">
53   - {% trans "authenticated as" %} <b>{{ user.username }}</b>
54   - </span>
55   - <span class="col-lg-1 text-center">
56   - <a href="{% url 'user_profile' user.username %}">
57   - {% trans "My Profile" %}
58   - </a>
59   - </span>
60   - <span class="col-lg-1 text-center">
61   - <a href="{% url 'logout' %}">
62   - {% trans "Logout" %}
63   - </a>
64   - </span>
65   - {% endif %}
  43 + {% if not user.is_authenticated %}
  44 + <div class="col-lg-2 col-lg-offset-9 text-right">
  45 + <a href="{% url 'signup' %}">{% trans "Sign up" %}</a>
  46 + </div>
  47 + <div class="col-lg-1 text-center">
  48 + <a href="{% url 'login' %}?next={{ request.path }}">{% trans "Login" %}</a>
  49 + </div>
  50 + {% else %}
  51 + <div class="col-lg-10 text-right">
  52 + {% trans "authenticated as" %} <b>{{ user.username }}</b>
66 53 </div>
  54 + <div class="col-lg-1 text-center">
  55 + <a href="{% url 'user_profile' user.username %}">
  56 + {% trans "My Profile" %}
  57 + </a>
  58 + </div>
  59 + <div class="col-lg-1 text-center">
  60 + <a href="{% url 'logout' %}">
  61 + {% trans "Logout" %}
  62 + </a>
  63 + </div>
  64 + {% endif %}
67 65 </div>
68 66  
69 67 {% block header %}
... ... @@ -73,7 +71,7 @@
73 71 </h1>
74 72 {% endblock %}
75 73  
76   - <div class="row vertical-center">
  74 + <div id="header-menu" class="row">
77 75  
78 76 <span class="col-lg-1 text-center">
79 77 <a href="{% url 'thread_list' %}">{% trans "Discussions" %}</a>
... ... @@ -95,14 +93,14 @@
95 93  
96 94 <span class="col-lg-4 col-lg-offset-2 text-right">
97 95 <form action="/search/" method="GET">
98   - <input name="q" class="col-lg-9" value="{{ request.GET.q }}"
  96 + <input name="q" id="header-searchbox" value="{{ request.GET.q }}"
99 97 type="text" placeholder="{% trans 'Search here...' %}" />
100 98 <input type="submit" value="{% trans 'Search' %}"></input>
101 99 </form>
102 100 </span>
103 101 </div>
104 102  
105   - <hr/>
  103 + <hr id="header-hr"/>
106 104  
107 105 <div>
108 106 {% block main-content %} {% endblock %}
... ...
src/colab/deprecated/templates/home.html
  Diff comments   View file @65b2a60
... ... @@ -20,8 +20,8 @@
20 20 <div class="row">
21 21 <div class="col-lg-6">
22 22 <h3>
23   - <span class="col-lg-11">{% trans "Latest collaborations" %}</span>
24   - <a class="col-lg-1" target="_blank"
  23 + <span>{% trans "Latest collaborations" %}</span>
  24 + <a class="pull-right" target="_blank"
25 25 href="{% url 'rss_latest_colab' %}"
26 26 title="{% trans 'RSS - Latest collaborations' %}">
27 27 <img src="{{ STATIC_URL }}img/rss.png" alt="{% trans 'RSS' %}"/></a>
... ... @@ -31,8 +31,7 @@
31 31 {% include "message-preview.html" %}
32 32 {% endfor %}
33 33 </ul>
34   - <hr />
35   - <a class="col-lg-8 col-lg-offset-4 text-right"
  34 + <a class="pull-right"
36 35 href="{% url 'search' %}?o=modified+desc">
37 36 {% trans "View more collaborations..." %}
38 37 </a>
... ... @@ -49,8 +48,8 @@
49 48 <div class="row">
50 49 <div class="col-lg-6">
51 50 <h3>
52   - <span class="col-lg-11">{% trans "Discussions Most Relevance" %}</span>
53   - <a class="col-lg-1" target="_blank"
  51 + <span>{% trans "Discussions Most Relevance" %}</span>
  52 + <a class="pull-right" target="_blank"
54 53 href="{% url 'rss_hottest_threads' %}"
55 54 title="{% trans "RSS - Discussions Most Relevance" %}">
56 55 <img src="{{ STATIC_URL }}img/rss.png" alt="{% trans 'RSS' %}"/></a>
... ... @@ -60,8 +59,7 @@
60 59 {% include "message-preview.html" with doc=thread.latest_message %}
61 60 {% endfor %}
62 61 </ul>
63   - <hr />
64   - <a class="col-lg-8 col-lg-offset-4 text-right"
  62 + <a class="pull-right"
65 63 href="{% url 'thread_list' %}?order=hottest">
66 64 {% trans "View more discussions relevance..." %}
67 65 </a>
... ... @@ -69,8 +67,8 @@
69 67  
70 68 <div class="col-lg-6">
71 69 <h3>
72   - <span class="col-lg-11">{% trans "Latest Discussions" %}</span>
73   - <a class="col-lg-1" target="_blank"
  70 + <span>{% trans "Latest Discussions" %}</span>
  71 + <a class="pull-right" target="_blank"
74 72 href="{% url 'rss_latest_threads' %}"
75 73 title="{% trans "RSS - Latest Discussions" %}">
76 74 <img src="{{ STATIC_URL }}img/rss.png" alt="{% trans 'RSS' %}"/></a>
... ... @@ -80,9 +78,7 @@
80 78 {% include "message-preview.html" with doc=thread.latest_message %}
81 79 {% endfor %}
82 80 </ul>
83   - <hr />
84   - <a class="col-lg-8 col-lg-offset-4 text-right"
85   - href="{% url 'thread_list' %}">
  81 + <a class="pull-right" href="{% url 'thread_list' %}">
86 82 {% trans "View more discussions..." %}
87 83 </a>
88 84 </div>
... ...
src/colab/static/css/screen.css
  Diff comments   View file @65b2a60
... ... @@ -0,0 +1,80 @@
  1 +/* Header */
  2 +
  3 +#header-searchbox {
  4 + width: 290px;
  5 +}
  6 +
  7 +#header-menu {
  8 + line-height: 33px;
  9 +}
  10 +
  11 +#header-hr{
  12 + margin-top: 0;
  13 +}
  14 +
  15 +/* From message-preview.html*/
  16 +.quiet {
  17 + color: #999;
  18 + font-size: 95%;
  19 +}
  20 +
  21 +.preview-message {
  22 + white-space: nowrap;
  23 + overflow: hidden;
  24 + line-height: 28px;
  25 + border-bottom: solid 1px #ddd;
  26 +}
  27 +
  28 +.preview-message a {
  29 + text-decoration: none;
  30 +}
  31 +
  32 +.preview-message img {
  33 + margin-right: 5px;
  34 +}
  35 +
  36 +.tag {
  37 + text-decoration: none;
  38 + background-color: #2183b3;
  39 + padding: 2px 4px;
  40 + border-radius: 5px;
  41 + font-size: 90%;
  42 + color: #fff;
  43 + margin-right: 5px;
  44 + line-height: 2;
  45 + white-space: nowrap;
  46 +}
  47 +
  48 +.tag:hover,
  49 +.tag:focus {
  50 + background-color: #21b6e6;
  51 + color: #fff;
  52 +}
  53 +
  54 +.tag-cloud .size-1 {
  55 + font-size: 90%;
  56 +}
  57 +.tag-cloud .size-2 {
  58 + font-size: 100%;
  59 +}
  60 +.tag-cloud .size-3 {
  61 + font-size: 130%;
  62 +}
  63 +.tag-cloud .size-4 {
  64 + font-size: 150%;
  65 +}
  66 +
  67 +.subject,
  68 +.subject a {
  69 + color: #000;
  70 +}
  71 +
  72 +.subject a:hover,
  73 +.subject a:focus {
  74 + text-decoration: underline;
  75 + color: #335;
  76 +}
  77 +
  78 +.subject img {
  79 + margin-right: 5px;
  80 +}
... ...