diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-06-14 22:28:40 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-06-14 22:28:40 -0700 |
| commit | ff74d2d809f276039581c1104fc3539e36a871bb (patch) | |
| tree | a7616c43f1d1bc8ac5cdf1464b19027b26419656 | |
| parent | 1b656be7135efe51ba0eb34d6ac76c2632ec193a (diff) | |
| parent | 3d4cbfa274dba7386d4cf5f2130ba85350ff0cbf (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
| -rw-r--r-- | lib/jquery.localscroll.js (renamed from themes/default/js/jquery.localscroll.js) | 0 | ||||
| -rw-r--r-- | lib/jquery.scrollTo.js (renamed from themes/default/js/jquery.scrollTo.js) | 0 | ||||
| -rw-r--r-- | themes/default/views/page.html.php | 9 |
3 files changed, 5 insertions, 4 deletions
diff --git a/themes/default/js/jquery.localscroll.js b/lib/jquery.localscroll.js index c4b0f3c1..c4b0f3c1 100644 --- a/themes/default/js/jquery.localscroll.js +++ b/lib/jquery.localscroll.js diff --git a/themes/default/js/jquery.scrollTo.js b/lib/jquery.scrollTo.js index fae1d1db..fae1d1db 100644 --- a/themes/default/js/jquery.scrollTo.js +++ b/lib/jquery.scrollTo.js diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php index 0c84129f..3283bf1d 100644 --- a/themes/default/views/page.html.php +++ b/themes/default/views/page.html.php @@ -13,7 +13,6 @@ <? else: ?> <?= $page_title ?> <? endif ?> - <?= $theme->page_type ?> </title> <link rel="shortcut icon" href="<?= $theme->url("images/favicon.ico") ?>" type="image/x-icon" /> <link rel="stylesheet" type="text/css" href="<?= url::file("lib/yui/reset-fonts-grids.css") ?>" @@ -48,13 +47,15 @@ <script src="<?= url::file("lib/gallery.dialog.js") ?>" type="text/javascript"></script> <script src="<?= url::file("lib/gallery.form.js") ?>" type="text/javascript"></script> <script src="<?= url::file("lib/superfish/js/superfish.js") ?>" type="text/javascript"></script> - <script src="<?= $theme->url("js/jquery.scrollTo.js") ?>" type="text/javascript"></script> - <script src="<?= $theme->url("js/jquery.localscroll.js") ?>" type="text/javascript"></script> + <? if ($theme->page_type == 'photo'): ?> + <script src="<?= url::file("lib/jquery.scrollTo.js") ?>" type="text/javascript"></script> + <script src="<?= url::file("lib/jquery.localscroll.js") ?>" type="text/javascript"></script> + <? endif ?> <script src="<?= $theme->url("js/ui.init.js") ?>" type="text/javascript"></script> <?= $theme->head() ?> </head> - <body <?= $theme->body_attributes() ?>> + <body <?= $theme->body_attributes() ?>> <?= $theme->page_top() ?> <div id="doc4" class="yui-t5 gView"> <?= $theme->site_status() ?> |