diff options
| author | Chad Parry <github@chad.parry.org> | 2011-04-22 14:10:42 -0600 |
|---|---|---|
| committer | Chad Parry <github@chad.parry.org> | 2011-04-22 14:10:42 -0600 |
| commit | 944cb72eea946f4c45a04b7e4c7c33929fa8b9f3 (patch) | |
| tree | 5bce3f7d88df65b0c26cab24807ce287f8607e6b /themes | |
| parent | 567522bfa08c370bb5baf8454afc5b04bc9e49b4 (diff) | |
| parent | 5af74d4714005c565fc9550dbf1f0689c18429a7 (diff) | |
Merge remote branch 'origin/master' into rawphoto
Diffstat (limited to 'themes')
| -rw-r--r-- | themes/admin_wind/views/admin.html.php | 2 | ||||
| -rw-r--r-- | themes/wind/views/page.html.php | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/themes/admin_wind/views/admin.html.php b/themes/admin_wind/views/admin.html.php index a56b6f41..12301e02 100644 --- a/themes/admin_wind/views/admin.html.php +++ b/themes/admin_wind/views/admin.html.php @@ -15,6 +15,8 @@ <link rel="shortcut icon" href="<?= url::file(module::get_var("gallery", "favicon_url")) ?>" type="image/x-icon" /> + <link rel="apple-touch-icon-precomposed" + href="<?= url::file(module::get_var("gallery", "apple_touch_icon_url")) ?>" /> <?= $theme->script("jquery.js") ?> <?= $theme->script("jquery.form.js") ?> diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php index 2b86556d..1c67ff9d 100644 --- a/themes/wind/views/page.html.php +++ b/themes/wind/views/page.html.php @@ -21,7 +21,8 @@ <link rel="shortcut icon" href="<?= url::file(module::get_var("gallery", "favicon_url")) ?>" type="image/x-icon" /> - + <link rel="apple-touch-icon-precomposed" + href="<?= url::file(module::get_var("gallery", "apple_touch_icon_url")) ?>" /> <? if ($theme->page_type == "collection"): ?> <? if ($thumb_proportion != 1): ?> <? $new_width = round($thumb_proportion * 213) ?> |