Layout adjusts

Zambom
1 parent a4a5a12d
Showing 4 changed files with 45 additions and 25 deletions Show diff stats
amadeus/templates/base.html
users/forms.py
users/models.py
users/templates/users/profile.html
@@ -105,16 +105,22 @@
                       </ul>
                     </li> -->
                     <li title data-original-title="{% trans 'settings' %}">
-                        <a href=""  data-toggle="dropdown"><i class="fa fa-cog" aria-hidden="true"></i></a> 
+                        <a href="" data-toggle="dropdown"><i class="fa fa-cog" aria-hidden="true"></i></a> 
                         <ul class="dropdown-menu pull-right">
                             <li><a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
                             <li><a href="#">{% trans 'Manage Courses' %}</a></li>
                         </ul>
                     </li>
-                    <li>
-                        <a href="{% url 'users:profile' %}" style="padding-top: 15px;padding-bottom:15px;">
+                    <li title data-original-title="{% trans 'account' %}">
+                        <a href="" data-toggle="dropdown" style="padding-top: 15px;padding-bottom:15px;">
                             <img src="{{ user.image_url }}" style="width:30px;height:30px" />
                         </a>
+                        <ul class="dropdown-menu pull-right">
+                            <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
+                            <li><a href="{% url 'users:edit_profile' %}">{% trans 'Edit Profile' %}</a></li>
+                            <li><a href="#">{% trans 'Change Password' %}</a></li>
+                            <li><a href="#">{% trans 'Delete Account' %}</a></li>
+                        </ul>
                     </li>
                     <li data-toggle="tooltip" data-placement="bottom" title data-original-title="log out">
                         <a href="{% url 'users:logout' %}"><i class="fa fa-sign-out" aria-hidden="true"></i></a>
@@ -66,17 +66,11 @@ class RegisterUserForm(Validation):
         fields = ['email', 'username', 'last_name', 'social_name', 'image', 'show_email', ]
 class ProfileForm(Validation):
-	password = forms.CharField(label=_('Password'), widget = forms.PasswordInput, required = False)
-	password2 = forms.CharField(label = _('Confirm Password'), widget = forms.PasswordInput, required = False)
-
 	is_edit = True
 	def save(self, commit=True):
 		super(ProfileForm, self).save(commit=False)
-		if len(self.cleaned_data['password']) > 0:
-			self.instance.set_password(self.cleaned_data['password'])
-
 		self.instance.save()
 		return self.instance
@@ -43,7 +43,7 @@ class User(AbstractBaseUser, PermissionsMixin):
 		verbose_name_plural = _('Users')
 	def __str__(self):
-		return self.social_name or self.username
+		return self.social_name or (self.username + " " + self.last_name)
 	def get_short_name(self):
 		return str(self)
@@ -54,3 +54,18 @@ class User(AbstractBaseUser, PermissionsMixin):
 			return self.image.url
 		else:
 			return static('img/no_image.jpg')
+
+	def is_admin(self):
+		if self.is_staff:
+			return _('Yes')
+
+		return _('Is not an admin')
+
+	def is_coordinator(self):
+		return _('Is not a coordinator')
+
+	def is_professor(self):
+		return _('Is not a professor')
+
+	def is_student(self):
+		return _('Is not a student')
@@ -32,27 +32,32 @@
 						<span class="thumbnail">
 							<img src="{{ user.image_url }}" />
 						</span>
+						<h4><b>{{ user }}</b></h4>
+						<p>{{ user.email }}</p>
 					</div>
 					<div class="col-md-9">
-						<span><b>{% trans 'Name' %}: </b> {{ user.username }}</span><br />
-						<span><b>{% trans 'Last Name' %}: </b> {{ user.last_name }}</span><br />
-						<span><b>{% trans 'Social Name' %}: </b> {% if user.social_name is None %}{% trans 'Not informed' %}{% else %}{{ user.social_name }}{% endif %}</span><br />
-						<span><b>{% trans 'User since' %}: </b> {{ user.date_created|date }}</span><br />
+						<div class="form-group">
+							<label class="control-form">{% trans 'System Admin' %}:</label>
+							<input type="text" readonly="readonly" class="form-control" value="{{ user.is_admin }}" />
+						</div>
+						<div class="form-group">
+							<label class="control-form">{% trans 'Coordinator in' %}:</label>
+							<input type="text" readonly="readonly" class="form-control" value="{{ user.is_coordinator }}" />
+						</div>
+						<div class="form-group">
+							<label class="control-form">{% trans 'Professor in' %}:</label>
+							<input type="text" readonly="readonly" class="form-control" value="{{ user.is_professor }}" />
+						</div>
+						<div class="form-group">
+							<label class="control-form">{% trans 'Student in' %}:</label>
+							<input type="text" readonly="readonly" class="form-control" value="{{ user.is_student }}" />
+						</div>
 					</div>
 				</div>
 				<div class="row-fluid">
+					<label class="control-form">{% trans 'Description' %}:</label>
 					<div class="col-md-12">
-						{{ user.description|linebreaks }}
-					</div>
-				</div>
-				<div class="row-fluid">
-					<div class="col-md-12">
-						<a href="{% url 'users:edit_profile' %}" class="pull-left btn btn-raised btn-primary btn-sm">
-							<i class="fa fa-edit"></i> {% trans 'Edit Profile' %}
-						</a>
-						<a class="pull-right btn btn-raised btn-danger btn-sm">
-							<i class="fa fa-trash"></i> {% trans 'Delete Account' %}
-						</a>
+						{{ user.description|default:_("Not Informed")|linebreaks }}
 					</div>
 				</div>
 			</div>
	@@ -43,7 +43,7 @@ class User(AbstractBaseUser, PermissionsMixin):		@@ -43,7 +43,7 @@ class User(AbstractBaseUser, PermissionsMixin):
43	verbose_name_plural = _('Users')	43	verbose_name_plural = _('Users')
44		44
45	def __str__(self):	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	def get_short_name(self):	48	def get_short_name(self):
49	return str(self)	49	return str(self)
	@@ -54,3 +54,18 @@ class User(AbstractBaseUser, PermissionsMixin):		@@ -54,3 +54,18 @@ class User(AbstractBaseUser, PermissionsMixin):
54	return self.image.url	54	return self.image.url
55	else:	55	else:
56	return static('img/no_image.jpg')	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')