[Stack-cvs] stack-1-0/lang/en stack.php,1.25,1.26

[Chris S. <san...@us...>]

Update of /cvsroot/stack/stack-1-0/lang/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12073/lang/en

Modified Files:
	stack.php 
Log Message:
**MAJOR** changes: added the Subject layer over the top,

Index: stack.php
===================================================================
RCS file: /cvsroot/stack/stack-1-0/lang/en/stack.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** stack.php	1 Sep 2005 08:13:57 -0000	1.25
--- stack.php	4 Sep 2005 19:24:57 -0000	1.26
***************
*** 49,52 ****
--- 49,55 ----
  $string['quiz_nonetochoose']   = 'You have no quizzes available.';
  
+ $string['subject_choose']         = 'Please choose a subject';
+ $string['subject_nonetochoose']   = 'You have no subjects available.';
+ 
  // Stack page footer.
  $string['ThisSTACKVer']      = 'This is STACK version';
***************
*** 120,124 ****
  $string['EmptyCASString']      =  'You have included a CAS string which is empty.  This is not permitted.'; // This occurs when validating CASText For example, a user might type "Factor @ @."
  $string['ErrorCASString']      =  'The string <font color=\'orange\'><tt>@{$a[\'key\']}@</tt></font> generated the following error(s)';
! $string['OddAmpCASString']     = 'You have an odd number of @s, which is not permitted.';
  
  $string['IncorrectPassword']   = 'Incorrect password!';
--- 123,127 ----
  $string['EmptyCASString']      =  'You have included a CAS string which is empty.  This is not permitted.'; // This occurs when validating CASText For example, a user might type "Factor @ @."
  $string['ErrorCASString']      =  'The string <font color=\'orange\'><tt>@{$a[\'key\']}@</tt></font> generated the following error(s)';
! $string['OddAmpCASString']     =  'You have an odd number of @s, which is not permitted.';
  
  $string['IncorrectPassword']   = 'Incorrect password!';
***************
*** 158,162 ****
  $string['stackQuestion_questionSol']            = 'Worked solution';
  $string['stackQuestion_questionOptions']        = 'Options';
! $string['stackQuestion_questionMetadata']   = 'Metadata';
  $string['stackQuestion_questionNote']           = 'Question note';
  $string['stackQuestion_questionID']             = 'Unique question ID';
--- 161,165 ----
  $string['stackQuestion_questionSol']            = 'Worked solution';
  $string['stackQuestion_questionOptions']        = 'Options';
! $string['stackQuestion_questionMetadata']       = 'Metadata';
  $string['stackQuestion_questionNote']           = 'Question note';
  $string['stackQuestion_questionID']             = 'Unique question ID';
***************
*** 170,184 ****
  
  // <PDK> $stackQuestion metadata added
! $string['stackQuestion_questionPublisher']  = 'Server published';
! $string['stackQuestion_questionType']       = 'Nature of content';
! $string['stackQuestion_questionFormat']     = 'Digital manifestation';
! $string['stackQuestion_questionLanguage']   = 'Language of content';
! $string['stackQuestion_questionLearningContext']= 'Targetted to';
! $string['stackQuestion_questionDifficulty'] = 'Difficulty';
! $string['stackQuestion_questionCompetency'] = 'Competencies trained';
! $string['stackQuestion_questionCompetencyLevel']= 'Skills required';
! $string['stackQuestion_questionTimeAllocated']  = 'Recommended time to take';
! $string['stackQuestion_questionExcerciseType']  = 'Type of question';
! $string['stackQuestion_questionRights']     = 'Rights statement';
  
  // Used in the question bank order select form to indicate no selection.
--- 173,187 ----
  
  // <PDK> $stackQuestion metadata added
! $string['stackQuestion_questionPublisher']       = 'Server published';
! $string['stackQuestion_questionType']            = 'Nature of content';
! $string['stackQuestion_questionFormat']          = 'Digital manifestation';
! $string['stackQuestion_questionLanguage']        = 'Language of content';
! $string['stackQuestion_questionLearningContext'] = 'Targetted to';
! $string['stackQuestion_questionDifficulty']      = 'Difficulty';
! $string['stackQuestion_questionCompetency']      = 'Competencies trained';
! $string['stackQuestion_questionCompetencyLevel'] = 'Skills required';
! $string['stackQuestion_questionTimeAllocated']   = 'Recommended time to take';
! $string['stackQuestion_questionExcerciseType']   = 'Type of question';
! $string['stackQuestion_questionRights']          = 'Rights statement';
  
  // Used in the question bank order select form to indicate no selection.
***************
*** 228,231 ****
--- 231,253 ----
  
  ////////////////////////////////////
+ // Subject
+ ////////////////////////////////////
+ $string['stackSubject_subjectName']           = 'Subject name';
+ 
+ // <PDK> $stackQuestion metadata added
+ $string['stackSubject_subjectPublisher']      = 'Server published';
+ $string['stackSubject_subjectType']           = 'Nature of content';
+ $string['stackSubject_subjectFormat']         = 'Digital manifestation';
+ $string['stackSubject_subjectLanguage']       = 'Language of content';
+ $string['stackSubject_subjectLearningContext']= 'Targetted to';
+ $string['stackSubject_subjectDifficulty']     = 'Difficulty';
+ $string['stackSubject_subjectCompetency']     = 'Competencies trained';
+ $string['stackSubject_subjectCompetencyLevel']= 'Skills required';
+ $string['stackSubject_subjectTimeAllocated']  = 'Recommended time to take';
+ $string['stackSubject_subjectExcerciseType']  = 'Type of subject';
+ $string['stackSubject_subjectRights']         = 'Rights statement';
+ 
+ 
+ ////////////////////////////////////
  // Options 
  ////////////////////////////////////
***************
*** 260,263 ****
--- 282,286 ----
  $string['stackOptions_FeedBackGenericPCorrect_def']  = "<font color='orange'>Your answer is partially correct.</font>";
  $string['stackOptions_QuizMode']           = 'Quiz mode';
+ $string['stackOptions_SubjectMode']        = 'Allow access to';
  
  ////////////////////////////////////
***************
*** 292,295 ****
--- 315,319 ----
  
  $string['menu_SelectQ']     = 'Select Quiz';
+ $string['menu_SelectS']     = 'Select Subject';
  $string['menu_Update']      = 'Update user info';
  $string['menu_Logout']      = 'Logout';
***************
*** 307,310 ****
--- 331,336 ----
  $string['menu_Import']      = 'Import';
  $string['menu_Quizzes']     = 'Quizzes';
+ $string['menu_Subjects']    = 'Subjects';
+ $string['menu_Zone']        = 'Zone';
  $string['menu_Reporting']   = 'Reporting';
  $string['menu_Qfields']     = 'Question fields';
***************
*** 314,323 ****
  
  ////////////////////////////////////
- // Question bank. 
- ////////////////////////////////////
- 
- $string['qp_notadmin']           = "<p><font color='red'>Warning!</font> You are not the admin user and any changes will not be stored in the database.</p>";
- 
- ////////////////////////////////////
  // Interactions with the CAS 
  ////////////////////////////////////
--- 340,343 ----
***************
*** 383,386 ****
--- 403,416 ----
  $string['ATDiff_int']               = 'It looks like you have integrated instead!';
  
+ ////////////////////////////////////
+ // Front end.
+ ////////////////////////////////////
+ 
+ $string['qp_notadmin']     = "<p><font color='red'>Warning!</font> You are not the admin user and any changes will not be stored in the database.</p>";
+ 
+ $string['FE_notadmin']     = 'Not permitted!';
+ $string['FE_needadmin']    = 'You need to be logged in as the admin to edit quizzes, but seem to be user {$a}.';
+ $string['FE_errors_exist'] = 'Errors exist!';
+ $string['FE_errors_field'] = 'The field $a, gave the following error.';
  
  $string['']  = '';
***************
*** 388,391 ****
--- 418,422 ----
  $string['']  = '';
  
+ 
  //get_string('ThisSTACKVer','stack','')
  ?>