Commit 2e8998ac25b9c7ac4e488e9c33ab3e4eab3508ca
1 parent
4fe94218
Exists in
master
and in
39 other branches
Adding CSS to user profile
Showing
2 changed files
with
64 additions
and
53 deletions
Show diff stats
src/accounts/templates/accounts/user-profile.html
| @@ -9,7 +9,7 @@ | @@ -9,7 +9,7 @@ | ||
| 9 | {% block main-content %} | 9 | {% block main-content %} |
| 10 | {% if not user_profile %} | 10 | {% if not user_profile %} |
| 11 | <span> | 11 | <span> |
| 12 | - <b>{% trans "User not registered." %}</b> {% trans "Is that you?" %} | 12 | + <strong>{% trans "User not registered." %}</strong> {% trans "Is that you?" %} |
| 13 | <a href="{% url 'signup' %}">{% trans "Click here and sign up." %}</a> | 13 | <a href="{% url 'signup' %}">{% trans "Click here and sign up." %}</a> |
| 14 | </span> | 14 | </span> |
| 15 | 15 | ||
| @@ -24,68 +24,69 @@ | @@ -24,68 +24,69 @@ | ||
| 24 | 24 | ||
| 25 | {% endif %} | 25 | {% endif %} |
| 26 | 26 | ||
| 27 | - <div> | ||
| 28 | - <h2>{{ email_address.get_full_name }}</h2> | 27 | + <div class="row"> |
| 28 | + <h3>{{ email_address.get_full_name }}</h3> | ||
| 29 | + </div> | ||
| 29 | 30 | ||
| 30 | - <div> | ||
| 31 | - <img id="avatar" width="120px" height="120px" | ||
| 32 | - src="http://www.gravatar.com/avatar/{{ email_address.md5 }}?s=120&d=identicon" /> | 31 | + <div> </div> |
| 32 | + | ||
| 33 | + <div class="row"> | ||
| 34 | + <div class="col-lg-1"> | ||
| 35 | + <img id="profile-img" src="http://www.gravatar.com/avatar/{{ email_address.md5 }}?s=120&d=identicon" /> | ||
| 33 | </div> | 36 | </div> |
| 34 | 37 | ||
| 35 | <div> | 38 | <div> |
| 36 | - <div> | ||
| 37 | - <form action="{% url 'user_profile_update' request.user %}" method='post'> | ||
| 38 | - {% csrf_token %} | ||
| 39 | - | ||
| 40 | - <h3>{% trans "Personal Information" %}</h3> | ||
| 41 | - <ul> | ||
| 42 | - | ||
| 43 | - <li> | ||
| 44 | - {% render_form_field form.institution user_profile.institution %} | ||
| 45 | - </li> | ||
| 46 | - <li> | ||
| 47 | - {% render_form_field form.role user_profile.role %} | ||
| 48 | - </li> | ||
| 49 | - </ul> | ||
| 50 | - | ||
| 51 | - <hr /> | ||
| 52 | - | ||
| 53 | - <h3>{% trans "Other informations" %}</h3> | ||
| 54 | - <ul> | ||
| 55 | - <li> | ||
| 56 | - {% render_form_field form.twitter user_profile.twitter %} | ||
| 57 | - </li> | ||
| 58 | - <li> | ||
| 59 | - {% render_form_field form.facebook user_profile.facebook %} | ||
| 60 | - </li> | ||
| 61 | - <li> | ||
| 62 | - {% render_form_field form.google_talk user_profile.google_talk %} | ||
| 63 | - </li> | ||
| 64 | - <li> | ||
| 65 | - {% render_form_field form.webpage user_profile.webpage %} | ||
| 66 | - </li> | ||
| 67 | - </ul> | ||
| 68 | - | ||
| 69 | - <hr /> | ||
| 70 | - {% if editable %} | ||
| 71 | - <span> | ||
| 72 | - <input type="submit" value="{% trans 'Save' %}"/> | ||
| 73 | - </span> | ||
| 74 | - {% endif %} | ||
| 75 | - </form> | 39 | + <form action="{% url 'user_profile_update' request.user %}" method='post'> |
| 40 | + {% csrf_token %} | ||
| 41 | + | ||
| 42 | + <div class="col-lg-5 col-lg-offset-1"> | ||
| 43 | + <h4 class="no-margin">{% trans "Personal Information" %}</h4> | ||
| 44 | + <ul class="none indent"> | ||
| 45 | + <li> | ||
| 46 | + {% render_form_field form.institution user_profile.institution %} | ||
| 47 | + </li> | ||
| 48 | + <li> | ||
| 49 | + {% render_form_field form.role user_profile.role %} | ||
| 50 | + </li> | ||
| 51 | + </ul> | ||
| 52 | + </div> | ||
| 53 | + | ||
| 54 | + <div class="col-lg-5"> | ||
| 55 | + <h4 class="no-margin">{% trans "Other informations" %}</h4> | ||
| 56 | + <ul class="none indent"> | ||
| 57 | + <li> | ||
| 58 | + {% render_form_field form.twitter user_profile.twitter %} | ||
| 59 | + </li> | ||
| 60 | + <li> | ||
| 61 | + {% render_form_field form.facebook user_profile.facebook %} | ||
| 62 | + </li> | ||
| 63 | + <li> | ||
| 64 | + {% render_form_field form.google_talk user_profile.google_talk %} | ||
| 65 | + </li> | ||
| 66 | + <li> | ||
| 67 | + {% render_form_field form.webpage user_profile.webpage %} | ||
| 68 | + </li> | ||
| 69 | + </ul> | ||
| 76 | </div> | 70 | </div> |
| 77 | 71 | ||
| 72 | + {% if editable %} | ||
| 73 | + <span> | ||
| 74 | + <input type="submit" value="{% trans 'Save' %}"/> | ||
| 75 | + </span> | ||
| 76 | + {% endif %} | ||
| 77 | + </form> | ||
| 78 | + | ||
| 78 | {% if type_count %} | 79 | {% if type_count %} |
| 79 | <div> | 80 | <div> |
| 80 | - <h3>{% trans "Collaborations by Area" %}</h3> | ||
| 81 | - <div></div> | 81 | + <h4 class="no-margin">{% trans "Collaborations by Area" %}</h4> |
| 82 | </div> | 82 | </div> |
| 83 | {% endif %} | 83 | {% endif %} |
| 84 | </div> | 84 | </div> |
| 85 | + </div> | ||
| 85 | 86 | ||
| 86 | - <hr /> | ||
| 87 | 87 | ||
| 88 | - <div> | 88 | + <div class="row"> |
| 89 | + <div class="col-lg-6"> | ||
| 89 | <h3>{% trans "Latest posted" %} </h3> | 90 | <h3>{% trans "Latest posted" %} </h3> |
| 90 | <ul> | 91 | <ul> |
| 91 | {% for doc in emails %} | 92 | {% for doc in emails %} |
| @@ -96,9 +97,9 @@ | @@ -96,9 +97,9 @@ | ||
| 96 | </ul> | 97 | </ul> |
| 97 | </div> | 98 | </div> |
| 98 | 99 | ||
| 99 | - <div> | 100 | + <div class="col-lg-6"> |
| 100 | <h3>{% trans "Community inside participations" %}</h3> | 101 | <h3>{% trans "Community inside participations" %}</h3> |
| 101 | - <ul> | 102 | + <ul class="none indent"> |
| 102 | {% for doc in docs %} | 103 | {% for doc in docs %} |
| 103 | {% include "message-preview.html" %} | 104 | {% include "message-preview.html" %} |
| 104 | {% empty %} | 105 | {% empty %} |
| @@ -106,6 +107,5 @@ | @@ -106,6 +107,5 @@ | ||
| 106 | {% endfor %} | 107 | {% endfor %} |
| 107 | </ul> | 108 | </ul> |
| 108 | </div> | 109 | </div> |
| 109 | - | ||
| 110 | </div> | 110 | </div> |
| 111 | {% endblock %} | 111 | {% endblock %} |
src/colab/static/css/screen.css
| @@ -142,6 +142,10 @@ fieldset>legend { | @@ -142,6 +142,10 @@ fieldset>legend { | ||
| 142 | margin: 10px 0; | 142 | margin: 10px 0; |
| 143 | } | 143 | } |
| 144 | 144 | ||
| 145 | +ul.indent{ | ||
| 146 | + padding-left: 1.5em; | ||
| 147 | +} | ||
| 148 | + | ||
| 145 | #avatar { | 149 | #avatar { |
| 146 | background-color: #FFF; | 150 | background-color: #FFF; |
| 147 | padding: 9px 12px; | 151 | padding: 9px 12px; |
| @@ -149,6 +153,12 @@ fieldset>legend { | @@ -149,6 +153,12 @@ fieldset>legend { | ||
| 149 | height: 50px; | 153 | height: 50px; |
| 150 | } | 154 | } |
| 151 | 155 | ||
| 156 | +#profile-img{ | ||
| 157 | + border: 1px solid #DDDDDD; | ||
| 158 | + width: 100px; | ||
| 159 | + height: 100px; | ||
| 160 | +} | ||
| 161 | + | ||
| 152 | .blog-post-item .post-meta { | 162 | .blog-post-item .post-meta { |
| 153 | margin-bottom: 2em; | 163 | margin-bottom: 2em; |
| 154 | } | 164 | } |
| @@ -257,3 +267,4 @@ form.sendXMPPMessage textarea { | @@ -257,3 +267,4 @@ form.sendXMPPMessage textarea { | ||
| 257 | .chat-content, .chatroom .participants{ | 267 | .chat-content, .chatroom .participants{ |
| 258 | border: none; | 268 | border: none; |
| 259 | } | 269 | } |
| 270 | +/* End of Converse JS*/ |