Commit da1d5675 authored by Giuseppe Terrasi's avatar Giuseppe Terrasi

Merge 114144 into trunk, thanks to Riccardo Padovani:
- New style for logout, profile and users page;
- Minor changes.
parents 62e81fc1 de027cd5
...@@ -34,7 +34,7 @@ h1, h2, h3, ul, li, form, img, p { ...@@ -34,7 +34,7 @@ h1, h2, h3, ul, li, form, img, p {
} }
label { label {
vertical-align: middle; /*vertical-align: middle;*/
} }
.login label { .login label {
...@@ -64,7 +64,7 @@ p { ...@@ -64,7 +64,7 @@ p {
} }
a { a {
color: #3060A8; color: #DD4814;
text-decoration: none; text-decoration: none;
} }
...@@ -195,12 +195,15 @@ blockquote blockquote { ...@@ -195,12 +195,15 @@ blockquote blockquote {
#wrapper, #announcement { #wrapper, #announcement {
margin: auto; margin: auto;
padding: 0 5px;
min-width: 985px; min-width: 985px;
margin: 0 20px; margin: 0 20px;
background-color: #FFF; background-color: #FFF;
} }
#announcement {
padding: 0 5px;
}
#fixed-header { #fixed-header {
height: 120px; height: 120px;
} }
...@@ -400,15 +403,12 @@ padding-top: 4px; ...@@ -400,15 +403,12 @@ padding-top: 4px;
} }
#mainbar-full { #mainbar-full {
border: 1px solid #DD4814;
background-color: #E7E7E7;
padding: 5px; padding: 5px;
} }
#room { #room {
background-color: #FFFFFF; background-color: #FFFFFF;
border-bottom: 1px solid #777777; border-bottom: 1px solid #777777;
padding: 10px 0;
} }
#CALeft { #CALeft {
...@@ -425,6 +425,8 @@ padding-top: 4px; ...@@ -425,6 +425,8 @@ padding-top: 4px;
#CAFull { #CAFull {
float: left; float: left;
width: 100%; width: 100%;
border: 1px solid #DD4814;
background-color: #E7E7E7;
} }
#ground { #ground {
...@@ -463,11 +465,11 @@ padding-top: 4px; ...@@ -463,11 +465,11 @@ padding-top: 4px;
} }
.user-stats-table .short-summary { .user-stats-table .short-summary {
width: 764px; width: 100%;
} }
.short-summary h2 a { .short-summary h2 a {
color: #2A5594; color: #DD4814;
font-family: "Trebuchet MS", "segoe ui", arial, sans-serif; font-family: "Trebuchet MS", "segoe ui", arial, sans-serif;
font-size: 17px; font-size: 17px;
} }
...@@ -479,7 +481,7 @@ padding-top: 4px; ...@@ -479,7 +481,7 @@ padding-top: 4px;
} }
.userinfo a, a.userinfo { .userinfo a, a.userinfo {
color: #3060A8; color: #DD4814;
} }
.short-summary .counts { .short-summary .counts {
...@@ -1373,7 +1375,7 @@ padding: 6px; ...@@ -1373,7 +1375,7 @@ padding: 6px;
.message { .message {
background-color: #EEEEEE; background-color: #EEEEEE;
border: 1px solid #AAAAAA; border: 1px solid #DD4814;
margin: 10px 0; margin: 10px 0;
padding: 5px; padding: 5px;
} }
...@@ -1390,8 +1392,8 @@ padding: 6px; ...@@ -1390,8 +1392,8 @@ padding: 6px;
} }
.submit { .submit {
background-color: #D4D0C8; background-color: white;
border: 1px solid #777777; border: 2px solid #DD4814;
cursor: pointer; cursor: pointer;
font-size: 120%; font-size: 120%;
font-weight: bold; font-weight: bold;
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
height: 1em; height: 1em;
font-size: 120%; font-size: 120%;
font-weight: bold; font-weight: bold;
color: #3060A8; color: #DD4814;
} }
#user-menu-dropdown { #user-menu-dropdown {
...@@ -62,7 +62,7 @@ div.dialog.award-rep-points table input, div.dialog.award-rep-points table texta ...@@ -62,7 +62,7 @@ div.dialog.award-rep-points table input, div.dialog.award-rep-points table texta
} }
#user-menu-dropdown li.item:hover { #user-menu-dropdown li.item:hover {
background-color: #3060A8; background-color: #DD4814;
color: white; color: white;
} }
......
...@@ -12,12 +12,14 @@ ...@@ -12,12 +12,14 @@
</script> </script>
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<div class="headNormal"> <div id="mainbar-full">
<div id="subheader" class="headUser">
{% trans "Logout" %} {% trans "Logout" %}
</div> </div>
<div id="main-body" style="width:100%"> <div id="main-body" style="width:100%">
<p>{% trans "As a registered user you can login with your OpenID, log out of the site or permanently remove your account." %}</p> <p>{% trans "As a registered user you can login with your OpenID, log out of the site or permanently remove your account." %}</p>
<input id="btLogout" type="button" class="submit" value="{% trans "Logout now" %}"><!-- style="width:150px">--> <input id="btLogout" type="button" class="submit" value="{% trans "Logout now" %}"><!-- style="width:150px">-->
</div> </div>
</div>
{% endblock %} {% endblock %}
<!-- end logout.html --> <!-- end logout.html -->
...@@ -29,25 +29,26 @@ ...@@ -29,25 +29,26 @@
{% endblock %} {% endblock %}
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<div id="main-bar" class="headNormal"> <div id="mainbar-full">
<div id="subheader" class="headUser">
{{ user.username }} - {% trans "edit profile" %} {{ user.username }} - {% trans "edit profile" %}
</div> </div>
<div id="main-body" style="width:100%;padding-top:10px"> <div id="main-body" style="width:100%">
<form name="" action="{% url edit_user user.id user.username|slugify %}" method="post"> <form name="" action="{% url edit_user user.id user.username|slugify %}" method="post">
{% csrf_token %} {% csrf_token %}
<div id="left" style="float:left;width:auto"> <div id="left" style="float:left;width:15%;text-align:center;">
{% if user.email %} {% if user.email %}
{% gravatar user 128 %} {% gravatar user 128 %}
{% else %} {% else %}
<img src="{% media "/media/images/nophoto.png" %}"> <img src="{% media "/media/images/nophoto.png" %}">
{% endif %} {% endif %}
<div style="padding:20px 0 0 20px;font-weight:bold;font-size:150%"> <div style="padding:10px 0 0 0;font-weight:bold;font-size:150%">
<a href="http://www.gravatar.com/" target="_blank" <a href="http://www.gravatar.com/" target="_blank"
title="gravatar {% trans "image associated with your email address" %}">{% trans "gravatar" %}</a> title="gravatar {% trans "image associated with your email address" %}">{% trans "gravatar" %}</a>
</div> </div>
</div> </div>
<div id="askform" style="float:left;width:auto;text-align:left;"> <div id="askform" style="float:left;width:80%;text-align:left;">
<h2>{% trans "Registered user" %}</h2> <h2>{% trans "Registered user" %}</h2>
<table class="user-details"> <table class="user-details">
<tr> <tr>
...@@ -103,6 +104,7 @@ ...@@ -103,6 +104,7 @@
</div> </div>
</form> </form>
</div>
</div> </div>
{% endblock %} {% endblock %}
<!-- end user_edit.html --> <!-- end user_edit.html -->
...@@ -10,9 +10,9 @@ ...@@ -10,9 +10,9 @@
<div id="subheader" class="headUser{% if view_user.is_suspended %} suspended-user{% endif %}"> <div id="subheader" class="headUser{% if view_user.is_suspended %} suspended-user{% endif %}">
{{view_user.decorated_name}} {{view_user.decorated_name}}
</div> </div>
<table class="user-info-table"> <table class="user-info-table" width="100%">
<tr> <tr>
<td width="180" style="vertical-align:middle;text-align:center;"> <td width="14%" style="vertical-align:middle;text-align:center;">
<table width="100%"> <table width="100%">
<tr> <tr>
<td> <td>
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
</tr> </tr>
</table> </table>
</td> </td>
<td width="360" style="vertical-align: top;"> <td width="40%" style="vertical-align: top;">
{% if can_view_private %}{% user_menu request.user view_user %}{% endif %} {% if can_view_private %}{% user_menu request.user view_user %}{% endif %}
<table class="user-details"> <table class="user-details">
<tr> <tr>
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
--> -->
</table> </table>
</td> </td>
<td width="380"> <td width="40%">
{% if not view_user.is_suspended %} {% if not view_user.is_suspended %}
<div class="user-about"> <div class="user-about">
{% if view_user.about %} {% if view_user.about %}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment