Skip to content

Commit a20bfe3

Browse files
Mobmaker55Mobmaker55
committed
Added rows to the form so I'm testing it
1 parent 76f193c commit a20bfe3

File tree

1 file changed

+114
-83
lines changed

1 file changed

+114
-83
lines changed

‎conditional/templates/major_project_submission.html

Lines changed: 114 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -1,103 +1,134 @@
11
{% extends "nav.html" %}
22
{% block title %}
3-
Major Project Form
3+
Major Project Form
44
{% endblock %}
55
{% block body %}
66

7-
<div class="container main">
8-
<h3 class="page-title">Major Project Form</h3>
9-
<form data-module="majorProjectForm">
10-
<div class="panel panel-default">
11-
<div class="panel-body">
12-
<div class="form-group label-floating is-empty">
13-
<label class="control-label" for="name">Project Name</label>
14-
<input class="form-control" id="name" name="name" type="text" maxlength="64"
15-
placeholder="A clever name for your project, sometimes people will come up with an acronym.">
7+
<div class="container main">
8+
<h3 class="page-title">Major Project Form</h3>
9+
<form data-module="majorProjectForm">
10+
<div class="panel panel-default">
11+
<div class="panel-body">
12+
<div class="form-group label-floating is-empty">
13+
<label class="control-label" for="name">Project Name</label>
14+
<input class="form-control" id="name" name="name" type="text" maxlength="64"
15+
placeholder="A clever name for your project, sometimes people will come up with an acronym.">
16+
</div>
17+
<div class="form-group label-floating is-empty">
18+
<label class="control-label" for="tldr">Short Description / TL;DR</label>
19+
<input class="form-control" id="tldr" name="tldr" type="text" maxlength="100"
20+
placeholder="A quick, one-sentence pitch for your project and what it does.">
21+
</div>
22+
<div class="row">
23+
<div class="col-lg-6">
24+
<label class="control-label" for="skills-applied">Skills Applied</label>
25+
<textarea id="skills-applied" name="skills-applied" class="form-control" rows="5"
26+
placeholder="A comma-separated list of skills, similar to what you'd put on a resume"></textarea>
27+
</div>
28+
<div class="col-lg-6">
29+
30+
</div>
31+
</div>
1632
</div>
1733
</div>
18-
</div>
19-
<div class="panel panel-default">
20-
<div class="panel-body">
21-
<div class="form-group label-floating is-empty">
22-
<label class="control-label" for="tldr">Short Description / TL;DR</label>
23-
<input class="form-control" id="tldr" name="tldr" type="text" maxlength="64"
24-
placeholder="A quick, one-sentence pitch for your project and what it does.">
34+
<div class="panel panel-default">
35+
<div class="panel-body">
36+
<div class="form-group label-floating is-empty">
37+
<label class="control-label" for="tldr">Short Description / TL;DR</label>
38+
<input class="form-control" id="tldr" name="tldr" type="text" maxlength="64"
39+
placeholder="A quick, one-sentence pitch for your project and what it does.">
40+
</div>
2541
</div>
2642
</div>
27-
</div>
28-
<div class="panel panel-default">
29-
<div class="panel-body" style="padding-top:20px;">
30-
<div class="form-group label-floating is-empty">
31-
<label class="control-label" for="description">Description</label>
32-
<textarea name="description" class="form-control" rows="3" id="description"
33-
placeholder="A 'two liner' description of what your project is. If you have source materials like a GitHub repo publicly available, it's also useful to include links to them."></textarea>
43+
<div class="panel panel-default">
44+
<div class="panel-body" style="padding-top:20px;">
45+
<div class="form-group label-floating is-empty">
46+
<label class="control-label" for="description">Description</label>
47+
<textarea name="description" class="form-control" rows="3" id="description"
48+
placeholder="A 'two liner' description of what your project is. If you have source materials like a GitHub repo publicly available, it's also useful to include links to them."></textarea>
49+
</div>
3450
</div>
3551
</div>
52+
<input class="btn btn-raised btn-primary" style="width:100%;margin-bottom:20px;" type="submit"
53+
value="Submit Major Project">
54+
</form>
55+
<h3 class="page-title">All Major Projects</h3> {% if major_projects_len
56+
<=0 %}
57+
<div class="panel panel-default">
58+
<div class="panel-body">
59+
<p class="text-center">No Pending Major Projects</p>
60+
</div>
3661
</div>
37-
<input class="btn btn-raised btn-primary" style="width:100%;margin-bottom:20px;" type="submit" value="Submit Major Project">
38-
</form>
39-
<h3 class="page-title">All Major Projects</h3> {% if major_projects_len
40-
<=0 %} <div class="panel panel-default">
41-
<div class="panel-body">
42-
<p class="text-center">No Pending Major Projects</p>
43-
</div>
44-
</div>
45-
{% else %}
62+
{% else %}
4663

47-
{% for p in major_projects %}
48-
<div class="panel panel-default">
49-
<div class="panel-body">
50-
<div class="col-xs-8 col-sm-10">
51-
<h4>{{p['proj_name']}}</h4>
52-
<img class="table-img" src="https://profiles.csh.rit.edu/image/{{p['username']}}">
53-
{{p['name']}} ({{p['username']}})
54-
</div>
55-
<div class="col-xs-4 col-sm-2">
64+
{% for p in major_projects %}
65+
<div class="panel panel-default">
66+
<div class="panel-body">
67+
<div class="col-xs-8 col-sm-10">
68+
<h4>{{ p['proj_name'] }}</h4>
69+
<img class="table-img" src="https://profiles.csh.rit.edu/image/{{ p['username'] }}">
70+
{{ p['name'] }} ({{ p['username'] }})
71+
</div>
72+
<div class="col-xs-4 col-sm-2">
5673

57-
{% if is_eval_director %}
74+
{% if is_eval_director %}
5875

59-
<div class="btn-group" data-module="majorProjectStatus" data-id="{{p['id']}}">
60-
<a href="#" class="btn {% if p['status'] == 'Passed' %}btn-success{% elif p['status'] == 'Failed' %}btn-danger{% else %}btn-warning{% endif %} dropdown-toggle btn-mp" data-toggle="dropdown" aria-expanded="false">
61-
{{p['status']}}
62-
<span class="caret"></span>
63-
</a>
64-
<ul class="dropdown-menu">
65-
<li>
66-
<a href="#" data-option="Passed"><span class="glyphicon glyphicon-ok-sign green"></span> Passed</a>
67-
</li>
68-
<li>
69-
<a href="#" data-option="Pending"><span class="glyphicon glyphicon-hourglass yellow"></span> Pending</a>
70-
</li>
71-
<li>
72-
<a href="#" data-option="Failed"><span class="glyphicon glyphicon-remove-sign red"></span> Failed</a>
73-
</li>
74-
<li>
75-
<a href="#" data-option="Delete"><span class="glyphicon glyphicon-trash red"></span> Delete</a>
76-
</li>
77-
</ul>
76+
<div class="btn-group" data-module="majorProjectStatus" data-id="{{ p['id'] }}">
77+
<a href="#"
78+
class="btn {% if p['status'] == 'Passed' %}btn-success{% elif p['status'] == 'Failed' %}btn-danger{% else %}btn-warning{% endif %} dropdown-toggle btn-mp"
79+
data-toggle="dropdown" aria-expanded="false">
80+
{{ p['status'] }}
81+
<span class="caret"></span>
82+
</a>
83+
<ul class="dropdown-menu">
84+
<li>
85+
<a href="#" data-option="Passed"><span
86+
class="glyphicon glyphicon-ok-sign green"></span> Passed</a>
87+
</li>
88+
<li>
89+
<a href="#" data-option="Pending"><span
90+
class="glyphicon glyphicon-hourglass yellow"></span> Pending</a>
91+
</li>
92+
<li>
93+
<a href="#" data-option="Failed"><span
94+
class="glyphicon glyphicon-remove-sign red"></span> Failed</a>
95+
</li>
96+
<li>
97+
<a href="#" data-option="Delete"><span
98+
class="glyphicon glyphicon-trash red"></span> Delete</a>
99+
</li>
100+
</ul>
101+
</div>
102+
{% else %}
103+
{% if p['status'] == 'Passed' %}
104+
<h5 style="padding:15px 20px;float:right"><span
105+
class="glyphicon glyphicon-ok green"></span></h5>
106+
{% elif p['status'] == 'Failed' %}
107+
<h5 style="padding:15px 20px;float:right"><span
108+
class="glyphicon glyphicon-remove red"></span></h5>
109+
{% else %}
110+
<h5 style="padding:15px 20px;float:right"><span
111+
class="glyphicon glyphicon-hourglass yellow"></span></h5>
112+
{% endif %}
113+
{% if p.is_owner and p['status'] == 'Pending' %}
114+
<button class="btn btn-danger btn-mp" data-module="majorProjectStatus"
115+
data-id="{{ p['id'] }}"><span class="glyphicon glyphicon-trash"></span> Delete
116+
</button>
117+
{% endif %}
118+
{% endif %}
119+
</div>
120+
<button class="btn-expand-panel" role="button" data-toggle="collapse"
121+
href="#evalsCollapse-{{ p['id'] }}" aria-expanded="false"
122+
aria-controls="evalsCollapse-{{ p['id'] }}"><span
123+
class="glyphicon glyphicon glyphicon-menu-down"></span></button>
124+
<div class="collapse major-project-desc" id="evalsCollapse-{{ p['id'] }}">
125+
{{ p['description'] }}
126+
</div>
78127
</div>
79-
{% else %}
80-
{% if p['status'] == 'Passed' %}
81-
<h5 style="padding:15px 20px;float:right"><span class="glyphicon glyphicon-ok green"></span></h5>
82-
{% elif p['status'] == 'Failed' %}
83-
<h5 style="padding:15px 20px;float:right"><span class="glyphicon glyphicon-remove red"></span></h5>
84-
{% else %}
85-
<h5 style="padding:15px 20px;float:right"><span class="glyphicon glyphicon-hourglass yellow"></span></h5>
86-
{% endif %}
87-
{% if p.is_owner and p['status'] == 'Pending' %}
88-
<button class="btn btn-danger btn-mp" data-module="majorProjectStatus" data-id="{{p['id']}}"><span class="glyphicon glyphicon-trash"></span> Delete</button>
89-
{% endif %}
90-
{% endif %}
91128
</div>
92-
<button class="btn-expand-panel" role="button" data-toggle="collapse" href="#evalsCollapse-{{p['id']}}" aria-expanded="false" aria-controls="evalsCollapse-{{p['id']}}"><span class="glyphicon glyphicon glyphicon-menu-down"></span></button>
93-
<div class="collapse major-project-desc" id="evalsCollapse-{{p['id']}}">
94-
{{p['description']}}
95-
</div>
96-
</div>
97-
</div>
98-
{% endfor %}
129+
{% endfor %}
99130

100-
{% endif %}
131+
{% endif %}
101132

102-
</div>
133+
</div>
103134
{% endblock %}

0 commit comments

Comments
 (0)