Skip to content

Commit 458c2cc

Browse files
authored
Merge branch 'FIRST-Tech-Challenge:main' into update-esd-page
2 parents 491c958 + 48e66b7 commit 458c2cc

File tree

10 files changed

+111
-59
lines changed

10 files changed

+111
-59
lines changed

docs/source/_static/css/ftc-rtd.css

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,3 +145,70 @@ div.ethical-sidebar, div.ethical-footer {
145145
.sphinx-tab img {
146146
margin-bottom: 24px;
147147
}
148+
149+
/* fix link text in body content for accessibility
150+
exclude .sd-btn which are the buttons on the persona pages*/
151+
.document a:not(.sd-btn) {
152+
color: #0000EE;
153+
text-decoration-line: underline;
154+
text-decoration-style: solid;
155+
text-decoration-color: #0000EE;
156+
text-underline-offset: 0.2em;
157+
}
158+
.document a:not(.sd-btn):visited {
159+
color: #551A8B;
160+
text-decoration-style: dotted; /* many browsers don't support decorations on visited link */
161+
text-decoration-color: #551A8B;
162+
}
163+
.document a:not(.sd-btn):focus {
164+
outline: 1px solid #0000EE;;
165+
}
166+
.document a:not(.sd-btn):hover {
167+
text-decoration-thickness: 0.2em;
168+
text-underline-offset: 0.25em;
169+
}
170+
.document a:not(.sd-btn):active {
171+
text-decoration-style: wavy;
172+
}
173+
/* handle dark mode links */
174+
html[data-theme='dark'] .document a:not(.sd-btn) {
175+
color: #249ee8;
176+
text-decoration-line: underline;
177+
text-decoration-style: solid;
178+
text-decoration-color: #249ee8;
179+
text-underline-offset: 0.2em;
180+
}
181+
html[data-theme='dark'] .document a:not(.sd-btn):visited {
182+
color: #bb7feF;
183+
text-decoration-style: dotted;
184+
text-decoration-color: #bb7feF;
185+
}
186+
html[data-theme='dark'] .document a:not(.sd-btn):focus {
187+
outline: 1px solid #249ee8;
188+
}
189+
html[data-theme='dark'] .document a:not(.sd-btn):hover {
190+
text-decoration-thickness: 0.2em;
191+
text-underline-offset: 0.25em;
192+
}
193+
html[data-theme='dark'] .document a:not(.sd-btn):active {
194+
text-decoration-style: wavy;
195+
}
196+
/* Screen Reader - No Select class */
197+
.sr-only-no-select {
198+
user-select: none;
199+
-webkit-user-select: none;
200+
position: absolute;
201+
width: 1px;
202+
height: 1px;
203+
margin: -1px;
204+
padding: 0;
205+
overflow: hidden;
206+
clip: rect(0, 0, 0, 0);
207+
border: 0;
208+
}
209+
.icon-external-link:before { /* This is the fa-external-link icon */
210+
font-family: FontAwesome;
211+
content: "\f08e";
212+
margin-left: .2em;
213+
text-decoration-line: none;
214+
}
Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
$(document).ready(function () {
2-
$('a.external').attr('target', '_blank');
3-
$('a.external').attr('rel', 'noopener');
2+
$('a.external').each(function( index, elem ) {
3+
var str = $(elem).html();
4+
$(elem).html(str + '<i class="icon icon-external-link" aria-hidden="true"></i><span class="sr-only-no-select">&nbsp;(external link opens in a new tab)&nbsp;</span>');
5+
$(elem).attr('target', '_blank');
6+
$(elem).attr('rel', 'noopener');
7+
});
48
});

docs/source/_templates/footer.html

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,19 @@
2323
{%- if hasdoc('copyright') %}
2424
{%- trans path=pathto('copyright'), copyright=copyright|e %}&#169; <a href="{{ path }}">Copyright</a> {{ copyright }}.{% endtrans %}
2525
{%- else %}
26-
&#169; 2023 <i>{%- trans copyright=copyright|e %}{{ copyright }}{% endtrans %}</i>
26+
&#169; 2025 <i>{%- trans copyright=copyright|e %}{{ copyright }}{% endtrans %}</i>
2727
{%- endif %}
2828
{%- endif %}
2929
</div>
3030

3131
<div>
32-
<a href="https://www.firstinspires.org/about/privacy-policy">Privacy Policy</a>
32+
<p><a href="{{ pathto('tos/tos') }}">Terms of Service</a></p>
3333
</div>
3434
<div>
35-
<a href="{{ pathto('tos/tos') }}">Terms of Service</a>
35+
<p><a class="external" href="https://www.firstinspires.org/about/privacy-policy">Privacy Policy</a></p>
3636
</div>
3737
<div>
38-
<a href="https://www.firstinspires.org/report">Report an Incident</a>
38+
<p><a href="https://www.firstinspires.org/report">Report an Incident</a></p>
3939
</div>
4040

4141
<div>
@@ -67,19 +67,9 @@
6767
</figure>
6868
</div>
6969
</div>
70-
70+
<!--
7171
<div>
72-
{% if show_sphinx %}
73-
{%- set sphinx_web = '<a href="https://www.sphinx-doc.org/">Sphinx</a>' %}
74-
{%- set readthedocs_web = '<a href="https://readthedocs.org">Read the Docs</a>' %}
75-
{#- Translators: the variable "sphinx_web" is a link to the Sphinx project documentation with the text "Sphinx" #}
76-
{%- trans sphinx_web=sphinx_web, readthedocs_web=readthedocs_web %}Built with {{ sphinx_web }} using a{% endtrans %}
77-
{#- Translators: "theme" refers to a theme for Sphinx, which alters the appearance of the generated documentation #}
78-
<a href="https://github.com/readthedocs/sphinx_rtd_theme">{% trans %}theme{% endtrans %}</a>
79-
{#- Translators: this is always used as "provided by Read the Docs", and should not imply Read the Docs is an author of the generated documentation. #}
80-
{% trans %}provided by {{ readthedocs_web }}{% endtrans %}.
81-
{% endif %}
82-
8372
{%- block extrafooter %} {% endblock %}
8473
</div>
74+
-->
8575
</footer>

docs/source/_templates/layout.html

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@
1515
<ul>
1616
<li id="ftc-page-link"><a href="https://www.firstinspires.org/resource-library/ftc/game-and-season-info" target="_blank"><i>FIRST</i> Official Team Resources</a></li>
1717
<li id="qa-link"><a href="https://ftc-qa.firstinspires.org/" target="_blank">Official Game Q&A</a></li>
18-
<script id="headerscript">
19-
if( new Date().getMonth() == 3 && new Date().getDate() == 1) {
20-
document.getElementById("headerscript").insertAdjacentHTML("afterend", '<li id="water-link"><a href="https://www.youtube.com/watch?v=dQw4w9WgXcQ">Water Game</a></li>');
21-
}
22-
</script>
2318
</ul>
2419
</div>
2520
</div>

docs/source/faq/faqs.rst

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -47,22 +47,19 @@ Judging FAQs
4747

4848
.. grid-item-card:: What do I need to bring to my Judging Appointment?
4949

50-
Teams should bring their robot, their engineering portfolio, their control award
51-
submission, and their request for feedback form. Please note that at some events,
52-
the engineering portfolio, control award submission and feedback request form are
53-
collected when the team checks in for the event.
50+
Teams should bring their robot, Portfolio and as many members of the team who want to participate in the presentation. Please note that at some events,
51+
the Portfolio is collected when the team checks in for the event.
5452

5553
.. grid-item-card:: What feedback will we receive from the judges?
5654

57-
Judges complete the feedback form after the team has completed their formal interview, and after the
58-
Judges have reviewed the Engineering Portfolio. Feedback is limited to the initial interview and
59-
Engineering Portfolio only.
55+
Judges complete the feedback form immediately after the team has completed their formal interview. Feedback is limited to the initial formal interview and does
56+
not include the team's performance in follow-up Pit interviews or their Portfolio.
6057

6158
.. grid-item-card:: Is my team required to prepare a 5 minute presentation?
6259

63-
Teams are not required to prepare a 5 minute presentation. Teams should let the judges know they do
64-
not have a formal presentation. The judges will begin to ask the team questions at the beginning of
65-
the interview. Teams are not penalized in any way if they do not have a prepared presentation.
60+
Teams are not required to prepare a 5 minute presentation, but teams should let the judges know they do
61+
not have a formal presentation when they enter the room. The judges will begin to ask the team questions at the beginning of
62+
the interview.
6663

6764

6865
Competition FAQs
@@ -82,27 +79,27 @@ Competition FAQs
8279

8380
.. grid-item-card:: Why aren’t you going to replay that match?
8481

85-
There are only certain situations that warrant replaying a match. Unless we can prove that it was a
86-
field fault or Wi-Fi interference, we cannot replay a match.
82+
There are only certain situations that warrant replaying a match. Consult the Competition Manual to understand what conditions and processes can result in a replay.
83+
Typically unless something went wrong with the field or field staff there will not be grounds for a replay. A malfunctioning robot typically does not provide grounds
84+
for a replay.
8785

8886
.. grid-item-card:: Why did you replay a match for someone else, but not us?
8987

9088
The situation was different. If necessary, teams can talk with the head referee in the competition area Question Box.
9189

9290
.. grid-item-card:: Why won’t you fix that score? We have video (or photographs) to prove the score is wrong!
9391

94-
Teams can go the question box so they can discuss this issue with the head referee. No photographs or videos wil be reviewed per GM1 <C02>.
92+
Teams can go the Question Box so they can discuss this issue with the head referee. No photographs or videos will be reviewed.
9593

9694
.. grid-item-card:: Why don’t you fix/cleanup the wireless environment? It’s obvious the wireless environment is disruptive and causing disconnects.
9795

98-
WiFi is observed throughout the event.
96+
Teams can work with the event FTA or Event Director if they have questions about the WiFi environment.
9997

10098
.. grid-item-card:: What do we do if we think the scoring referees scored our match wrong or the scorekeeper put the wrong score into the computer.
10199

102-
Teams may formally protest a match for a period of time not to exceed three matches following the match in question. If a team wants to dispute a score,
103-
one student representative should wait patiently in the designated Question Box area for the head referee (do not interrupt matches for this conversation).
104-
If the referees agree that they made a mistake, they can correct it. If the referees are confident in their score, the team should accept that decision.
105-
Refer to GM1 <C02>.
100+
If a team has questions about a match outcome, they should send one student representative to the Question Box to talk to the Head Referee (do not interrupt matches for
101+
this conversation). If the referees agree that they made a mistake, they can correct it. If the referees are confident in their score, the team should accept that
102+
decision. Check the Competition Manual for more information about key volunteer roles, tournament operations, and how to use the Question Box.
106103

107104
Technology FAQs
108105
--------------------

docs/source/game_specific_resources/playing_field_resources/playing_field_resources.rst

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,15 @@ Playing Field Resources
22
=======================
33

44
.. figure:: images/CenterStageField.png
5-
:alt: Arena with four teams in alliances areas. Four robots are on the field along with CENTERSTAGE game elements.
5+
:alt: Arena with four teams in alliance areas. Four robots are on the field along with CENTERSTAGE game elements.
66

77
Traditional Playing Field, CENTERSTAGE presented by RTX, 2023-2024
88

99
About the Playing Field
1010
-----------------------
1111

1212
There are multiple configurations of the playing field that can be used. For traditional games, the playing field is a part of the Arena that includes the 12 ft. x 12 ft. (3.66 m x 3.66 m) field and all
13-
the elements described in the official field drawings. For remote games, the playing field is a part of the Arena that includes a 12 ft. x 8 ft. (3.66 m x 2.44 m) field and all the elements described
14-
in the official field drawings. The base field stays the same for all games but the game elements are subject to change as per the Competition Manual.
13+
the elements described in the official field drawings. The base field stays the same for all games but the game elements are subject to change as per the Competition Manual.
1514

1615
The Competition Manual contains an Arena section that details the playing field for that years game.
1716
It includes measurements for key aspects of the field and game elements and scoring elements.
@@ -36,17 +35,17 @@ The guide typically has the following sections:
3635
- Most games have AprilTags placed around the field that can be used for robot navigation.
3736
- Finally, there are teardown instructions that indicate how to take the field down for storage or transport.
3837

39-
Use the following button link to download a PDF of the Field Setup Guide from the *FIRST* Website:
38+
Use the following button link to download a PDF of the current Field Setup Guide from the *FIRST* Website:
4039

4140
.. button-link:: https://ftc-resources.firstinspires.org/file/ftc/game/fieldguide
4241
:color: primary
4342

44-
Download PDF, 4.5 MB, will open in a new tab
43+
Download Field Setup Guide PDF, 4.5 MB
4544

4645
.. note:: The Field Setup Guide has instructions for assembling an official game set as purchased from AndyMark.
4746

4847
A purchased game set can be full or partial. A partial game set is less expensive and also suitable for teams who
4948
want official game elements but don't have room to setup a full field.
5049

51-
The `Game and Season Materials page (FIRST website) <https://ftc-resources.firstinspires.org/files/ftc/game>`_ also contains downloadable PDFs for the AprilTag images that can be printed and placed on the field.
52-
There is also a do it yourself (DIY) Resources section that include CAD models of the game and scoring elements and DIY field and perimeter build guides.
50+
The `Game and Season Materials page <https://ftc-resources.firstinspires.org/files/ftc/game>`_ also contains a downloadable PDF for the AprilTag images that can be printed and placed on the field.
51+
There is a Do It Yourself (DIY) Resources section that includes CAD models of scoring elements and DIY field and perimeter build guides.

docs/source/index.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -126,13 +126,13 @@ and :doc:`gracious_professionalism/gp` to see why.
126126
127127
**I am a...**
128128

129-
- :doc:`New Team <persona_pages/rookie_teams/rookie_teams>` - New Teams may not know where to start. This is the way!
129+
- :doc:`New Team <persona_pages/rookie_teams/rookie_teams>` New Teams may not know where to start. This is the way!
130130

131-
- :doc:`Returning Team <persona_pages/veteran_teams/veteran_teams>` - Returning Teams looking for resources can look here.
131+
- :doc:`Returning Team <persona_pages/veteran_teams/veteran_teams>` Returning Teams looking for resources can look here.
132132

133-
- :doc:`Coach <persona_pages/coach_admin/coach_admin>` - Coaches looking for help or Team Administrative Resources can look here.
133+
- :doc:`Coach <persona_pages/coach_admin/coach_admin>` Coaches looking for help or Team Administrative Resources can look here.
134134

135-
- :doc:`Mentor <persona_pages/mentor_tech/mentor_tech>` - Technical Mentors looking for Technical Resources should look here first!
135+
- :doc:`Mentor <persona_pages/mentor_tech/mentor_tech>` Technical Mentors looking for Technical Resources should look here first!
136136

137137
The main menu contains links to the top level content. The following are quick links organized by topic.
138138

@@ -290,7 +290,7 @@ The main menu contains links to the top level content. The following are quick l
290290
:outline:
291291
:expand:
292292

293-
SDK GitHub Repository (external)
293+
SDK GitHub Repository
294294

295295
.. div:: col-sm pl-1 pr-1
296296

@@ -299,7 +299,7 @@ The main menu contains links to the top level content. The following are quick l
299299
:outline:
300300
:expand:
301301

302-
SDK Releases (external)
302+
SDK Releases
303303

304304
.. div:: col-sm pl-1 pr-1
305305

@@ -308,7 +308,7 @@ The main menu contains links to the top level content. The following are quick l
308308
:outline:
309309
:expand:
310310

311-
Javadoc Documentation (external)
311+
Javadoc Documentation
312312

313313
.. grid-item-card::
314314
:class-header: sd-bg-secondary font-weight-bold sd-text-black
@@ -350,7 +350,7 @@ The main menu contains links to the top level content. The following are quick l
350350
:outline:
351351
:expand:
352352

353-
Game Question and Answer System (external)
353+
Game Question and Answer System
354354

355355
.. note::
356356

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Game Manuals
22
============
33

4-
Game Manuals can be found on the `Game and Season Materials page <https://ftc-resources.firstinspires.org/files/ftc/game>`__ on the *FIRST* Website. They are presented here for your convenience.
4+
Game Manuals can be found on the `Game and Season Materials page <https://ftc-resources.firstinspires.org/files/ftc/game>`__ on the *FIRST* Website.
55

docs/source/programming_resources/shared/installing_kotlin/Installing-Kotlin.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ many new features and syntax that can make it easier to write code and less pron
1818
the features of Kotlin include:
1919

2020
* Full interoperability with Java; you can use Java classes and libraries from Kotlin and vice versa.
21-
* Dynamic typing; Kotlin allows you to use dynamic typing when needed, that is, you don't need
21+
* Type inference; Kotlin allows you to use type inference when needed, that is, you don't need
2222
to specify the type of a variable when it can be inferred from the context
2323
(``var myString = "Hi!"``).
2424
* No semicolons; Kotlin does not require semicolons to end statements.

docs/source/sponsors/software/software.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ requirement. Read details below for each product for more information.
118118
* Atlassian Trello brings all your tasks, teammates, and tools together
119119

120120
* Boards, Lists, and Cards help organize and keep team on task
121-
* Free Workspaces can have 10 open boards
121+
* Free Workspaces can have 10 open boards (limited to 10 collaborators)
122122
* Invite viewers to the boards
123123

124124
**Expires**: N/A

0 commit comments

Comments
 (0)