From 973342f9744419be5a6f7a30b16a528a3755d3e5 Mon Sep 17 00:00:00 2001 From: Harshvardhan Singh <73544247+Lawful2002@users.noreply.github.com> Date: Tue, 28 Mar 2023 12:18:04 +0530 Subject: [PATCH] (ac-4) - made ac-4 leave module responsive (#1154) Co-authored-by: A Anunaya <76819712+Anunaya07@users.noreply.github.com> Co-authored-by: Aksh Bansal <63552235+Aksh-Bansal-dev@users.noreply.github.com> Co-authored-by: akshatnema <20bcs022@iiitdmj.ac.in> Fix responsiveness (#1125) --- FusionIIIT/templates/globals/usercard.html | 127 ++++++++++++-------- FusionIIIT/templates/leaveModule/leave.html | 9 +- 2 files changed, 86 insertions(+), 50 deletions(-) mode change 100755 => 100644 FusionIIIT/templates/globals/usercard.html diff --git a/FusionIIIT/templates/globals/usercard.html b/FusionIIIT/templates/globals/usercard.html old mode 100755 new mode 100644 index ecb758bd3..c04753bbb --- a/FusionIIIT/templates/globals/usercard.html +++ b/FusionIIIT/templates/globals/usercard.html @@ -1,14 +1,40 @@ {% load static %} {% block usercard %} - {% comment %} TODO: Something! {% endcomment %} + {% comment %}The Employee Image Card starts here!{% endcomment %} -
+ + +
@@ -18,61 +44,66 @@ TODO: Add a If-Else here! {% endcomment %} {% if user %} -
- {{ user.first_name}} - {{ user.last_name}} - - {{ user.extrainfo.department.name}} - - - +
+
+ {{ user.first_name }} + {{ user.last_name }} +
+ +
+ {{ user.extrainfo.department.name }} +
+
+ +
{% if user.extrainfo.user_type == 'student' %} - {{user.extrainfo.student.programme}} - {{ user.extrainfo.student.batch}} -
- Sem - {{user.extrainfo.student.curr_semester_no}} + {{ user.extrainfo.student.programme }} + {{ user.extrainfo.student.batch }} +
+ Sem - {{ user.extrainfo.student.curr_semester_no }} {% endif %} - - -
+
{% else %} -
- {{ request.user.first_name}} - {{ request.user.last_name}} - - {{ request.user.extrainfo.department.name}} - - {% if request.user.extrainfo.user_type == 'student' %} - {{request.user.extrainfo.student.programme}} - {{ request.user.extrainfo.student.batch}} -
- Sem - {{request.user.extrainfo.student.curr_semester_no}} +
+
+ {{ request.user.first_name }} + {{ request.user.last_name }} +
+ +
+ {{ request.user.extrainfo.department.name }} +
+
+ +
+ {% if user.extrainfo.user_type == 'student' %} + {{ request.user.extrainfo.student.programme }} + {{ request.user.extrainfo.student.batch }}
- {% endif %} - + Sem - {{ request.user.extrainfo.student.curr_semester_no }} + {% endif %} +
+ - {{user.extrainfo.student.programme}} - {{ user.extrainfo.student.batch}} - {{user.extrainfo.student.curr_semester_no}} + {{ user.extrainfo.student.programme }} + {{ user.extrainfo.student.batch }} + {{ user.extrainfo.student.curr_semester_no }} -
{% endif %} -
-
+
{% for i in Curr_desig %} - {% comment %}Should this be inside if else?{% endcomment %} - {% if i == "co-ordinator" or i == "co co-ordinator" %} - {{ i }} of {{ club_details }} club - {% else %} - {{ i }} - {% endif %} - -
+ {% comment %} Should this be inside if else? {% endcomment %} + + {% if i == "co-ordinator" or i == "co co-ordinator" %} + {{ i }} of {{ club_details }} club + {% else %} + {{ i }} + {% endif %} + +
{% endfor %}
- {% comment %}The Employee Image Card ends here!{% endcomment %} - - + {% comment %} The Employee Image Card ends here! {% endcomment %} {% endblock %} diff --git a/FusionIIIT/templates/leaveModule/leave.html b/FusionIIIT/templates/leaveModule/leave.html index 86f97c2ed..f9d01befb 100755 --- a/FusionIIIT/templates/leaveModule/leave.html +++ b/FusionIIIT/templates/leaveModule/leave.html @@ -112,6 +112,11 @@

Please Add a remark

+ {% comment %}The grid starts here!{% endcomment %}
@@ -120,7 +125,7 @@

Please Add a remark

{% comment %}The left-rail segment starts here!{% endcomment %} -
+
{% comment %}ROW #1 starts here!{% endcomment %}
@@ -172,7 +177,7 @@

Please Add a remark

{% comment %}The left-rail segment endss here!{% endcomment %} {% comment %}The central-rail segment starts here!{% endcomment %} -
+
{% comment %}The Leave Application Form starts here!{% endcomment %}