Download as
Browse Code »

Commit 9daae87c2569b9b59200b3e5dbda53bd007b37d9

Authored by Zambom
1 parent a4a5a12d
Exists in master and in 3 other branches amadeus_univasf, image-crop, refactoring

Layout adjusts

Showing 4 changed files with 45 additions and 25 deletions   Show diff stats
amadeus/templates/base.html
  Diff comments   View file @9daae87
... ... @@ -105,16 +105,22 @@
105 105 </ul>
106 106 </li> -->
107 107 <li title data-original-title="{% trans 'settings' %}">
108   - <a href="" data-toggle="dropdown"><i class="fa fa-cog" aria-hidden="true"></i></a>
  108 + <a href="" data-toggle="dropdown"><i class="fa fa-cog" aria-hidden="true"></i></a>
109 109 <ul class="dropdown-menu pull-right">
110 110 <li><a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
111 111 <li><a href="#">{% trans 'Manage Courses' %}</a></li>
112 112 </ul>
113 113 </li>
114   - <li>
115   - <a href="{% url 'users:profile' %}" style="padding-top: 15px;padding-bottom:15px;">
  114 + <li title data-original-title="{% trans 'account' %}">
  115 + <a href="" data-toggle="dropdown" style="padding-top: 15px;padding-bottom:15px;">
116 116 <img src="{{ user.image_url }}" style="width:30px;height:30px" />
117 117 </a>
  118 + <ul class="dropdown-menu pull-right">
  119 + <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
  120 + <li><a href="{% url 'users:edit_profile' %}">{% trans 'Edit Profile' %}</a></li>
  121 + <li><a href="#">{% trans 'Change Password' %}</a></li>
  122 + <li><a href="#">{% trans 'Delete Account' %}</a></li>
  123 + </ul>
118 124 </li>
119 125 <li data-toggle="tooltip" data-placement="bottom" title data-original-title="log out">
120 126 <a href="{% url 'users:logout' %}"><i class="fa fa-sign-out" aria-hidden="true"></i></a>
... ...
users/forms.py
  Diff comments   View file @9daae87
... ... @@ -66,17 +66,11 @@ class RegisterUserForm(Validation):
66 66 fields = ['email', 'username', 'last_name', 'social_name', 'image', 'show_email', ]
67 67  
68 68 class ProfileForm(Validation):
69   - password = forms.CharField(label=_('Password'), widget = forms.PasswordInput, required = False)
70   - password2 = forms.CharField(label = _('Confirm Password'), widget = forms.PasswordInput, required = False)
71   -
72 69 is_edit = True
73 70  
74 71 def save(self, commit=True):
75 72 super(ProfileForm, self).save(commit=False)
76 73  
77   - if len(self.cleaned_data['password']) > 0:
78   - self.instance.set_password(self.cleaned_data['password'])
79   -
80 74 self.instance.save()
81 75  
82 76 return self.instance
... ...
users/models.py
  Diff comments   View file @9daae87
... ... @@ -43,7 +43,7 @@ class User(AbstractBaseUser, PermissionsMixin):
43 43 verbose_name_plural = _('Users')
44 44  
45 45 def __str__(self):
46   - return self.social_name or self.username
  46 + return self.social_name or (self.username + " " + self.last_name)
47 47  
48 48 def get_short_name(self):
49 49 return str(self)
... ... @@ -54,3 +54,18 @@ class User(AbstractBaseUser, PermissionsMixin):
54 54 return self.image.url
55 55 else:
56 56 return static('img/no_image.jpg')
  57 +
  58 + def is_admin(self):
  59 + if self.is_staff:
  60 + return _('Yes')
  61 +
  62 + return _('Is not an admin')
  63 +
  64 + def is_coordinator(self):
  65 + return _('Is not a coordinator')
  66 +
  67 + def is_professor(self):
  68 + return _('Is not a professor')
  69 +
  70 + def is_student(self):
  71 + return _('Is not a student')
... ...
users/templates/users/profile.html
  Diff comments   View file @9daae87
... ... @@ -32,27 +32,32 @@
32 32 <span class="thumbnail">
33 33 <img src="{{ user.image_url }}" />
34 34 </span>
  35 + <h4><b>{{ user }}</b></h4>
  36 + <p>{{ user.email }}</p>
35 37 </div>
36 38 <div class="col-md-9">
37   - <span><b>{% trans 'Name' %}: </b> {{ user.username }}</span><br />
38   - <span><b>{% trans 'Last Name' %}: </b> {{ user.last_name }}</span><br />
39   - <span><b>{% trans 'Social Name' %}: </b> {% if user.social_name is None %}{% trans 'Not informed' %}{% else %}{{ user.social_name }}{% endif %}</span><br />
40   - <span><b>{% trans 'User since' %}: </b> {{ user.date_created|date }}</span><br />
  39 + <div class="form-group">
  40 + <label class="control-form">{% trans 'System Admin' %}:</label>
  41 + <input type="text" readonly="readonly" class="form-control" value="{{ user.is_admin }}" />
  42 + </div>
  43 + <div class="form-group">
  44 + <label class="control-form">{% trans 'Coordinator in' %}:</label>
  45 + <input type="text" readonly="readonly" class="form-control" value="{{ user.is_coordinator }}" />
  46 + </div>
  47 + <div class="form-group">
  48 + <label class="control-form">{% trans 'Professor in' %}:</label>
  49 + <input type="text" readonly="readonly" class="form-control" value="{{ user.is_professor }}" />
  50 + </div>
  51 + <div class="form-group">
  52 + <label class="control-form">{% trans 'Student in' %}:</label>
  53 + <input type="text" readonly="readonly" class="form-control" value="{{ user.is_student }}" />
  54 + </div>
41 55 </div>
42 56 </div>
43 57 <div class="row-fluid">
  58 + <label class="control-form">{% trans 'Description' %}:</label>
44 59 <div class="col-md-12">
45   - {{ user.description|linebreaks }}
46   - </div>
47   - </div>
48   - <div class="row-fluid">
49   - <div class="col-md-12">
50   - <a href="{% url 'users:edit_profile' %}" class="pull-left btn btn-raised btn-primary btn-sm">
51   - <i class="fa fa-edit"></i> {% trans 'Edit Profile' %}
52   - </a>
53   - <a class="pull-right btn btn-raised btn-danger btn-sm">
54   - <i class="fa fa-trash"></i> {% trans 'Delete Account' %}
55   - </a>
  60 + {{ user.description|default:_("Not Informed")|linebreaks }}
56 61 </div>
57 62 </div>
58 63 </div>
... ...