diff options
Diffstat (limited to 'themes/default/views/page.html.php')
| -rw-r--r-- | themes/default/views/page.html.php | 42 |
1 files changed, 25 insertions, 17 deletions
diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php index 3feb14cb..3ae3e155 100644 --- a/themes/default/views/page.html.php +++ b/themes/default/views/page.html.php @@ -23,17 +23,17 @@ <? endif ?> <? endif ?> </title> - <link rel="shortcut icon" href="<?= $theme->url("images/favicon.ico") ?>" type="image/x-icon" /> + <link rel="shortcut icon" href="<?= $theme->theme_url("images/favicon.ico") ?>" type="image/x-icon" /> <link rel="stylesheet" type="text/css" href="<?= url::file("lib/yui/reset-fonts-grids.css") ?>" media="screen,print,projection" /> <link rel="stylesheet" type="text/css" href="<?= url::file("lib/superfish/css/superfish.css") ?>" media="screen" /> <link rel="stylesheet" type="text/css" href="<?= url::file("lib/themeroller/ui.base.css") ?>" media="screen,print,projection" /> - <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/screen.css") ?>" + <link rel="stylesheet" type="text/css" href="<?= $theme->theme_url("css/screen.css") ?>" media="screen,print,projection" /> <!--[if lt IE 8]> - <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>" + <link rel="stylesheet" type="text/css" href="<?= $theme->theme_url("css/fix-ie.css") ?>" media="screen,print,projection" /> <![endif]--> <? if ($theme->page_type == 'album'): ?> @@ -49,18 +49,24 @@ </style> <? endif ?> <? endif ?> - <script src="<?= url::file("lib/jquery.js") ?>" type="text/javascript"></script> - <script src="<?= url::file("lib/jquery.form.js") ?>" type="text/javascript"></script> - <script src="<?= url::file("lib/jquery-ui.js") ?>" type="text/javascript"></script> - <script src="<?= url::file("lib/gallery.common.js") ?>" type="text/javascript"></script> - <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> - <? 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> + <?= $theme->script("lib/jquery.js") ?> + <?= $theme->script("lib/jquery.form.js") ?> + <?= $theme->script("lib/jquery-ui.js") ?> + <?= $theme->script("lib/gallery.common.js") ?> + <?= $theme->script("lib/gallery.dialog.js") ?> + <?= $theme->script("lib/gallery.form.js") ?> + <?= $theme->script("lib/superfish/js/superfish.js") ?> + <?= $theme->script("lib/jquery.localscroll.js") ?> + <?= $theme->theme_script("js/ui.init.js") ?> + + <? /* These are page specific, but if we put them before $theme->head() they get combined */ ?> + <? if ($theme->page_type == "photo"): ?> + <?= $theme->script("lib/jquery.scrollTo.js") ?> + <?= $theme->script("lib/gallery.show_full_size.js") ?> + <? elseif ($theme->page_type == "movie"): ?> + <?= $theme->script("lib/flowplayer.js") ?> <? endif ?> - <script src="<?= $theme->url("js/ui.init.js") ?>" type="text/javascript"></script> + <?= $theme->head() ?> </head> @@ -69,7 +75,7 @@ <div id="doc4" class="yui-t5 gView"> <?= $theme->site_status() ?> <div id="gHeader"> - <?= $theme->display("header.html") ?> + <?= new View("header.html") ?> </div> <div id="bd"> <div id="yui-main"> @@ -81,11 +87,13 @@ </div> </div> <div id="gSidebar" class="yui-b"> - <?= $theme->display("sidebar.html") ?> + <? if ($theme->page_type != "login"): ?> + <?= new View("sidebar.html") ?> + <? endif ?> </div> </div> <div id="gFooter"> - <?= $theme->display("footer.html") ?> + <?= new View("footer.html") ?> </div> </div> <?= $theme->page_bottom() ?> |