Skip to content

Commit

Permalink
Merge branch 'IEEE-NITK:main' into migrating-pages
Browse files Browse the repository at this point in the history
  • Loading branch information
imApoorva36 authored Dec 20, 2023
2 parents e91275c + 5b6228a commit 85d6e92
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 23 deletions.
20 changes: 17 additions & 3 deletions corpus/templates/embedathon/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ <h2 class="card-title">Light Weight Cryptography for IoT</h2>
<span>By P.V. Ananda Mohan</span>
<span>Technology Advisor at Center for Development of Advanced Computing (CDAC)</span>
<div class="card-actions">
<strong>3rd Jan, 2024 at 5:00PM</strong>
<strong>3rd Jan, 2024 at 666666</strong>
</div>
</div>
</div>
Expand Down Expand Up @@ -202,8 +202,9 @@ <h2>FAQs</h2>
accommodation arranged for students coming to NITK?
</div>
<div class="collapse-content">
<p>Yes, the final hackathon is in offline mode. Accommodation in NITK will be arranged for
all students of the qualifying teams.</p>
<p>Yes, the final hackathon is in offline mode. The travel expenses will be the
responsibility of the qualifying teams, while arrangements for food and accommodation
will be provided on campus.</p>
</div>
</div>
<div tabindex="0" class="collapse collapse-arrow border border-base-300 bg-base-200 my-1">
Expand Down Expand Up @@ -240,6 +241,19 @@ <h2>Contact</h2>
<p>For any queries, you can contact <strong>Jalak Kamdar</strong>, IEEE NITK CAS Secretary. You can
reach out with your enquiries at <a href="mailto:[email protected]">[email protected]</a>.</p>
</section>

<section id="cass-ad" class="px-5 py-5 border mb-5">
<p>
Those who are taking IEEE/Renewing membership can add CAS membership for 2024 for FREE. Please
encourage more students to get the benefit. <strong>Please note its only applicable to those who
have never been CAS Member before.</strong><br />
Check out <a href="https://cas.ieeebangalore.org/guide-to-join-ieee-cas/">this link</a> to learn how to become a CASS member!
</p>
<figure>
<img src="{% static 'img/embedathon/CASS_Ad.jpg' %}" alt="CASS Poster" />
</figure>

</section>
</div>
<div class="md:basis-1/6"></div>
</div>
Expand Down
22 changes: 12 additions & 10 deletions corpus/templates/embedathon/team_page.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,18 @@ <h3>Members</h3>
</thead>
<tbody>
{% for member in members %}
<td>{{ forloop.counter }}</td>
<td>{{ member.user }}</td>
<td>{{ member.from_nitk|yesno:"Yes,No" }}</td>
<td>{{ member.college_name }}</td>
<td>{{ member.get_course_display }}</td>
<td>{{ member.get_year_display }}</td>
<td>{{ member.branch }}</td>
<td>{{ member.ieee_member|yesno:"Yes,No" }}</td>
<td>{{ member.ieee_membership_no }}</td>
<td>{{ member.cass_member|yesno:"Yes,No" }}</td>
<tr>
<td>{{ forloop.counter }}</td>
<td>{{ member.user }}</td>
<td>{{ member.from_nitk|yesno:"Yes,No" }}</td>
<td>{{ member.college_name }}</td>
<td>{{ member.get_course_display }}</td>
<td>{{ member.get_year_display }}</td>
<td>{{ member.branch }}</td>
<td>{{ member.ieee_member|yesno:"Yes,No" }}</td>
<td>{{ member.ieee_membership_no }}</td>
<td>{{ member.cass_member|yesno:"Yes,No" }}</td>
</tr>
{% endfor %}
</tbody>
</table>
Expand Down
22 changes: 12 additions & 10 deletions corpus/templates/embedathon/user_management.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,18 @@ <h1 class="text-center">User Management</h1>
</thead>
<tbody>
{% for user in users %}
<td>{{ forloop.counter }}</td>
<td>{{ user.user }}</td>
<td>{{ user.from_nitk|yesno:"Yes,No" }}</td>
<td>{{ user.college_name }}</td>
<td>{{ user.get_course_display }}</td>
<td>{{ user.get_year_display }}</td>
<td>{{ user.branch }}</td>
<td>{{ user.ieee_member|yesno:"Yes,No" }}</td>
<td>{{ user.ieee_membership_no }}</td>
<td>{{ user.cass_member|yesno:"Yes,No" }}</td>
<tr>
<td>{{ forloop.counter }}</td>
<td>{{ user.user }}</td>
<td>{{ user.from_nitk|yesno:"Yes,No" }}</td>
<td>{{ user.college_name }}</td>
<td>{{ user.get_course_display }}</td>
<td>{{ user.get_year_display }}</td>
<td>{{ user.branch }}</td>
<td>{{ user.ieee_member|yesno:"Yes,No" }}</td>
<td>{{ user.ieee_membership_no }}</td>
<td>{{ user.cass_member|yesno:"Yes,No" }}</td>
</tr>
{% endfor %}
</tbody>
</table>
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 85d6e92

Please sign in to comment.