Download as
Browse Code »

Commit 70e08214f0d8f3eeb852fe7b92c862297715b23d

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

Adding css to message-thread

Showing 3 changed files with 150 additions and 121 deletions   Show diff stats
src/accounts/templates/accounts/signup-form.html
  Diff comments   View file @70e0821
@@ -3,73 +3,71 @@ @@ -3,73 +3,71 @@
3 {% load i18n %} 3 {% load i18n %}
4 {% block main-content %} 4 {% block main-content %}
5 5
6 -<div class="container">  
7 - <h2>{% trans "Sign up" %}</h2> 6 +<h2>{% trans "Sign up" %}</h2>
8 7
9 - {% if form.errors %}  
10 - <div>  
11 - <b>{% trans "Please correct the errors below and try again." %}</b>  
12 - </div>  
13 - {% endif %} 8 +{% if form.errors %}
  9 +<div>
  10 + <b>{% trans "Please correct the errors below and try again." %}</b>
  11 +</div>
  12 +{% endif %}
14 13
15 - <div class="row">  
16 - <div class="col-lg-11 well">  
17 - <label>{% trans "Avatar" %}</label >  
18 - <div id="avatar">  
19 - <img src="{{ STATIC_URL }}img/user.png" alt="user"/>  
20 - </div>  
21 - <p>  
22 - {% trans "Add an avatar to your account using" %} <a href="http://gravatar.com/" target="_blank">Gravatar</a>  
23 - </p>  
24 - </div> 14 +<div class="row">
  15 + <div class="col-lg-11 well">
  16 + <label>{% trans "Avatar" %}</label >
  17 + <div id="avatar">
  18 + <img src="{{ STATIC_URL }}img/user.png" alt="user"/>
  19 + </div>
  20 + <p>
  21 + {% trans "Add an avatar to your account using" %} <a href="http://gravatar.com/" target="_blank">Gravatar</a>
  22 + </p>
25 </div> 23 </div>
  24 +</div>
26 25
27 26
28 - <p class="required">  
29 - <label>{% trans "Required fields" %}</label>  
30 - </p> 27 +<p class="required">
  28 + <label>{% trans "Required fields" %}</label>
  29 +</p>
31 30
32 - <form action="." method="post">  
33 - {% csrf_token %} 31 +<form action="." method="post">
  32 + {% csrf_token %}
34 33
35 - <div class="row">  
36 - <div class="col-lg-5">  
37 - <fieldset class="well">  
38 - <legend>{% trans "Personal Information" %}</legend>  
39 - {% render_form_field form.first_name %}  
40 - {% render_form_field form.last_name %}  
41 - {% render_form_field form.email %}  
42 - {% render_form_field form.username %}  
43 - </fieldset> 34 + <div class="row">
  35 + <div class="col-lg-5">
  36 + <fieldset class="well">
  37 + <legend>{% trans "Personal Information" %}</legend>
  38 + {% render_form_field form.first_name %}
  39 + {% render_form_field form.last_name %}
  40 + {% render_form_field form.email %}
  41 + {% render_form_field form.username %}
  42 + </fieldset>
44 43
45 - <fieldset class="well">  
46 - <legend>{% trans "Others" %}</legend>  
47 - {% render_form_field form.twitter %}  
48 - {% render_form_field form.facebook %}  
49 - {% render_form_field form.google_talk %}  
50 - {% render_form_field form.webpage %}  
51 - </fieldset>  
52 - </div> 44 + <fieldset class="well">
  45 + <legend>{% trans "Others" %}</legend>
  46 + {% render_form_field form.twitter %}
  47 + {% render_form_field form.facebook %}
  48 + {% render_form_field form.google_talk %}
  49 + {% render_form_field form.webpage %}
  50 + </fieldset>
  51 + </div>
53 52
54 - <div class="col-lg-5 col-lg-offset-1">  
55 - <fieldset class="well">  
56 - <legend>{% trans "Professionals Information" %}</legend>  
57 - {% render_form_field form.institution %}  
58 - {% render_form_field form.role %}  
59 - </fieldset> 53 + <div class="col-lg-5 col-lg-offset-1">
  54 + <fieldset class="well">
  55 + <legend>{% trans "Professionals Information" %}</legend>
  56 + {% render_form_field form.institution %}
  57 + {% render_form_field form.role %}
  58 + </fieldset>
60 59
61 - <fieldset class="well">  
62 - <legend>{% trans "Subscribe to mail lists" %}</legend>  
63 - <div class="unstyled-list">  
64 - {% render_form_field form.lists %}  
65 - </div>  
66 - </fieldset>  
67 - </div> 60 + <fieldset class="well">
  61 + <legend>{% trans "Subscribe to mail lists" %}</legend>
  62 + <div class="unstyled-list">
  63 + {% render_form_field form.lists %}
  64 + </div>
  65 + </fieldset>
  66 + </div>
68 67
69 - <div class="col-lg-2 pull-right">  
70 - <input type="submit" value="{% trans 'Register' %}"/>  
71 - </div> 68 + <div class="col-lg-2 pull-right">
  69 + <input type="submit" value="{% trans 'Register' %}"/>
72 </div> 70 </div>
73 - </form>  
74 -</div> 71 + </div>
  72 +</form>
75 {% endblock %} 73 {% endblock %}
src/colab/static/css/screen.css
  Diff comments   View file @70e0821
@@ -156,3 +156,28 @@ fieldset&gt;legend { @@ -156,3 +156,28 @@ fieldset&gt;legend {
156 .blog-post-item .tags { 156 .blog-post-item .tags {
157 margin-top: 1em; 157 margin-top: 1em;
158 } 158 }
  159 +
  160 +.plus {
  161 + border: 1px dotted #ddd;
  162 + margin: 0;
  163 +}
  164 +
  165 +.plus span {
  166 + vertical-align: middle;
  167 + height: 40px;
  168 + line-height: 40px;
  169 + font-size: 150%;
  170 + font-weight: bold;
  171 + color: #0a0;
  172 +}
  173 +
  174 +.plus img {
  175 + vertical-align: middle;
  176 + cursor: pointer;
  177 + margin-top: 8px;
  178 + margin-right: 20px;
  179 +}
  180 +
  181 +.plus img:hover {
  182 + opacity: 0.8;
  183 +}
src/super_archives/templates/message-thread.html
  Diff comments   View file @70e0821
@@ -2,77 +2,83 @@ @@ -2,77 +2,83 @@
2 {% load i18n %} 2 {% load i18n %}
3 {% load append_to_get %} 3 {% load append_to_get %}
4 {% block main-content %} 4 {% block main-content %}
5 - <div id="vote-notification" class="error hide"></div> 5 +<div class="row">
6 6
7 <h2>{{ first_msg.subject_clean }}</h2> 7 <h2>{{ first_msg.subject_clean }}</h2>
8 - <hr/>  
9 - <div class="span-17 border">  
10 - <ul>  
11 - {% for email in emails %}  
12 - <li>  
13 - <div id="msg-{{ email.id }}" class="email_message">  
14 - <div class="span-3 center">  
15 - <div>  
16 - <a href="{{ email.from_address.get_profile_link }}">  
17 - <img class="avatar" width="80px" heigth="80px"  
18 - src="http://www.gravatar.com/avatar/{{ email.from_address.md5 }}?s=80&d=identicon" />  
19 - {% trans "Anonymous" as anonymous %}  
20 - <span>{% firstof email.from_address.get_full_name anonymous %}</span>  
21 - </a>  
22 - </div>  
23 - <p>{{ email.received_time|date:"SHORT_DATETIME_FORMAT" }}</p>  
24 -  
25 - <div class="plus">  
26 - <span>{{ email.votes_count }}</span>  
27 - <img title="{% trans 'Vote' %}" class="right" src="{{ STATIC_URL }}img/plus.png">  
28 - </div> 8 + <hr />
29 9
30 - <p class="minus {% if not user in email.vote_list %}hide{% endif %}">  
31 - <a href="#">{% trans "Remove votes" %}</a>  
32 - </p>  
33 - </div>  
34 -  
35 - <div class="span-13">  
36 - <pre>{{ email.body }}</pre>  
37 - </div>  
38 - </div>  
39 - {% if not forloop.last %}  
40 - <hr/>  
41 - {% endif %}  
42 - </li>  
43 - {% endfor %}  
44 - </ul>  
45 - </div>  
46 - <div class="span-6 filters last">  
47 - <h4><b>{% trans "Order by" %}:</b></h4>  
48 - <ul>  
49 - <li><a href="{% append_to_get order='voted' %}">{% trans "Votes" %}</a></li>  
50 - <li><a href="{% append_to_get order='date' %}">{% trans "Date" %}</a></li> 10 + <div class="col-lg-3 pull-right">
  11 + <h4><strong>{% trans "Order by" %}:</strong></h4>
  12 + <ul class="none">
  13 + <li><span class="glyphicon glyphicon-chevron-right">
  14 + <a href="{% append_to_get order='voted' %}">{% trans "Votes" %}</a>
  15 + </span></li>
  16 + <li><span class="glyphicon glyphicon-chevron-right">
  17 + <a href="{% append_to_get order='date' %}">{% trans "Date" %}</a>
  18 + </span></li>
51 </ul> 19 </ul>
52 20
53 - <hr class="space"/>  
54 -  
55 - <h4><b>{% trans "Statistics:" %}</b></h4>  
56 -  
57 - <ul>  
58 - <li class="quiet">{% trans "started at" %}  
59 - <h4>{{ first_msg.received_time|timesince }} {% trans "ago" %}</h4>  
60 - </li>  
61 - <li class="quiet">{% trans "viewed" %}  
62 - <h4>{{ pagehits }} {% trans "times" %}</h4>  
63 - </li>  
64 - <li class="quiet">{% trans "answered" %}  
65 - <h4>{{ emails|length }} {% trans "times" %}</h4>  
66 - </li>  
67 - <li class="quiet">{% trans "voted" %}  
68 - <h4>{{ total_votes }} {% trans "times" %}</h4>  
69 - </li> 21 + <div>&nbsp;</div>
  22 +
  23 + <h4><strong>{% trans "Statistics:" %}</strong></h4>
  24 +
  25 + <ul class="none">
  26 + <li class="quiet"><span class="glyphicon glyphicon-chevron-right">
  27 + {% trans "started at" %}
  28 + </span></li>
  29 + <h5>{{ first_msg.received_time|timesince }} {% trans "ago" %}</h5>
  30 + <li class="quiet"><span class="glyphicon glyphicon-chevron-right">
  31 + {% trans "viewed" %}
  32 + </span></li>
  33 + <h5>{{ pagehits }} {% trans "times" %}</h5>
  34 + <li class="quiet"><span class="glyphicon glyphicon-chevron-right">
  35 + {% trans "answered" %}
  36 + </span></li>
  37 + <h5>{{ emails|length }} {% trans "times" %}</h5>
  38 + <li class="quiet"><span class="glyphicon glyphicon-chevron-right">
  39 + {% trans "voted" %}
  40 + </span></li>
  41 + <h5>{{ total_votes }} {% trans "times" %}</h5>
70 </ul> 42 </ul>
71 -  
72 </div> 43 </div>
73 - 44 +
  45 + <ul class="none">
  46 + {% for email in emails %}
  47 + <li>
  48 + <div class="col-lg-2 text-center">
  49 + <a href="{{ email.from_address.get_profile_link }}">
  50 + <img width="80px" height="80px"
  51 + src="http://www.gravatar.com/avatar/{{ email.from_address.md5 }}?s=80&d=identicon" />
  52 + <div>&nbsp;</div>
  53 + {% trans "Anonymous" as anonymous %}
  54 + <span>{% firstof email.from_address.get_full_name anonymous %}</span>
  55 + </a>
  56 +
  57 + <p>{{ email.received_time|date:"SHORT_DATETIME_FORMAT" }}</p>
  58 +
  59 + <div class="plus">
  60 + <span>{{ email.votes_count }}</span>
  61 + <img title="{% trans 'Vote' %}" class="pull-right" src="{{ STATIC_URL }}img/plus.png">
  62 + </div>
  63 +
  64 + <p class="{% if not user in email.vote_list %}hide{% endif %}">
  65 + <a href="#">{% trans "Remove votes" %}</a>
  66 + </p>
  67 + </div>
  68 +
  69 + <div class="col-lg-7">
  70 + <pre>{{ email.body }}</pre>
  71 + </div>
  72 + {% if not forloop.last %}
  73 + <div>&nbsp;</div>
  74 + {% endif %}
  75 + </li>
  76 + {% endfor %}
  77 + </ul>
  78 +
74 <script type="text/javascript" charset="utf-8"> 79 <script type="text/javascript" charset="utf-8">
75 pagehit("{{ request.path_info }}"); 80 pagehit("{{ request.path_info }}");
76 </script> 81 </script>
77 -  
78 -{% endblock %} 82 +
  83 +</div>
  84 +{% endblock %}