From b166d7141e89a1b4b79a3f92c1bdb8143a342b0e Mon Sep 17 00:00:00 2001 From: Barbara Ramiro Date: Fri, 23 Nov 2012 16:17:53 +0800 Subject: [PATCH 1/2] MDL-36782 usability: New icon to mark posts as read on forum --- pix/t/check.png | Bin 0 -> 266 bytes pix/t/check.svg | 14 ++++++++++++++ pix/t/markasread.png | Bin 0 -> 266 bytes pix/t/markasread.svg | 14 ++++++++++++++ 4 files changed, 28 insertions(+) create mode 100644 pix/t/check.png create mode 100644 pix/t/check.svg create mode 100644 pix/t/markasread.png create mode 100644 pix/t/markasread.svg diff --git a/pix/t/check.png b/pix/t/check.png new file mode 100644 index 0000000000000000000000000000000000000000..43540a5d82350eb9b61b4847358d7b1568de8a64 GIT binary patch literal 266 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&k$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWw1GYdl>XLn>}1B`PqaotvY{u;iWdPT@!ij%FqWv4%~rXL8I~ z#}L$_Qqs`b@bdG;ADuoGKIIHSd>&51mo8tHHxSJH#jcRYVi?h&Cdu%UVZ!eQHJOH4 ze4kb@O=@#nAmbs-tQ_#kW`bEmC07S`V}*Ut2^$8ju$Gr8jzMP_NdA2AEQ+(glDQy3$K^VMKmvmlho0i?)Q!nNcQbgp L`njxgN@xNABiUML literal 0 HcmV?d00001 diff --git a/pix/t/check.svg b/pix/t/check.svg new file mode 100644 index 00000000000..b29d965c734 --- /dev/null +++ b/pix/t/check.svg @@ -0,0 +1,14 @@ + + + +]> + + + + + diff --git a/pix/t/markasread.png b/pix/t/markasread.png new file mode 100644 index 0000000000000000000000000000000000000000..43540a5d82350eb9b61b4847358d7b1568de8a64 GIT binary patch literal 266 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&k$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWw1GYdl>XLn>}1B`PqaotvY{u;iWdPT@!ij%FqWv4%~rXL8I~ z#}L$_Qqs`b@bdG;ADuoGKIIHSd>&51mo8tHHxSJH#jcRYVi?h&Cdu%UVZ!eQHJOH4 ze4kb@O=@#nAmbs-tQ_#kW`bEmC07S`V}*Ut2^$8ju$Gr8jzMP_NdA2AEQ+(glDQy3$K^VMKmvmlho0i?)Q!nNcQbgp L`njxgN@xNABiUML literal 0 HcmV?d00001 diff --git a/pix/t/markasread.svg b/pix/t/markasread.svg new file mode 100644 index 00000000000..b29d965c734 --- /dev/null +++ b/pix/t/markasread.svg @@ -0,0 +1,14 @@ + + + +]> + + + + + From 99938034dfc445ff83fa9f47c2efbfdd69d04df7 Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Fri, 23 Nov 2012 16:18:35 +0800 Subject: [PATCH 2/2] MDL-36782 usability: Adjustments following new mark as read icon --- mod/forum/index.php | 4 ++-- mod/forum/lib.php | 6 +++--- mod/forum/styles.css | 2 ++ mod/lti/locallib.php | 2 +- theme/upgrade.txt | 3 +++ 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/mod/forum/index.php b/mod/forum/index.php index fd91cc5fb6b..8c334ad3a51 100644 --- a/mod/forum/index.php +++ b/mod/forum/index.php @@ -208,7 +208,7 @@ if ($generalforums) { } else if ($unread = forum_tp_count_forum_unread_posts($cm, $course)) { $unreadlink = ''.$unread.''; $unreadlink .= ''.$strmarkallread.''; + $forum->id.'&mark=read">'.$strmarkallread.''; } else { $unreadlink = '0'; } @@ -335,7 +335,7 @@ if ($course->id != SITEID) { // Only real courses have learning forums } else if ($unread = forum_tp_count_forum_unread_posts($cm, $course)) { $unreadlink = ''.$unread.''; $unreadlink .= ''.$strmarkallread.''; + $forum->id.'&mark=read">'.$strmarkallread.''; } else { $unreadlink = '0'; } diff --git a/mod/forum/lib.php b/mod/forum/lib.php index 42a15351c37..bc54e2217f7 100644 --- a/mod/forum/lib.php +++ b/mod/forum/lib.php @@ -3727,7 +3727,7 @@ function forum_print_discussion_header(&$post, $forum, $group=-1, $datestring="" echo ''; echo '' . - ''.$strmarkalldread.''; + ''.$strmarkalldread.''; echo ''; } else { echo ''; @@ -5608,10 +5608,10 @@ function forum_print_latest_discussions($course, $forum, $maxdiscussions=-1, $di if ($cantrack) { echo ''.get_string('unread', 'forum'); if ($forumtracked) { - echo ' '. - ''.get_string('markallread', 'forum').''; + ''.get_string('markallread', 'forum').''; } echo ''; } diff --git a/mod/forum/styles.css b/mod/forum/styles.css index ab25041379b..ab4b080f586 100644 --- a/mod/forum/styles.css +++ b/mod/forum/styles.css @@ -88,6 +88,8 @@ #page-mod-forum-view .unread a:first-child {padding-right: 10px;} #page-mod-forum-index .unread img, #page-mod-forum-view .unread img {margin-left: 5px;} +#page-mod-forum-view .unread img {margin-left: 5px;} +.dir-rtl#page-mod-forum-view .unread img {margin-right: 5px; margin-left: 0; } /** Unknown Styles ??? */ #email .unsubscribelink {margin-top:20px;} diff --git a/mod/lti/locallib.php b/mod/lti/locallib.php index 17666596baf..dccfcf4ae61 100644 --- a/mod/lti/locallib.php +++ b/mod/lti/locallib.php @@ -325,7 +325,7 @@ function lti_build_request($instance, $typeconfig, $course) { } function lti_get_tool_table($tools, $id) { - global $CFG, $USER; + global $CFG, $OUTPUT, $USER; $html = ''; $typename = get_string('typename', 'lti'); diff --git a/theme/upgrade.txt b/theme/upgrade.txt index 833e94334b4..8a6daee760b 100644 --- a/theme/upgrade.txt +++ b/theme/upgrade.txt @@ -16,6 +16,7 @@ deprecation: * c/group: Use i/groupevent instead * c/site: Use i/siteevent instead * c/user: Use i/userevent instead +* t/clear: Use t/check instead optional changes: * new optional boolean parameter $withlinks for public function login_info() in lib/outputrenderers.php (MDL-31365) @@ -33,6 +34,8 @@ optional changes: * new icons t/addcontact, t/removecontact and t/messages, previously t/addgreen, t/delete and t/log were used in messaging. * new icons t/unblock and i/twoway. * new icons i/courseevent, i/groupevent, i/siteevent and i/userevent (16x16) instead of c/* for calendar events. +* new icon t/markasread (12x12) to replace t/clear used in forums. +* new icon t/check (12x12) to replace t/clear which name does not reflect the icon meaning. === 2.3 ===