MDL-53657 tool_lp: Dialog box opens twice in the path

moodle · Apr 18, 2016 · 9af8f0e · 9af8f0e
1 parent 2f411bc
commit 9af8f0e
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 23 deletions.
diff --git a/admin/tool/lp/templates/competency_summary.mustache b/admin/tool/lp/templates/competency_summary.mustache
@@ -13,7 +13,7 @@
 <p>{{{competency.description}}}</p>
 {{/competency.description}}
 {{#comppath}}
-    <span class="pull-left">{{#str}}path, tool_lp{{/str}} </span>{{> tool_lp/competency_path }}
+    <span class="pull-left">{{#str}}path, tool_lp{{/str}}&nbsp;</span>{{> tool_lp/competency_path }}
 {{/comppath}}
 {{#showrelatedcompetencies}}
     {{> tool_lp/related_competencies }}

diff --git a/admin/tool/lp/templates/course_competencies_page.mustache b/admin/tool/lp/templates/course_competencies_page.mustache
@@ -65,7 +65,7 @@
             <p>{{{competency.description}}}</p>
         {{/competency}}
         {{#comppath}}
-            <span class="pull-left">{{#str}}path, tool_lp{{/str}}</span>{{> tool_lp/competency_path }}
+            <span class="pull-left">{{#str}}path, tool_lp{{/str}}&nbsp;</span>{{> tool_lp/competency_path }}
         {{/comppath}}
         {{#usercompetency}}
             {{#grade}}

diff --git a/admin/tool/lp/templates/plan_page.mustache b/admin/tool/lp/templates/plan_page.mustache
@@ -122,7 +122,7 @@
                         <em>{{competency.idnumber}}</em>
                         {{#comppath}}
                             <br>
-                            <span class="pull-left">{{#str}}path, tool_lp{{/str}}</span>{{> tool_lp/competency_path }}
+                            <span class="pull-left">{{#str}}path, tool_lp{{/str}}&nbsp;</span>{{> tool_lp/competency_path }}
                         {{/comppath}}
                     </td>
                     {{#plan.iscompleted}}

diff --git a/admin/tool/lp/templates/related_competencies.mustache b/admin/tool/lp/templates/related_competencies.mustache
@@ -22,3 +22,9 @@
     {{#str}}nocrossreferencedcompetencies, tool_lp{{/str}}
 {{/relatedcompetencies}}
 </div>
+{{#js}}
+require(['tool_lp/competencydialogue'], function(Compdialogue) {
+    var competencydialogue = new Compdialogue({includerelated : true});
+    competencydialogue.watch('[data-region="relatedcompetencies"]');
+});
+{{/js}}
diff --git a/admin/tool/lp/templates/user_competency_summary.mustache b/admin/tool/lp/templates/user_competency_summary.mustache
@@ -101,10 +101,3 @@
         </dd>
     </dl>
 </div>
-
-{{#js}}
-require(['tool_lp/competencydialogue'], function(Compdialogue) {
-    var competencydialogue = new Compdialogue({includerelated : true});
-    competencydialogue.watch('[data-region="competency-summary"]');
-});
-{{/js}}
diff --git a/admin/tool/lp/templates/user_competency_summary_in_course.mustache b/admin/tool/lp/templates/user_competency_summary_in_course.mustache
@@ -132,10 +132,3 @@
     </dl>
 </div>
 {{/usercompetencysummary}}
-
-{{#js}}
-require(['tool_lp/competencydialogue'], function(Compdialogue) {
-    var competencydialogue = new Compdialogue({includerelated : true});
-    competencydialogue.watch('[data-region="competency-summary"]');
-});
-{{/js}}
diff --git a/admin/tool/lp/templates/user_competency_summary_in_plan.mustache b/admin/tool/lp/templates/user_competency_summary_in_plan.mustache
@@ -126,9 +126,3 @@
 </div>
 {{/usercompetencysummary}}
 
-{{#js}}
-require(['tool_lp/competencydialogue'], function(Compdialogue) {
-    var competencydialogue = new Compdialogue({includerelated : true});
-    competencydialogue.watch('[data-region="competency-summary"]');
-});
-{{/js}}