wellton/CTAT
1
0
Fork 0
Código Issues Pull Requests Ações Pacotes Projetos Versões Wiki Atividade

Merge branch 'master' into CTAT4_1

Ver Código-Fonte
Esse commit está contido em:
Sandy Demi
2017-01-04 10:54:09 -05:00
commit de GitHub
pai 4eaa4c4780 5341e6dfd7
commit 825915dbab
25 arquivos alterados com 42 adições e 140 exclusões
Baixar Arquivo de Patch Baixar Arquivo de Diff Expandir todos os arquivos Colapsar todos os arquivos
Examples/CTATAudioButton.html
+1 -1
Ver Arquivo
@@ -6,7 +6,7 @@
<link rel="stylesheet" href="https://cdn.ctat.cs.cmu.edu/releases/latest/CTAT.min.css"/>
<link rel="stylesheet" href="css/ctat_example.css"/>
<script src="https://code.jquery.com/jquery-2.2.3.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/jquery.min.js"></script>
<!-- cdn.rawgit.com/CMUCTAT/CTAT/<tag>/Examples/ctat.min.js -->
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/ctat.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/ctatloader.js"></script>
Examples/CTATButton.html
+1 -1
Ver Arquivo
@@ -6,7 +6,7 @@
<link rel="stylesheet" href="https://cdn.ctat.cs.cmu.edu/releases/latest/CTAT.min.css"/>
<link rel="stylesheet" href="css/ctat_example.css"/>
<script src="https://code.jquery.com/jquery-2.2.3.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/jquery.min.js"></script>
<!-- cdn.rawgit.com/CMUCTAT/CTAT/<tag>/Examples/ctat.min.js -->
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/ctat.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/ctatloader.js"></script>
Examples/CTATCheckBox.html
+1 -1
Ver Arquivo
@@ -6,7 +6,7 @@
<link rel="stylesheet" href="https://cdn.ctat.cs.cmu.edu/releases/latest/CTAT.min.css"/>
<link rel="stylesheet" href="css/ctat_example.css"/>
<script src="https://code.jquery.com/jquery-2.2.3.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/jquery.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/ctat.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/ctatloader.js"></script>
<script>
Examples/CTATComboBox.brd
+8 -92
Ver Arquivo
@@ -13,7 +13,7 @@
<verb>NotePropertySet</verb>
<properties>
<MessageType>InterfaceAction</MessageType>
<transaction_id>2b22b39c-7e73-1e2d-09a6-918a65571044</transaction_id>
<transaction_id>a157d78b-e522-7eda-d2bf-c8fca5f1214f</transaction_id>
<Selection>
<value>combo2</value>
</Selection>
@@ -25,22 +25,6 @@
</Input>
</properties>
</message>
<message>
<verb>NotePropertySet</verb>
<properties>
<MessageType>InterfaceAction</MessageType>
<transaction_id>aa31f28f-d31f-2fd9-a070-2ec017eab1f9</transaction_id>
<Selection>
<value>combo3</value>
</Selection>
<Action>
<value>setLabels</value>
</Action>
<Input>
<value>oui;non</value>
</Input>
</properties>
</message>
<message>
<verb>SendNoteProperty</verb>
<properties>
@@ -60,32 +44,24 @@
<text>state1</text>
<uniqueID>2</uniqueID>
<dimension>
<x>146</x>
<y>139</y>
<x>148</x>
<y>114</y>
</dimension>
</node>
<node locked="false" doneState="false">
<text>state2</text>
<uniqueID>3</uniqueID>
<dimension>
<x>146</x>
<y>249</y>
</dimension>
</node>
<node locked="false" doneState="false">
<text>state3</text>
<uniqueID>4</uniqueID>
<dimension>
<x>146</x>
<y>359</y>
<x>148</x>
<y>194</y>
</dimension>
</node>
<node locked="false" doneState="true">
<text>Done</text>
<uniqueID>5</uniqueID>
<dimension>
<x>150</x>
<y>469</y>
<x>151</x>
<y>274</y>
</dimension>
</node>
<edge>
@@ -208,66 +184,6 @@
<destID>3</destID>
<traversalCount>0</traversalCount>
</edge>
<edge>
<actionLabel preferPathMark="true" minTraversals="1" maxTraversals="1">
<studentHintRequest></studentHintRequest>
<stepSuccessfulCompletion></stepSuccessfulCompletion>
<stepStudentError></stepStudentError>
<uniqueID>5</uniqueID>
<message>
<verb>NotePropertySet</verb>
<properties>
<MessageType>InterfaceAction</MessageType>
<transaction_id>8147daff-e3a4-695f-7992-0224ba112d7a</transaction_id>
<Selection>
<value>combo3</value>
</Selection>
<Action>
<value>UpdateComboBox</value>
</Action>
<Input>
<value>oui</value>
</Input>
</properties>
</message>
<buggyMessage>No, this is not correct.</buggyMessage>
<successMessage></successMessage>
<hintMessage>Please select 'oui' from the highlighted menu.</hintMessage>
<callbackFn></callbackFn>
<actionType>Correct Action</actionType>
<oldActionType>Correct Action</oldActionType>
<checkedStatus>Never Checked</checkedStatus>
<matchers Concatenation="true">
<Selection>
<matcher>
<matcherType>ExactMatcher</matcherType>
<matcherParameter name="single">combo3</matcherParameter>
</matcher>
</Selection>
<Action>
<matcher>
<matcherType>ExactMatcher</matcherType>
<matcherParameter name="single">UpdateComboBox</matcherParameter>
</matcher>
</Action>
<Input>
<matcher>
<matcherType>ExactMatcher</matcherType>
<matcherParameter name="single">oui</matcherParameter>
</matcher>
</Input>
<Actor linkTriggered="false">Student</Actor>
</matchers>
</actionLabel>
<preCheckedStatus>No-Applicable</preCheckedStatus>
<rule>
<text>unnamed</text>
<indicator>-1</indicator>
</rule>
<sourceID>3</sourceID>
<destID>4</destID>
<traversalCount>0</traversalCount>
</edge>
<edge>
<actionLabel preferPathMark="true" minTraversals="1" maxTraversals="1">
<studentHintRequest></studentHintRequest>
@@ -324,7 +240,7 @@
<text>unnamed</text>
<indicator>-1</indicator>
</rule>
<sourceID>4</sourceID>
<sourceID>3</sourceID>
<destID>5</destID>
<traversalCount>0</traversalCount>
</edge>
Examples/CTATComboBox.html
+4 -21
Ver Arquivo
@@ -6,7 +6,7 @@
<link rel="stylesheet" href="https://cdn.ctat.cs.cmu.edu/releases/latest/CTAT.min.css"/>
<link rel="stylesheet" href="css/ctat_example.css"/>
<script src="https://code.jquery.com/jquery-2.2.3.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/jquery.min.js"></script>
<!-- cdn.rawgit.com/CMUCTAT/CTAT/<tag>/Examples/ctat.min.js -->
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/ctat.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/ctatloader.js"></script>
@@ -50,7 +50,8 @@ function ctatOnload() {
<hr/>
<div>
<div class="ctat_example">
A select where the options are set with an attribute:
<p>A select where the options are set with an attribute:</p>
Select "oui":
<div id="combo2" class="CTATComboBox" data-ctat-labels="----,oui,non">
</div>
</div>
@@ -61,30 +62,12 @@ function ctatOnload() {
&lt;/div&gt;</pre>
</div>
</div>
<hr/>
<div>
<div class="ctat_example">
A select using both ways of setting options:
<div id="combo3" class="CTATComboBox" data-ctat-labels="oui;non"
data-ctat-split-on=";">
<option>----</option>
</div>
</div>
<div class="ctat_code">
<pre>
&lt;div id="combo2" class="CTATComboBox"
data-ctat-labels="oui;non"
data-ctat-split-on=";"&gt;
&lt;option&gt;----&lt;/option&gt;
&lt;/div&gt;</pre>
</div>
</div>
<div id="hint-box" style="margin:3px;text-align:right;">
<div id="HintWindow" class="CTATHintWindow"></div>
<div style="float:right;">
<div id="hint-button" class="CTATHintButton"></div>
<div id="done-button" class="CTATDoneButton"></div>
<div id="done" class="CTATDoneButton"></div>
</div>
</div>
</div>
Examples/CTATDragNDrop.html
+1 -1
Ver Arquivo
@@ -6,7 +6,7 @@
<link rel="stylesheet" href="https://cdn.ctat.cs.cmu.edu/releases/latest/CTAT.min.css"/>
<link rel="stylesheet" href="css/ctat_example.css"/>
<script src="https://code.jquery.com/jquery-2.2.3.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/jquery.min.js"></script>
<!-- cdn.rawgit.com/CMUCTAT/CTAT/<tag>/Examples/ctat.min.js -->
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/ctat.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/ctatloader.js"></script>
Examples/CTATFractionBar.html
+1 -1
Ver Arquivo
@@ -6,7 +6,7 @@
<link rel="stylesheet" href="https://cdn.ctat.cs.cmu.edu/releases/latest/CTAT.min.css"/>
<link rel="stylesheet" href="css/ctat_example.css"/>
<script src="https://code.jquery.com/jquery-2.2.3.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/jquery.min.js"></script>
<!-- cdn.rawgit.com/CMUCTAT/CTAT/<tag>/Examples/ctat.min.js -->
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/ctat.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/ctatloader.js"></script>
Examples/CTATGroupingComponent-UseDiv.html
+2 -2
Ver Arquivo
@@ -23,7 +23,7 @@
}
</style>
<script src="https://code.jquery.com/jquery-3.1.0.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/jquery.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/ctat.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/ctatloader.js"></script>
@@ -85,4 +85,4 @@
</div>
</body>
</html>
</html>
Examples/CTATGroupingComponent-UseList.brd
+4 -4
Ver Arquivo
@@ -380,7 +380,7 @@
</message>
<buggyMessage>No, this is not correct.</buggyMessage>
<successMessage></successMessage>
<hintMessage>Please enter '8' in the highlighted field.</hintMessage>
<hintMessage>Please enter '16' in the highlighted field.</hintMessage>
<callbackFn></callbackFn>
<actionType>Correct Action</actionType>
<oldActionType>Correct Action</oldActionType>
@@ -560,7 +560,7 @@
</message>
<buggyMessage>No, this is not correct.</buggyMessage>
<successMessage></successMessage>
<hintMessage>Please enter '8' in the highlighted field.</hintMessage>
<hintMessage>Please enter '32' in the highlighted field.</hintMessage>
<callbackFn></callbackFn>
<actionType>Correct Action</actionType>
<oldActionType>Correct Action</oldActionType>
@@ -740,7 +740,7 @@
</message>
<buggyMessage>No, this is not correct.</buggyMessage>
<successMessage></successMessage>
<hintMessage>Please enter '8' in the highlighted field.</hintMessage>
<hintMessage>Please enter '64' in the highlighted field.</hintMessage>
<callbackFn></callbackFn>
<actionType>Correct Action</actionType>
<oldActionType>Correct Action</oldActionType>
@@ -920,7 +920,7 @@
</message>
<buggyMessage>No, this is not correct.</buggyMessage>
<successMessage></successMessage>
<hintMessage>Please enter '8' in the highlighted field.</hintMessage>
<hintMessage>Please enter '128' in the highlighted field.</hintMessage>
<callbackFn></callbackFn>
<actionType>Correct Action</actionType>
<oldActionType>Correct Action</oldActionType>
Examples/CTATGroupingComponent-UseList.html
+1 -1
Ver Arquivo
@@ -23,7 +23,7 @@
}
</style>
<script src="https://code.jquery.com/jquery-3.1.0.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/jquery.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/ctat.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/ctatloader.js"></script>
Examples/CTATImageButton.html
+1 -1
Ver Arquivo
@@ -6,7 +6,7 @@
<link rel="stylesheet" href="https://cdn.ctat.cs.cmu.edu/releases/latest/CTAT.min.css"/>
<link rel="stylesheet" href="css/ctat_example.css"/>
<script src="https://code.jquery.com/jquery-2.2.3.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/jquery.min.js"></script>
<!-- cdn.rawgit.com/CMUCTAT/CTAT/<tag>/Examples/ctat.min.js -->
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/ctat.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/ctatloader.js"></script>
Examples/CTATJumble.html
+1 -1
Ver Arquivo
@@ -6,7 +6,7 @@
<link rel="stylesheet" href="https://cdn.ctat.cs.cmu.edu/releases/latest/CTAT.min.css"/>
<link rel="stylesheet" href="css/ctat_example.css"/>
<script src="https://code.jquery.com/jquery-2.2.3.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/jquery.min.js"></script>
<!-- cdn.rawgit.com/CMUCTAT/CTAT/<tag>/Examples/ctat.min.js -->
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/ctat.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/ctatloader.js"></script>
Examples/CTATNumberLine.html
+1 -1
Ver Arquivo
@@ -6,7 +6,7 @@
<link rel="stylesheet" href="https://cdn.ctat.cs.cmu.edu/releases/latest/CTAT.min.css"/>
<link rel="stylesheet" href="css/ctat_example.css"/>
<script src="https://code.jquery.com/jquery-2.2.3.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/jquery.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/ctat.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/ctatloader.js"></script>
<script>
Examples/CTATNumericStepper.html
+1 -1
Ver Arquivo
@@ -6,7 +6,7 @@
<link rel="stylesheet" href="https://cdn.ctat.cs.cmu.edu/releases/latest/CTAT.min.css"/>
<link rel="stylesheet" href="css/ctat_example.css"/>
<script src="https://code.jquery.com/jquery-2.2.3.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/jquery.min.js"></script>
<!-- cdn.rawgit.com/CMUCTAT/CTAT/<tag>/Examples/ctat.min.js -->
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/ctat.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/ctatloader.js"></script>
Examples/CTATPieChart.html
+1 -1
Ver Arquivo
@@ -6,7 +6,7 @@
<link rel="stylesheet" href="https://cdn.ctat.cs.cmu.edu/releases/latest/CTAT.min.css"/>
<link rel="stylesheet" href="css/ctat_example.css"/>
<script src="https://code.jquery.com/jquery-2.2.3.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/jquery.min.js"></script>
<!-- cdn.rawgit.com/CMUCTAT/CTAT/<tag>/Examples/ctat.min.js -->
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/ctat.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/ctatloader.js"></script>
Examples/CTATRadioButton.html
+1 -1
Ver Arquivo
@@ -6,7 +6,7 @@
<link rel="stylesheet" href="https://cdn.ctat.cs.cmu.edu/releases/latest/CTAT.min.css"/>
<link rel="stylesheet" href="css/ctat_example.css"/>
<script src="https://code.jquery.com/jquery-2.2.3.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/jquery.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/ctat.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/ctatloader.js"></script>
<script>
Examples/CTATSubmitButton.html
+1 -1
Ver Arquivo
@@ -6,7 +6,7 @@
<link rel="stylesheet" href="https://cdn.ctat.cs.cmu.edu/releases/latest/CTAT.min.css"/>
<link rel="stylesheet" href="css/ctat_example.css"/>
<script src="https://code.jquery.com/jquery-2.2.3.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/jquery.min.js"></script>
<!-- cdn.rawgit.com/CMUCTAT/CTAT/<tag>/Examples/ctat.min.js -->
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/ctat.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/ctatloader.js"></script>
Examples/CTATTable.html
+1 -1
Ver Arquivo
@@ -6,7 +6,7 @@
<link rel="stylesheet" href="https://cdn.ctat.cs.cmu.edu/releases/latest/CTAT.min.css"/>
<link rel="stylesheet" href="css/ctat_example.css"/>
<script src="https://code.jquery.com/jquery-2.2.3.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/jquery.min.js"></script>
<!-- cdn.rawgit.com/CMUCTAT/CTAT/<tag>/Examples/ctat.min.js -->
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/ctat.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/ctatloader.js"></script>
Examples/CTATTextArea.html
+1 -1
Ver Arquivo
@@ -6,7 +6,7 @@
<link rel="stylesheet" href="https://cdn.ctat.cs.cmu.edu/releases/latest/CTAT.min.css"/>
<link rel="stylesheet" href="css/ctat_example.css"/>
<script src="https://code.jquery.com/jquery-2.2.3.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/jquery.min.js"></script>
<!-- cdn.rawgit.com/CMUCTAT/CTAT/<tag>/Examples/ctat.min.js -->
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/ctat.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/ctatloader.js"></script>
Examples/CTATTextField.html
+1 -1
Ver Arquivo
@@ -6,7 +6,7 @@
<link rel="stylesheet" href="https://cdn.ctat.cs.cmu.edu/releases/latest/CTAT.min.css"/>
<link rel="stylesheet" href="css/ctat_example.css"/>
<script src="https://code.jquery.com/jquery-2.2.3.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/jquery.min.js"></script>
<script src='https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML' async></script>
<!-- cdn.rawgit.com/CMUCTAT/CTAT/<tag>/Examples/ctat.min.js -->
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/ctat.min.js"></script>
Examples/CTATTextInput.html
+1 -1
Ver Arquivo
@@ -6,7 +6,7 @@
<link rel="stylesheet" href="https://cdn.ctat.cs.cmu.edu/releases/latest/CTAT.min.css"/>
<link rel="stylesheet" href="css/ctat_example.css"/>
<script src="https://code.jquery.com/jquery-2.2.3.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/jquery.min.js"></script>
<!-- cdn.rawgit.com/CMUCTAT/CTAT/<tag>/Examples/ctat.min.js -->
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/ctat.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/ctatloader.js"></script>
Examples/CTATVideo.html
+2 -2
Ver Arquivo
@@ -7,7 +7,7 @@
html,body { width: 100%; height: 100%; margin: 0px; padding: 0px; }
</style>
<script src="https://code.jquery.com/jquery-2.2.3.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/jquery.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/ctat.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/ctatloader.js"></script>
@@ -48,4 +48,4 @@ html,body { width: 100%; height: 100%; margin: 0px; padding: 0px; }
</div>
</body>
</html>
</html>
Examples/FractionAddition-CustomLogging.html
+1 -1
Ver Arquivo
@@ -3,7 +3,7 @@
<meta http-equiv="cache-control" content="no-cache">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="stylesheet" href="https://cdn.ctat.cs.cmu.edu/releases/latest/CTAT.min.css"/>
<script src="https://code.jquery.com/jquery-2.2.3.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/jquery.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/ctat.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/ctatloader.js"></script>
<script>
Examples/FractionAddition.html
+1 -1
Ver Arquivo
@@ -3,7 +3,7 @@
<meta http-equiv="cache-control" content="no-cache">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="stylesheet" href="https://cdn.ctat.cs.cmu.edu/releases/latest/CTAT.min.css"/>
<script src="https://code.jquery.com/jquery-2.2.3.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/jquery.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/ctat.min.js"></script>
<script src="https://cdn.ctat.cs.cmu.edu/releases/latest/ctatloader.js"></script>
<script>
Examples/css/ctat_example.css
+3
Ver Arquivo
@@ -32,6 +32,9 @@ div.ctat_code {
#done-button {
margin: 0 5px 0px 5px
}
#done {
margin: 0 5px 0px 5px
}
#HintWindow {
display: inline-flex;
}