Skip to content
This repository has been archived by the owner on Sep 19, 2024. It is now read-only.

Added the feature of, only superuser can delete the members in the the team and also changed the sizes of images in the team list. #332

Open
wants to merge 7 commits into
base: development
Choose a base branch
from
Open

Added the feature of, only superuser can delete the members in the the team and also changed the sizes of images in the team list. #332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e60ee27
"Added the feature of, only superuser can delete the members in the t…
DheerajMalisetty Jul 17, 2018
87dc339
"Changed the images link in the clubmanagement back to '/static/media' "
DheerajMalisetty Jul 18, 2018
2bba487
"Each team page gets its name on the top inplace of word 'Team'"
DheerajMalisetty Jul 18, 2018
7864ee7
"Changed the images links to original"
DheerajMalisetty Jul 18, 2018
da824f8
"Added the links to the members profiles for members names in the team"
DheerajMalisetty Jul 20, 2018
2754195
Merge branch 'development' of https://github.com/amfoss/fosswebsite i…
DheerajMalisetty Jul 20, 2018
e58c727
"Changed the Title of the Members page to Members"
DheerajMalisetty Jul 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed clubManagement/static/clubManagement/image/team/11.jpg
View file
Open in desktop
Binary file not shown.
Binary file removed clubManagement/static/clubManagement/image/team/1154_akxNUqZ.png
View file
Open in desktop
Binary file not shown.
Binary file removed clubManagement/static/clubManagement/image/team/BLOG_7dkXOXf.jpeg
View file
Open in desktop
Binary file not shown.
Binary file removed ...agement/static/clubManagement/image/team/Screenshot_20170717_123949_XqiJ38U.png
View file
Open in desktop
Binary file not shown.
Binary file removed clubManagement/static/clubManagement/image/team/Web_Development.jpg
View file
Open in desktop
Binary file not shown.
Binary file removed clubManagement/static/clubManagement/image/team/alumni_B6EbLVX.png
View file
Open in desktop
Binary file not shown.
Binary file removed ...-ad-essere-sistema-operativo-mobile-preferito-dagli-italiani-v2-242_Mwfjjp2.jpg
View file
Open in desktop
Binary file not shown.
11 changes: 7 additions & 4 deletions clubManagement/templates/clubManagement/team_detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<!-- HERO TEXT -->
<div class="hero-caption">
<div class="hero-text">
<h1 class="hero-title font-alt">Team</h1>
<h1 class="hero-title font-alt">{{ object.name }}</h1>
<p class="hero-subtitle font-serif"></p>
</div>
</div>
Expand All @@ -30,7 +30,7 @@ <h1 class="hero-title font-alt">Team</h1>
<div class="col-md-4">
<h3>Team details</h3>
<div class="card mb-3">
<img class="card-img-top img-fluid" src="/static/clubManagement/image/{{ object.image }}">
<img class="card-img-top img-fluid" src="/static/media{{ object.image }}">
<div class="card-block">
<h4 class="card-title">{{ object.name }}</h4>
<p class="card-text">{{ object.description }}</p>
Expand Down Expand Up @@ -61,15 +61,18 @@ <h5>Team members</h5>
<span class="badge badge-default badge-pill">{{ user_count }}</span>
</li>
{% for resp in responsibility_list %}

<li class="list-group-item justify-content-between">
<a class="link" href="{% url 'profile' resp.user.id %}">
<a class="link" href="{% url 'profile' resp.user.username %}">
{{ resp.user.first_name }} {{ resp.user.last_name }}
</a>
{% if edit_permission %}
<form method="post" action="{% url "team_member_delete" resp.id %}">
{% csrf_token %}
<button type="submit" class="close">×</button>
</form>
</li>
{% endif %}
</li>
{% endfor %}
{% if edit_permission %}
<div onclick="showForm()" class="col-md-6 offset-md-3">
Expand Down
6 changes: 3 additions & 3 deletions clubManagement/templates/clubManagement/team_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ <h1 class="hero-title font-alt">Teams</h1>
<div class="col-md-4">
<br>
<div class="card-group" style="width:60%" >
<img class="card-img-top img-fluid" height="auto" width="auto"
src="/static/clubManagement/image/{{ object.image }}"
<img class="card-img-top img-fluid" style="height: 200px;width: 300px"
src="/static/media/{{ object.image }}"
alt="Card image cap">
<div class="card-block">
<h3 class="card-title">{{ object.name }}</h3>
<p class="card-body text-truncate">{{ object.description | truncatechars:99}}</p>
<p class="card-body text-truncate">{{ object.description | truncatechars:50}}</p>
<a href="{% url 'team_detail' object.id %}"
class="btn btn-dark anim-scroll">More info
</a>
Expand Down
2 changes: 1 addition & 1 deletion registration/templates/registration/profile_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<!-- HERO TEXT -->
<div class="hero-caption">
<div class="hero-text">
<h1 class="hero-title font-alt">Event Details</h1>
<h1 class="hero-title font-alt">Members</h1>
<p class="hero-subtitle font-serif"></p>
</div>
</div>
Expand Down