Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
scratch-www
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
xpstem
scratch-www
Commits
dddc867c
Commit
dddc867c
authored
Jan 14, 2016
by
Matthew Taylor
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #319 from mewtaylor/feature/gh-288-accessibility
GH-288: accessibility
parents
9e58efc7
2ac3e533
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
35 additions
and
30 deletions
+35
-30
src/components/activity/activity.jsx
src/components/activity/activity.jsx
+1
-1
src/components/navigation/navigation.jsx
src/components/navigation/navigation.jsx
+6
-3
src/components/news/news.jsx
src/components/news/news.jsx
+1
-1
src/components/thumbnail/thumbnail.jsx
src/components/thumbnail/thumbnail.jsx
+3
-2
src/components/welcome/welcome.jsx
src/components/welcome/welcome.jsx
+3
-3
src/views/about/about.jsx
src/views/about/about.jsx
+1
-0
src/views/hoc/hoc.jsx
src/views/hoc/hoc.jsx
+20
-20
No files found.
src/components/activity/activity.jsx
View file @
dddc867c
...
@@ -46,7 +46,7 @@ var Activity = React.createClass({
...
@@ -46,7 +46,7 @@ var Activity = React.createClass({
return
(
return
(
<
li
key=
{
item
.
pk
}
>
<
li
key=
{
item
.
pk
}
>
<
a
href=
{
actorProfileUrl
}
>
<
a
href=
{
actorProfileUrl
}
>
<
img
src=
{
item
.
actor
.
thumbnail_url
}
width=
"34"
height=
"34"
/>
<
img
src=
{
item
.
actor
.
thumbnail_url
}
width=
"34"
height=
"34"
alt=
""
/>
<
p
dangerouslySetInnerHTML=
{
{
__html
:
activityMessageHTML
}
}
></
p
>
<
p
dangerouslySetInnerHTML=
{
{
__html
:
activityMessageHTML
}
}
></
p
>
<
p
>
<
p
>
<
span
className=
"stamp"
>
<
span
className=
"stamp"
>
...
...
src/components/navigation/navigation.jsx
View file @
dddc867c
...
@@ -196,7 +196,7 @@ var Navigation = React.createClass({
...
@@ -196,7 +196,7 @@ var Navigation = React.createClass({
return
(
return
(
<
div
className=
{
classes
}
>
<
div
className=
{
classes
}
>
<
ul
>
<
ul
>
<
li
className=
"logo"
><
a
href=
"/"
></
a
></
li
>
<
li
className=
"logo"
><
a
href=
"/"
aria
-
label=
"Scratch"
></
a
></
li
>
<
li
className=
"link create"
>
<
li
className=
"link create"
>
<
a
href=
"/projects/editor"
>
<
a
href=
"/projects/editor"
>
...
@@ -237,7 +237,10 @@ var Navigation = React.createClass({
...
@@ -237,7 +237,10 @@ var Navigation = React.createClass({
<
li
className=
"search"
>
<
li
className=
"search"
>
<
form
action=
"/search/google_results"
method=
"get"
>
<
form
action=
"/search/google_results"
method=
"get"
>
<
Input
type=
"submit"
value=
""
/>
<
Input
type=
"submit"
value=
""
/>
<
Input
type=
"text"
placeholder=
{
formatMessage
(
defaultMessages
.
search
)
}
name=
"q"
/>
<
Input
type=
"text"
aria
-
label=
{
formatMessage
(
defaultMessages
.
search
)
}
placeholder=
{
formatMessage
(
defaultMessages
.
search
)
}
name=
"q"
/>
<
Input
type=
"hidden"
name=
"date"
value=
"anytime"
/>
<
Input
type=
"hidden"
name=
"date"
value=
"anytime"
/>
<
Input
type=
"hidden"
name=
"sort_by"
value=
"datetime_shared"
/>
<
Input
type=
"hidden"
name=
"sort_by"
value=
"datetime_shared"
/>
</
form
>
</
form
>
...
@@ -262,7 +265,7 @@ var Navigation = React.createClass({
...
@@ -262,7 +265,7 @@ var Navigation = React.createClass({
</
li
>,
</
li
>,
<
li
className=
"link right account-nav"
key=
"account-nav"
>
<
li
className=
"link right account-nav"
key=
"account-nav"
>
<
a
className=
"userInfo"
href=
"#"
onClick=
{
this
.
handleAccountNavClick
}
>
<
a
className=
"userInfo"
href=
"#"
onClick=
{
this
.
handleAccountNavClick
}
>
<
Avatar
src=
{
this
.
state
.
session
.
user
.
thumbnailUrl
}
/>
<
Avatar
src=
{
this
.
state
.
session
.
user
.
thumbnailUrl
}
alt=
""
/>
{
this
.
state
.
session
.
user
.
username
}
{
this
.
state
.
session
.
user
.
username
}
</
a
>
</
a
>
<
Dropdown
<
Dropdown
...
...
src/components/news/news.jsx
View file @
dddc867c
...
@@ -31,7 +31,7 @@ var News = React.createClass({
...
@@ -31,7 +31,7 @@ var News = React.createClass({
return
(
return
(
<
li
key=
{
item
.
id
}
>
<
li
key=
{
item
.
id
}
>
<
a
href=
{
item
.
url
}
>
<
a
href=
{
item
.
url
}
>
<
img
src=
{
item
.
image
}
width=
"53"
height=
"53"
/>
<
img
src=
{
item
.
image
}
width=
"53"
height=
"53"
alt=
""
/>
<
h4
>
{
item
.
headline
}
</
h4
>
<
h4
>
{
item
.
headline
}
</
h4
>
<
p
>
{
item
.
copy
}
</
p
>
<
p
>
{
item
.
copy
}
</
p
>
</
a
>
</
a
>
...
...
src/components/thumbnail/thumbnail.jsx
View file @
dddc867c
...
@@ -15,7 +15,8 @@ var Thumbnail = React.createClass({
...
@@ -15,7 +15,8 @@ var Thumbnail = React.createClass({
src
:
''
,
src
:
''
,
type
:
'
project
'
,
type
:
'
project
'
,
showLoves
:
false
,
showLoves
:
false
,
showRemixes
:
false
showRemixes
:
false
,
alt
:
''
};
};
},
},
render
:
function
()
{
render
:
function
()
{
...
@@ -57,7 +58,7 @@ var Thumbnail = React.createClass({
...
@@ -57,7 +58,7 @@ var Thumbnail = React.createClass({
return
(
return
(
<
div
className=
{
classes
}
>
<
div
className=
{
classes
}
>
<
a
className=
"thumbnail-image"
href=
{
this
.
props
.
href
}
>
<
a
className=
"thumbnail-image"
href=
{
this
.
props
.
href
}
>
<
img
src=
{
this
.
props
.
src
}
/>
<
img
src=
{
this
.
props
.
src
}
alt=
{
this
.
props
.
alt
}
/>
</
a
>
</
a
>
<
div
className=
"thumbnail-title"
>
<
div
className=
"thumbnail-title"
>
<
a
href=
{
this
.
props
.
href
}
>
{
this
.
props
.
title
}
</
a
>
<
a
href=
{
this
.
props
.
href
}
>
{
this
.
props
.
title
}
</
a
>
...
...
src/components/welcome/welcome.jsx
View file @
dddc867c
...
@@ -38,7 +38,7 @@ var Welcome = React.createClass({
...
@@ -38,7 +38,7 @@ var Welcome = React.createClass({
</
a
>
</
a
>
</
h4
>
</
h4
>
<
a
href=
"/projects/editor/?tip_bar=getStarted"
>
<
a
href=
"/projects/editor/?tip_bar=getStarted"
>
<
img
src=
"/images/welcome-learn.png"
/>
<
img
src=
"/images/welcome-learn.png"
alt=
"Get Started"
/>
</
a
>
</
a
>
</
div
>
</
div
>
<
div
className=
"welcome-col green"
>
<
div
className=
"welcome-col green"
>
...
@@ -48,7 +48,7 @@ var Welcome = React.createClass({
...
@@ -48,7 +48,7 @@ var Welcome = React.createClass({
</
a
>
</
a
>
</
h4
>
</
h4
>
<
a
href=
"/starter_projects/"
>
<
a
href=
"/starter_projects/"
>
<
img
src=
"/images/welcome-try.png"
/>
<
img
src=
"/images/welcome-try.png"
alt=
"Starter Projects"
/>
</
a
>
</
a
>
</
div
>
</
div
>
<
div
className=
"welcome-col pink"
>
<
div
className=
"welcome-col pink"
>
...
@@ -58,7 +58,7 @@ var Welcome = React.createClass({
...
@@ -58,7 +58,7 @@ var Welcome = React.createClass({
</
a
>
</
a
>
</
h4
>
</
h4
>
<
a
href=
"/studios/146521/"
>
<
a
href=
"/studios/146521/"
>
<
img
src=
"/images/welcome-connect.png"
/>
<
img
src=
"/images/welcome-connect.png"
alt=
"Connect"
/>
</
a
>
</
a
>
</
div
>
</
div
>
</
Box
>
</
Box
>
...
...
src/views/about/about.jsx
View file @
dddc867c
...
@@ -27,6 +27,7 @@ var About = React.createClass({
...
@@ -27,6 +27,7 @@ var About = React.createClass({
<
div
>
<
div
>
<
iframe
<
iframe
title=
"Scratch Overview Video"
src=
"https://player.vimeo.com/video/65583694?title=0&byline=0&portrait=0"
src=
"https://player.vimeo.com/video/65583694?title=0&byline=0&portrait=0"
frameBorder=
"0"
frameBorder=
"0"
webkitAllowFullScreen
webkitAllowFullScreen
...
...
src/views/hoc/hoc.jsx
View file @
dddc867c
...
@@ -51,7 +51,7 @@ var Hoc = React.createClass({
...
@@ -51,7 +51,7 @@ var Hoc = React.createClass({
<
div
className=
"card"
>
<
div
className=
"card"
>
<
a
href=
"/projects/editor/?tip_bar=name"
>
<
a
href=
"/projects/editor/?tip_bar=name"
>
<
div
className=
"card-info"
onMouseEnter=
{
this
.
onCardEnter
.
bind
(
this
,
'
name-bg
'
)
}
>
<
div
className=
"card-info"
onMouseEnter=
{
this
.
onCardEnter
.
bind
(
this
,
'
name-bg
'
)
}
>
<
img
src=
"/images/hoc2015/name-tutorial.jpg"
/>
<
img
src=
"/images/hoc2015/name-tutorial.jpg"
alt=
""
/>
<
Button
>
<
Button
>
<
FormattedMessage
<
FormattedMessage
id=
'general.tipsAnimateYourNameTitle'
id=
'general.tipsAnimateYourNameTitle'
...
@@ -64,7 +64,7 @@ var Hoc = React.createClass({
...
@@ -64,7 +64,7 @@ var Hoc = React.createClass({
<
div
className=
"card"
onMouseEnter=
{
this
.
onCardEnter
.
bind
(
this
,
'
wbb-bg
'
)
}
>
<
div
className=
"card"
onMouseEnter=
{
this
.
onCardEnter
.
bind
(
this
,
'
wbb-bg
'
)
}
>
<
a
href=
"/hide/"
>
<
a
href=
"/hide/"
>
<
div
className=
"card-info"
>
<
div
className=
"card-info"
>
<
img
src=
"/images/hoc2015/hide-seek-tutorial.jpg"
/>
<
img
src=
"/images/hoc2015/hide-seek-tutorial.jpg"
alt=
""
/>
<
Button
>
<
Button
>
<
FormattedMessage
<
FormattedMessage
id=
'general.tipsHideAndSeekTitle'
id=
'general.tipsHideAndSeekTitle'
...
@@ -77,7 +77,7 @@ var Hoc = React.createClass({
...
@@ -77,7 +77,7 @@ var Hoc = React.createClass({
<
div
className=
"card"
onMouseEnter=
{
this
.
onCardEnter
.
bind
(
this
,
'
dance-bg
'
)
}
>
<
div
className=
"card"
onMouseEnter=
{
this
.
onCardEnter
.
bind
(
this
,
'
dance-bg
'
)
}
>
<
a
href=
"/projects/editor/?tip_bar=dance"
>
<
a
href=
"/projects/editor/?tip_bar=dance"
>
<
div
className=
"card-info"
>
<
div
className=
"card-info"
>
<
img
src=
"/images/hoc2015/dance-tutorial.jpg"
/>
<
img
src=
"/images/hoc2015/dance-tutorial.jpg"
alt=
""
/>
<
Button
>
<
Button
>
<
FormattedMessage
<
FormattedMessage
id=
'general.tipsDanceTitle'
id=
'general.tipsDanceTitle'
...
@@ -143,7 +143,7 @@ var Hoc = React.createClass({
...
@@ -143,7 +143,7 @@ var Hoc = React.createClass({
</
div
>
</
div
>
<
div
className=
"resource"
>
<
div
className=
"resource"
>
<
img
src=
"/svgs/tips-card.svg"
/>
<
img
src=
"/svgs/tips-card.svg"
alt=
""
/>
<
div
className=
"resource-info"
>
<
div
className=
"resource-info"
>
<
h5
>
<
h5
>
<
FormattedMessage
<
FormattedMessage
...
@@ -164,7 +164,7 @@ var Hoc = React.createClass({
...
@@ -164,7 +164,7 @@ var Hoc = React.createClass({
</
div
>
</
div
>
<
div
className=
"resource"
>
<
div
className=
"resource"
>
<
img
src=
"/svgs/tips-card.svg"
/>
<
img
src=
"/svgs/tips-card.svg"
alt=
""
/>
<
div
className=
"resource-info"
>
<
div
className=
"resource-info"
>
<
h5
>
<
h5
>
<
FormattedMessage
<
FormattedMessage
...
@@ -185,7 +185,7 @@ var Hoc = React.createClass({
...
@@ -185,7 +185,7 @@ var Hoc = React.createClass({
</
div
>
</
div
>
<
div
className=
"resource"
>
<
div
className=
"resource"
>
<
img
src=
"/svgs/tips-card.svg"
/>
<
img
src=
"/svgs/tips-card.svg"
alt=
""
/>
<
div
className=
"resource-info"
>
<
div
className=
"resource-info"
>
<
h5
>
<
h5
>
<
FormattedMessage
<
FormattedMessage
...
@@ -224,7 +224,7 @@ var Hoc = React.createClass({
...
@@ -224,7 +224,7 @@ var Hoc = React.createClass({
</
p
>
</
p
>
</
div
>
</
div
>
<
div
className=
"column"
>
<
div
className=
"column"
>
<
img
src=
"/images/hoc2015/tips-test-animation.gif"
/>
<
img
src=
"/images/hoc2015/tips-test-animation.gif"
alt=
"Tips Window Animation"
/>
</
div
>
</
div
>
</
section
>
</
section
>
...
@@ -249,7 +249,7 @@ var Hoc = React.createClass({
...
@@ -249,7 +249,7 @@ var Hoc = React.createClass({
<
div
className=
"card"
>
<
div
className=
"card"
>
<
a
href=
"/projects/editor/?tip_bar=getStarted"
>
<
a
href=
"/projects/editor/?tip_bar=getStarted"
>
<
div
className=
"card-info"
>
<
div
className=
"card-info"
>
<
img
src=
"/images/hoc2015/getting-started-tutorial.jpg"
/>
<
img
src=
"/images/hoc2015/getting-started-tutorial.jpg"
alt=
""
/>
<
Button
>
<
Button
>
<
FormattedMessage
<
FormattedMessage
id=
'general.tipsGetStarted'
id=
'general.tipsGetStarted'
...
@@ -262,7 +262,7 @@ var Hoc = React.createClass({
...
@@ -262,7 +262,7 @@ var Hoc = React.createClass({
<
div
className=
"card"
>
<
div
className=
"card"
>
<
a
href=
"/bearstack/"
>
<
a
href=
"/bearstack/"
>
<
div
className=
"card-info"
>
<
div
className=
"card-info"
>
<
img
src=
"/images/hoc2015/bearstack-tutorial.jpg"
/>
<
img
src=
"/images/hoc2015/bearstack-tutorial.jpg"
alt=
""
/>
<
Button
>
<
Button
>
<
FormattedMessage
<
FormattedMessage
id=
'general.tipsBearstack'
id=
'general.tipsBearstack'
...
@@ -275,7 +275,7 @@ var Hoc = React.createClass({
...
@@ -275,7 +275,7 @@ var Hoc = React.createClass({
<
div
className=
"card"
>
<
div
className=
"card"
>
<
a
href=
"/hoops"
>
<
a
href=
"/hoops"
>
<
div
className=
"card-info"
>
<
div
className=
"card-info"
>
<
img
src=
"/images/hoc2015/bball-tutorial.jpg"
/>
<
img
src=
"/images/hoc2015/bball-tutorial.jpg"
alt=
""
/>
<
Button
>
<
Button
>
<
FormattedMessage
<
FormattedMessage
id=
'general.tipsBBallHoops'
id=
'general.tipsBBallHoops'
...
@@ -306,7 +306,7 @@ var Hoc = React.createClass({
...
@@ -306,7 +306,7 @@ var Hoc = React.createClass({
</
div
>
</
div
>
<
div
className=
"studio"
>
<
div
className=
"studio"
>
<
img
src=
"/svgs/studio.svg"
/>
<
img
src=
"/svgs/studio.svg"
alt=
""
/>
<
div
className=
"studio-info"
>
<
div
className=
"studio-info"
>
<
a
href=
"/studios/432299/"
>
<
a
href=
"/studios/432299/"
>
<
h5
>
<
h5
>
...
@@ -319,7 +319,7 @@ var Hoc = React.createClass({
...
@@ -319,7 +319,7 @@ var Hoc = React.createClass({
</
div
>
</
div
>
<
div
className=
"studio"
>
<
div
className=
"studio"
>
<
img
src=
"/svgs/studio.svg"
/>
<
img
src=
"/svgs/studio.svg"
alt=
""
/>
<
div
className=
"studio-info"
>
<
div
className=
"studio-info"
>
<
a
href=
"/studios/1672166/"
>
<
a
href=
"/studios/1672166/"
>
<
h5
>
<
h5
>
...
@@ -332,7 +332,7 @@ var Hoc = React.createClass({
...
@@ -332,7 +332,7 @@ var Hoc = React.createClass({
</
div
>
</
div
>
<
div
className=
"studio"
>
<
div
className=
"studio"
>
<
img
src=
"/svgs/studio.svg"
/>
<
img
src=
"/svgs/studio.svg"
alt=
""
/>
<
div
className=
"studio-info"
>
<
div
className=
"studio-info"
>
<
a
href=
"/studios/1065372/"
>
<
a
href=
"/studios/1065372/"
>
<
h5
>
<
h5
>
...
@@ -345,7 +345,7 @@ var Hoc = React.createClass({
...
@@ -345,7 +345,7 @@ var Hoc = React.createClass({
</
div
>
</
div
>
<
div
className=
"studio"
>
<
div
className=
"studio"
>
<
img
src=
"/svgs/studio.svg"
/>
<
img
src=
"/svgs/studio.svg"
alt=
""
/>
<
div
className=
"studio-info"
>
<
div
className=
"studio-info"
>
<
a
href=
"/studios/1672164/"
>
<
a
href=
"/studios/1672164/"
>
<
h5
>
<
h5
>
...
@@ -367,22 +367,22 @@ var Hoc = React.createClass({
...
@@ -367,22 +367,22 @@ var Hoc = React.createClass({
</
h3
>
</
h3
>
<
div
className=
"logos"
>
<
div
className=
"logos"
>
<
a
href=
"http://scratched.gse.harvard.edu/"
>
<
a
href=
"http://scratched.gse.harvard.edu/"
>
<
img
src=
"/images/hoc2015/scratchEd-logo.png"
/>
<
img
src=
"/images/hoc2015/scratchEd-logo.png"
alt=
"ScratchEd"
/>
</
a
>
</
a
>
<
a
href=
"https://code.org/"
>
<
a
href=
"https://code.org/"
>
<
img
src=
"/images/hoc2015/code-org-logo.png"
/>
<
img
src=
"/images/hoc2015/code-org-logo.png"
alt=
"code.org"
/>
</
a
>
</
a
>
<
a
href=
"http://www.cartoonnetwork.com/"
>
<
a
href=
"http://www.cartoonnetwork.com/"
>
<
img
src=
"/images/hoc2015/cn-logo.png"
/>
<
img
src=
"/images/hoc2015/cn-logo.png"
alt=
"Cartoon Network"
/>
</
a
>
</
a
>
<
a
href=
"http://www.madewithcode.com/"
>
<
a
href=
"http://www.madewithcode.com/"
>
<
img
src=
"/images/hoc2015/made-with-code-logo.png"
/>
<
img
src=
"/images/hoc2015/made-with-code-logo.png"
alt=
"Made with Code"
/>
</
a
>
</
a
>
<
a
href=
"http://www.paalive.org/"
>
<
a
href=
"http://www.paalive.org/"
>
<
img
src=
"/images/hoc2015/paa-logo.png"
/>
<
img
src=
"/images/hoc2015/paa-logo.png"
alt=
"Progressive Arts Alliance"
/>
</
a
>
</
a
>
<
a
href=
"http://www.catrobat.org/"
>
<
a
href=
"http://www.catrobat.org/"
>
<
img
src=
"/images/hoc2015/pocketcode-logo.png"
/>
<
img
src=
"/images/hoc2015/pocketcode-logo.png"
alt=
"Pocket Code"
/>
</
a
>
</
a
>
</
div
>
</
div
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment