Skip to content

Commit 490c44e

Browse files
breitybreity
committed
Better delineated node and link sections in Concept Map Authoring; updated layout and styles. #2885 
1 parent 7bf7e54 commit 490c44e

4 files changed

Lines changed: 350 additions & 330 deletions

File tree

‎src/main/webapp/site/src/messages.xlf‎

Lines changed: 64 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -6006,7 +6006,7 @@
60066006
<source>Prompt</source>
60076007
<context-group purpose="location">
60086008
<context context-type="sourcefile">../../wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html</context>
6009-
<context context-type="linenumber">2</context>
6009+
<context context-type="linenumber">3</context>
60106010
</context-group>
60116011
<context-group purpose="location">
60126012
<context context-type="sourcefile">../../wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html</context>
@@ -6021,7 +6021,7 @@
60216021
<source>Enter Prompt Here</source>
60226022
<context-group purpose="location">
60236023
<context context-type="sourcefile">../../wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html</context>
6024-
<context context-type="linenumber">6</context>
6024+
<context context-type="linenumber">7</context>
60256025
</context-group>
60266026
<context-group purpose="location">
60276027
<context context-type="sourcefile">../../wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html</context>
@@ -6036,29 +6036,29 @@
60366036
<source>Background Image (Optional)</source>
60376037
<context-group purpose="location">
60386038
<context context-type="sourcefile">../../wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html</context>
6039-
<context context-type="linenumber">13</context>
6039+
<context context-type="linenumber">15</context>
60406040
</context-group>
60416041
</trans-unit>
60426042
<trans-unit datatype="html" id="ac7627de4d6171adbfba4d934025c8c39debc469">
60436043
<source>Choose an Image</source>
60446044
<context-group purpose="location">
60456045
<context context-type="sourcefile">../../wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html</context>
6046-
<context context-type="linenumber">21</context>
6046+
<context context-type="linenumber">23</context>
60476047
</context-group>
60486048
<context-group purpose="location">
60496049
<context context-type="sourcefile">../../wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html</context>
6050-
<context context-type="linenumber">96</context>
6050+
<context context-type="linenumber">95</context>
60516051
</context-group>
60526052
<context-group purpose="location">
60536053
<context context-type="sourcefile">../../wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html</context>
6054-
<context context-type="linenumber">99</context>
6054+
<context context-type="linenumber">98</context>
60556055
</context-group>
60566056
<context-group purpose="location">
60576057
<context context-type="sourcefile">../../wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html</context>
60586058
<context context-type="linenumber">56</context>
60596059
</context-group>
60606060
</trans-unit>
6061-
<trans-unit datatype="html" id="6e1f7bc27ba16bcfd1aff4344767e48b7ae1ab03">
6061+
<trans-unit datatype="html" id="d63d6215608fa83637b7cfc6dc6a4d92b6ad11ef">
60626062
<source> Stretch Background </source>
60636063
<context-group purpose="location">
60646064
<context context-type="sourcefile">../../wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html</context>
@@ -6079,87 +6079,80 @@
60796079
<context context-type="linenumber">45</context>
60806080
</context-group>
60816081
</trans-unit>
6082-
<trans-unit datatype="html" id="377bbe71522993c698127209227d84637bae65e8">
6083-
<source> Show Node Labels </source>
6084-
<context-group purpose="location">
6085-
<context context-type="sourcefile">../../wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html</context>
6086-
<context context-type="linenumber">57</context>
6087-
</context-group>
6088-
</trans-unit>
60896082
<trans-unit datatype="html" id="6e2329529b1953198c7dfa0edb260554310bc636">
60906083
<source>Nodes</source>
60916084
<context-group purpose="location">
60926085
<context context-type="sourcefile">../../wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html</context>
6093-
<context context-type="linenumber">62</context>
6086+
<context context-type="linenumber">54</context>
60946087
</context-group>
60956088
</trans-unit>
60966089
<trans-unit datatype="html" id="a2abc798988051264ce46963e3ec75953d4a1216">
60976090
<source>Add Node</source>
60986091
<context-group purpose="location">
60996092
<context context-type="sourcefile">../../wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html</context>
6100-
<context context-type="linenumber">66</context>
6093+
<context context-type="linenumber">58</context>
61016094
</context-group>
61026095
<context-group purpose="location">
61036096
<context context-type="sourcefile">../../wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html</context>
6104-
<context context-type="linenumber">69</context>
6097+
<context context-type="linenumber">61</context>
61056098
</context-group>
61066099
</trans-unit>
61076100
<trans-unit datatype="html" id="ae13e4d6aa03b7492e7e3f106053af91587e1594">
61086101
<source>There are no nodes. Click the "Add Node" button to add a node.</source>
61096102
<context-group purpose="location">
61106103
<context context-type="sourcefile">../../wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html</context>
6111-
<context context-type="linenumber">75</context>
6104+
<context context-type="linenumber">67</context>
61126105
</context-group>
61136106
</trans-unit>
6114-
<trans-unit datatype="html" id="863226cffd5b66a6fee9810a9282a5006d6ef576">
6115-
<source>Label</source>
6107+
<trans-unit datatype="html" id="0738afe18a258dbcc9031a6ca2bb42747696bd46">
6108+
<source>Node Label</source>
61166109
<context-group purpose="location">
61176110
<context context-type="sourcefile">../../wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html</context>
6118-
<context context-type="linenumber">82</context>
6111+
<context context-type="linenumber">75</context>
61196112
</context-group>
6113+
</trans-unit>
6114+
<trans-unit datatype="html" id="a5f9ba9bb9faa8284bcadb1cdbc6aaf969e9c4bb">
6115+
<source>Image</source>
61206116
<context-group purpose="location">
61216117
<context context-type="sourcefile">../../wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html</context>
6122-
<context context-type="linenumber">171</context>
6118+
<context context-type="linenumber">87</context>
61236119
</context-group>
6124-
</trans-unit>
6125-
<trans-unit datatype="html" id="8ae7f24cac7975fccced98f430d4e406427999c6">
6126-
<source>File Name</source>
61276120
<context-group purpose="location">
6128-
<context context-type="sourcefile">../../wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html</context>
6129-
<context context-type="linenumber">88</context>
6121+
<context context-type="sourcefile">../../wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html</context>
6122+
<context context-type="linenumber">59</context>
61306123
</context-group>
61316124
</trans-unit>
61326125
<trans-unit datatype="html" id="828bc0d28636c4fda125fbf32af8df99cf1fe83e">
61336126
<source>Width</source>
61346127
<context-group purpose="location">
61356128
<context context-type="sourcefile">../../wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html</context>
6136-
<context context-type="linenumber">104</context>
6129+
<context context-type="linenumber">105</context>
61376130
</context-group>
61386131
</trans-unit>
61396132
<trans-unit datatype="html" id="179eb5c4a21ad324f75f723218a621d120e39d30">
61406133
<source>Height</source>
61416134
<context-group purpose="location">
61426135
<context context-type="sourcefile">../../wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html</context>
6143-
<context context-type="linenumber">111</context>
6136+
<context context-type="linenumber">112</context>
61446137
</context-group>
61456138
</trans-unit>
61466139
<trans-unit datatype="html" id="ab36fe6b1ac84106333447d7c1c4e20fb79c7de3">
61476140
<source>Move Up</source>
61486141
<context-group purpose="location">
61496142
<context context-type="sourcefile">../../wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html</context>
6150-
<context context-type="linenumber">121</context>
6143+
<context context-type="linenumber">125</context>
61516144
</context-group>
61526145
<context-group purpose="location">
61536146
<context context-type="sourcefile">../../wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html</context>
6154-
<context context-type="linenumber">124</context>
6147+
<context context-type="linenumber">128</context>
61556148
</context-group>
61566149
<context-group purpose="location">
61576150
<context context-type="sourcefile">../../wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html</context>
6158-
<context context-type="linenumber">186</context>
6151+
<context context-type="linenumber">206</context>
61596152
</context-group>
61606153
<context-group purpose="location">
61616154
<context context-type="sourcefile">../../wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html</context>
6162-
<context context-type="linenumber">189</context>
6155+
<context context-type="linenumber">209</context>
61636156
</context-group>
61646157
<context-group purpose="location">
61656158
<context context-type="sourcefile">app/authoring-tool/edit-component-tags/edit-component-tags.component.html</context>
@@ -6174,19 +6167,19 @@
61746167
<source>Move Down</source>
61756168
<context-group purpose="location">
61766169
<context context-type="sourcefile">../../wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html</context>
6177-
<context context-type="linenumber">132</context>
6170+
<context context-type="linenumber">136</context>
61786171
</context-group>
61796172
<context-group purpose="location">
61806173
<context context-type="sourcefile">../../wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html</context>
6181-
<context context-type="linenumber">135</context>
6174+
<context context-type="linenumber">139</context>
61826175
</context-group>
61836176
<context-group purpose="location">
61846177
<context context-type="sourcefile">../../wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html</context>
6185-
<context context-type="linenumber">197</context>
6178+
<context context-type="linenumber">217</context>
61866179
</context-group>
61876180
<context-group purpose="location">
61886181
<context context-type="sourcefile">../../wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html</context>
6189-
<context context-type="linenumber">200</context>
6182+
<context context-type="linenumber">220</context>
61906183
</context-group>
61916184
<context-group purpose="location">
61926185
<context context-type="sourcefile">app/authoring-tool/edit-component-tags/edit-component-tags.component.html</context>
@@ -6201,19 +6194,19 @@
62016194
<source>Delete</source>
62026195
<context-group purpose="location">
62036196
<context context-type="sourcefile">../../wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html</context>
6204-
<context context-type="linenumber">142</context>
6197+
<context context-type="linenumber">146</context>
62056198
</context-group>
62066199
<context-group purpose="location">
62076200
<context context-type="sourcefile">../../wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html</context>
6208-
<context context-type="linenumber">145</context>
6201+
<context context-type="linenumber">149</context>
62096202
</context-group>
62106203
<context-group purpose="location">
62116204
<context context-type="sourcefile">../../wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html</context>
6212-
<context context-type="linenumber">207</context>
6205+
<context context-type="linenumber">227</context>
62136206
</context-group>
62146207
<context-group purpose="location">
62156208
<context context-type="sourcefile">../../wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html</context>
6216-
<context context-type="linenumber">210</context>
6209+
<context context-type="linenumber">230</context>
62176210
</context-group>
62186211
<context-group purpose="location">
62196212
<context context-type="sourcefile">app/authoring-tool/edit-component-tags/edit-component-tags.component.html</context>
@@ -6228,58 +6221,79 @@
62286221
<context context-type="linenumber">113</context>
62296222
</context-group>
62306223
</trans-unit>
6224+
<trans-unit datatype="html" id="e3b469b69eef004764c51b7a8b3efa761501ab73">
6225+
<source> Show Node Labels </source>
6226+
<context-group purpose="location">
6227+
<context context-type="sourcefile">../../wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html</context>
6228+
<context context-type="linenumber">160</context>
6229+
</context-group>
6230+
</trans-unit>
62316231
<trans-unit datatype="html" id="dc60677d5a906e69f38a5cf9da7f2eb03931bea0">
62326232
<source>Links</source>
62336233
<context-group purpose="location">
62346234
<context context-type="sourcefile">../../wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html</context>
6235-
<context context-type="linenumber">151</context>
6235+
<context context-type="linenumber">167</context>
62366236
</context-group>
62376237
</trans-unit>
62386238
<trans-unit datatype="html" id="72ea393a8941d9c78b055e5c4597a7f760b713a7">
62396239
<source>Add Link</source>
62406240
<context-group purpose="location">
62416241
<context context-type="sourcefile">../../wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html</context>
6242-
<context context-type="linenumber">155</context>
6242+
<context context-type="linenumber">171</context>
62436243
</context-group>
62446244
<context-group purpose="location">
62456245
<context context-type="sourcefile">../../wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html</context>
6246-
<context context-type="linenumber">158</context>
6246+
<context context-type="linenumber">174</context>
62476247
</context-group>
62486248
</trans-unit>
62496249
<trans-unit datatype="html" id="8774f599f2e1ccb18ed0cf4536279ddce1868359">
62506250
<source>There are no links. Click the "Add Link" button to add a link.</source>
62516251
<context-group purpose="location">
62526252
<context context-type="sourcefile">../../wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html</context>
6253-
<context context-type="linenumber">164</context>
6253+
<context context-type="linenumber">180</context>
6254+
</context-group>
6255+
</trans-unit>
6256+
<trans-unit datatype="html" id="704ff937be1fcf12bfd12a1a85844849765d13f5">
6257+
<source>Link Label</source>
6258+
<context-group purpose="location">
6259+
<context context-type="sourcefile">../../wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html</context>
6260+
<context context-type="linenumber">189</context>
62546261
</context-group>
62556262
</trans-unit>
62566263
<trans-unit datatype="html" id="8fa4d523f7b91df4390120b85ed0406138273e1a">
62576264
<source>Color</source>
62586265
<context-group purpose="location">
62596266
<context context-type="sourcefile">../../wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html</context>
6260-
<context context-type="linenumber">177</context>
6267+
<context context-type="linenumber">195</context>
6268+
</context-group>
6269+
</trans-unit>
6270+
<trans-unit datatype="html" id="9fae747b3706d7f4d6b694ae273d7df2799a732c">
6271+
<source>(Optional) Create a starting state for the concept map by editing the "Student Preview" below and then saving here:</source>
6272+
<context-group purpose="location">
6273+
<context context-type="sourcefile">../../wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html</context>
6274+
<context context-type="linenumber">242</context>
62616275
</context-group>
62626276
</trans-unit>
62636277
<trans-unit datatype="html" id="116d459d032992c6d86e207ff08fab531e990322">
62646278
<source>Save Starter Concept Map</source>
62656279
<context-group purpose="location">
62666280
<context context-type="sourcefile">../../wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html</context>
6267-
<context context-type="linenumber">219</context>
6281+
<context context-type="linenumber">246</context>
62686282
</context-group>
62696283
<context-group purpose="location">
62706284
<context context-type="sourcefile">../../wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html</context>
6271-
<context context-type="linenumber">222</context>
6285+
<context context-type="linenumber">249</context>
62726286
</context-group>
62736287
</trans-unit>
62746288
<trans-unit datatype="html" id="aebb147a3be02ea5345152dbf903a6db25c29858">
62756289
<source>Delete Starter Concept Map</source>
62766290
<context-group purpose="location">
62776291
<context context-type="sourcefile">../../wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html</context>
6278-
<context context-type="linenumber">229</context>
6292+
<context context-type="linenumber">256</context>
62796293
</context-group>
62806294
<context-group purpose="location">
62816295
<context context-type="sourcefile">../../wise5/components/conceptMap/concept-map-authoring/concept-map-authoring.component.html</context>
6282-
<context context-type="linenumber">232</context>
6296+
<context context-type="linenumber">259</context>
62836297
</context-group>
62846298
</trans-unit>
62856299
<trans-unit datatype="html" id="7affaae0e14529c0192d5a4bfabd6fcb1ea27529">
@@ -6394,13 +6408,6 @@
63946408
<context context-type="linenumber">49</context>
63956409
</context-group>
63966410
</trans-unit>
6397-
<trans-unit datatype="html" id="a5f9ba9bb9faa8284bcadb1cdbc6aaf969e9c4bb">
6398-
<source>Image</source>
6399-
<context-group purpose="location">
6400-
<context context-type="sourcefile">../../wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html</context>
6401-
<context context-type="linenumber">59</context>
6402-
</context-group>
6403-
</trans-unit>
64046411
<trans-unit datatype="html" id="946344604c321ff0c86a78f6e047f9142b309dd1">
64056412
<source> Is Correct </source>
64066413
<context-group purpose="location">

‎src/main/webapp/wise5/authoringTool/node/node.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ <h6 ng-if="projectController.isGroupNode(nodeAuthoringController.node.id)">{{ ::
143143
</div>
144144
<div ng-repeat='(componentIndex, component) in nodeAuthoringController.components'
145145
class='component md-padding'
146-
style='padding: 0; margin-top: 0; margin-left: 16px;'
146+
style='padding: 0; margin: 0 16px;'
147147
ng-if='nodeAuthoringController.showComponents'>
148148
<div id='{{component.id}}' layout='row'>
149149
<div style='margin-top: 15px; width: 300px;'>

0 commit comments

Comments
 (0)