Skip to content

Commit 97bf683

Browse files
s-sajid-alis-sajid-ali
authored
Merge pull request #19 from NYU-ITS/branding_cleanup
NYU branding
2 parents 4d7fc77 + 50c50d1 commit 97bf683

18 files changed

+226
-68
lines changed

‎Dockerfile

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1-
FROM python:3.12
1+
FROM python:3.12-slim-bookworm
2+
COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
23

34
RUN apt-get update \
45
&& apt-get install -y --no-install-recommends \
56
&& rm -rf /var/lib/apt/lists/*
67

78
WORKDIR /usr/src/app
8-
COPY requirements.txt ./
9-
RUN pip3 install -r requirements.txt
9+
COPY . .
1010
RUN pip3 install setuptools
1111
RUN pip3 install debugpy
12-
COPY . .
12+
RUN pip3 install python-dateutil
13+
RUN pip3 install .[all]
1314

1415
RUN echo "yes" | python3 ./manage.py initial_setup
1516
RUN python3 ./manage.py load_test_data

‎coldfront/core/portal/templates/portal/authorized_home.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ <h2><a href="{% url 'project-list' %}">Projects &raquo;</a></h2>
2323
{% else %}
2424
<div class="alert alert-info" role="alert"><i class="fa fa-info-circle" aria-hidden="true"></i> There are no projects to display.</div>
2525
{% if user.userprofile.is_pi or user.is_superuser %}
26-
<a class="btn btn-primary btn-block" href="{% url 'project-create' %}" role="button">Add a project</a>
26+
<a class="btn btn-nyu-primary-violet btn-block" href="{% url 'project-create' %}" role="button">Add a project</a>
2727
<hr>
2828
{% endif %}
2929
{% endif %}

‎coldfront/core/portal/templates/portal/center_summary.html

+40-22
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,17 @@
1313
{% block content %}
1414
<h2>{% settings_value 'CENTER_NAME' %} Scientific Impact</h2>
1515
<hr>
16-
1716
{% if settings.PUBLICATION_ENABLE %}
1817
<!-- Start Publications -->
1918
<div class="card mb-3 border-primary">
20-
<div class="card-header bg-primary text-white">
21-
<i class="fas fa-newspaper" aria-hidden="true"></i> User Entered Publications
19+
<div class="card-header bg-nyu-primary-violet text-white">
20+
<i class="fas fa-newspaper" aria-hidden="true"></i>
21+
User Entered Publications
2222
</div>
2323
<div class="card-body">
2424
<div id="chartPublications"></div>
25-
<strong>Total Publications:</strong> {{total_publications_count}}
25+
<strong>Total Publications:</strong>
26+
{{total_publications_count}}
2627
</div>
2728
</div>
2829
<!-- End Publications -->
@@ -31,11 +32,13 @@ <h2>{% settings_value 'CENTER_NAME' %} Scientific Impact</h2>
3132
{% if settings.RESEARCH_OUTPUT_ENABLE %}
3233
<!-- Start Research Outputs -->
3334
<div class="card mb-3 border-primary">
34-
<div class="card-header bg-primary text-white">
35-
<i class="far fa-newspaper" aria-hidden="true"></i> User Entered Research Outputs
35+
<div class="card-header bg-nyu-primary-violet text-white">
36+
<i class="far fa-newspaper" aria-hidden="true"></i>
37+
User Entered Research Outputs
3638
</div>
3739
<div class="card-body">
38-
<strong>Total Publications:</strong> {{total_research_outputs_count}}
40+
<strong>Total Publications:</strong>
41+
{{total_research_outputs_count}}
3942
</div>
4043
</div>
4144
<!-- End Research Outputs -->
@@ -44,24 +47,39 @@ <h2>{% settings_value 'CENTER_NAME' %} Scientific Impact</h2>
4447
{% if settings.GRANT_ENABLE %}
4548
<!-- Start Grants -->
4649
<div class="card mb-3 border-primary">
47-
<div class="card-header bg-primary text-white">
48-
<i class="fas fa-trophy" aria-hidden="true"></i> User Grants Summary
50+
<div class="card-header bg-nyu-primary-violet text-white">
51+
<i class="fas fa-trophy" aria-hidden="true"></i>
52+
User Grants Summary
4953
</div>
5054
<div class="card-body">
5155
<div id="chartGrants"></div>
5256
<hr>
53-
<strong> Grants Total:</strong> ${{grants_total}} <br>
54-
<strong> Grants Total PI Only:</strong> ${{grants_total_pi_only}} <br>
55-
<strong> Grants Total CoPI Only:</strong> ${{grants_total_copi_only}} <br>
56-
<strong> Grants Total Senior Personnel Only:</strong> ${{grants_total_sp_only}}
57+
<strong>
58+
Grants Total:
59+
</strong>
60+
${{grants_total}}
61+
<br>
62+
<strong>
63+
Grants Total PI Only:
64+
</strong>
65+
${{grants_total_pi_only}}
66+
<br>
67+
<strong>
68+
Grants Total CoPI Only:
69+
</strong>
70+
${{grants_total_copi_only}}
71+
<br>
72+
<strong>
73+
Grants Total Senior Personnel Only:
74+
</strong>
75+
${{grants_total_sp_only}}
5776
</div>
5877
</div>
5978
<!-- End Grants -->
6079
{% endif %}
61-
6280
<!--&lt;!&ndash; Start Allocation by Field of Science &ndash;&gt;-->
6381
<!--<div class="card mb-3 border-primary">-->
64-
<!-- <div class="card-header bg-primary text-white">-->
82+
<!-- <div class="card-header bg-nyu-primary-violet text-white">-->
6583
<!-- <i class="fas fa-flask" aria-hidden="true"></i> Active Allocations and Users by Field of Science-->
6684
<!-- </div>-->
6785
<!-- <div id="allocation-by-fos" class="card-body">-->
@@ -72,21 +90,21 @@ <h2>{% settings_value 'CENTER_NAME' %} Scientific Impact</h2>
7290
<!-- </div>-->
7391
<!--</div>-->
7492
<!--&lt;!&ndash; End Allocation by Field of Science &ndash;&gt;-->
75-
7693
<!-- Start Allocation Charts -->
7794
<div class="card mb-3 border-primary">
78-
<div class="card-header bg-primary text-white">
79-
<i class="fas fa-trophy"></i> Resources and Allocations Summary
95+
<div class="card-header bg-nyu-primary-violet text-white">
96+
<i class="fas fa-trophy"></i>
97+
Resources and Allocations Summary
8098
</div>
8199
<div id="allocation-summary" class="card-body">
82100
<div class="text-center">
83-
<button type="button" class="btn btn-primary"><i class="fas fa-sync fa-spin fa-fw" aria-hidden="true"></i> Getting Data <span
84-
class="sr-only">...</span></button>
101+
<button type="button" class="btn btn-primary"><i class="fas fa-sync fa-spin fa-fw" aria-hidden="true"></i>
102+
Getting Data
103+
<span class="sr-only">...</span></button>
85104
</div>
86105
</div>
87106
</div>
88107
<!-- End Allocation Charts -->
89-
90108
<script>
91109
$("#navbar-main > ul > li.active").removeClass("active")
92110
$("#navbar-center-summary").addClass("active")
@@ -198,4 +216,4 @@ <h2>{% settings_value 'CENTER_NAME' %} Scientific Impact</h2>
198216
return cookieValue;
199217
}
200218
</script>
201-
{% endblock %}
219+
{% endblock %}

‎coldfront/core/portal/templates/portal/nonauthorized_home.html

+6-7
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@
77
<div class="col mr-5">
88
<h2 class="text-center">Log In to ColdFront</h2>
99
<hr>
10-
11-
<p><a class="btn btn-primary btn-block" href="{% url 'login' %}" role="button"><i class="fas fa-sign-in-alt" aria-hidden="true"></i> Log In</a></p>
12-
10+
<p><a class="btn btn-nyu-primary-violet btn-block" href="{% url 'login' %}" role="button"><i class="fas fa-sign-in-alt" aria-hidden="true"></i>
11+
Log In</a></p>
1312
<div class="card bg-light">
1413
<div class="card-body">
1514
<h3 class="card-title h5">Do not have an Account?</h3>
@@ -24,8 +23,8 @@ <h3 class="card-title h5">Do not have an Account?</h3>
2423

2524
{% block javascript %}
2625
{{ block.super }}
27-
<script>
28-
$("#navbar-main > ul > li.active").removeClass("active");
26+
<script>
27+
$("#navbar-main > ul > li.active").removeClass("active");
2928
$("#navbar-home").addClass("active");
30-
</script>
31-
{% endblock %}
29+
</script>
30+
{% endblock %}

‎coldfront/core/user/templates/user/login.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
{% endif %}
2121

2222
<div class="card border-primary">
23-
<div class="card-header bg-primary text-white">
23+
<div class="card-header bg-nyu-primary-violet text-white">
2424
<h2 class="h5"><i class="fas fa-lock" aria-hidden="true"></i> Log In</h2>
2525
</div>
2626
<div class="card-body">
@@ -29,7 +29,7 @@ <h2 class="h5"><i class="fas fa-lock" aria-hidden="true"></i> Log In</h2>
2929
<hr/>
3030
<p class="text-center"><strong>OR</strong></p>
3131

32-
<a class="btn btn-primary btn-block" role="button" href="{% url 'oidc_authentication_init' %}?next={{request.GET.next}}">
32+
<a class="btn btn-nyu-primary-violet btn-block" role="button" href="{% url 'oidc_authentication_init' %}?next={{request.GET.next}}">
3333
<i class="fab fa-openid" aria-hidden="true"></i> Log in via OpenID Connect
3434
</a>
3535
{% endif %}

‎coldfront/core/user/templates/user/login_form.html

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
{% load common_tags %}
22
{% load crispy_forms_tags %}
3-
4-
53
<form method="post" action="{% url 'login' %}?next={{request.GET.next}}">
64
{% csrf_token %}
75
{{ form|crispy }}
8-
<button type="submit" class="btn btn-primary btn-block"><i class="fas fa-sign-in-alt" aria-hidden="true"></i> Log In</button>
6+
<button type="submit" class="btn btn-nyu-primary-violet btn-block"><i class="fas fa-sign-in-alt" aria-hidden="true"></i>
7+
Log In</button>
98
</form>

‎coldfront/static/bootstrap/bootstrap.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coldfront/static/branding/nyu_violet.css

+144
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,144 @@
1+
2+
/*------------------------------------
3+
- COLOR nyu-nyu-primary-violet-violet
4+
------------------------------------*/
5+
.alert-nyu-primary-violet {
6+
color: #0e0016;
7+
background-color: #be65f8;
8+
border-color: #b652f7;
9+
}
10+
11+
.alert-nyu-primary-violet hr {
12+
border-top-color: #ab39f6;
13+
}
14+
15+
.alert-nyu-primary-violet .alert-link {
16+
color: #000000;
17+
}
18+
19+
.badge-nyu-primary-violet {
20+
color: #fff;
21+
background-color: #57068c;
22+
}
23+
24+
.badge-nyu-primary-violet[href]:hover, .badge-nyu-primary-violet[href]:focus {
25+
color: #fff;
26+
background-color: #38035b;
27+
}
28+
29+
.bg-nyu-primary-violet {
30+
background-color: #57068c !important;
31+
}
32+
33+
a.bg-nyu-primary-violet:hover, a.bg-nyu-primary-violet:focus,
34+
button.bg-nyu-primary-violet:hover,
35+
button.bg-nyu-primary-violet:focus {
36+
background-color: #38035b !important;
37+
}
38+
39+
.border-nyu-primary-violet {
40+
border-color: #57068c !important;
41+
}
42+
43+
.btn-nyu-primary-violet {
44+
color: #fff;
45+
background-color: #57068c;
46+
border-color: #57068c;
47+
}
48+
49+
.btn-nyu-primary-violet:hover {
50+
color: #fff;
51+
background-color: #410469;
52+
border-color: #38035b;
53+
}
54+
55+
.btn-nyu-primary-violet:focus, .btn-nyu-primary-violet.focus {
56+
box-shadow: 0 0 0 0.2rem rgba(87, 6, 140, 0.5);
57+
}
58+
59+
.btn-nyu-primary-violet.disabled, .btn-nyu-primary-violet:disabled {
60+
color: #fff;
61+
background-color: #57068c;
62+
border-color: #57068c;
63+
}
64+
65+
.btn-nyu-primary-violet:not(:disabled):not(.disabled):active, .btn-nyu-primary-violet:not(:disabled):not(.disabled).active, .show > .btn-nyu-primary-violet.dropdown-toggle {
66+
color: #fff;
67+
background-color: #38035b;
68+
border-color: #2f034c;
69+
}
70+
71+
.btn-nyu-primary-violet:not(:disabled):not(.disabled):active:focus, .btn-nyu-primary-violet:not(:disabled):not(.disabled).active:focus, .show > .btn-nyu-primary-violet.dropdown-toggle:focus {
72+
box-shadow: 0 0 0 0.2rem rgba(87, 6, 140, 0.5);
73+
}
74+
75+
.btn-outline-nyu-primary-violet {
76+
color: #57068c;
77+
background-color: transparent;
78+
border-color: #57068c;
79+
}
80+
81+
.btn-outline-nyu-primary-violet:hover {
82+
color: #fff;
83+
background-color: #57068c;
84+
border-color: #57068c;
85+
}
86+
87+
.btn-outline-nyu-primary-violet:focus, .btn-outline-nyu-primary-violet.focus {
88+
box-shadow: 0 0 0 0.2rem rgba(87, 6, 140, 0.5);
89+
}
90+
91+
.btn-outline-nyu-primary-violet.disabled, .btn-outline-nyu-primary-violet:disabled {
92+
color: #57068c;
93+
background-color: transparent;
94+
}
95+
96+
.btn-outline-nyu-primary-violet:not(:disabled):not(.disabled):active, .btn-outline-nyu-primary-violet:not(:disabled):not(.disabled).active, .show > .btn-outline-nyu-primary-violet.dropdown-toggle {
97+
color: #fff;
98+
background-color: #57068c;
99+
border-color: #57068c;
100+
}
101+
102+
.btn-outline-nyu-primary-violet:not(:disabled):not(.disabled):active:focus, .btn-outline-nyu-primary-violet:not(:disabled):not(.disabled).active:focus, .show > .btn-outline-nyu-primary-violet.dropdown-toggle:focus {
103+
box-shadow: 0 0 0 0.2rem rgba(87, 6, 140, 0.5);
104+
}
105+
106+
.list-group-item-nyu-primary-violet {
107+
color: #0e0016;
108+
background-color: #b652f7;
109+
}
110+
111+
.list-group-item-nyu-primary-violet.list-group-item-action:hover, .list-group-item-nyu-primary-violet.list-group-item-action:focus {
112+
color: #0e0016;
113+
background-color: #ab39f6;
114+
}
115+
116+
.list-group-item-nyu-primary-violet.list-group-item-action.active {
117+
color: #fff;
118+
background-color: #0e0016;
119+
border-color: #0e0016;
120+
}
121+
122+
.table-nyu-primary-violet,
123+
.table-nyu-primary-violet > th,
124+
.table-nyu-primary-violet > td {
125+
background-color: #b652f7;
126+
}
127+
128+
.table-hover .table-nyu-primary-violet:hover {
129+
background-color: #ab39f6;
130+
}
131+
132+
.table-hover .table-nyu-primary-violet:hover > td,
133+
.table-hover .table-nyu-primary-violet:hover > th {
134+
background-color: #ab39f6;
135+
}
136+
137+
.text-nyu-primary-violet {
138+
color: #57068c !important;
139+
}
140+
141+
a.text-nyu-primary-violet:hover, a.text-nyu-primary-violet:focus {
142+
color: #38035b !important;
143+
}
144+

‎coldfront/static/common/images/favicon-16x16.png

-626 Bytes
Binary file not shown.

‎coldfront/static/common/images/favicon-32x32.png

-423 Bytes
Loading

‎coldfront/static/common/images/favicon.ico

-320 Bytes
Binary file not shown.

‎coldfront/static/common/images/logo.png

-102 KB
Loading

‎coldfront/templates/common/authorized_navbar.html

+4-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
{% include 'common/navbar_brand.html' %}
22
{% load common_tags %}
3-
4-
<nav class="navbar navbar-expand-md navbar-dark bg-primary">
3+
<nav class="navbar navbar-expand-md navbar-dark bg-nyu-primary-violet">
54
<div class="container">
65
<a class="navbar-brand d-block d-sm-none text-primary" href="#">ColdFront</a>
7-
86
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-main">
97
<span class="navbar-toggler-icon"></span>
108
</button>
11-
129
<div class="navbar-collapse collapse" id="navbar-main">
1310
<ul class="navbar-nav">
1411
<li id="navbar-home" class="nav-item active">
@@ -24,10 +21,10 @@
2421
<a id="navbar-allocation" class="dropdown-item" href="{% url 'allocation-list' %}">Allocations</a>
2522
<a id="navbar-resource" class="dropdown-item" href="{% url 'resource-list' %}">Resources</a>
2623
{% if settings.ALLOCATION_ACCOUNT_ENABLED %}
27-
<a class="dropdown-item" href="{% url 'allocation-account-list' %}">Allocation Accounts</a>
24+
<a class="dropdown-item" href="{% url 'allocation-account-list' %}">Allocation Accounts</a>
2825
{% endif %}
2926
{% if request.user.userprofile.is_pi %}
30-
<a id="navbar-user-allocation" class="dropdown-item" href="{% url 'user-list-allocations' %}">User Allocations</a>
27+
<a id="navbar-user-allocation" class="dropdown-item" href="{% url 'user-list-allocations' %}">User Allocations</a>
3128
{% endif %}
3229
</div>
3330
</li>
@@ -50,4 +47,4 @@
5047
</ul>
5148
</div>
5249
</div>
53-
</nav>
50+
</nav>

0 commit comments

Comments
 (0)