From 4a9b45c9c3bbd574103e01debcd84cab1a18352a Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Fri, 22 Apr 2011 12:37:28 -0400 Subject: [PATCH] Created apple-touch-icon and added to wind and admin_wind themes. --- installer/install.sql | 1 + lib/images/apple-touch-icon.png | Bin 0 -> 4441 bytes .../gallery/controllers/admin_theme_options.php | 4 ++++ modules/gallery/helpers/gallery_installer.php | 8 +++++++- modules/gallery/helpers/gallery_theme.php | 5 ++++- modules/gallery/module.info | 2 +- themes/admin_wind/views/admin.html.php | 2 ++ themes/wind/views/page.html.php | 3 ++- 8 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 lib/images/apple-touch-icon.png diff --git a/installer/install.sql b/installer/install.sql index 77cda72b..06d2fcde 100644 --- a/installer/install.sql +++ b/installer/install.sql @@ -406,6 +406,7 @@ INSERT INTO {vars} VALUES (NULL,'gallery','admin_area_timeout','5400'); INSERT INTO {vars} VALUES (NULL,'gallery','maintenance_mode','0'); INSERT INTO {vars} VALUES (NULL,'gallery','visible_title_length','15'); INSERT INTO {vars} VALUES (NULL,'gallery','favicon_url','lib/images/favicon.ico'); +INSERT INTO {vars} VALUES (NULL,'gallery','apple_touch_url','lib/images/apple-touch-icon.png'); INSERT INTO {vars} VALUES (NULL,'gallery','email_from','unknown@unknown.com'); INSERT INTO {vars} VALUES (NULL,'gallery','email_reply_to','unknown@unknown.com'); INSERT INTO {vars} VALUES (NULL,'gallery','email_line_length','70'); diff --git a/lib/images/apple-touch-icon.png b/lib/images/apple-touch-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d15ce1a6c48f94eae81a0aeeb5ff398e33006ae1 GIT binary patch literal 4441 zcmZ{obyyQ#)W>N_LCVo3-8i~?G){yuKwujs1076IQlz`P8w94*R2q>OAxI5GKw=^i zN=v`|-v8b|-t#=?exB#v`@MC}ALqHTmga_Z)a=wmL_~B(AU*I6mH%@}ikmh85FU90 z3YdwZ-VJZ;RJT3!22{^Lw!Sw6{jVF~JT-`j7<`QMw5{BiX7X)Q>}_7Y>h|58JUNy- zFPp!Y2ox~Ma*6rMi#(Q>rqU-D%Or~~+t(6fsfn(<03*DIf;3B3 zuGcPwkAf{FaR;Q(ULKrt^W+`sR8cFFUi8+uOOcs!=qeJXiw zhIjDiEi?}u!0z}Hf1&C2jf^8MQ%a)8KWPnBIh%tgFTGeZT$_!y-s(3iZpXDH$iVlQt;yaNG69t%ecM$CyydOG^s;P-GiT=U6dXmQwqt4LKN5u;9v zd60T6gAU~aw)(%m>YFhrt)EHxNBiA1%vRSF(LfG9phw!o9v|!`m3^-CmyH*j-y%AG z@)S6r^z*2!H;ex>c^}KGwbQG_9!=6=A=&vBK|+e`&qq_RtvA_n;S>xp$91!hXn8C3 zD8sCOe`1R4N%NruktQls$Ql6P6VUG0?j(A!E36BAUcq@nN%Ne;%>Cd#G00=>g$9b5 zA)1&nOzTGl_(ceNx%`YVRVA}d%<)l01^}+d)HESyV<;Lq$$mhs%U<5-6^%5!h1s$c z(JFszr&vS7n>gSDu8`w`V8h>WuFB|%MrNdCY^3i8wai91gX|@nkBuoTW23mVT6p#A znf*As%YMFT9Y8%qqo1#wYUpUWxe1FU)#B?wji@B&1nvA3t8ct_c<-@Wq7qnN2QHvI~s9S{0dG%=+Un#}KNN%y*w}I2vW*GWg(1)m)F?+Vmen>L2@mGAn zT!{Z=z{DIyY1?CT3Vh;X#oWSDGAvjo!hc)$lSqeCp^0d0dCg@P9b1(1NR}gaAp@Xc zZ^|R!?CkFaP`je$)*UEE3-S2#&7G|c`;erYQ)JwIGHr2=Mk7SCji<#btJ3t!8kB_G zfl_j0+JLCLItC9~R>q_Z!#7Q{u6iZ^by)}`82FgWlxs2D0x#U0_^@Rg#)9QIDu$tYZb zJq41bU(sXiVzi-BYdvf=?2^UGTJxw*qChoTL8f3=3!(s`5xD0(H;3-fp)4~Sn`uf* ze=O$iD-_9aczkpp8_cPgS!SQ?PR0k7Cr;G%OaZ4Hb2fFwdl~Up#%6fjIeQE0!bJ#(ae_RKwJM^*S4XSR=I1$RX3 zY>T!>xYm!43iB-{!;KHVS<y-gF`2vO}AQy*|VjUn@-O|Yt?g%Zp7qm)P{Q-ZYYED{98u>&> zxs^DE4Mv9%d?pc=KVnHIpJ=&qZad(&+q*xhloUT3Rq|Lkf8>D}YfXj;ghQ#stkV+^ zMJehCG^ZwmiX#`CgJ8Fq+A$;^jZloDe9avlCp*@VVZn5tl&q3Fp1(`^CUI@1|7f!q zKqw8K8R#9W5vR&`T(_#r(+w(W@LSVQ9tE7=%FQWQKTRKRYU|LOj)2y&ixLJ>B#$05 zH{~*@ddJ1a8VULB7|23Q^L;nKq6Tha7S#g&{9vfotq8Wa4dg21qNS&o1*(m1=X(4cA9G&#qSBlR_V&g! zK(MmKyw1yV*ah_znu9Hj=1Og>XRaiV)2mfs03mG zlthf6gjBuHcCE0elr*>wk3%1={A1&%Bf!FD2;@&%+3&k;%=sR18@%_1YZO;oH^5p8 zgzi%D`TF`E($hN0oB4Uo3r6rJ@yl^>Z3nJ}++31BhK{C=gHzQVSFWm~**5ZrMzdl~H@_ZB!jpb`5ohIr3 z`wLKQQMkGu>-J89hEK1ZOq?~|3sgt-jV*dbI6m?x}sbRzYkc8ojGfLZ_FnNqcrYypdt{<>y@o!jV4TjOk@Io(jGzS;Iwshbp=YO*UM^GO4a7Y zSB#cO&wYE1@!@^Bam{PB%i!RIgrrIQagPdACm-mzG-bHlO-;a51g>-| z7+1Q@-e~TlA`NwmPHtYZnz@$F^~0c4jD23+;H{yGd%_!ih(ueGdD?v+y1(Qn7WMRt zrr$FaL>AA2yF6S#8Yf5`_Hi;!(xdG@>&E`e-4Ey9yQfR&=&yHp+sP;<>9b+!II2ktn$7g`t@ z|NP6FN{sh_{D!DtZiSDmt;;011{#o7)8RmDSteJ*K5H(2Oo@t`4OnaVV zZo3Tt`8wGswnsHd{H*?Xe(sMN$-XX(=DCp7E)Ux{-!kqT%X5|-dY)uhul%)1f;;4w zMh802;&NBga8x@B21&`}>n-c#m5pC!;<)su474-)77a zgom{V_s_t&kUXOg9y_d0^y+>;4-dciiBD#Xq*EKW*sVU&Ur}&K_r$w^#f4f4mnT<5 z;|Hhl-Dkjufd(~i2wlV;*h_bl*?W|!zG~c%P3gDHb4JgHiV7SPG-6g zHV(>KgcpKXeAeAGS0;MfUmT`Ji`Gl5RH>ejP|L#-uPuX3wVhvh4ZqCW?2#s7Sln*1X~ ztP2Vp^r*j5B*OadPnjT>CvlikiSaR;)17(hZ#k}0CQRZ(rwZ-S_qP|m^}2^!UYA>?c_Qx-*6vW9Ix8S(qEkgoTUhC4;bV6w) zXOJvtXr44||Mo#V9BfWiNR-_X20L~WTsvCEd9H9g2iV~9h(=eT?zEhH3hTNy3Gd@(Jj2~=t0;Ll&y@tkA zCOw}bRHd9JerR@Ikjv#tbYGX!?W=6(-9qdwboA3jAi*)E-j zo$O(j=ZC`$=}5)`PyQfGvPZ7DHB5!_32n8a27&FOtR|cnOX}Z)H@FHkPLY#r7Q*I) znUJ7RTnbJ?nJkh0ebAoJ^Ug~OUvBqe_^`1*y zoykqva`%ehsO;~T1$NFv3(>t@6*zA#Q-r2-adBmnd4Ps%pp~Dw-iNSA6COYuR+8+V zmVzZFG-YCD^Dee;YNV-!TYXn{`Ep_?*4Q1hmRxsI6DLxLHKWo1=Xwh%~2?P}!&6 z*%`{47Ib{nc!Y$@QcNEnZuUuHSrLbI<%T=}&hI{BJv}`|_<#&)8&+0U^NZhjLmndj zo|YEZw-VAcUZy}5xhBbU9NJhkb ziTiT7IwYM0NI2*^={O0$F(&Y^32njKLidK5i;D|i`m1r>6HaBHbr7@u#w+#`I|hmg zV^MWQMVqmWg9A~#{5%qCXuQb|w=@=1RmPN*D@#3Wu#O*0;yOR=)I9rIDqIw_+9(od zPJAFabTICoHs;6G!yrRJtFYW|f6B3=TQW_SPrN^Na>s0NY7#Mhp+!npLWw5T@H~Fw z7*_U5aS$R#JNI0GOu{ZCCO*P#2A3R3&f$#y)=wW4(H2cHg8(; zPTOAEr;J@_7B+|=Sjy`8ZoVM|(fSZH!Wr$N0{3yb0g;@HtgNIAP*P6LN>)ZiURFg; zQBp=;MMkDcCAs+j2)v#mJX~M?|AIa@MS&Xu+kZPeeCmq!clL21(ndUmx$qi!IlH-l YU7QgwQ8*X1n@L1Q`sR8V9jDj-1H1lZfdBvi literal 0 HcmV?d00001 diff --git a/modules/gallery/controllers/admin_theme_options.php b/modules/gallery/controllers/admin_theme_options.php index 055e063c..840b3b3d 100644 --- a/modules/gallery/controllers/admin_theme_options.php +++ b/modules/gallery/controllers/admin_theme_options.php @@ -59,6 +59,7 @@ class Admin_Theme_Options_Controller extends Admin_Controller { module::set_var("gallery", "footer_text", $form->edit_theme->footer_text->value); module::set_var("gallery", "show_credits", $form->edit_theme->show_credits->value); module::set_var("gallery", "favicon_url", $form->edit_theme->favicon_url->value); + module::set_var("gallery", "apple_touch_url", $form->edit_theme->apple_touch_url->value); module::event("theme_edit_form_completed", $form); @@ -93,6 +94,9 @@ class Admin_Theme_Options_Controller extends Admin_Controller { $group->input("favicon_url")->label(t("URL (or relative path) to your favicon.ico")) ->id("g-favicon") ->value(module::get_var("gallery", "favicon_url")); + $group->input("apple_touch_url")->label(t("URL (or relative path) to your Apple Touch icon")) + ->id("g-apple-touch") + ->value(module::get_var("gallery", "apple_touch_url")); $group->textarea("header_text")->label(t("Header text"))->id("g-header-text") ->value(module::get_var("gallery", "header_text")); $group->textarea("footer_text")->label(t("Footer text"))->id("g-footer-text") diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php index 01c59eaa..cd9526b1 100644 --- a/modules/gallery/helpers/gallery_installer.php +++ b/modules/gallery/helpers/gallery_installer.php @@ -304,6 +304,7 @@ class gallery_installer { module::set_var("gallery", "maintenance_mode", 0); module::set_var("gallery", "visible_title_length", 15); module::set_var("gallery", "favicon_url", "lib/images/favicon.ico"); + module::set_var("gallery", "apple_touch_url", "lib/images/apple-touch-icon.png"); module::set_var("gallery", "email_from", ""); module::set_var("gallery", "email_reply_to", ""); module::set_var("gallery", "email_line_length", 70); @@ -311,7 +312,7 @@ class gallery_installer { module::set_var("gallery", "show_user_profiles_to", "registered_users"); module::set_var("gallery", "extra_binary_paths", "/usr/local/bin:/opt/local/bin:/opt/bin"); - module::set_version("gallery", 46); + module::set_version("gallery", 47); } static function upgrade($version) { @@ -677,6 +678,11 @@ class gallery_installer { module::set_var("gallery", "upgrade_checker_auto_enabled", true); module::set_version("gallery", $version = 46); } + + if ($version == 46) { + module::set_var("gallery", "apple_touch_url", "lib/images/apple-touch-icon.png"); + module::set_version("gallery", $version = 47); + } } static function uninstall() { diff --git a/modules/gallery/helpers/gallery_theme.php b/modules/gallery/helpers/gallery_theme.php index c4a82390..aa3fb7bb 100644 --- a/modules/gallery/helpers/gallery_theme.php +++ b/modules/gallery/helpers/gallery_theme.php @@ -60,11 +60,14 @@ class gallery_theme_Core { if ($session->get("debug")) { $buf .= $theme->css("debug.css"); } + if (in_array(URI::instance()->segment(1), array("admin", "admin/dashboard"))) { + $buf .= $theme->script("jquery.jcarousel.min.js"); + } if ($session->get("l10n_mode", false)) { $buf .= $theme->css("l10n_client.css"); $buf .= $theme->script("jquery.cookie.js"); - $buf .=$theme->script("l10n_client.js"); + $buf .= $theme->script("l10n_client.js"); } return $buf; } diff --git a/modules/gallery/module.info b/modules/gallery/module.info index 4c0c8866..aa1dc341 100644 --- a/modules/gallery/module.info +++ b/modules/gallery/module.info @@ -1,3 +1,3 @@ name = "Gallery 3" description = "Gallery core application" -version = 46 +version = 47 diff --git a/themes/admin_wind/views/admin.html.php b/themes/admin_wind/views/admin.html.php index a56b6f41..0d35ac97 100644 --- a/themes/admin_wind/views/admin.html.php +++ b/themes/admin_wind/views/admin.html.php @@ -15,6 +15,8 @@ " type="image/x-icon" /> + " /> script("jquery.js") ?> script("jquery.form.js") ?> diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php index 2b86556d..8b9ddf8a 100644 --- a/themes/wind/views/page.html.php +++ b/themes/wind/views/page.html.php @@ -21,7 +21,8 @@ " type="image/x-icon" /> - + " /> page_type == "collection"): ?>