Skip to content

Commit

Permalink
layout fixes for profile pages
Browse files Browse the repository at this point in the history
  • Loading branch information
@Sandravaphilips
Sandravaphilips committed Oct 16, 2024
1 parent 15f18a4 commit c578451
Show file tree
Hide file tree
Showing 6 changed files with 95 additions and 90 deletions.
94 changes: 49 additions & 45 deletions peachjam/templates/account/password_change.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,56 +9,60 @@
{% block account-content %}
<form method="post" action="{% url 'account_change_password' %}">
{% csrf_token %}
<div class="card">
<h5 class="card-header">{% trans 'Change Your Password' %}</h5>
<div class="card-body">
<div class="mb-3">
<label for="{{ form.oldpassword.id_for_label }}">{{ form.oldpassword.label }}</label>
<input type="password"
class="form-control"
name="{{ form.oldpassword.name }}"
id="{{ form.oldpassword.id_for_label }}"
value="{{ form.oldpassword.value|default:'' }}"
required
autofocus/>
{% if form.oldpassword.errors %}
<div class="text-danger">
{% for error in form.oldpassword.errors %}<p>{{ error }}</p>{% endfor %}
<div class="row">
<div class="col-lg-6 mx-auto">
<div class="card">
<h5 class="card-header">{% trans 'Change Your Password' %}</h5>
<div class="card-body">
<div class="mb-3">
<label for="{{ form.oldpassword.id_for_label }}">{{ form.oldpassword.label }}</label>
<input type="password"
class="form-control"
name="{{ form.oldpassword.name }}"
id="{{ form.oldpassword.id_for_label }}"
value="{{ form.oldpassword.value|default:'' }}"
required
autofocus/>
{% if form.oldpassword.errors %}
<div class="text-danger">
{% for error in form.oldpassword.errors %}<p>{{ error }}</p>{% endfor %}
</div>
{% endif %}
</div>
{% endif %}
</div>
<div class="mb-3">
<label for="{{ form.password1.id_for_label }}">{{ form.password1.label }}</label>
<input type="password"
class="form-control"
name="{{ form.password1.name }}"
id="{{ form.password1.id_for_label }}"
value="{{ form.password1.value|default:'' }}"
required/>
{% if form.password1.errors %}
<div class="text-danger">
{% for error in form.password1.errors %}<p>{{ error }}</p>{% endfor %}
<div class="mb-3">
<label for="{{ form.password1.id_for_label }}">{{ form.password1.label }}</label>
<input type="password"
class="form-control"
name="{{ form.password1.name }}"
id="{{ form.password1.id_for_label }}"
value="{{ form.password1.value|default:'' }}"
required/>
{% if form.password1.errors %}
<div class="text-danger">
{% for error in form.password1.errors %}<p>{{ error }}</p>{% endfor %}
</div>
{% endif %}
</div>
{% endif %}
</div>
<div class="mb-3">
<label for="{{ form.password2.id_for_label }}">{{ form.password2.label }}</label>
<input type="password"
class="form-control"
name="{{ form.password2.name }}"
id="{{ form.password2.id_for_label }}"
value="{{ form.password2.value|default:'' }}"
required/>
{% if form.password2.errors %}
<div class="text-danger">
{% for error in form.password2.errors %}<p>{{ error }}</p>{% endfor %}
<div class="mb-3">
<label for="{{ form.password2.id_for_label }}">{{ form.password2.label }}</label>
<input type="password"
class="form-control"
name="{{ form.password2.name }}"
id="{{ form.password2.id_for_label }}"
value="{{ form.password2.value|default:'' }}"
required/>
{% if form.password2.errors %}
<div class="text-danger">
{% for error in form.password2.errors %}<p>{{ error }}</p>{% endfor %}
</div>
{% endif %}
</div>
{% endif %}
</div>
<div class="card-footer text-end">
<button type="submit" class="btn btn-success" name="action">{% trans "Change Password" %}</button>
</div>
</div>
</div>
<div class="card-footer text-end">
<button type="submit" class="btn btn-success" name="action">{% trans "Change Password" %}</button>
</div>
</div>
</form>
{% endblock %}
6 changes: 3 additions & 3 deletions peachjam/templates/peachjam/_folders_list.html
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% load i18n %}
<div>
<div class="d-flex justify-content-between align-items-center mb-4">
<h1>{% trans 'Saved documents' %}</h1>
<h2>{% trans 'Saved documents' %}</h2>
<button class="btn btn-primary"
hx-target="#folders-list"
hx-prompt="Give your folder a name:"
Expand All @@ -12,7 +12,7 @@ <h1>{% trans 'Saved documents' %}</h1>
{% if folders or ungrouped_saved_documents %}
{% for folder in folders %}
<div class="card mb-5">
<h3 class="card-header">{{ folder }}</h3>
<h5 class="card-header">{{ folder }}</h5>
<div class="card-body">
<div>
{% if folder.saved_documents.all %}
Expand Down Expand Up @@ -66,7 +66,7 @@ <h3 class="card-header">{{ folder }}</h3>
{% endfor %}
{% if ungrouped_saved_documents %}
<div class="card">
<h3 class="card-header">{% trans 'Ungrouped documents' %}</h3>
<h5 class="card-header">{% trans 'Ungrouped documents' %}</h5>
<div class="card-body">
<table class="doc-table">
{% for saved_doc in ungrouped_saved_documents %}
Expand Down
26 changes: 0 additions & 26 deletions peachjam/templates/user_account/_profile_form.html
View file

This file was deleted.

2 changes: 1 addition & 1 deletion peachjam/templates/user_account/_tabs.html
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% load socialaccount i18n %}
<ul class="nav nav-tabs">
<ul class="nav nav-tabs border-bottom">
{% block list-group-items %}
<li class="nav-item">
<a href="{% url 'edit_account' %}"
Expand Down
40 changes: 36 additions & 4 deletions peachjam/templates/user_account/edit.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,42 @@
{% block account-content %}
<form method="post">
{% csrf_token %}
<div class="card mb-5">
<div class="card-body">{% include 'user_account/_profile_form.html' %}</div>
<div class="card-footer text-end">
<button type="submit" class="btn btn-success">{% trans "Save" %}</button>
<div class="row">
<div class="col-lg-6 mx-auto">
<div class="card mb-5">
<h5 class="card-header">{% trans "Profile" %}</h5>
<div class="card-body">
<div class="mb-3">
<label for="{{ form.first_name.id_for_label }}">{{ form.first_name.label }}</label>
<input type="text"
class="form-control"
name="{{ form.first_name.name }}"
id="{{ form.first_name.id_for_label }}"
value="{{ form.first_name.value|default:'' }}"/>
{% if form.first_name.errors %}
<div class="text-danger">
{% for error in form.first_name.errors %}<p>{{ error }}</p>{% endfor %}
</div>
{% endif %}
</div>
<div class="mb-3">
<label for="{{ form.last_name.id_for_label }}">{{ form.last_name.label }}</label>
<input type="text"
class="form-control"
name="{{ form.last_name.name }}"
id="{{ form.last_name.id_for_label }}"
value="{{ form.last_name.value|default:'' }}"/>
{% if form.last_name.errors %}
<div class="text-danger">
{% for error in form.last_name.errors %}<p>{{ error }}</p>{% endfor %}
</div>
{% endif %}
</div>
</div>
<div class="card-footer text-end">
<button type="submit" class="btn btn-success">{% trans "Save" %}</button>
</div>
</div>
</div>
</div>
</form>
Expand Down
17 changes: 6 additions & 11 deletions peachjam/templates/user_account/layout.html
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,13 @@
{% extends 'peachjam/layouts/main.html' %}
{% load i18n %}
{% block page-content %}
<div class="container">
<div class="row">
<div class="col-sm-10 offset-sm-3">
<h1 class="mb-3 mt-3">{{ user.first_name }} {{ user.last_name }}</h1>
</div>
</div>
<h1 class="mb-3 mt-3">{% trans "My Account" %}</h1>
<div>
<div>
{% block account-tabs %}{% endblock %}
</div>
<div class="mt-3">
{% block account-content %}{% endblock %}
</div>
{% block account-tabs %}{% endblock %}
</div>
<div class="mt-3">
{% block account-content %}{% endblock %}
</div>
</div>
{% endblock %}

0 comments on commit c578451

Please sign in to comment.