diff --git a/scripts/langindex.json b/scripts/langindex.json index 741c90a6b..e8a555bb2 100644 --- a/scripts/langindex.json +++ b/scripts/langindex.json @@ -580,6 +580,7 @@ "addon.mod_forum.favouriteupdated": "forum", "addon.mod_forum.forumnodiscussionsyet": "local_moodlemobileapp", "addon.mod_forum.group": "local_moodlemobileapp", + "addon.mod_forum.lastpost": "forum", "addon.mod_forum.lockdiscussion": "forum", "addon.mod_forum.lockupdated": "forum", "addon.mod_forum.message": "forum", diff --git a/src/addon/mod/forum/components/index/addon-mod-forum-index.html b/src/addon/mod/forum/components/index/addon-mod-forum-index.html index 4c8be80bf..caf4f4888 100644 --- a/src/addon/mod/forum/components/index/addon-mod-forum-index.html +++ b/src/addon/mod/forum/components/index/addon-mod-forum-index.html @@ -35,66 +35,64 @@ -
+
- - + +

-

+

{{ 'core.notsent' | translate }} {{discussion.userfullname}} -

+

- - + + {{ discussion.groupname }} -

-
-
- - + + + +

-

+

- {{discussion.created | coreDateDayOrTime}}
{{ 'addon.mod_forum.unreadpostsnumber' | translate:{ '$a' : discussion.numunread} }}
{{discussion.userfullname}} -

+

+

{{discussion.created | coreDateDayOrTime}}

- - - - - - - {{ discussion.groupname }} - - - - - {{ 'addon.mod_forum.numreplies' | translate:{numreplies: discussion.numreplies} }} - - - - - {{discussion.timemodified | coreTimeAgo}} - - - -
+ + + + + {{ discussion.groupname }} + + + + + {{ 'addon.mod_forum.numreplies' | translate:{numreplies: discussion.numreplies} }} + + + + + {{ 'addon.mod_forum.lastpost' | translate }} {{discussion.timemodified | coreTimeAgo}} + + + + + diff --git a/src/addon/mod/forum/components/index/index.scss b/src/addon/mod/forum/components/index/index.scss index 733686a59..5b0fd16cc 100644 --- a/src/addon/mod/forum/components/index/index.scss +++ b/src/addon/mod/forum/components/index/index.scss @@ -1,16 +1,5 @@ ion-app.app-root addon-mod-forum-index { - .addon-forum-discussion-selected { - border-top: 5px solid $core-splitview-selected; - } - .addon-forum-star { color: $core-star-color; } - - button.core-button-select .core-section-selector-text { - overflow: hidden; - text-overflow: ellipsis; - line-height: 2em; - white-space: nowrap; - } } diff --git a/src/addon/mod/forum/lang/en.json b/src/addon/mod/forum/lang/en.json index 65a9af9df..29215eb9d 100644 --- a/src/addon/mod/forum/lang/en.json +++ b/src/addon/mod/forum/lang/en.json @@ -28,6 +28,7 @@ "favouriteupdated": "Your star option has been updated.", "forumnodiscussionsyet": "There are no discussions yet in this forum.", "group": "Group", + "lastpost": "Last post", "lockdiscussion": "Lock this discussion", "lockupdated": "The lock option has been updated.", "message": "Message", diff --git a/src/app/app.scss b/src/app/app.scss index 474ace86f..a43d1efee 100644 --- a/src/app/app.scss +++ b/src/app/app.scss @@ -503,6 +503,13 @@ ion-app.app-root { } } + button.core-button-select .core-button-select-text { + overflow: hidden; + text-overflow: ellipsis; + line-height: 2em; + white-space: nowrap; + } + // File uploader. // ------------------------- .core-fileuploader-file-handler { diff --git a/src/assets/lang/en.json b/src/assets/lang/en.json index f8d0edfe3..d4514cc94 100644 --- a/src/assets/lang/en.json +++ b/src/assets/lang/en.json @@ -579,6 +579,7 @@ "addon.mod_forum.favouriteupdated": "Your star option has been updated.", "addon.mod_forum.forumnodiscussionsyet": "There are no discussions yet in this forum.", "addon.mod_forum.group": "Group", + "addon.mod_forum.lastpost": "Last post", "addon.mod_forum.lockdiscussion": "Lock this discussion", "addon.mod_forum.lockupdated": "The lock option has been updated.", "addon.mod_forum.message": "Message", diff --git a/src/core/course/components/format/core-course-format.html b/src/core/course/components/format/core-course-format.html index c7c3bf6ed..40bcd52fe 100644 --- a/src/core/course/components/format/core-course-format.html +++ b/src/core/course/components/format/core-course-format.html @@ -14,7 +14,7 @@
diff --git a/src/core/course/components/format/format.scss b/src/core/course/components/format/format.scss index 75426f095..34684e29c 100644 --- a/src/core/course/components/format/format.scss +++ b/src/core/course/components/format/format.scss @@ -6,13 +6,6 @@ ion-app.app-root ion-badge.core-course-download-section-progress { ion-app.app-root core-course-format { - button.core-button-select .core-section-selector-text { - overflow: hidden; - text-overflow: ellipsis; - line-height: 2em; - white-space: nowrap; - } - .core-format-progress-list { margin-bottom: 0;