moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Dan Poltawski 2017-04-20 13:14:00 +01:00
commit 992b296209
10 changed files with 1 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

2
blocks/myoverview/templates/course-item.mustache
View file

@ -23,8 +23,6 @@
{ {
"shortname": "course 3", "shortname": "course 3",
"viewurl": "https://www.google.com", "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." "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."
} }
}} }}

4
blocks/myoverview/templates/course-paging-content-item.mustache
View file

@ -27,15 +27,11 @@
{ {
"fullnamedisplay": "course 1", "fullnamedisplay": "course 1",
"viewurl": "https://www.google.com", "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." "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", "fullnamedisplay": "course 2",
"viewurl": "https://www.google.com", "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." "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."
} }
] ]

4
blocks/myoverview/templates/course-paging-content.mustache
View file

@ -29,15 +29,11 @@
{ {
"fullnamedisplay": "course 1", "fullnamedisplay": "course 1",
"viewurl": "https://www.google.com", "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." "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", "fullnamedisplay": "course 2",
"viewurl": "https://www.google.com", "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." "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."
} }
] ]

8
blocks/myoverview/templates/course-summary.mustache
View file

@ -23,8 +23,6 @@
{ {
"fullnamedisplay": "course 3", "fullnamedisplay": "course 3",
"viewurl": "https://www.google.com", "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." "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> </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"> <p class="text-muted">
{{#shortentext}} 140, {{summary}}{{/shortentext}} {{#shortentext}} 140, {{summary}}{{/shortentext}}
</p> </p>

8
blocks/myoverview/templates/courses-view-course-item.mustache
View file

@ -23,8 +23,6 @@
{ {
"fullnamedisplay": "course 3", "fullnamedisplay": "course 3",
"viewurl": "https://www.google.com", "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." "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> </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"> <p class="text-muted">
{{#shortentext}} 140, {{summary}}{{/shortentext}} {{#shortentext}} 140, {{summary}}{{/shortentext}}
</p> </p>

2
theme/boost/scss/moodle/blocks.scss
View file

@ -147,7 +147,7 @@ $doughnut-fill-colour: $brand-warning;
/*rtl:ignore*/ /*rtl:ignore*/
left: 50%; left: 50%;
margin: 0; margin: 0;
transform: translate(-48%, -50%); transform: translate(-45%, -45%);
color: #fff; color: #fff;
height: ($chart-size / 2) + 10px; height: ($chart-size / 2) + 10px;
width: ($chart-size / 2) + 10px; width: ($chart-size / 2) + 10px;

2
theme/bootstrapbase/templates/block_myoverview/course-item.mustache
View file

@ -23,8 +23,6 @@
{ {
"shortname": "course 3", "shortname": "course 3",
"viewurl": "https://www.google.com", "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." "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."
} }
}} }}

4
theme/bootstrapbase/templates/block_myoverview/course-paging-content-item.mustache
View file

@ -27,15 +27,11 @@
{ {
"fullnamedisplay": "course 1", "fullnamedisplay": "course 1",
"viewurl": "https://www.google.com", "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." "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", "fullnamedisplay": "course 2",
"viewurl": "https://www.google.com", "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." "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."
} }
] ]

8
theme/bootstrapbase/templates/block_myoverview/course-summary.mustache
View file

@ -23,8 +23,6 @@
{ {
"fullnamedisplay": "course 3", "fullnamedisplay": "course 3",
"viewurl": "https://www.google.com", "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." "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> </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"> <p class="muted">
{{#shortentext}} 140, {{{summary}}}{{/shortentext}} {{#shortentext}} 140, {{{summary}}}{{/shortentext}}
</p> </p>

8
theme/bootstrapbase/templates/block_myoverview/courses-view-course-item.mustache
View file

@ -23,8 +23,6 @@
{ {
"shortname": "course 3", "shortname": "course 3",
"viewurl": "https://www.google.com", "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." "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> <h4 class="media-heading"><a href="{{viewurl}}">{{fullnamedisplay}}</a></h4>
</div> </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"> <p class="text-muted">
{{#shortentext}} 140, {{{summary}}}{{/shortentext}} {{#shortentext}} 140, {{{summary}}}{{/shortentext}}
</p> </p>