From 40fb0a9e268031f3d3f22a3cae8497073b4f1caf Mon Sep 17 00:00:00 2001 From: Barbara Ramiro Date: Fri, 23 Nov 2012 12:00:08 +0800 Subject: [PATCH 1/2] MDL-36784 usability: New print icon for glossary --- mod/glossary/styles.css | 3 ++- mod/glossary/view.php | 4 ++-- pix/t/print.png | Bin 0 -> 182 bytes pix/t/print.svg | 14 ++++++++++++++ theme/upgrade.txt | 2 ++ 5 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 pix/t/print.png create mode 100644 pix/t/print.svg diff --git a/mod/glossary/styles.css b/mod/glossary/styles.css index c0508352bcf..89906b53dab 100644 --- a/mod/glossary/styles.css +++ b/mod/glossary/styles.css @@ -22,7 +22,8 @@ .glossary-activity-content { margin-left: 40px; } /** Page specific styles **/ -#page-mod-glossary-view .glossarycontrol {float: right;text-align:right;white-space: nowrap;margin: 5px 0;} +#page-mod-glossary-view .glossarycontrol {text-align:right;white-space: nowrap;margin: 5px 0;} +.dir-rtl#page-mod-glossary-view .glossarycontrol { text-align: left; } #page-mod-glossary-view table.glossarycategoryheader, #page-mod-glossary-import table.glossaryimportexport {margin-left:auto;margin-right:auto;} diff --git a/mod/glossary/view.php b/mod/glossary/view.php index 6db375c1c23..6a296a5c29a 100644 --- a/mod/glossary/view.php +++ b/mod/glossary/view.php @@ -308,7 +308,7 @@ if ($showcommonelements) { /// Start to print glossary controls // print_box_start('glossarycontrol clearfix'); - echo '
'; + echo '
'; echo $availableoptions; /// The print icon @@ -316,7 +316,7 @@ if ($showcommonelements) { if (has_capability('mod/glossary:manageentries', $context) or $glossary->allowprintview) { // print_box_start('printicon'); echo ''; - echo " id&mode=$mode&hook=".urlencode($hook)."&sortkey=$sortkey&sortorder=$sortorder&offset=$offset\">pix_url('print', 'glossary')."\" alt=\"". get_string("printerfriendly","glossary") . "\" />"; + echo " id&mode=$mode&hook=".urlencode($hook)."&sortkey=$sortkey&sortorder=$sortorder&offset=$offset\">pix_url('t/print')."\" alt=\"". get_string("printerfriendly","glossary") . "\" />"; echo ''; // print_box_end(); } diff --git a/pix/t/print.png b/pix/t/print.png new file mode 100644 index 0000000000000000000000000000000000000000..81e12fadda67f2372adf677e4879b394feed53fc GIT binary patch literal 182 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&k$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWw1G5uPrNAr-fhQXH6!)6dP}Um_&2q2bGy5;uXfO}>UcLZ0vJ zd(O6~^j%FUInZ=As-~f{(d9tX>9rxuJr2Rr4JEb{UrEpO2;gD*`lNbRz=T6gEv;7s cm^cg=IF+Pg)>ym@1=_*j>FVdQ&MBb@0Gv5Jj{pDw literal 0 HcmV?d00001 diff --git a/pix/t/print.svg b/pix/t/print.svg new file mode 100644 index 00000000000..2a7fce7dfe9 --- /dev/null +++ b/pix/t/print.svg @@ -0,0 +1,14 @@ + + + +]> + + + + + diff --git a/theme/upgrade.txt b/theme/upgrade.txt index 908ffb5cc43..3b5cde267aa 100644 --- a/theme/upgrade.txt +++ b/theme/upgrade.txt @@ -8,6 +8,7 @@ required changes: deprecation: * i/roles: Use t/assignroles instead +* mod/glossary/pix/print: Use t/print instead optional changes: * new optional boolean parameter $withlinks for public function login_info() in lib/outputrenderers.php (MDL-31365) @@ -20,6 +21,7 @@ optional changes: * new icon t/cohorts (sized 12x12), to prevent the use of i/cohorts which is 16x16. * new icons t/sort_asc, t/sort_desc to use for ordering in table headers. * new class 'iconsort' for icons used for ordering in table headers. +* new icon t/print (sized 12x12). === 2.3 === From 79ba32c607f4a5b43760523dd2044aeab3e720ca Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Fri, 23 Nov 2012 12:02:46 +0800 Subject: [PATCH 2/2] MDL-36784 usability: CSS adjustments for Glossary print icon --- mod/glossary/styles.css | 3 +-- mod/glossary/view.php | 4 ++-- theme/upgrade.txt | 2 -- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/mod/glossary/styles.css b/mod/glossary/styles.css index 89906b53dab..c0508352bcf 100644 --- a/mod/glossary/styles.css +++ b/mod/glossary/styles.css @@ -22,8 +22,7 @@ .glossary-activity-content { margin-left: 40px; } /** Page specific styles **/ -#page-mod-glossary-view .glossarycontrol {text-align:right;white-space: nowrap;margin: 5px 0;} -.dir-rtl#page-mod-glossary-view .glossarycontrol { text-align: left; } +#page-mod-glossary-view .glossarycontrol {float: right;text-align:right;white-space: nowrap;margin: 5px 0;} #page-mod-glossary-view table.glossarycategoryheader, #page-mod-glossary-import table.glossaryimportexport {margin-left:auto;margin-right:auto;} diff --git a/mod/glossary/view.php b/mod/glossary/view.php index 6a296a5c29a..6db375c1c23 100644 --- a/mod/glossary/view.php +++ b/mod/glossary/view.php @@ -308,7 +308,7 @@ if ($showcommonelements) { /// Start to print glossary controls // print_box_start('glossarycontrol clearfix'); - echo '
'; + echo '
'; echo $availableoptions; /// The print icon @@ -316,7 +316,7 @@ if ($showcommonelements) { if (has_capability('mod/glossary:manageentries', $context) or $glossary->allowprintview) { // print_box_start('printicon'); echo ''; - echo " id&mode=$mode&hook=".urlencode($hook)."&sortkey=$sortkey&sortorder=$sortorder&offset=$offset\">pix_url('t/print')."\" alt=\"". get_string("printerfriendly","glossary") . "\" />"; + echo " id&mode=$mode&hook=".urlencode($hook)."&sortkey=$sortkey&sortorder=$sortorder&offset=$offset\">pix_url('print', 'glossary')."\" alt=\"". get_string("printerfriendly","glossary") . "\" />"; echo ''; // print_box_end(); } diff --git a/theme/upgrade.txt b/theme/upgrade.txt index 3b5cde267aa..908ffb5cc43 100644 --- a/theme/upgrade.txt +++ b/theme/upgrade.txt @@ -8,7 +8,6 @@ required changes: deprecation: * i/roles: Use t/assignroles instead -* mod/glossary/pix/print: Use t/print instead optional changes: * new optional boolean parameter $withlinks for public function login_info() in lib/outputrenderers.php (MDL-31365) @@ -21,7 +20,6 @@ optional changes: * new icon t/cohorts (sized 12x12), to prevent the use of i/cohorts which is 16x16. * new icons t/sort_asc, t/sort_desc to use for ordering in table headers. * new class 'iconsort' for icons used for ordering in table headers. -* new icon t/print (sized 12x12). === 2.3 ===