Skip to content

Commit 3de1ee8

Browse files
adamcarhedenMarkusBordihn
adamcarheden
authored and
MarkusBordihn
committed
Moved AIY and Tutorial cards out of experimental (#209)
- Fixed bug displaying feedback for SVG tutorial
1 parent b5d7f36 commit 3de1ee8

File tree

5 files changed

+70
-78
lines changed

5 files changed

+70
-78
lines changed

‎src/ui/select_screen/advanced/advanced.soy

Lines changed: 19 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
* Advanced overview template.
2525
*/
2626
{template .template}
27-
{@param experimental: bool}
2827
{@param prefix: string}
2928

3029
<div class="{$prefix}overview mdl-layout mdl-js-layout">
@@ -76,13 +75,11 @@
7675
{param icon kind="html"}{call cwc.soy.SelectScreenAdvanced.graphic.icon /}{/param}
7776
{/call}
7877

79-
{if $experimental}
80-
{call cwc.soy.SelectScreenTemplate.mainTabBarLink}
81-
{param id: 'aiy' /}
82-
{param name: 'AIY' /}
83-
{param icon kind="html"}{call cwc.soy.SelectScreenAdvanced.aiy.icon /}{/param}
84-
{/call}
85-
{/if}
78+
{call cwc.soy.SelectScreenTemplate.mainTabBarLink}
79+
{param id: 'aiy' /}
80+
{param name: 'AIY' /}
81+
{param icon kind="html"}{call cwc.soy.SelectScreenAdvanced.aiy.icon /}{/param}
82+
{/call}
8683
</nav>
8784
</header>
8885

@@ -138,14 +135,12 @@
138135
{/param}
139136
{/call}
140137

141-
{if $experimental}
142-
{call cwc.soy.SelectScreenTemplate.mainTabBarContent}
143-
{param id: 'aiy' /}
144-
{param content kind="html"}
145-
{call cwc.soy.SelectScreenAdvanced.aiy.overview data="all" /}
146-
{/param}
147-
{/call}
148-
{/if}
138+
{call cwc.soy.SelectScreenTemplate.mainTabBarContent}
139+
{param id: 'aiy' /}
140+
{param content kind="html"}
141+
{call cwc.soy.SelectScreenAdvanced.aiy.overview data="all" /}
142+
{/param}
143+
{/call}
149144

150145
</div>
151146

@@ -157,7 +152,6 @@
157152
* Advanced overview page.
158153
*/
159154
{template .overview}
160-
{@param experimental: bool}
161155

162156
{call cwc.soy.SelectScreenTemplate.container}
163157
{param header kind="html"}
@@ -224,16 +218,14 @@
224218
{param opt_icon: '3d_rotation' /}
225219
{/call}
226220

227-
{if $experimental}
228-
{call cwc.soy.SelectScreenTemplate.selectCard data="all"}
229-
{param title: 'AIY' /}
230-
{param text: 'Build for one of the Google AIY kits' /}
231-
{param link_text: 'Start with AIY' /}
232-
{param tab: 'aiy' /}
233-
{param opt_color_class: 'bg-orange' /}
234-
{param opt_icon: 'build' /}
235-
{/call}
236-
{/if}
221+
{call cwc.soy.SelectScreenTemplate.selectCard data="all"}
222+
{param title: 'AIY' /}
223+
{param text: 'Build for one of the Google AIY kits' /}
224+
{param link_text: 'Start with AIY' /}
225+
{param tab: 'aiy' /}
226+
{param opt_color_class: 'bg-orange' /}
227+
{param opt_icon: 'build' /}
228+
{/call}
237229

238230
{/param}
239231
{/call}

‎src/ui/select_screen/advanced/programming/javascript/javascript.soy

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
* JavaScript overview page.
2525
*/
2626
{template .overview}
27-
{@param experimental: bool}
2827
{@param online: bool}
2928

3029
{call cwc.soy.SelectScreenTemplate.container}
@@ -91,27 +90,25 @@
9190
{/param}
9291
{/call}
9392

94-
{if $experimental}
95-
<div id="tutorial-javascript-content">
96-
{call cwc.soy.SelectScreenTemplate.titleGrid data="all"}
97-
{param text: 'Select a Tutorial ...' /}
93+
<div id="tutorial-javascript-content">
94+
{call cwc.soy.SelectScreenTemplate.titleGrid data="all"}
95+
{param text: 'Select a Tutorial ...' /}
96+
{param opt_icon: 'school' /}
97+
{/call}
98+
99+
<div class="mdl-grid">
100+
101+
{call cwc.soy.SelectScreenTemplate.fileCard data="all"}
102+
{param title: 'Scalable Vector Graphics' /}
103+
{param text: 'Drawing with JavaScript' /}
104+
{param opt_link_text: 'Learn to draw with JavaScript' /}
105+
{param tutorial: 'javascript/script/svg.cwct' /}
106+
{param opt_color_class: 'bg-light-blue' /}
98107
{param opt_icon: 'school' /}
99108
{/call}
100-
101-
<div class="mdl-grid">
102-
103-
{call cwc.soy.SelectScreenTemplate.fileCard data="all"}
104-
{param title: 'Scalable Vector Graphics' /}
105-
{param text: 'Drawing with JavaScript' /}
106-
{param opt_link_text: 'Learn to draw with JavaScript' /}
107-
{param tutorial: 'javascript/script/svg.cwct' /}
108-
{param opt_color_class: 'bg-light-blue' /}
109-
{param opt_icon: 'school' /}
110-
{/call}
111109

112-
</div>
113110
</div>
114-
{/if}
111+
</div>
115112

116113
{/template}
117114

‎src/ui/select_screen/normal/basic/basic.soy

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -110,42 +110,42 @@
110110
{/call}
111111
</div>
112112
</div>
113+
{/if}
113114

114-
<div id="tutorial-basic-content">
115-
{call cwc.soy.SelectScreenTemplate.titleGrid data="all"}
116-
{param text: 'Select a Tutorial ...' /}
115+
<div id="tutorial-basic-content">
116+
{call cwc.soy.SelectScreenTemplate.titleGrid data="all"}
117+
{param text: 'Select a Tutorial ...' /}
118+
{param opt_icon: 'school' /}
119+
{/call}
120+
121+
<div class="mdl-grid cwc-tutorial-list">
122+
{call cwc.soy.SelectScreenTemplate.fileCard data="all"}
123+
{param title: 'Introduction to Coding with Chrome' /}
124+
{param text: 'Everything you need to know to get started.' /}
125+
{param opt_link_text: 'Learn CwC' /}
126+
{param tutorial: 'cwc.cwct' /}
127+
{param opt_color_class: 'bg-light-blue' /}
117128
{param opt_icon: 'school' /}
118129
{/call}
119130

120-
<div class="mdl-grid cwc-tutorial-list">
121-
{call cwc.soy.SelectScreenTemplate.fileCard data="all"}
122-
{param title: 'Introduction to Coding with Chrome' /}
123-
{param text: 'Everything you need to know to get started.' /}
124-
{param opt_link_text: 'Learn CwC' /}
125-
{param tutorial: 'cwc.cwct' /}
126-
{param opt_color_class: 'bg-light-blue' /}
127-
{param opt_icon: 'school' /}
128-
{/call}
129-
130-
{call cwc.soy.SelectScreenTemplate.fileCard data="all"}
131-
{param title: 'Blockly Basics' /}
132-
{param text: 'Learn drag-and-drop programming' /}
133-
{param opt_link_text: 'Learn Blockly' /}
134-
{param tutorial: 'basic/blocks/blockly.cwct' /}
135-
{param opt_color_class: 'bg-light-blue' /}
136-
{param opt_icon: 'school' /}
137-
{/call}
131+
{call cwc.soy.SelectScreenTemplate.fileCard data="all"}
132+
{param title: 'Blockly Basics' /}
133+
{param text: 'Learn drag-and-drop programming' /}
134+
{param opt_link_text: 'Learn Blockly' /}
135+
{param tutorial: 'basic/blocks/blockly.cwct' /}
136+
{param opt_color_class: 'bg-light-blue' /}
137+
{param opt_icon: 'school' /}
138+
{/call}
138139

139-
{call cwc.soy.SelectScreenTemplate.fileCard data="all"}
140-
{param title: 'Output' /}
141-
{param text: 'Your first program: Hello, World!' /}
142-
{param opt_link_text: 'Learn Output' /}
143-
{param tutorial: 'basic/blocks/hello.cwct' /}
144-
{param opt_color_class: 'bg-light-blue' /}
145-
{param opt_icon: 'school' /}
146-
{/call}
147-
</div>
140+
{call cwc.soy.SelectScreenTemplate.fileCard data="all"}
141+
{param title: 'Output' /}
142+
{param text: 'Your first program: Hello, World!' /}
143+
{param opt_link_text: 'Learn Output' /}
144+
{param tutorial: 'basic/blocks/hello.cwct' /}
145+
{param opt_color_class: 'bg-light-blue' /}
146+
{param opt_icon: 'school' /}
147+
{/call}
148148
</div>
149+
</div>
149150

150-
{/if}
151151
{/template}

‎static_files/tutorials/basic/blocks/blockly.cwct/eng/step1/tour.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
"element": ".blocklyTreeRowItem_draw",
66
"on": "right"
77
},
8-
"text": "Drag a 'Circle' block into the editor"
8+
"text": "Click the 'Draw' category and drag a 'Circle' block into the editor"
99
}
1010
]

‎static_files/tutorials/javascript/script/svg.cwct/cwct.template

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,10 @@
8282
"mime_type": "text/markdown"
8383
},
8484
"___TEMPLATE___:code": "eng/step8/code.js",
85-
"___TEMPLATE___:validate": "eng/step8/validate.js"
85+
"validate": {
86+
"type": "function",
87+
"___TEMPLATE___:value": "eng/step8/validate.js"
88+
}
8689
}
8790
]
8891
}

0 commit comments

Comments
 (0)