Merge pull request #401 from edx/markhoeber-doc1918

Poll and Survey XBlock
openedx · Jul 8, 2015 · 54f4971 · 54f4971
2 parents 6f647cd + 0300484
commit 54f4971
Show file tree

Hide file tree

Showing 25 changed files with 611 additions and 8 deletions.
diff --git a/en_us/course_authors/source/exercises_tools/index.rst b/en_us/course_authors/source/exercises_tools/index.rst
@@ -43,12 +43,14 @@ Course Content Index`.
    numerical_input
    open_response_assessments/index
    periodic_table
+   poll_question
    poll
    problem_with_hint
    problem_in_latex
    protein_builder
    randomized_content_blocks
    recommenderXBlock
+   survey
    text_input
    word_cloud
    custom_python

diff --git a/en_us/course_authors/source/exercises_tools/poll_question.rst b/en_us/course_authors/source/exercises_tools/poll_question.rst
@@ -0,0 +1 @@
+.. include:: ../../../shared/exercises_tools/poll_question.rst
diff --git a/en_us/course_authors/source/exercises_tools/survey.rst b/en_us/course_authors/source/exercises_tools/survey.rst
@@ -0,0 +1,2 @@
+.. include:: ../../../shared/exercises_tools/survey.rst
+
diff --git a/en_us/course_authors/source/front_matter/change_log.rst b/en_us/course_authors/source/front_matter/change_log.rst
@@ -22,7 +22,9 @@ July 2015
 
    * - Date
      - Change
-   * - 01 July
+   * - 8 July 2015
+     - Added the :ref:`Poll Tool` and :ref:`Survey Tool` sections.
+   * - 1 July
      - Several additions were made to provide information about using feedback
        and hints in common problems.
 
@@ -243,4 +245,3 @@ January 2015
        Tool` chapters.
    * - 1/7/15
      - Added the :ref:`Rerun a Course` chapter.
-
diff --git a/en_us/olx/source/front_matter/change_log.rst b/en_us/olx/source/front_matter/change_log.rst
@@ -3,7 +3,21 @@ Change Log
 ############
 
 ****************
-March 2015
+July 2015
+****************
+
+.. list-table::
+   :widths: 10 70
+   :header-rows: 1
+
+   * - Date
+     - Change
+   * - 8 July 2015
+     - Added the :ref:`Poll Tool` and :ref:`Survey Tool` sections.
+
+
+****************
+June 2015
 ****************
 
 .. list-table::

diff --git a/en_us/olx/source/problem-xml/index.rst b/en_us/olx/source/problem-xml/index.rst
@@ -53,9 +53,11 @@ approximately identical.
    mult_choice_num_input
    multiple_choice
    numerical_input
+   poll_question
    problem_in_latex
    problem_with_hint
    protein_builder
+   survey
    symbolic_response
    text_input
 

diff --git a/en_us/olx/source/problem-xml/poll_question.rst b/en_us/olx/source/problem-xml/poll_question.rst
@@ -0,0 +1 @@
+.. include:: ../../../shared/exercises_tools/poll_question.rst
diff --git a/en_us/olx/source/problem-xml/survey.rst b/en_us/olx/source/problem-xml/survey.rst
@@ -0,0 +1,2 @@
+.. include:: ../../../shared/exercises_tools/survey.rst
+
diff --git a/en_us/open_edx_course_authors/source/exercises_tools/index.rst b/en_us/open_edx_course_authors/source/exercises_tools/index.rst
@@ -44,12 +44,14 @@ Course Content Index`.
    numerical_input
    open_response_assessments/index
    periodic_table
+   poll_question
    poll
    problem_with_hint
    problem_in_latex
    protein_builder
    randomized_content_blocks
    recommenderXBlock
+   survey
    text_input
    word_cloud
    custom_python

diff --git a/en_us/open_edx_course_authors/source/exercises_tools/poll_question.rst b/en_us/open_edx_course_authors/source/exercises_tools/poll_question.rst
@@ -0,0 +1 @@
+.. include:: ../../../shared/exercises_tools/poll_question.rst
diff --git a/en_us/open_edx_course_authors/source/exercises_tools/survey.rst b/en_us/open_edx_course_authors/source/exercises_tools/survey.rst
@@ -0,0 +1,2 @@
+.. include:: ../../../shared/exercises_tools/survey.rst
+
diff --git a/en_us/open_edx_course_authors/source/front_matter/change_log.rst b/en_us/open_edx_course_authors/source/front_matter/change_log.rst
@@ -12,7 +12,9 @@ July 2015
 
    * - Date
      - Change
-   * - 01 July
+   * - 8 July 2015
+     - Added the :ref:`Poll Tool` and :ref:`Survey Tool` sections.
+   * - 1 July
      - Several additions were made to provide information about using feedback
        and hints in common problems.
 

diff --git a/en_us/shared/building_and_running_chapters/Images/poll_studio.png b/en_us/shared/building_and_running_chapters/Images/poll_studio.png
diff --git a/en_us/shared/building_and_running_chapters/Images/poll_tool.png b/en_us/shared/building_and_running_chapters/Images/poll_tool.png
diff --git a/en_us/shared/building_and_running_chapters/Images/poll_view_results.png b/en_us/shared/building_and_running_chapters/Images/poll_view_results.png
diff --git a/en_us/shared/building_and_running_chapters/Images/poll_with_results.png b/en_us/shared/building_and_running_chapters/Images/poll_with_results.png
diff --git a/en_us/shared/building_and_running_chapters/Images/survey.png b/en_us/shared/building_and_running_chapters/Images/survey.png
diff --git a/en_us/shared/building_and_running_chapters/Images/survey_poll_advanced_setting.png b/en_us/shared/building_and_running_chapters/Images/survey_poll_advanced_setting.png
diff --git a/en_us/shared/building_and_running_chapters/Images/survey_results.png b/en_us/shared/building_and_running_chapters/Images/survey_results.png
diff --git a/en_us/shared/building_and_running_chapters/Images/survey_studio.png b/en_us/shared/building_and_running_chapters/Images/survey_studio.png
diff --git a/en_us/shared/building_and_running_chapters/Images/survey_view_results.png b/en_us/shared/building_and_running_chapters/Images/survey_view_results.png
diff --git a/en_us/shared/exercises_tools/create_exercises_and_tools.rst b/en_us/shared/exercises_tools/create_exercises_and_tools.rst
@@ -102,9 +102,14 @@ General Exercises and Tools
        upload. Open response assessments include self assessment and peer
        assessment.
      - Full support  
+   * - :ref:`Poll Tool`
+     - You can include polls in your course to gather learners' opinions on
+       various questions. You can use the Poll Tool in Studio.
+     - Full support 
    * - :ref:`Poll`
      - You can run polls in your course so that your students can share
-       opinions on different questions.
+       opinions on different questions. You can use this type of poll only in
+       OLX, not Studio.
      - Provisional support  
    * - :ref:`Problem with Adaptive Hint`
      - A problem with an adaptive hint evaluates a student's response, then
@@ -119,6 +124,10 @@ General Exercises and Tools
 
 .. Removed student notes row for now-- cannot conditionalize in tables. Currently student notes page is included in open edx, not in edx.
 
+   * - :ref:`Survey Tool`
+     - You can include surveys in your course to collect learner responses to
+       multiple questions. You can use the Survey Tool in Studio.
+     - Full support 
    * - :ref:`Text Input`
      - In text input problems, students enter text into a response field. The
        response can include numbers, letters, and special characters such as

diff --git a/en_us/shared/exercises_tools/poll.rst b/en_us/shared/exercises_tools/poll.rst
@@ -1,9 +1,9 @@
 
 .. _Poll:
 
-##########
-Poll Tool
-##########
+##################
+Poll Tool for OLX
+##################
 
 You can run polls in your course so that your students can share opinions on different questions.