Merge branch 'MDL-58621-master' of git://github.com/ryanwyllie/moodle

abgreeve · Apr 20, 2017 · 992b296 · 992b296
2 parents 1d53b80 + d6c25e5
commit 992b296
Show file tree

Hide file tree

Showing 10 changed files with 1 addition and 49 deletions.
diff --git a/blocks/myoverview/templates/course-item.mustache b/blocks/myoverview/templates/course-item.mustache
@@ -23,8 +23,6 @@
     {
         "shortname": "course 3",
         "viewurl": "https://www.google.com",
-        "startdate": 1490320388,
-        "enddate": 1490320388,
         "summary": "It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout."
     }
 }}

diff --git a/blocks/myoverview/templates/course-paging-content-item.mustache b/blocks/myoverview/templates/course-paging-content-item.mustache
@@ -27,15 +27,11 @@
             {
                 "fullnamedisplay": "course 1",
                 "viewurl": "https://www.google.com",
-                "startdate": 1490252232,
-                "enddate": 1490252232,
                 "summary": "It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout."
             },
             {
                 "fullnamedisplay": "course 2",
                 "viewurl": "https://www.google.com",
-                "startdate": 1490252232,
-                "enddate": 1490252232,
                 "summary": "It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout."
             }
         ]

diff --git a/blocks/myoverview/templates/course-paging-content.mustache b/blocks/myoverview/templates/course-paging-content.mustache
@@ -29,15 +29,11 @@
                     {
                         "fullnamedisplay": "course 1",
                         "viewurl": "https://www.google.com",
-                        "startdate": 1490252232,
-                        "enddate": 1490252232,
                         "summary": "It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout."
                     },
                     {
                         "fullnamedisplay": "course 2",
                         "viewurl": "https://www.google.com",
-                        "startdate": 1490252232,
-                        "enddate": 1490252232,
                         "summary": "It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout."
                     }
                 ]

diff --git a/blocks/myoverview/templates/course-summary.mustache b/blocks/myoverview/templates/course-summary.mustache
@@ -23,8 +23,6 @@
     {
         "fullnamedisplay": "course 3",
         "viewurl": "https://www.google.com",
-        "startdate": 1490320388,
-        "enddate": 1490320388,
         "summary": "It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout."
     }
 }}
@@ -49,12 +47,6 @@
             </div>
         </div>
     </div>
-    <p class="text-muted">
-        {{#userdate}}{{startdate}}, {{#str}}strftimedate, langconfig{{/str}}{{/userdate}}
-        {{#enddate}}
-        - {{#userdate}}{{enddate}}, {{#str}}strftimedate, langconfig{{/str}}{{/userdate}}
-        {{/enddate}}
-    </p>
     <p class="text-muted">
         {{#shortentext}} 140, {{summary}}{{/shortentext}}
     </p>

diff --git a/blocks/myoverview/templates/courses-view-course-item.mustache b/blocks/myoverview/templates/courses-view-course-item.mustache
@@ -23,8 +23,6 @@
     {
         "fullnamedisplay": "course 3",
         "viewurl": "https://www.google.com",
-        "startdate": 1490252232,
-        "enddate": 1490252232,
         "summary": "It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout."
     }
 }}
@@ -47,12 +45,6 @@
                     </div>
                 </div>
             </div>
-            <p class="text-muted">
-                {{#userdate}}{{startdate}}, {{#str}}strftimedate, langconfig{{/str}}{{/userdate}}
-                {{#enddate}}
-                - {{#userdate}}{{enddate}}, {{#str}}strftimedate, langconfig{{/str}}{{/userdate}}
-                {{/enddate}}
-            </p>
             <p class="text-muted">
                 {{#shortentext}} 140, {{summary}}{{/shortentext}}
             </p>

diff --git a/theme/boost/scss/moodle/blocks.scss b/theme/boost/scss/moodle/blocks.scss
@@ -147,7 +147,7 @@ $doughnut-fill-colour: $brand-warning;
             /*rtl:ignore*/
             left: 50%;
             margin: 0;
-            transform: translate(-48%, -50%);
+            transform: translate(-45%, -45%);
             color: #fff;
             height: ($chart-size / 2) + 10px;
             width: ($chart-size / 2) + 10px;

diff --git a/theme/bootstrapbase/templates/block_myoverview/course-item.mustache b/theme/bootstrapbase/templates/block_myoverview/course-item.mustache
@@ -23,8 +23,6 @@
     {
         "shortname": "course 3",
         "viewurl": "https://www.google.com",
-        "startdate": 1490320388,
-        "enddate": 1490320388,
         "summary": "It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout."
     }
 }}

diff --git a/theme/bootstrapbase/templates/block_myoverview/course-paging-content-item.mustache b/theme/bootstrapbase/templates/block_myoverview/course-paging-content-item.mustache
@@ -27,15 +27,11 @@
             {
                 "fullnamedisplay": "course 1",
                 "viewurl": "https://www.google.com",
-                "startdate": 1490252232,
-                "enddate": 1490252232,
                 "summary": "It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout."
             },
             {
                 "fullnamedisplay": "course 2",
                 "viewurl": "https://www.google.com",
-                "startdate": 1490252232,
-                "enddate": 1490252232,
                 "summary": "It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout."
             }
         ]

diff --git a/theme/bootstrapbase/templates/block_myoverview/course-summary.mustache b/theme/bootstrapbase/templates/block_myoverview/course-summary.mustache
@@ -23,8 +23,6 @@
     {
         "fullnamedisplay": "course 3",
         "viewurl": "https://www.google.com",
-        "startdate": 1490320388,
-        "enddate": 1490320388,
         "summary": "It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout."
     }
 }}
@@ -45,12 +43,6 @@
             </div>
         </div>
     </div>
-    <p class="muted">
-        {{#userdate}}{{startdate}}, {{#str}}strftimedate, langconfig{{/str}}{{/userdate}}
-        {{#enddate}}
-        - {{#userdate}}{{enddate}}, {{#str}}strftimedate, langconfig{{/str}}{{/userdate}}
-        {{/enddate}}
-    </p>
     <p class="muted">
         {{#shortentext}} 140, {{{summary}}}{{/shortentext}}
     </p>

diff --git a/theme/bootstrapbase/templates/block_myoverview/courses-view-course-item.mustache b/theme/bootstrapbase/templates/block_myoverview/courses-view-course-item.mustache
@@ -23,8 +23,6 @@
     {
         "shortname": "course 3",
         "viewurl": "https://www.google.com",
-        "startdate": "Nov 1th, 10am",
-        "enddate": "Nov 4th, 10am",
         "summary": "It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout."
     }
 }}
@@ -40,12 +38,6 @@
                 <h4 class="media-heading"><a href="{{viewurl}}">{{fullnamedisplay}}</a></h4>
             </div>
         </div>
-        <p class="text-muted">
-            {{#userdate}}{{startdate}}, {{#str}}strftimedate, langconfig{{/str}}{{/userdate}}
-            {{#enddate}}
-            - {{#userdate}}{{enddate}}, {{#str}}strftimedate, langconfig{{/str}}{{/userdate}}
-            {{/enddate}}
-        </p>
         <p class="text-muted">
             {{#shortentext}} 140, {{{summary}}}{{/shortentext}}
         </p>