From 9c183bb7f48c884a463eb63140e5ffd9dc32ce1b Mon Sep 17 00:00:00 2001 From: Joel Kuczmarski Date: Thu, 9 May 2013 16:33:03 -0500 Subject: [PATCH 01/23] reorganize init defines --- lib/init.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/init.php b/lib/init.php index fb5cc59..09b651e 100644 --- a/lib/init.php +++ b/lib/init.php @@ -30,7 +30,7 @@ if (!defined('__DIR__')) { define('__DIR__', dirname(__FILE__)); } // Define helper constants $get_theme_name = explode('/themes/', get_template_directory()); -define('THEME_NAME', next($get_theme_name)); define('RELATIVE_PLUGIN_PATH', str_replace(home_url() . '/', '', plugins_url())); define('RELATIVE_CONTENT_PATH', str_replace(home_url() . '/', '', content_url())); +define('THEME_NAME', next($get_theme_name)); define('THEME_PATH', RELATIVE_CONTENT_PATH . '/themes/' . THEME_NAME); From f006dd20870d6a579c13969216d28f845ad173dd Mon Sep 17 00:00:00 2001 From: Foxaii Date: Sat, 11 May 2013 18:53:11 +0200 Subject: [PATCH 02/23] Wrapper Templates Filter Allows manual control over the base and sidebar templates being used. --- lib/utils.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/utils.php b/lib/utils.php index 9a86123..1a928d8 100644 --- a/lib/utils.php +++ b/lib/utils.php @@ -34,6 +34,7 @@ class Roots_Wrapping { array_unshift($templates, sprintf('base-%s.php', self::$base)); } + $templates = apply_filters('roots_wrapping_base', $templates); return locate_template($templates); } @@ -44,6 +45,7 @@ class Roots_Wrapping { array_unshift($templates, sprintf('templates/sidebar-%s.php', self::$base)); } + $templates = apply_filters('roots_wrapping_sidebar', $templates); return locate_template($templates); } } From 25005f3c22b70dd49810ae8d5aa62b144bd83d56 Mon Sep 17 00:00:00 2001 From: Hariadi Hinta Date: Mon, 13 May 2013 13:47:08 +0800 Subject: [PATCH 03/23] Update Malay language. --- lang/ms_MY.mo | Bin 5715 -> 4657 bytes lang/ms_MY.po | 320 +++++++++++++++++++++++++------------------------- 2 files changed, 160 insertions(+), 160 deletions(-) diff --git a/lang/ms_MY.mo b/lang/ms_MY.mo index bf444c056585a671b95a3939d7db2b3571acdb60..1e3cc0a7b3b9e7e9a417f3842e812daab304a310 100644 GIT binary patch delta 1897 zcmYM!Pi$009Ki9RK%u4oOZh7}XsKXZ+R{JbLWt0W)PGRZdLZIq%A0l{yZhd{Zyrk% z!rnY+JlKK6#27gkBnk(jF?upwObCe{h{glegbOA_qj-@>(C=@%)ybRvyq%pl^PAty z+gp9tx+_0*th%5m2dIxxAFfbp3U9CEgR*P2QtNOxuEJ65#0+-fQS86~>#>Z_;<;M; zmni*jVjcdBd+`o#RjQ)8cJJceUWt=j~glB8NFQB|(7g4ru5vBjb3O8J;fhc4} zTTu3TA3lZC$Tq68$fe%oLk``0cm&_aC-4q(snwiJ$=pVizrk(E}1M#&PpQa#Y}TJEIQ{z|x8DzX4soR;^$ zmmAr`Nte+}nH&s?BMfOs%Cq)jNY|S85GA5;)`ZQHiEeBB!t!!_G zDrJwH8cCm&9;&?WL-M6oWH0wpWv@r5V}4uxasO_;sXILH|ET}uvxjTyRtz7BV`oe1 zd8hMnoJ({*%vtTSVWP_>;l}EcP13y6@vOEX-%A<4rQ!Rwqp{OR;xr1>q?xlx#?LnH z^q)5#7@0|3^|2z&dOl8d*_IfwG#^HD+Qs^GXv;c?ZK5NFuxG-=?eV`f>h0-FA#{2? zE);C!)O6MstUh$og{O@RI!;}GJlh`_XIVm& z^DCQAv<>$Uj`j}?>!IPy$XM^-J|8!4ZT!E*pKp%*cg<`4jg~fF*YdT$-?HBS+VYXV z(i*HfmbY2o+V-j6(Ej(>a*~YB*?gEaju{hMv?UknFbWC8FgYEB&KA;8P0+7kqKtakMyY<)@kLFAft@j>rEmUT=fP3yOfh7%YF|BXNSuiR zqfe$YMyHWWbNZwynozsy;N|pG8tm~q*6VE(CUOk*VoVOzq>biG&V{o?%k;*-)K&1` jbXEG2YP8OTMO~f4siH|`O%e~gXA8wRt4@!bQlS0?KG`KK literal 5715 zcma)~6B@*`3*$*_mwInaw!cYqBA*-0r&5 zeW$CdDpj{;((y5fAU+r&3gVM*5m8WIR1{HAF!(4$#UMT?fj~e(5Fz-Ts_vej4AEk% zzo}dIo_p^3tFv$1e$y+8>mv94+|RvFDFeTC6F*$~{YrfZJ^*E?3h#ik@GiItZ->u8 z{;8OsPrx1cID8q(``4hXdjrnGf57|T)GbOa!bNyDdwf`7{%@f8*JdioCxK`^X|l1;^#>ydM`pb$LFA|dj`tB7CIO~IoIoO z6TUfoK8sMX%Q}=e>cP*zFF`_GeIJUvA456suc73{>u?qR2~NUE4kK~00_EK6@CGPn zk?S~WG?E{R3C zL}$64;1;_t%LCVm5~>EpzMmdGi;W)Peu!KAEIvKUExr?b$R%+tu^@3TvG^$W1Kj7h zN7n*>h+V~3Vh_w+T*vr*kXvH&;bNqWL$NU?D|{xyVq3W+SLKpi5x*?S!@g^F__z3= z!7VYMxi4_fa4TI&?en=yZE##o%{-K;sZ2M!wr}-f+q)g(T^y-np-Iy@{Zts(RJY@P z-$p(=IGV&6LzR`l`Qz$r+j*xd+sq33`pf8&p*C~~dmE$>RkT0mk+;`(tFQ)CT+p$?gPi1PkYodoToZVY>28Iwe0+$z81Gp+z%RRIdn`B zbDTB0o7$~&liOy;WbM=?zR`7=kJCY|W!k;U@yYomc(!ilbu0HCr!AL$8Zpxb6STuP zvq6o)$h#=Ffm%+j!C9uTt!C>GUtEj{022k8BWmZxaxLtKCYi?@ZM~Hupja{z5RE;h zOXmy)ziRaCn&_goP^axZ#-U8SBP3$ z-?Sa78FPJViE9c9b1~PIywxYjM+wukp-sARWE-l<(M2&aV39vz9QUw7p+Vnux?XoB za9Y+zY}}7`Y;b}h{EwPaVsyKxM~tE~7WTHE#JEr*IVWcbUom)1wmMjJn-W#xU|E(> zZFb|73YZeSZ5&Y3D-@cv@Xq)xp}OPj?zl!H)_L4ni4(~n6CQ7I_YWK$|&yYX`+YPr&|Mc4Zj_Z=4&=n*RW$h=S(E(ffxu! zX;Z`_8x$uuqm$HR<@nnp7BRcVQNlX9AM;fz3Pepk>ykE)b%{|E;?V#nmXWlP#@iUK z`eac3yiGF+1YLxhUNT*i8NF^pGsq{X0CDQ8>siMI)up_XRhw}`Pi#EZtQK{Ph1Clf zu%TzCXJ)I@XR5Pj^vq0SmcLInnRF zo~cbwNbTnfRc#IuPT}nfzMh1}MRO9XDHZ?R)#hsT%-%dva?7UGl?dZX4bW#=&QCm3 z-H0vU`|2e-kl4)D_#!p*^*KUBq>gw!isNMN`t`Z%c5lrR1u8MV+t9UIo#7{JBwiFl zlv4Ff?R4$b_{5DvZW?c17J&^!Ri_cQx5K^{GrXuv=3#1^9XVxIri89Fp(?v(+qL$( zp$!{#OwYS5L-n$KGwORTQMF_w4NNx=^U?5P>Rr!S z^joIO!hX)@-h`&ljsrYS4QCIHscnkkdkj<9*J*+DRnIInTsd09%VB?%_FPMIfSewy z=#H9s&(Ltt67?v@`-%Vywk7(GY>=)NdcAAWf-1!gnWW6;i#7Oa=X^h+PRE2Ir?lDI4X zDX5*dOqs&WbiLd+)P;RnoET)#MPbFl<7GAvJEmc7593yH>VP&wjmuf@Zk*_z9H+|g zv-~+$kFEAUH`KZ@TPKJGQKe@SazVU1jEWk4W(UpdPh*yWq}`&FC68o2Qt2=xq+!~U z#%iQfQM3vJwb`2we$=7*ku_ma#uA6^y4d$bk$qB;XqC(fx=E9d!qV_{;I-*x{I9Sy zEtQe)mPri_=i#C}@-X4WD*iVWuql6*>DxncXb8}#rq?Cv#JPKeL;0kJ>#}Q4Dmw+C z$oWcwG!dwaMZE~qDH^<>Lo|0GJ5M`EM0>X%K*8fJ(z{gi}>gprOz z+a2b3lkdzZ;IEPR5`Y2Uny%%qo;w&GL7A0BiWM!@c)t#ZDH66kWsx;Sg{8vaT(T#^ T#CWaft1^eN\n" "Language-Team: Hariadi Hinta \n" +"Language: Bahasa Melayu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-KeywordsList: _;gettext;gettext_noop;__;_e\n" "X-Poedit-Basepath: ../\n" "X-Generator: Poedit 1.5.4\n" -"Language: Bahasa Melayu\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SearchPath-1: ./templates\n" "X-Poedit-SearchPath-2: ./lib\n" -#: 404.php:5 -msgid "" -"The page you are looking for might have been removed, had its name changed, " -"or is temporarily unavailable." -msgstr "" -"Halaman yang anda cari mungkin telah dipindahkan, ditukar nama, atau tidak " -"dapat diakses untuk sementara." +#: 404.php:4 +msgid "Sorry, but the page you were trying to view does not exist." +msgstr "Maaf, tetapi halaman yang anda cuba untuk capai tidak wujud." -#: 404.php:8 -msgid "Please try the following:" -msgstr "Sila cuba yang berikut:" +#: 404.php:7 +msgid "It looks like this was the result of either:" +msgstr "Ia kelihatan seperti ini adalah hasil sama ada:" + +#: 404.php:9 +msgid "a mistyped address" +msgstr "salah taip alamat" #: 404.php:10 -msgid "Check your spelling" -msgstr "Semak ejaan anda" +msgid "an out-of-date link" +msgstr "pautan tamat tempoh" -#: 404.php:11 -#, php-format -msgid "Return to the home page" -msgstr "Kembali ke Halaman Utama" +#: index.php:5 +msgid "Sorry, no results were found." +msgstr "Maaf, tiada keputusan ditemui." -#: 404.php:12 -msgid "Click the Back button" -msgstr "Klik pautan Kembali" +#: index.php:17 +msgid "← Older posts" +msgstr "← Artikel sebelumnya" -#: functions.php:28 -msgid "Primary Navigation" -msgstr "Menu Utama" +#: index.php:18 +msgid "Newer posts →" +msgstr "Artikel selanjutnya →" -#: lib/activation.php:32 lib/activation.php:33 +#: lib/activation.php:28 lib/activation.php:29 msgid "Theme Activation" msgstr "Pengaktifan tema" -#: lib/activation.php:72 +#: lib/activation.php:51 #, php-format msgid "%s Theme Activation" msgstr "%s Pengaktifan tema" -#: lib/activation.php:87 lib/activation.php:89 +#: lib/activation.php:62 lib/activation.php:64 msgid "Create static front page?" msgstr "Buat halaman depan statik?" -#: lib/activation.php:91 lib/activation.php:104 lib/activation.php:117 -#: lib/activation.php:130 lib/activation.php:143 +#: lib/activation.php:66 lib/activation.php:79 lib/activation.php:92 +#: lib/activation.php:105 lib/activation.php:118 msgid "Yes" msgstr "Ya" -#: lib/activation.php:92 lib/activation.php:105 lib/activation.php:118 -#: lib/activation.php:131 lib/activation.php:144 +#: lib/activation.php:67 lib/activation.php:80 lib/activation.php:93 +#: lib/activation.php:106 lib/activation.php:119 msgid "No" msgstr "Tidak" -#: lib/activation.php:95 +#: lib/activation.php:70 msgid "Create a page called Home and set it to be the static front page" msgstr "" "Buat halaman dengan tajuk Home dan tetapkan ianya sebagai halaman depan " "statik" -#: lib/activation.php:100 +#: lib/activation.php:75 msgid "Change permalink structure?" msgstr "Ubah struktur permalink?" -#: lib/activation.php:102 +#: lib/activation.php:77 msgid "Update permalink structure?" msgstr "Kemaskini struktur permalink?" -#: lib/activation.php:108 +#: lib/activation.php:83 msgid "Change permalink structure to /%postname%/" msgstr "Tukar struktur permalink menjadi /%postname%/" -#: lib/activation.php:113 +#: lib/activation.php:88 msgid "Change uploads folder?" msgstr "Tukar folder muat naik?" -#: lib/activation.php:115 +#: lib/activation.php:90 msgid "Update uploads folder?" msgstr "Kemaskini folder muat naik?" -#: lib/activation.php:121 +#: lib/activation.php:96 msgid "Change uploads folder to /assets/ instead of /wp-content/uploads/" msgstr "Tukar folder muat naik ke /assets/ berbanding /wp-content/uploads/" -#: lib/activation.php:126 lib/activation.php:128 +#: lib/activation.php:101 lib/activation.php:103 msgid "Create navigation menu?" msgstr "Buat menu navigasi?" -#: lib/activation.php:134 +#: lib/activation.php:109 msgid "Create the Primary Navigation menu and set the location" msgstr "Buat Menu Navigasi Utama dan tentukan lokasinya" -#: lib/activation.php:139 lib/activation.php:141 +#: lib/activation.php:114 lib/activation.php:116 msgid "Add pages to menu?" msgstr "Tambah halaman ke menu?" -#: lib/activation.php:147 +#: lib/activation.php:122 msgid "Add all current published pages to the Primary Navigation" msgstr "Tambah semua halaman yang sudah diterbitkan ke Menu Utama" -#: lib/cleanup.php:404 +#: lib/cleanup.php:358 msgid "Continued" msgstr "Teruskan" -#: lib/htaccess.php:26 +#: lib/init.php:11 +msgid "Primary Navigation" +msgstr "Menu Utama" + +#: lib/utils.php:60 +msgid "Latest Posts" +msgstr "Artikel Terbaru" + +#: lib/utils.php:69 #, php-format -msgid "Please make sure your .htaccess file is writable " -msgstr "" -"Sila pastikan .htaccess anda berkeupayaan untuk ditulis" +msgid "Daily Archives: %s" +msgstr "Arkib Harian: %s" -#: lib/template-tags.php:5 +#: lib/utils.php:71 #, php-format -msgid "Posted on %s at %s." -msgstr "Diterbitkan pada %s %s" +msgid "Monthly Archives: %s" +msgstr "Arkib Bulanan: %s" -#: lib/template-tags.php:6 -msgid "Written by" -msgstr "Ditulis oleh" +#: lib/utils.php:73 +#, php-format +msgid "Yearly Archives: %s" +msgstr "Arkib Tahunan: %s" -#: lib/widgets.php:6 +#: lib/utils.php:75 +#, php-format +msgid "Author Archives: %s" +msgstr "Arkib Penulis: %s" + +#: lib/utils.php:80 +#, php-format +msgid "Search Results for %s" +msgstr "Hasil Carian untuk %s" + +#: lib/utils.php:82 +msgid "Not Found" +msgstr "Tidak ditemui" + +#: lib/widgets.php:8 msgid "Primary Sidebar" msgstr "Sidebar Utama" -#: lib/widgets.php:14 +#: lib/widgets.php:17 msgid "Footer" msgstr "Footer" -#: lib/widgets.php:30 +#: lib/widgets.php:45 msgid "Use this widget to add a vCard" msgstr "Gunakan widget ini untuk menambah vCard" -#: lib/widgets.php:31 +#: lib/widgets.php:47 msgid "Roots: vCard" msgstr "Roots: vCard" -#: lib/widgets.php:58 +#: lib/widgets.php:74 msgid "vCard" msgstr "vCard" -#: lib/widgets.php:124 -msgid "Title (optional):" -msgstr "Tajuk (pilihan):" - -#: lib/widgets.php:128 -msgid "Street Address:" -msgstr "Alamat" - -#: lib/widgets.php:132 -msgid "City/Locality:" -msgstr "Bandar/Daerah:" - -#: lib/widgets.php:136 -msgid "State/Region:" -msgstr "Negeri/Wilayah:" - -#: lib/widgets.php:140 -msgid "Zipcode/Postal Code:" -msgstr "Poskod:" - -#: lib/widgets.php:144 -msgid "Telephone:" -msgstr "Telefon:" - -#: lib/widgets.php:148 -msgid "Email:" -msgstr "Emel:" - -#: templates/comments.php:7 -#, php-format -msgid "%s" -msgstr "%s" - -#: templates/comments.php:8 +#: templates/comment.php:4 #, php-format msgid "%1$s" msgstr "%1$s" -#: templates/comments.php:9 +#: templates/comment.php:5 msgid "(Edit)" msgstr "(Kemaskini)" -#: templates/comments.php:15 +#: templates/comment.php:9 msgid "Your comment is awaiting moderation." msgstr "Komen anda dalam senarai moderasi." -#: templates/comments.php:32 -msgid "This post is password protected. Enter the password to view comments." -msgstr "" -"Artikel ini dilindungi dengan katalaluan. Masukkan katalaluan untuk melihat " -"komen." - -#: templates/comments.php:49 +#: templates/comments.php:18 msgid "← Older comments" msgstr "← Komen terdahulu" -#: templates/comments.php:50 +#: templates/comments.php:21 msgid "Newer comments →" msgstr "Komentar seterusnya →" -#: templates/comments.php:58 templates/comments.php:68 +#: templates/comments.php:29 templates/comments.php:38 msgid "Comments are closed." msgstr "KOmen ditutup." -#: templates/comments.php:75 +#: templates/comments.php:45 msgid "Leave a Reply" msgstr "Tinggalkan Komen" -#: templates/comments.php:75 +#: templates/comments.php:45 #, php-format msgid "Leave a Reply to %s" msgstr "Balasan untuk %s" -#: templates/comments.php:78 +#: templates/comments.php:48 #, php-format msgid "You must be logged in to post a comment." msgstr "" "Anda dikehendaki daftar masuk untuk menghantar komen." -#: templates/comments.php:82 +#: templates/comments.php:53 #, php-format msgid "Logged in as %s." msgstr "Daftar masuk sebagai %s." -#: templates/comments.php:82 +#: templates/comments.php:54 msgid "Log out of this account" msgstr "Daftar keluar bagi akaun ini" -#: templates/comments.php:82 +#: templates/comments.php:54 msgid "Log out »" msgstr "Daftar keluar »" -#: templates/comments.php:84 +#: templates/comments.php:57 msgid "Name" msgstr "Nama" -#: templates/comments.php:84 templates/comments.php:86 +#: templates/comments.php:57 templates/comments.php:59 msgid " (required)" msgstr "(wajib)" -#: templates/comments.php:86 +#: templates/comments.php:59 msgid "Email (will not be published)" msgstr "Emel (tidak akan diterbitkan)" -#: templates/comments.php:88 +#: templates/comments.php:61 msgid "Website" msgstr "Laman Web" -#: templates/comments.php:91 +#: templates/comments.php:64 msgid "Comment" msgstr "Komen" -#: templates/comments.php:93 +#: templates/comments.php:66 msgid "Submit Comment" msgstr "Hantar Komen" @@ -274,50 +256,9 @@ msgstr "Hantar Komen" msgid "Pages:" msgstr "Halaman:" -#: templates/content.php:4 -msgid "Sorry, no results were found." -msgstr "Maaf, tiada keputusan ditemui." - -#: templates/content.php:26 -msgid "← Older posts" -msgstr "← Artikel sebelumnya" - -#: templates/content.php:27 -msgid "Newer posts →" -msgstr "Artikel selanjutnya →" - -#: templates/page-header.php:8 -msgid "Latest Posts" -msgstr "Artikel Terbaru" - -#: templates/page-header.php:17 -#, php-format -msgid "Daily Archives: %s" -msgstr "Arkib Harian: %s" - -#: templates/page-header.php:19 -#, php-format -msgid "Monthly Archives: %s" -msgstr "Arkib Bulanan: %s" - -#: templates/page-header.php:21 -#, php-format -msgid "Yearly Archives: %s" -msgstr "Arkib Tahunan: %s" - -#: templates/page-header.php:25 -#, php-format -msgid "Author Archives: %s" -msgstr "Arkib Penulis: %s" - -#: templates/page-header.php:30 -#, php-format -msgid "Search Results for %s" -msgstr "Hasil Carian untuk %s" - -#: templates/page-header.php:32 -msgid "File Not Found" -msgstr "Fail tidak ditemui" +#: templates/entry-meta.php:2 +msgid "By" +msgstr "Oleh" #: templates/searchform.php:2 msgid "Search for:" @@ -326,3 +267,62 @@ msgstr "Carian untuk:" #: templates/searchform.php:3 templates/searchform.php:4 msgid "Search" msgstr "Cari" + +#~ msgid "" +#~ "The page you are looking for might have been removed, had its name " +#~ "changed, or is temporarily unavailable." +#~ msgstr "" +#~ "Halaman yang anda cari mungkin telah dipindahkan, ditukar nama, atau " +#~ "tidak dapat diakses untuk sementara." + +#~ msgid "Please try the following:" +#~ msgstr "Sila cuba yang berikut:" + +#~ msgid "Check your spelling" +#~ msgstr "Semak ejaan anda" + +#~ msgid "Return to the home page" +#~ msgstr "Kembali ke Halaman Utama" + +#~ msgid "Click the Back button" +#~ msgstr "Klik pautan Kembali" + +#~ msgid "Please make sure your .htaccess file is writable " +#~ msgstr "" +#~ "Sila pastikan .htaccess anda berkeupayaan untuk ditulis" + +#~ msgid "Posted on %s at %s." +#~ msgstr "Diterbitkan pada %s %s" + +#~ msgid "Written by" +#~ msgstr "Ditulis oleh" + +#~ msgid "Title (optional):" +#~ msgstr "Tajuk (pilihan):" + +#~ msgid "Street Address:" +#~ msgstr "Alamat" + +#~ msgid "City/Locality:" +#~ msgstr "Bandar/Daerah:" + +#~ msgid "State/Region:" +#~ msgstr "Negeri/Wilayah:" + +#~ msgid "Zipcode/Postal Code:" +#~ msgstr "Poskod:" + +#~ msgid "Telephone:" +#~ msgstr "Telefon:" + +#~ msgid "Email:" +#~ msgstr "Emel:" + +#~ msgid "%s" +#~ msgstr "%s" + +#~ msgid "" +#~ "This post is password protected. Enter the password to view comments." +#~ msgstr "" +#~ "Artikel ini dilindungi dengan katalaluan. Masukkan katalaluan untuk " +#~ "melihat komen." From 06f424d3713bfce6db85f32adbace63eb3244f59 Mon Sep 17 00:00:00 2001 From: Foxaii Date: Mon, 13 May 2013 18:44:14 +0200 Subject: [PATCH 04/23] Renamed Wrapper Templates Filter --- lib/utils.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/utils.php b/lib/utils.php index 1a928d8..29ea532 100644 --- a/lib/utils.php +++ b/lib/utils.php @@ -34,7 +34,7 @@ class Roots_Wrapping { array_unshift($templates, sprintf('base-%s.php', self::$base)); } - $templates = apply_filters('roots_wrapping_base', $templates); + $templates = apply_filters('roots_wrap_base', $templates); return locate_template($templates); } @@ -45,7 +45,7 @@ class Roots_Wrapping { array_unshift($templates, sprintf('templates/sidebar-%s.php', self::$base)); } - $templates = apply_filters('roots_wrapping_sidebar', $templates); + $templates = apply_filters('roots_wrap_sidebar', $templates); return locate_template($templates); } } From ecfaefd7517ba4fb291cb37951b075caa655b7c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Louis-R=C3=A9mi=20Bab=C3=A9?= Date: Tue, 14 May 2013 19:02:09 +0300 Subject: [PATCH 05/23] Never remove media attribute on link tags --- lib/cleanup.php | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/lib/cleanup.php b/lib/cleanup.php index a9f1833..6108b5a 100644 --- a/lib/cleanup.php +++ b/lib/cleanup.php @@ -94,17 +94,6 @@ function roots_wp_title($title) { } add_filter('wp_title', 'roots_wp_title', 10); -/** - * Clean up output of stylesheet tags - */ -function roots_clean_style_tag($input) { - preg_match_all("!!", $input, $matches); - // Only display media if it's print - $media = $matches[3][0] === 'print' ? ' media="print"' : ''; - return '' . "\n"; -} -add_filter('style_loader_tag', 'roots_clean_style_tag'); - /** * Add and remove body_class() classes */ From de206a2cf74d944fff45d9659967d2ad69c0b519 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Louis-R=C3=A9mi=20Bab=C3=A9?= Date: Tue, 14 May 2013 20:06:33 +0300 Subject: [PATCH 06/23] Only display media if it is meaningful --- lib/cleanup.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/lib/cleanup.php b/lib/cleanup.php index 6108b5a..4555077 100644 --- a/lib/cleanup.php +++ b/lib/cleanup.php @@ -94,6 +94,17 @@ function roots_wp_title($title) { } add_filter('wp_title', 'roots_wp_title', 10); +/** + * Clean up output of stylesheet tags + */ +function roots_clean_style_tag($input) { + preg_match_all("!!", $input, $matches); + // Only display media if it is meaningful + $media = $matches[3][0] !== '' && $matches[3][0] !== 'all' ? ' media="' . $matches[3][0] . '"' : ''; + return '' . "\n"; +} +add_filter('style_loader_tag', 'roots_clean_style_tag'); + /** * Add and remove body_class() classes */ From 530b0731f68802a378f4dc2d4de0b42ab6e5a7bf Mon Sep 17 00:00:00 2001 From: Ben Word Date: Tue, 21 May 2013 20:06:57 -0500 Subject: [PATCH 07/23] /assets/css/less/ -> /assets/less/ --- assets/{css => }/less/accordion.less | 0 assets/{css => }/less/alerts.less | 0 assets/{css => }/less/bootstrap.less | 0 assets/{css => }/less/breadcrumbs.less | 0 assets/{css => }/less/button-groups.less | 0 assets/{css => }/less/buttons.less | 0 assets/{css => }/less/carousel.less | 0 assets/{css => }/less/close.less | 0 assets/{css => }/less/code.less | 0 assets/{css => }/less/component-animations.less | 0 assets/{css => }/less/dropdowns.less | 0 assets/{css => }/less/forms.less | 0 assets/{css => }/less/grid.less | 0 assets/{css => }/less/hero-unit.less | 0 assets/{css => }/less/labels-badges.less | 0 assets/{css => }/less/layouts.less | 0 assets/{css => }/less/media.less | 0 assets/{css => }/less/mixins.less | 0 assets/{css => }/less/modals.less | 0 assets/{css => }/less/navbar.less | 0 assets/{css => }/less/navs.less | 0 assets/{css => }/less/pager.less | 0 assets/{css => }/less/pagination.less | 0 assets/{css => }/less/popovers.less | 0 assets/{css => }/less/progress-bars.less | 0 assets/{css => }/less/reset.less | 0 assets/{css => }/less/responsive-1200px-min.less | 0 assets/{css => }/less/responsive-767px-max.less | 0 assets/{css => }/less/responsive-768px-979px.less | 0 assets/{css => }/less/responsive-navbar.less | 0 assets/{css => }/less/responsive-utilities.less | 0 assets/{css => }/less/responsive.less | 0 assets/{css => }/less/scaffolding.less | 0 assets/{css => }/less/sprites.less | 0 assets/{css => }/less/tables.less | 0 assets/{css => }/less/thumbnails.less | 0 assets/{css => }/less/tooltip.less | 0 assets/{css => }/less/type.less | 0 assets/{css => }/less/utilities.less | 0 assets/{css => }/less/variables.less | 0 assets/{css => }/less/wells.less | 0 41 files changed, 0 insertions(+), 0 deletions(-) rename assets/{css => }/less/accordion.less (100%) rename assets/{css => }/less/alerts.less (100%) rename assets/{css => }/less/bootstrap.less (100%) rename assets/{css => }/less/breadcrumbs.less (100%) rename assets/{css => }/less/button-groups.less (100%) rename assets/{css => }/less/buttons.less (100%) rename assets/{css => }/less/carousel.less (100%) rename assets/{css => }/less/close.less (100%) rename assets/{css => }/less/code.less (100%) rename assets/{css => }/less/component-animations.less (100%) rename assets/{css => }/less/dropdowns.less (100%) rename assets/{css => }/less/forms.less (100%) rename assets/{css => }/less/grid.less (100%) rename assets/{css => }/less/hero-unit.less (100%) rename assets/{css => }/less/labels-badges.less (100%) rename assets/{css => }/less/layouts.less (100%) rename assets/{css => }/less/media.less (100%) rename assets/{css => }/less/mixins.less (100%) rename assets/{css => }/less/modals.less (100%) rename assets/{css => }/less/navbar.less (100%) rename assets/{css => }/less/navs.less (100%) rename assets/{css => }/less/pager.less (100%) rename assets/{css => }/less/pagination.less (100%) rename assets/{css => }/less/popovers.less (100%) rename assets/{css => }/less/progress-bars.less (100%) rename assets/{css => }/less/reset.less (100%) rename assets/{css => }/less/responsive-1200px-min.less (100%) rename assets/{css => }/less/responsive-767px-max.less (100%) rename assets/{css => }/less/responsive-768px-979px.less (100%) rename assets/{css => }/less/responsive-navbar.less (100%) rename assets/{css => }/less/responsive-utilities.less (100%) rename assets/{css => }/less/responsive.less (100%) rename assets/{css => }/less/scaffolding.less (100%) rename assets/{css => }/less/sprites.less (100%) rename assets/{css => }/less/tables.less (100%) rename assets/{css => }/less/thumbnails.less (100%) rename assets/{css => }/less/tooltip.less (100%) rename assets/{css => }/less/type.less (100%) rename assets/{css => }/less/utilities.less (100%) rename assets/{css => }/less/variables.less (100%) rename assets/{css => }/less/wells.less (100%) diff --git a/assets/css/less/accordion.less b/assets/less/accordion.less similarity index 100% rename from assets/css/less/accordion.less rename to assets/less/accordion.less diff --git a/assets/css/less/alerts.less b/assets/less/alerts.less similarity index 100% rename from assets/css/less/alerts.less rename to assets/less/alerts.less diff --git a/assets/css/less/bootstrap.less b/assets/less/bootstrap.less similarity index 100% rename from assets/css/less/bootstrap.less rename to assets/less/bootstrap.less diff --git a/assets/css/less/breadcrumbs.less b/assets/less/breadcrumbs.less similarity index 100% rename from assets/css/less/breadcrumbs.less rename to assets/less/breadcrumbs.less diff --git a/assets/css/less/button-groups.less b/assets/less/button-groups.less similarity index 100% rename from assets/css/less/button-groups.less rename to assets/less/button-groups.less diff --git a/assets/css/less/buttons.less b/assets/less/buttons.less similarity index 100% rename from assets/css/less/buttons.less rename to assets/less/buttons.less diff --git a/assets/css/less/carousel.less b/assets/less/carousel.less similarity index 100% rename from assets/css/less/carousel.less rename to assets/less/carousel.less diff --git a/assets/css/less/close.less b/assets/less/close.less similarity index 100% rename from assets/css/less/close.less rename to assets/less/close.less diff --git a/assets/css/less/code.less b/assets/less/code.less similarity index 100% rename from assets/css/less/code.less rename to assets/less/code.less diff --git a/assets/css/less/component-animations.less b/assets/less/component-animations.less similarity index 100% rename from assets/css/less/component-animations.less rename to assets/less/component-animations.less diff --git a/assets/css/less/dropdowns.less b/assets/less/dropdowns.less similarity index 100% rename from assets/css/less/dropdowns.less rename to assets/less/dropdowns.less diff --git a/assets/css/less/forms.less b/assets/less/forms.less similarity index 100% rename from assets/css/less/forms.less rename to assets/less/forms.less diff --git a/assets/css/less/grid.less b/assets/less/grid.less similarity index 100% rename from assets/css/less/grid.less rename to assets/less/grid.less diff --git a/assets/css/less/hero-unit.less b/assets/less/hero-unit.less similarity index 100% rename from assets/css/less/hero-unit.less rename to assets/less/hero-unit.less diff --git a/assets/css/less/labels-badges.less b/assets/less/labels-badges.less similarity index 100% rename from assets/css/less/labels-badges.less rename to assets/less/labels-badges.less diff --git a/assets/css/less/layouts.less b/assets/less/layouts.less similarity index 100% rename from assets/css/less/layouts.less rename to assets/less/layouts.less diff --git a/assets/css/less/media.less b/assets/less/media.less similarity index 100% rename from assets/css/less/media.less rename to assets/less/media.less diff --git a/assets/css/less/mixins.less b/assets/less/mixins.less similarity index 100% rename from assets/css/less/mixins.less rename to assets/less/mixins.less diff --git a/assets/css/less/modals.less b/assets/less/modals.less similarity index 100% rename from assets/css/less/modals.less rename to assets/less/modals.less diff --git a/assets/css/less/navbar.less b/assets/less/navbar.less similarity index 100% rename from assets/css/less/navbar.less rename to assets/less/navbar.less diff --git a/assets/css/less/navs.less b/assets/less/navs.less similarity index 100% rename from assets/css/less/navs.less rename to assets/less/navs.less diff --git a/assets/css/less/pager.less b/assets/less/pager.less similarity index 100% rename from assets/css/less/pager.less rename to assets/less/pager.less diff --git a/assets/css/less/pagination.less b/assets/less/pagination.less similarity index 100% rename from assets/css/less/pagination.less rename to assets/less/pagination.less diff --git a/assets/css/less/popovers.less b/assets/less/popovers.less similarity index 100% rename from assets/css/less/popovers.less rename to assets/less/popovers.less diff --git a/assets/css/less/progress-bars.less b/assets/less/progress-bars.less similarity index 100% rename from assets/css/less/progress-bars.less rename to assets/less/progress-bars.less diff --git a/assets/css/less/reset.less b/assets/less/reset.less similarity index 100% rename from assets/css/less/reset.less rename to assets/less/reset.less diff --git a/assets/css/less/responsive-1200px-min.less b/assets/less/responsive-1200px-min.less similarity index 100% rename from assets/css/less/responsive-1200px-min.less rename to assets/less/responsive-1200px-min.less diff --git a/assets/css/less/responsive-767px-max.less b/assets/less/responsive-767px-max.less similarity index 100% rename from assets/css/less/responsive-767px-max.less rename to assets/less/responsive-767px-max.less diff --git a/assets/css/less/responsive-768px-979px.less b/assets/less/responsive-768px-979px.less similarity index 100% rename from assets/css/less/responsive-768px-979px.less rename to assets/less/responsive-768px-979px.less diff --git a/assets/css/less/responsive-navbar.less b/assets/less/responsive-navbar.less similarity index 100% rename from assets/css/less/responsive-navbar.less rename to assets/less/responsive-navbar.less diff --git a/assets/css/less/responsive-utilities.less b/assets/less/responsive-utilities.less similarity index 100% rename from assets/css/less/responsive-utilities.less rename to assets/less/responsive-utilities.less diff --git a/assets/css/less/responsive.less b/assets/less/responsive.less similarity index 100% rename from assets/css/less/responsive.less rename to assets/less/responsive.less diff --git a/assets/css/less/scaffolding.less b/assets/less/scaffolding.less similarity index 100% rename from assets/css/less/scaffolding.less rename to assets/less/scaffolding.less diff --git a/assets/css/less/sprites.less b/assets/less/sprites.less similarity index 100% rename from assets/css/less/sprites.less rename to assets/less/sprites.less diff --git a/assets/css/less/tables.less b/assets/less/tables.less similarity index 100% rename from assets/css/less/tables.less rename to assets/less/tables.less diff --git a/assets/css/less/thumbnails.less b/assets/less/thumbnails.less similarity index 100% rename from assets/css/less/thumbnails.less rename to assets/less/thumbnails.less diff --git a/assets/css/less/tooltip.less b/assets/less/tooltip.less similarity index 100% rename from assets/css/less/tooltip.less rename to assets/less/tooltip.less diff --git a/assets/css/less/type.less b/assets/less/type.less similarity index 100% rename from assets/css/less/type.less rename to assets/less/type.less diff --git a/assets/css/less/utilities.less b/assets/less/utilities.less similarity index 100% rename from assets/css/less/utilities.less rename to assets/less/utilities.less diff --git a/assets/css/less/variables.less b/assets/less/variables.less similarity index 100% rename from assets/css/less/variables.less rename to assets/less/variables.less diff --git a/assets/css/less/wells.less b/assets/less/wells.less similarity index 100% rename from assets/css/less/wells.less rename to assets/less/wells.less From 05a974165360b332202c8a1dfe7b77ccc72a00ac Mon Sep 17 00:00:00 2001 From: Ben Word Date: Tue, 21 May 2013 20:10:38 -0500 Subject: [PATCH 08/23] /assets/css/less/ -> /assets/less/ --- doc/usage.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/usage.md b/doc/usage.md index 12ba501..d749fc5 100755 --- a/doc/usage.md +++ b/doc/usage.md @@ -16,20 +16,20 @@ A basic Roots theme initially looks like this: . ├── assets │ ├── css -│ │ ├── less -│ │ │ │── bootstrap.less -│ │ │ └── responsive.less │ │ │── app.css │ │ │── bootstrap.css │ │ │── bootstrap-responsive.css │ │ │── editor-style.css │ ├── img -│ └── js -│ ├── main.js -│ ├── plugins.js (includes bootstrap.js) -│ └── vendor -│ ├── jquery-1.9.1.min.js -│ └── modernizr-2.6.2.min.js +│ ├── js +│ │ ├── main.js +│ │ ├── plugins.js (includes bootstrap.js) +│ │ └── vendor +│ │ ├── jquery-1.9.1.min.js +│ │ └── modernizr-2.6.2.min.js +│ └── less +│ │ │── bootstrap.less +│ │ └── responsive.less ├── doc ├── lang │ └── roots.pot From e506262602b4d7f145dcf7915f551e4e9aeb44a7 Mon Sep 17 00:00:00 2001 From: Ben Word Date: Tue, 21 May 2013 20:12:30 -0500 Subject: [PATCH 09/23] Update CHANGELOG --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 08d94d2..811af81 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,6 @@ ### HEAD +* Move `/assets/css/less/` to `/assets/less/` +* Add wrapper templates filter * Fix relative external URLs issue ### 6.4.0: May 1st, 2013 From 7ff73d0f6bdfbe6d0f19f081d36940b73b6eaae2 Mon Sep 17 00:00:00 2001 From: Mark Figueredo Date: Wed, 22 May 2013 15:29:53 -0300 Subject: [PATCH 10/23] Add roots_display_sidebar filter Add filter to sidebar display to have the ability to change when it is displayed in child themes and other circumstances. https://github.com/retlehs/roots/issues/767 --- lib/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/config.php b/lib/config.php index a2c3caa..75b9d5c 100644 --- a/lib/config.php +++ b/lib/config.php @@ -67,7 +67,7 @@ function roots_display_sidebar() { ) ); - return $sidebar_config->display; + return apply_filters('roots_display_sidebar', $sidebar_config->display); } /** From 9fbecfc2c6c564f7e2322c3f29e8d47f3aa161c7 Mon Sep 17 00:00:00 2001 From: Mark Figueredo Date: Thu, 23 May 2013 12:06:42 -0300 Subject: [PATCH 11/23] Removed extra space before apply filters --- lib/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/config.php b/lib/config.php index 75b9d5c..49b73ce 100644 --- a/lib/config.php +++ b/lib/config.php @@ -67,7 +67,7 @@ function roots_display_sidebar() { ) ); - return apply_filters('roots_display_sidebar', $sidebar_config->display); + return apply_filters('roots_display_sidebar', $sidebar_config->display); } /** From 01617bb077a38cd69b03c9d52b56cbe68f981713 Mon Sep 17 00:00:00 2001 From: Ben Word Date: Fri, 24 May 2013 12:50:47 -0500 Subject: [PATCH 12/23] Remove additional widget classes --- CHANGELOG.md | 1 + lib/cleanup.php | 39 --------------------------------------- 2 files changed, 1 insertion(+), 39 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 811af81..5213132 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ ### HEAD +* Remove additional widget classes * Move `/assets/css/less/` to `/assets/less/` * Add wrapper templates filter * Fix relative external URLs issue diff --git a/lib/cleanup.php b/lib/cleanup.php index 4555077..f25c573 100644 --- a/lib/cleanup.php +++ b/lib/cleanup.php @@ -395,45 +395,6 @@ function roots_change_mce_options($options) { } add_filter('tiny_mce_before_init', 'roots_change_mce_options'); -/** - * Add additional classes onto widgets - * - * @link http://wordpress.org/support/topic/how-to-first-and-last-css-classes-for-sidebar-widgets - */ -function roots_widget_first_last_classes($params) { - global $my_widget_num; - - $this_id = $params[0]['id']; - $arr_registered_widgets = wp_get_sidebars_widgets(); - - if (!$my_widget_num) { - $my_widget_num = array(); - } - - if (!isset($arr_registered_widgets[$this_id]) || !is_array($arr_registered_widgets[$this_id])) { - return $params; - } - - if (isset($my_widget_num[$this_id])) { - $my_widget_num[$this_id] ++; - } else { - $my_widget_num[$this_id] = 1; - } - - $class = 'class="widget-' . $my_widget_num[$this_id] . ' '; - - if ($my_widget_num[$this_id] == 1) { - $class .= 'widget-first '; - } elseif ($my_widget_num[$this_id] == count($arr_registered_widgets[$this_id])) { - $class .= 'widget-last '; - } - - $params[0]['before_widget'] = preg_replace('/class=\"/', "$class", $params[0]['before_widget'], 1); - - return $params; -} -add_filter('dynamic_sidebar_params', 'roots_widget_first_last_classes'); - /** * Redirects search results from /?s=query to /search/query/, converts %20 to + * From 5fd83abb5d6a56bf8b4552ed2afc2b74fa5625c4 Mon Sep 17 00:00:00 2001 From: Ben Word Date: Fri, 24 May 2013 12:58:49 -0500 Subject: [PATCH 13/23] Remove TinyMCE valid elements tweaks (no longer necessary) --- CHANGELOG.md | 1 + lib/cleanup.php | 16 ---------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5213132..1e84f3e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ ### HEAD +* Remove TinyMCE valid elements tweaks (no longer necessary) * Remove additional widget classes * Move `/assets/css/less/` to `/assets/less/` * Add wrapper templates filter diff --git a/lib/cleanup.php b/lib/cleanup.php index f25c573..9ca01d3 100644 --- a/lib/cleanup.php +++ b/lib/cleanup.php @@ -379,22 +379,6 @@ function roots_remove_default_description($bloginfo) { } add_filter('get_bloginfo_rss', 'roots_remove_default_description'); -/** - * Allow more tags in TinyMCE including