Final updates to speaker language on CFP

Signed-off-by: Jimmy McArthur <jimmy@tipit.net>

Author: jimmytipit

summit/code/forms/AddSpeakerForm.php

@@ -49,7 +49,7 @@ protected function getFormFields() {
         $max_moderators_reached = $this->presentation->maxModeratorsReached();
         $use_moderator          = $this->presentation->Type()->UseModerator;
         $moderator_exists       = $this->presentation->Moderator()->exists();
-        $speaker_type           = ($use_moderator && (!$max_moderators_reached || !$use_speakers)) ? 'moderator' : 'speaker';
+        $speaker_type           = ($use_moderator && (!$max_moderators_reached || !$use_speakers)) ? 'moderator' : 'moderator';
 
         $fields = FieldList::create(
             LiteralField::create('SpeakerNote',
@@ -84,14 +84,14 @@ protected function getFormFields() {
             || $this->presentation->ModeratorID == Member::currentUser()->getSpeakerProfile()->ID) {
             $fields->replaceField('SpeakerType', HiddenField::create('SpeakerType', '', 'Else'));
             $fields->field('EmailAddress')
-                ->setTitle('Enter the first name, last name or email address of your presenter/moderator (*)')
+                ->setTitle('Enter the first name, last name or email address of your '.$speaker_type.' (*)')
                 ->setDisplayLogicCriteria(null);
         }
 
         if ( (!$use_speakers || $speakers_exists) && (!$use_moderator || $moderator_exists) ) {
             if ( ($use_speakers && !$max_speakers_reached) || ($use_moderator && !$max_moderators_reached) ) {
                 $fields->insertBefore(
-                    LiteralField::create('MoreSpeakers', '<h3 class="more-speakers">Any more presenters/moderators to add?</h3>'),
+                    LiteralField::create('MoreSpeakers', '<h3 class="more-speakers">Any more '.$speaker_type.' to add?</h3>'),
                     'SpeakerNote'
                 );
                 $fields->removeField('SpeakerNote');
@@ -119,12 +119,12 @@ protected function getFormActions($controller) {
         $max_moderators_reached = $this->presentation->maxModeratorsReached();
         $use_moderator          = $this->presentation->Type()->UseModerator;
         $moderator_exists       = $this->presentation->Moderator()->exists();
-        $speaker_type           = ($use_moderator && (!$max_moderators_reached || !$use_speakers)) ? 'moderator' : 'speaker';
+        $speaker_type           = ($use_moderator && (!$max_moderators_reached || !$use_speakers)) ? 'moderator' : 'moderator';
         $actions = array();
 
         if ( (!$use_speakers || $speakers_exists) && (!$use_moderator || $moderator_exists) ) {
             if (($use_speakers && !$max_speakers_reached) || ($use_moderator && !$max_moderators_reached)) {
-                $actions[] = FormAction::create('doAddSpeaker', '<i class="fa fa-plus fa-start"></i> Add another moderator');
+                $actions[] = FormAction::create('doAddSpeaker', '<i class="fa fa-plus fa-start"></i> Add another '.$speaker_type);
             }
 
             $default_actions = $controller->createSaveActions('doFinishSpeaker', 3);

summit/code/forms/PresentationForm.php

@@ -78,7 +78,7 @@ protected function getPresentationFields() {
         foreach($types as $type){
             $instructions .= $type->Type;
             if(intval($type->MaxSpeakers > 0))
-                $instructions .= sprintf(" Max %s speakers", $type->MaxSpeakers);
+                $instructions .= sprintf(" Max %s moderators", $type->MaxSpeakers);
 
             if(intval($type->MaxModerators > 0))
                 $instructions .= sprintf(" %s moderator", $type->MaxModerators);
@@ -87,7 +87,7 @@ protected function getPresentationFields() {
         }
         $instructions .= ')';
         $fields = FieldList::create()
-            ->text('Title', 'Proposed Presentation Title')
+            ->text('Title', 'Proposed Title')
                 ->configure()
                     ->setAttribute('autofocus','TRUE')
                 ->end()
@@ -98,7 +98,7 @@ protected function getPresentationFields() {
                     ->setSource($types->map('ID', 'Type'))
                 ->end()
             ->literal('CategoryContainer','<div id="category_options"></div>')
-            ->dropdown('Level','Select the technical level of your presentation content')
+            ->dropdown('Level','Select the technical level of your session')
                 ->configure()
                     ->setEmptyString('-- Select one --')
                     ->setSource(Presentation::create()->dbObject('Level')->enumValues())
@@ -114,13 +114,13 @@ protected function getPresentationFields() {
                     ->setRows(10)
                     ->setColumns(8)
                 ->end()
-            ->tinyMCEEditor('AttendeesExpectedLearnt','What should attendees expect to learn? (1000 chars)')
+            ->tinyMCEEditor('AttendeesExpectedLearnt','Why is this session useful? (1000 chars)')
                 ->configure()
                     ->setRows(20)
                     ->setColumns(8)
                 ->end()
             ->optionset('AttendingMedia',
-                'Are you available to discuss the topic of this presentation with attending media?',
+                'Are you available to discuss this topic with attending media?',
                 array(
                     1 => 'Yes',
                     0 => 'No'
@@ -145,7 +145,7 @@ protected function getPresentationFields() {
                 ->end()
             ->literal('EndHr','<hr>');
 
-        $CategoryGroupField = new CategoryGroupField('GroupID','Select the <a href="'.$this->summit->Link.'categories" target="_blank">Summit Category</a> of your presentation');
+        $CategoryGroupField = new CategoryGroupField('GroupID','Select the <a href="'.$this->summit->Link.'categories" target="_blank">Summit Category</a> of your session');
         $CategoryGroupField->setSource($category_groups_map);
         if(count($category_groups_map) < 2 && count($category_groups_map) > 0 ) {
             $CategoryGroupField->setValue($category_groups_map[0]['id']);

summit/templates/PresentationPage.ss

@@ -19,7 +19,7 @@
         <% if $IsWelcome %>
             <div class="presentation-app-header success">
                 <div class="container">
-                    <p class="status">Welcome to OpenStack!</p>
+                    <p class="status">Welcome to the OpenStack CFP!</p>
                 </div>
             </div>
         <% end_if %>