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
bfd8bcd6
Commit
bfd8bcd6
authored
Jul 03, 2016
by
Ray Schamp
Committed by
GitHub
Jul 03, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #663 from rschamp/feature/remove-warnings
Get rid of most splash warnings in development
parents
0414f069
7fe82c11
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
8 deletions
+8
-8
src/components/carousel/carousel.jsx
src/components/carousel/carousel.jsx
+1
-1
src/components/navigation/www/navigation.jsx
src/components/navigation/www/navigation.jsx
+1
-1
src/components/teacher-banner/teacher-banner.jsx
src/components/teacher-banner/teacher-banner.jsx
+5
-5
src/views/splash/splash.jsx
src/views/splash/splash.jsx
+1
-1
No files found.
src/components/carousel/carousel.jsx
View file @
bfd8bcd6
...
...
@@ -55,7 +55,7 @@ var Carousel = React.createClass({
}
return
(
<
Thumbnail
key=
{
item
.
id
}
<
Thumbnail
key=
{
[
this
.
key
,
item
.
id
].
join
(
'
.
'
)
}
showLoves=
{
this
.
props
.
showLoves
}
showRemixes=
{
this
.
props
.
showRemixes
}
type=
{
item
.
type
}
...
...
src/components/navigation/www/navigation.jsx
View file @
bfd8bcd6
...
...
@@ -266,7 +266,7 @@ var Navigation = React.createClass({
</
a
>
</
li
>
{
this
.
props
.
permissions
.
educator
?
[
<
li
>
<
li
key=
"my-classes-li"
>
<
a
href=
"/educators/classes/"
>
<
FormattedMessage
id=
"general.myClasses"
/>
</
a
>
...
...
src/components/teacher-banner/teacher-banner.jsx
View file @
bfd8bcd6
...
...
@@ -35,11 +35,11 @@ var TeacherBanner = React.createClass({
<
div
className=
"welcome"
>
{
this
.
props
.
session
.
status
===
sessionActions
.
Status
.
FETCHED
?
(
this
.
props
.
session
.
session
.
user
?
[
<
h3
>
<
h3
key=
"greeting"
>
{
this
.
props
.
messages
[
'
teacherbanner.greeting
'
]
}
,
{
'
'
}
{
this
.
props
.
session
.
session
.
user
.
username
}
</
h3
>,
<
p
>
<
p
key=
"subgreeting"
>
{
this
.
props
.
messages
[
'
teacherbanner.subgreeting
'
]
}
</
p
>
]
:
[]
...
...
@@ -48,17 +48,17 @@ var TeacherBanner = React.createClass({
<
FlexRow
className=
"quick-links"
>
{
this
.
props
.
session
.
status
===
sessionActions
.
Status
.
FETCHED
?
(
this
.
props
.
session
.
session
.
user
?
[
<
a
href=
"/educators/classes"
>
<
a
href=
"/educators/classes"
key=
"classes-button"
>
<
Button
>
{
this
.
props
.
messages
[
'
teacherbanner.classesButton
'
]
}
</
Button
>
</
a
>,
<
a
href=
"/info/educators"
>
<
a
href=
"/info/educators"
key=
"resources-button"
>
<
Button
>
{
this
.
props
.
messages
[
'
teacherbanner.resourcesButton
'
]
}
</
Button
>
</
a
>,
<
a
href=
"/educators/faq"
>
<
a
href=
"/educators/faq"
key=
"faq-button"
>
<
Button
>
{
this
.
props
.
messages
[
'
teacherbanner.faqButton
'
]
}
</
Button
>
...
...
src/views/splash/splash.jsx
View file @
bfd8bcd6
...
...
@@ -377,7 +377,7 @@ var Splash = injectIntl(React.createClass({
</
Modal
>
]
:
[]
}
{
this
.
props
.
permissions
.
educator
?
[
<
TeacherBanner
messages=
{
messages
}
/>
<
TeacherBanner
key=
"teacherbanner"
messages=
{
messages
}
/>
]
:
[]
}
<
div
key=
"inner"
className=
"inner"
>
{
this
.
props
.
session
.
status
===
sessionActions
.
Status
.
FETCHED
?
(
...
...
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