Merge branch 'master' into simple-israel-login

app/locale/sk.coffee

@@ -10,7 +10,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
     classroom_in_a_box: "Virtuálna trieda pre výuku programovania."
     codecombat_is: "CodeCombat je platforma  <strong>pre študentov</strong>, kde sa naučia programovať hrou. "
     our_courses: "Naše kurzy boli špeciálne testované <strong>v reálnych triedach</strong> a to dokonca aj učiteľmi, ktorí nemali predchádzajúce skúsenosti v programovaní."
-#    watch_how: "Watch how CodeCombat is transforming the way people learn computer science."
+    watch_how: "Pozri si ako CodeCombat mení spôsob učenia informatiky."
     top_screenshots_hint: "Zmeny v správaní programu vidia študenti v reálnom čase."
     designed_with: "Navrhnuté s ohľadom na potreby učiteľov"
     real_code: "Skutočný kód"
@@ -23,12 +23,12 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
     everyone: "pre každého"
     democratizing: "Demokratizácia procesu výuky programovania je jadrom našej filozofie. Každému by malo byť umožnené naučiť sa programovať."
     forgot_learning: "Moji študenti zabudli, že sa učia programovať. Brali to ako hru."
-    wanted_to_do: "Vždy som sa chcel naučiť programovať a nikdy som nemyslel, že tu bude v škole."
+    wanted_to_do: "Vždy som sa chcel naučiť programovať a nikdy som nemyslel, že to bude v škole."
     why_games: "Prečo je učenie sa hrou také dôležité?"
     games_reward: "Hry odmeňujú tvorivé úsilie."
     encourage: "Hra podporuje interaktivitu, objavovanie a metódu pokusov a omylov. Dobrá hra núti hráča, aby sa časom jeho schopnosti zdokonaľovali, čo je ktitické aj v procese učenia."
     excel: "Hry vynikajú"
-    struggle: "v oceňovaní tvorivého úsilia,"
+    struggle: "v oceňovaní tvorivého úsilia"
     kind_of_struggle: "ktoré sa často spája s činnosťou,"
     motivating: "ktorá nie je"
     not_tedious: "nudná."
@@ -50,7 +50,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
     have_an_account: "Máš účet?"
     logged_in_as: "Si prihlásený ako"
     computer_science: "Kurz programovania pre každý vek" # {change}
-    ffa: "Zdarma pre všetkých študentov"
+    ffa: "Zdarma pre študentov"
     coming_soon: "Čoskoro!"
     courses_available_in: "Kurzy sú dostupné v JavaScripte, Pythone a čoskoro aj v Jave." # {change}
     boast: "Komplexita úloh je dostatočná na fascináciu hráčov aj programátorov."
@@ -1322,7 +1322,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 #    view_project: "View Project"
 #    start: "Start"
 #    last_level: "Last level played"
-#    not_you: "Not you?"
+    not_you: "Nie si to ty?"
 #    continue_playing: "Continue Playing"
 #    option1_header: "Invite Students by Email"
 #    remove_student1: "Remove Student"

app/schemas/models/level.coffee

@@ -68,7 +68,7 @@ GoalSchema = c.object {title: 'Goal', description: 'A goal that the player can a
   html: c.object {title: 'HTML', description: 'A jQuery selector and what its result should be'},
     selector: {type: 'string', description: 'jQuery selector to run on the user HTML, like "h1:first-child"'}
     valueChecks: c.array {title: 'Value checks', description: 'Logical checks on the resulting value for this goal to pass.', format: 'event-prereqs'}, EventPrereqSchema
-
+  concepts: c.array {title: 'Target Concepts', description: 'Which programming concepts this goal demonstrates.', uniqueItems: true, format: 'concepts-list'}, c.concept
 ResponseSchema = c.object {title: 'Dialogue Button', description: 'A button to be shown to the user with the dialogue.', required: ['text']},
   text: {title: 'Title', description: 'The text that will be on the button', 'default': 'Okay', type: 'string', maxLength: 30}
   channel: c.shortString(title: 'Channel', format: 'event-channel', description: 'Channel that this event will be broadcast over, like "level:set-playing".')

app/views/editor/level/settings/SettingsTabView.coffee

@@ -150,14 +150,14 @@ class ConceptNode extends TreemaNode.nodeMap.string
     @$el.append($("<span class='treema-description'>#{description}</span>").show())
 
   limitChoices: (options) ->
-    if @parent.keyForParent is 'concepts'
+    if @parent.keyForParent is 'concepts' and (not this.parent.parent)
       options = (o for o in options when _.find(concepts, (c) -> c.concept is o and not c.automatic and not c.deprecated))  # Allow manual, not automatic
     else
       options = (o for o in options when _.find(concepts, (c) -> c.concept is o and not c.deprecated))  # Allow both
     super options
 
   onClick: (e) ->
-    return if this.parent.keyForParent is 'concepts' and @$el.hasClass('concept-automatic')  # Don't allow editing of automatic concepts
+    return if this.parent.keyForParent is 'concepts' and (not this.parent.parent) and @$el.hasClass('concept-automatic')  # Don't allow editing of automatic concepts
     super e
 
 class ConceptsListNode extends TreemaNode.nodeMap.array