Bug 1505873: Removing the 'for assesment' duplicate drop box

Also tidied up the fact that we were using two strings to do the job
that one string should do.

behatnotneeded: the form functioned fine with both dropdowns - it's
just we don't need two :)

Change-Id: Ib326adecf554739149c827637b280afc0a7435af
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

htdocs/lang/en.utf8/view.php

@@ -60,9 +60,9 @@ $string['reallyaddaccesstoemptyview'] = 'Your page contains no blocks. Do you re
 $string['viewdeleted'] = 'Page deleted';
 $string['viewsubmitted'] = 'Page submitted';
 $string['deletethisview'] = 'Delete this page';
-$string['submitthisviewto'] = 'Submit this page';
-$string['submitthiscollectionto'] = 'Submit this collection';
-$string['forassessment'] = 'for assessment';
+$string['submitthisviewto1'] = 'Submit this page for assessment to';
+$string['submitthiscollectionto1'] = 'Submit this collection for assessment to';
+$string['forassessment1'] = 'Submit for assessment';
 $string['accessfromdate2'] = 'Nobody else can see this page before %s.';
 $string['accessuntildate2'] = 'Nobody else can see this page after %s.';
 $string['accessbetweendates2'] = 'Nobody else can see this page before %s or after %s.';

htdocs/lib/group.php

@@ -1379,13 +1379,9 @@ function group_view_submission_form($groupid) {
         'successcallback' => 'group_view_submission_form_submit',
         'elements' => array(
             'text1' => array(
-                'class' => 'text-inline text-small',
-                'type' => 'html', 'value' => get_string('submit', 'group') . ' ',
-            ),
-            'text2' => array(
                 'type' => 'html',
                 'class' => 'forassessment text-inline text-small',
-                'value' => get_string('forassessment', 'view'),
+                'value' => get_string('forassessment1', 'view'),
             ),
             'inputgroup' => array(
                 'type' => 'fieldset',

htdocs/lib/view.php

@@ -6531,16 +6531,6 @@ function view_group_submission_form($view, $tutorgroupdata, $returnto=null) {
                 'class' => 'text-inline',
                 'value' => '',
             ),
-            'options' => array(
-                'type' => 'select',
-                'collapseifoneoption' => false,
-                'options' => $options,
-            ),
-            'text2' => array(
-                'type' => 'html',
-                'class' => 'prm',
-                'value' => get_string('forassessment', 'view'),
-            ),
             'inputgroup' => array(
                 'type' => 'fieldset',
                 'class' => 'input-group',
@@ -6570,14 +6560,14 @@ function view_group_submission_form($view, $tutorgroupdata, $returnto=null) {
             'type' => 'hidden',
             'value' => $view->get_collection()->get('id'),
         );
-        $form['elements']['text1']['value'] = get_string('submitthiscollectionto', 'view') . ' ';
+        $form['elements']['text1']['value'] = get_string('submitthiscollectionto1', 'view') . ' ';
     }
     else {
         $form['elements']['view'] = array(
             'type' => 'hidden',
             'value' => $viewid
         );
-        $form['elements']['text1']['value'] = get_string('submitthisviewto', 'view') . ' ';
+        $form['elements']['text1']['value'] = get_string('submitthisviewto1', 'view') . ' ';
     }
 
     return pieform($form);