Skip to content

Commit bbae2cb

Browse files
committed
refactor: remove unused code
- package.json and yarn.lock no longer needed due to hugo module change - Makefile no longer needs to update submodule - minor refinements to footer for responsiveness
1 parent dbc248a commit bbae2cb

File tree

9 files changed

+42
-1170
lines changed

9 files changed

+42
-1170
lines changed

Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@ ARG DOCSY_VERSION=v0.4.0
77
LABEL maintainer="CoMSES Net <support@comses.net>"
88

99
WORKDIR /src
10-
COPY . /src/
10+
COPY config.toml /src/
1111

1212
RUN git config --global --add safe.directory /src \
1313
&& hugo mod init github.com/openmodelingfoundation/openmodelingfoundation.github.io \
1414
&& hugo mod get github.com/google/docsy@${DOCSY_VERSION}
1515

16+
COPY . /src/
17+
1618
CMD ["server"]

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ commands :
1818

1919
## build : build files but do not run a server.
2020
build :
21-
git submodule update --init --recursive
2221
docker-compose build --pull
2322

2423
## serve : start and run a local server.
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
.td-sidebar-nav {
2-
32
.td-page-meta {
43
a {
54
display: block;
@@ -8,4 +7,4 @@
87
font-weight: $font-weight-medium;
98
}
109
}
11-
}
10+
}

assets/scss/main.scss

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,16 @@
3333
}
3434

3535
footer {
36-
min-height: 150px;
36+
min-height: 160px;
37+
38+
.logo {
39+
max-width: 100%;
40+
height: 60%;
41+
}
42+
43+
a {
44+
color: orange !important;
45+
}
3746

3847
a:hover {
3948
color: white !important;
@@ -63,4 +72,4 @@ footer {
6372
}
6473
}
6574

66-
@import "styles_project";
75+
@import "styles_project";

config.toml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ anchor = "smart"
7373

7474
[languages]
7575
[languages.en]
76-
title = ""
76+
title = "The Open Modeling Foundation"
7777
description = "The Open Modeling Foundation is an alliance of modeling organizations that coordinates and administers a common, community developed body of standards and best practices among diverse communities of modeling scientists."
7878
languageName ="English"
7979
# Weight used for sorting.
@@ -88,6 +88,9 @@ time_format_blog = "02.01.2006"
8888

8989
# Everything below this are Site Params
9090

91+
[outputs]
92+
section = [ "HTML", "RSS" ]
93+
9194
[params]
9295

9396
working_group_request_form = "https://asu.questionpro.com/omf-wg-joinrequest"
@@ -142,7 +145,7 @@ offlineSearch = true
142145
# User interface configuration
143146
[params.ui]
144147
# Enable to show the side bar menu in its compact state.
145-
sidebar_menu_compact = false
148+
sidebar_menu_compact = true
146149
# Set to true to disable breadcrumb navigation.
147150
breadcrumb_disable = false
148151
# Set to true to hide the sidebar search box (the top nav search box will still be displayed if search is enabled)

layouts/partials/footer.html

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
1-
<footer class="-bg-dark py-3 row d-print-none">
2-
<div class="container-fluid">
1+
<footer class="-bg-gray py-5 row d-print-none">
2+
<div class="container-fluid mx-sm-5">
33
<div class='row'>
4-
<div class="col my-auto">
5-
<a target="_blank" href='https://alliancecan.ca/en'><img class="logo" height="60" src="/images/digital-research-alliance-canada.svg" /></a>
4+
<div class="col-3 col-sm-4 order-sm-2">
5+
<a target="_blank" href='https://alliancecan.ca/en'><img class="img-fluid" src="/images/digital-research-alliance-canada.svg" /></a>
66
</div>
7-
<div class='col text-center my-auto'>
8-
&copy; 2021 The Open Modeling Foundation.
9-
<p>
10-
This work was enabled in part by support from
11-
<a target="_blank" href='https://alliancecan.ca/en'><u>the Digital Research Alliance</u></a> of Canada's
12-
Research Portals and Platforms program as well as generous support from the
13-
<a target="_blank" href='https://sloan.org'><u>Alfred P. Sloan Foundation</u></a>.
14-
</p>
7+
<div class='col-6 col-sm-4 text-center my-0 py-0 order-sm-2'>
8+
This work was enabled in part by generous support from
9+
<a target="_blank" href='https://alliancecan.ca/en'><u>the Digital Research Alliance</u></a> of Canada
10+
and the <a target="_blank" href='https://sloan.org'><u>Alfred P. Sloan Foundation</u></a>.
11+
{{ with .Site.Params.copyright }}&copy; {{ now.Year }} {{ .}} {{ T "footer_all_rights_reserved" }}{{ end }}
1512
</div>
16-
<div class='col my-auto text-right'>
17-
<a target="_blank" href='https://sloan.org'><img class="logo" height="60" src="/images/alfred-p-sloan-logo.png" /></a>
13+
<div class='col-3 col-sm-4 text-xs-center text-right order-sm-3'>
14+
<a target="_blank" href='https://sloan.org'><img class="logo" src="/images/alfred-p-sloan-logo.png" /></a>
1815
</div>
1916
</div>
2017
</div>
Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
{{ if .Path }}
2-
{{ $pathFormatted := replace .Path "\\" "/" }}
1+
{{ if .File }}
2+
{{ $pathFormatted := replace .File.Path "\\" "/" }}
33
{{ $gh_issue_template := ($.Param "github_issue_template") }}
44
{{ $gh_issue_filter := ($.Param "github_issue_filter") }}
55
{{ $gh_repo := ($.Param "github_repo") }}
66
{{ $gh_subdir := ($.Param "github_subdir") }}
77
{{ $gh_project_repo := ($.Param "github_project_repo") }}
8-
{{ $gh_project_number := .Params.github_project_number }}
98
{{ $gh_branch := (default "develop" ($.Param "github_branch")) }}
109
{{ $gh_repo := (.Param "github_repo") }}
1110
{{ $issue_template_page := (.Site.GetPage "/issue_templates") }}
@@ -14,18 +13,18 @@
1413
{{ $issueURL := (printf "%s/issues/new?%s" $gh_repo $queryString) }}
1514
{{ $github_discuss_category := ($.Param "github_discuss_category" | default "general") }}
1615

16+
<div class="td-page-meta ml-2 pb-1 pt-2 mb-0">
1717
{{ if $gh_repo }}
1818
{{ $discussionURL := (printf "%s/discussions/categories/%s" $gh_repo $github_discuss_category) }}
1919
{{ $newDiscussionURL := (printf "%s/discussions/new?category=%s" $gh_repo $github_discuss_category) }}
20-
<div class="td-page-meta ml-2 pb-1 pt-2 mb-0">
2120
{{ $editURL := printf "%s/edit/%s/content/%s" $gh_repo $gh_branch $pathFormatted }}
2221
{{ if and ($gh_subdir) (.Site.Language.Lang) }}
2322
{{ $editURL = printf "%s/edit/%s/%s/content/%s/%s" $gh_repo $gh_branch $gh_subdir ($.Site.Language.Lang) $pathFormatted }}
2423
{{ else if .Site.Language.Lang }}
2524
{{ $editURL = printf "%s/edit/%s/content/%s/%s" $gh_repo $gh_branch ($.Site.Language.Lang) $pathFormatted }}
2625
{{ else if $gh_subdir }}
2726
{{ $editURL = printf "%s/edit/%s/%s/content/%s" $gh_repo $gh_branch $gh_subdir $pathFormatted }}
28-
{{ end }}
27+
{{ end -}}
2928
{{ $qExpr := printf "is:open %s" $gh_issue_filter }}
3029
{{ $viewRelatedIssuesURL := printf "%s/issues?%s" $gh_repo (querify "q" $qExpr) }}
3130
<a href="{{ $issueURL }}" target="_blank"><i class="fab fa-github"></i> {{ T "post_create_issue" }}</a>
@@ -35,7 +34,11 @@
3534
{{ if $gh_project_repo }}
3635
{{ $project_issueURL := printf "%s/issues/new" $gh_project_repo }}
3736
<a href="{{ $project_issueURL }}" target="_blank"><i class="fas fa-tasks"></i> {{ T "post_create_project_issue" }}</a>
38-
{{ end }}
39-
</div>
40-
{{ end }}
37+
{{ end -}}
38+
{{ end -}}
39+
{{ with .CurrentSection.AlternativeOutputFormats.Get "print" -}}
40+
<a id="print" href="{{ .Permalink | safeURL }}"><i class="fa-solid fa-print fa-fw"></i> {{ T "print_entire_section" }}</a>
41+
{{ end -}}
42+
</div>
43+
4144
{{ end }}

package.json

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)