MDL-53698 tool_lp: Progress percent sign not showing

NoelDeMartin · Apr 22, 2016 · 68f8ad4 · 68f8ad4
1 parent 6c1342d
commit 68f8ad4
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 32 deletions.
diff --git a/admin/tool/lp/styles.css b/admin/tool/lp/styles.css
@@ -10,9 +10,8 @@
     vertical-align: top;
 }
 .path-admin-tool-lp .progress {
-    width: 10em;
+    width: 100%;
     display: inline-block;
-    margin-left: 2em;
     margin-right: 2em;
 }
 .dir-rtl.path-admin-tool-lp .progress .bar {

diff --git a/admin/tool/lp/templates/course_competency_statistics.mustache b/admin/tool/lp/templates/course_competency_statistics.mustache
@@ -45,13 +45,16 @@
 {{#competencycount}}
 <div data-region="coursecompetencystatistics" class="well">
     {{#canbegradedincourse}}
-    <div>
-        <div class="progresstext">
-            {{#str}}xcompetenciesproficientoutofyincourse, tool_lp, { "x": "{{proficientcompetencycount}}", "y": "{{competencycount}}" } {{/str}}
+    <div class="clearfix">
+        <div class="span6">
+            <div class="progresstext">
+                {{#str}}xcompetenciesproficientoutofyincourse, tool_lp, { "x": "{{proficientcompetencycount}}", "y": "{{competencycount}}" } {{/str}}
+            </div>
         </div>
-        <div class="progress">
-            <div class="bar" style="width: {{proficientcompetencypercentage}}%;">
-                {{proficientcompetencypercentageformatted}} %
+        <div class="span6">
+            <span class="pull-right label label-info">{{proficientcompetencypercentageformatted}} %</span>
+            <div class="progress">
+                <div class="bar" style="width: {{proficientcompetencypercentage}}%;"></div>
             </div>
         </div>
     </div>

diff --git a/admin/tool/lp/templates/plan_page.mustache b/admin/tool/lp/templates/plan_page.mustache
@@ -81,10 +81,16 @@
                 <dd>{{{plan.description}}}</dd>
             {{/description}}
             <dt>{{#str}}progress, tool_lp{{/str}}</dt>
-            <dd><span class="progresstext">{{#str}}xcompetenciesproficientoutofy, tool_lp, { "x": "{{proficientcompetencycount}}", "y": "{{competencycount}}" }{{/str}}</span>
-                <div class="progress">
-                    <div class="bar" style="width: {{proficientcompetencypercentage}}%;">
-                        {{proficientcompetencypercentageformatted}} %
+            <dd>
+                <div class="span4">
+                    <div class="progresstext">
+                        {{#str}}xcompetenciesproficientoutofy, tool_lp, { "x": "{{proficientcompetencycount}}", "y": "{{competencycount}}" }{{/str}}
+                    </div>
+                </div>
+                <div class="span4">
+                    <span class="pull-right label label-info">{{proficientcompetencypercentageformatted}} %</span>
+                    <div class="progress">
+                        <div class="bar" style="width: {{proficientcompetencypercentage}}%;"></div>
                     </div>
                 </div>
             </dd>

diff --git a/admin/tool/lp/templates/template_statistics.mustache b/admin/tool/lp/templates/template_statistics.mustache
@@ -46,38 +46,49 @@
 }}
 {{#competencycount}}
 <div data-region="templatestatistics" class="well">
-    <div>
-        <div class="progresstext">
-            {{#str}}xcompetencieslinkedoutofy, tool_lp, { "x": "{{linkedcompetencycount}}", "y": "{{competencycount}}" } {{/str}}
+    <div class="clearfix">
+        <div class="span4">
+            <div class="progresstext">
+                {{#str}}xcompetencieslinkedoutofy, tool_lp, { "x": "{{linkedcompetencycount}}", "y": "{{competencycount}}" } {{/str}}
+            </div>
         </div>
-        <div class="progress">
-            <div class="bar" style="width: {{linkedcompetencypercentage}}%;">
-                {{linkedcompetencypercentageformatted}} %
+        <div class="span6">
+            <span class="pull-right label label-info">{{linkedcompetencypercentageformatted}} %</span>
+            <div class="progress">
+                <div class="bar" style="width: {{linkedcompetencypercentage}}%;"></div>
             </div>
         </div>
     </div>
     {{#plancount}}
-    <div>
-        <div class="progresstext">
-            {{#str}}xplanscompletedoutofy, tool_lp, { "x": "{{completedplancount}}", "y": "{{plancount}}" } {{/str}}
-        </div>
-        <div class="progress">
-            <div class="bar" style="width: {{completedplanpercentage}}%;">
-                {{completedplanpercentageformatted}} %
+    <div class="clearfix">
+        <div class="span4">
+            <div class="progresstext">
+                {{#str}}xplanscompletedoutofy, tool_lp, { "x": "{{completedplancount}}", "y": "{{plancount}}" } {{/str}}
             </div>
         </div>
+        <div class="span6">
+            <span class="pull-right label label-info">{{completedplanpercentageformatted}} %</span>
+            <div class="progress">
+                <div class="bar" style="width: {{completedplanpercentage}}%;">
+
+                </div>
+            </div>
+        </div>    
     </div>
     {{/plancount}}
     {{#usercompetencyplancount}}
-    <div>
-        <div class="progresstext">
-            {{#str}}averageproficiencyrate, tool_lp, {{proficientusercompetencyplanpercentageformatted}} {{/str}}
-        </div>
-        <div class="progress">
-            <div class="bar" style="width: {{proficientusercompetencyplanpercentage}}%;">
-                {{proficientusercompetencyplanpercentageformatted}} %
+    <div  class="clearfix">
+        <div class="span4">
+            <div class="progresstext">
+                {{#str}}averageproficiencyrate, tool_lp, {{proficientusercompetencyplanpercentageformatted}} {{/str}}
             </div>
         </div>
+        <div class="span6">
+            <span class="pull-right label label-info">{{proficientusercompetencyplanpercentageformatted}} %</span>
+            <div class="progress">
+                <div class="bar" style="width: {{proficientusercompetencyplanpercentage}}%;"></div>
+            </div>
+        </div>     
     </div>
     {{/usercompetencyplancount}}
     {{#leastproficientcount}}