summaryrefslogtreecommitdiff
path: root/themes
diff options
context:
space:
mode:
Diffstat (limited to 'themes')
-rw-r--r--themes/admin_default/css/screen.css13
-rw-r--r--themes/admin_default/views/admin.html.php24
-rw-r--r--themes/admin_default/views/pager.html.php32
-rw-r--r--themes/default/css/screen.css256
-rw-r--r--themes/default/images/ico-print.pngbin0 -> 989 bytes
-rwxr-xr-xthemes/default/images/movie-placeholder.pngbin8474 -> 0 bytes
-rw-r--r--themes/default/views/album.html.php1
-rw-r--r--themes/default/views/footer.html.php4
-rw-r--r--themes/default/views/header.html.php2
-rw-r--r--themes/default/views/movie.html.php6
-rw-r--r--themes/default/views/page.html.php42
-rw-r--r--themes/default/views/photo.html.php1
12 files changed, 199 insertions, 182 deletions
diff --git a/themes/admin_default/css/screen.css b/themes/admin_default/css/screen.css
index de4d2413..f4173d4b 100644
--- a/themes/admin_default/css/screen.css
+++ b/themes/admin_default/css/screen.css
@@ -9,6 +9,8 @@
* 4) Content blocks in specific layout containers
* 5) Browser hacks
* 6) jQuery and jQuery UI
+ * 7) Server Add
+ * 8) Digibug Print Administration
*/
/** *******************************************************************
@@ -77,14 +79,14 @@
**********************************************************************/
.gView {
- min-width: 974px !important;
+ min-width: 974px !important;
}
#gHeader {
- background-color: #e8e8e8;
- border-bottom: 1px solid #ccc;
+ background-color: #e8e8e8;
+ border-bottom: 1px solid #ccc;
margin-bottom: 20px;
- padding: 0 20px;
+ padding: 0 20px;
}
#gContent {
@@ -171,7 +173,7 @@
}
#gSiteStatus {
- margin-bottom: 0;
+ margin-bottom: 0;
}
#gContent .gItem {
@@ -436,3 +438,4 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
width: 150px;
overflow: hidden;
}
+
diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php
index b7cfaa40..62f9761f 100644
--- a/themes/admin_default/views/admin.html.php
+++ b/themes/admin_default/views/admin.html.php
@@ -14,21 +14,23 @@
media="screen,projection" />
<link rel="stylesheet" type="text/css" href="<?= url::file("themes/default/css/screen.css") ?>"
media="screen,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,projection" />
<!--[if IE]>
- <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]-->
- <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/superfish/js/superfish.js") ?>" type="text/javascript"></script>
- <script src="<?= $theme->url("js/jquery.dropshadow.js") ?>" type="text/javascript"></script>
- <script src="<?= $theme->url("js/ui.init.js") ?>" type="text/javascript"></script>
- <?= $theme->admin_head() ?>
+
+ <?= $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/superfish/js/superfish.js") ?>
+ <?= $theme->theme_script("js/jquery.dropshadow.js") ?>
+ <?= $theme->theme_script("js/ui.init.js") ?>
+
+ <?= $theme->admin_head() ?>
</head>
<body <?= $theme->body_attributes() ?>>
diff --git a/themes/admin_default/views/pager.html.php b/themes/admin_default/views/pager.html.php
index 505e8cf0..8df1b030 100644
--- a/themes/admin_default/views/pager.html.php
+++ b/themes/admin_default/views/pager.html.php
@@ -1,30 +1,42 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
<? // See http://docs.kohanaphp.com/libraries/pagination ?>
-<ul id="gPager">
+<ul class="gPager">
<? /* XXX: This message isn't easily localizable */
$from_to_msg = t("Items %from_number - %to_number of %total",
array("from_number" => $current_first_item,
"to_number" => $current_last_item,
"total" => $total_items)) ?>
- <li><?= $from_to_msg ?></li>
+ <li>
<? if ($first_page): ?>
- <li><span class="ui-icon ui-icon-seek-first"></span><a href="<?= str_replace('{page}', 1, $url) ?>"><?= t("first") ?></a></li>
+ <a href="<?= str_replace('{page}', 1, $url) ?>" class="gButtonLink ui-icon-left ui-state-default ui-corner-all">
+ <span class="ui-icon ui-icon-seek-first"></span><?= t("first") ?></a>
<? else: ?>
- <li class="inactive"><span class="ui-icon ui-icon-seek-first"></span><?= t("first") ?></li>
+ <a class="gButtonLink ui-icon-left ui-state-disabled ui-corner-all">
+ <span class="ui-icon ui-icon-seek-first"></span><?= t("first") ?></a>
<? endif ?>
<? if ($previous_page): ?>
- <li><span class="ui-icon ui-icon-seek-prev"></span><a href="<?= str_replace('{page}', $previous_page, $url) ?>"><?= t("previous") ?></a></li>
+ <a href="<?= str_replace('{page}', $previous_page, $url) ?>" class="gButtonLink ui-icon-left ui-state-default ui-corner-all">
+ <span class="ui-icon ui-icon-seek-prev"></span><?= t("previous") ?></a>
<? else: ?>
- <li class="inactive"><span class="ui-icon ui-icon-seek-prev"></span><?= t("previous") ?></li>
+ <a class="gButtonLink ui-icon-left ui-state-disabled ui-corner-all">
+ <span class="ui-icon ui-icon-seek-prev"></span><?= t("previous") ?></a>
<? endif ?>
+ </li>
+ <li class="gInfo"><?= $from_to_msg ?></li>
+ <li class="txtright">
<? if ($next_page): ?>
- <li><a href="<?= str_replace('{page}', $next_page, $url) ?>"><?= t("next") ?></a><span class="ui-icon ui-icon-seek-next"></span></li>
+ <a href="<?= str_replace('{page}', $next_page, $url) ?>" class="gButtonLink ui-icon-right ui-state-default ui-corner-all">
+ <span class="ui-icon ui-icon-seek-next"></span><?= t("next") ?></a>
<? else: ?>
- <li class="inactive"><?= t("next") ?><span class="ui-icon ui-icon-seek-next"></span></li>
+ <a class="gButtonLink ui-state-disabled ui-icon-right ui-corner-all">
+ <span class="ui-icon ui-icon-seek-next"></span><?= t("next") ?></a>
<? endif ?>
<? if ($last_page): ?>
- <li><a href="<?= str_replace('{page}', $last_page, $url) ?>"><?= t("last") ?></a><span class="ui-icon ui-icon-seek-end"></span></li>
+ <a href="<?= str_replace('{page}', $last_page, $url) ?>" class="gButtonLink ui-icon-right ui-state-default ui-corner-all">
+ <span class="ui-icon ui-icon-seek-end"></span><?= t("last") ?></a>
<? else: ?>
- <li class="inactive"><?= t("last") ?><span class="ui-icon ui-icon-seek-end"></span></li>
+ <a class="gButtonLink ui-state-disabled ui-icon-right ui-corner-all">
+ <span class="ui-icon ui-icon-seek-end"></span><?= t("last") ?></a>
<? endif ?>
+ </li>
</ul>
diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index 03c13cc1..e37de70e 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -4,24 +4,22 @@
* @requires YUI reset, font, grids CSS
*
* Sheet organization:
- * 1) Basic HTML elements
- * 2) Reusable classes
- * 3) Reusable content blocks
- * 4) Page layout containers
- * 5) Content blocks in specific layout containers
- * 6) Navigation and menus
- * 7) Browser hacks
- * 8) jQuery and jQuery UI
+ * 1) Basic HTML elements
+ * 2) Reusable classes
+ * 3) Reusable content blocks
+ * 4) Page layout containers
+ * 5) Content blocks in specific layout containers
+ * 6) Navigation and menus
+ * 7) Browser hacks
+ * 8) jQuery and jQuery UI
+ * 9) Right-to-left language styles
+ * 10) Digibug Print
*/
/** *******************************************************************
* 1) Basic HTML elements
**********************************************************************/
-.rtl {
- direction: rtl;
-}
-
body, html {
background-color: #ccc;
font-family: 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
@@ -31,17 +29,11 @@ p {
margin-bottom: 1em;
}
-strong {
- font-weight: bold;
-}
-
em {
font-style: oblique;
}
-/* Headings ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-h1, h2, h3, h4, h5 {
+h1, h2, h3, h4, h5, strong, th {
font-weight: bold;
}
@@ -53,6 +45,10 @@ h1 {
margin-bottom: 1em;
}
+#gProgress h1 {
+ font-size: 1.1em;
+}
+
h2 {
font-size: 1.4em;
}
@@ -61,6 +57,10 @@ h2 {
font-size: 1.2em;
}
+#gSidebar .gBlock li {
+ margin-bottom: .6em;
+}
+
h3 {
font-size: 1.2em;
}
@@ -71,7 +71,8 @@ a,
.gMenu a,
#gDialog a,
.gButtonLink,
-.gButtonLink:hover {
+.gButtonLink:hover,
+.gButtonLink:active {
color: #5382BF !important;
text-decoration: none;
-moz-outline-style: none;
@@ -92,11 +93,12 @@ a:hover,
margin: .3em 1em;
}
-#gForgotPasswordLink, .rtl #gDialog .gCancel {
+#gForgotPasswordLink {
float: right;
+ font-size: .9em;
}
-#gDialog .gCancel, .rtl #gForgotPasswordLink {
+#gDialog .gCancel {
float: left;
}
@@ -115,15 +117,6 @@ th {
text-align: left;
}
-.rtl caption,
-.rtl th {
- text-align: right;
-}
-
-th {
- font-weight: bold;
-}
-
th,
td {
border: none;
@@ -152,7 +145,9 @@ legend {
#gHeader legend,
#gSidebar legend,
-#gContent #gSearchForm legend {
+#gContent #gSearchForm legend,
+input[type="hidden"],
+.gShortForm label {
display: none;
}
@@ -174,10 +169,6 @@ textarea {
color: #333;
}
-input[type="hidden"] {
- display: none;
-}
-
textarea {
width: 100%;
height: 12em;
@@ -205,10 +196,6 @@ form ul ul li {
float: left;
}
-.rtl form ul ul li {
- float: right;
-}
-
input,
select,
textarea {
@@ -224,11 +211,6 @@ input[type="reset"] {
float: left;
}
-.rtl input[type="submit"],
-.rtl input[type="reset"] {
- float: right;
-}
-
/* Form validation ~~~~~~~~~~~~~~~~~~~~~~~ */
.gValidationRule {
@@ -330,7 +312,7 @@ form p.gError,
}
form .gError {
- color: #f00;
+ color: #f00;
}
#gSiteStatus .gError,
@@ -368,7 +350,7 @@ form p.gError {
form .gError,
.gPager .gInfo {
- background-color: #fff;
+ background-color: #fff;
}
#gAdminMaintenance .gError,
@@ -385,14 +367,6 @@ form .gError,
padding: .4em 0;
}
-.rtl .gShortForm li {
- float: right;
-}
-
-.gShortForm label {
- display: none;
-}
-
.gShortForm input[type="text"] {
color: #666;
padding: .3em .6em;
@@ -414,7 +388,7 @@ form .gError,
/* Layout containers ~~~~~~~~~~~~~~~~~~~~~ */
#gHeader {
- background-color: #e8e8e8;
+ background-color: #e8e8e8;
border-bottom: 1px solid #fff;
font-size: .8em;
margin-bottom: 1em;
@@ -435,7 +409,7 @@ form .gError,
}
#gFooter {
- background-color: #e8e8e8;
+ background-color: #e8e8e8;
border-top: 1px solid #ccc;
font-size: .8em;
margin-top: 20px;
@@ -453,21 +427,12 @@ form .gError,
margin: -4px 10px 0 0;
}
-.rtl #gHeader #gLogo {
- float: right;
-}
-
#gHeader #gQuickSearchForm {
clear: right;
float: right;
margin: 1em 0;
}
-.rtl #gHeader #gQuickSearchForm {
- clear: left;
- float: left;
-}
-
#gHeader #gQuickSearchForm input[type='text'] {
width: 17em;
}
@@ -481,14 +446,6 @@ form .gError,
padding-left: 1em;
}
-/* Album/Photo information ~~~~~~~~~~~~~~~ */
-
-#gContent #gInfo {
-}
-
-#gContent #gInfo .gDescription {
-}
-
/* Album content ~~~~~~~~~~~~~~~~~~~~~~~~~ */
#gContent #gAlbumGrid {
@@ -508,11 +465,6 @@ form .gError,
width: 213px;
}
-
-.rtl #gContent #gAlbumGrid .gItem {
- float: right;
-}
-
#gContent #gAlbumGrid .gItem h2 {
margin: 5px 0;
}
@@ -618,10 +570,6 @@ form .gError,
float: right;
}
-.rtl #gHeader #gLoginMenu {
- float: left;
-}
-
/* Site Menu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
#gSiteMenu {
@@ -630,10 +578,6 @@ form .gError,
padding: 0 20px 0 0;
}
-.rtl #gSiteMenu {
- float: right;
-}
-
#gSiteMenu ul {
margin-bottom: 0;
}
@@ -665,6 +609,10 @@ form .gError,
background-image: url('../images/ico-view-comments.png');
}
+#gViewMenu #gDigibugLink {
+ background-image: url('../images/ico-print.png');
+}
+
/* Breadcrumbs ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
.gBreadcrumbs {
@@ -681,10 +629,6 @@ form .gError,
padding: 10px 6px 10px 16px !important;
}
-.rtl .gBreadcrumbs li {
- float: right;
-}
-
.gBreadcrumbs li.root {
background: transparent;
}
@@ -700,7 +644,7 @@ form .gError,
}
#gAddPhotos .gBreadcrumbs {
- font-size: .9em;
+ font-size: .9em;
}
/* Tags and cloud ~~~~~~~~~~~~~~~~~~~~~~~~ */
@@ -785,10 +729,6 @@ form .gError,
width: 30%;
}
-.rtl .gPager li {
- float: right;
-}
-
.gPager .gInfo {
text-align: center;
width: 40%;
@@ -833,14 +773,14 @@ form .gError,
}
.gDraggable {
- cursor: move;
+ cursor: move;
}
.gDropTarget {
- background-color: #cfdeff;
- border: 1px dotted #999;
- height: 100px;
- margin: 1em 0;
+ background-color: #cfdeff;
+ border: 1px dotted #999;
+ height: 100px;
+ margin: 1em 0;
}
/* jQuery UI Dialog ~~~~~~~~~~~~~~~~~~~~~~ */
@@ -852,19 +792,11 @@ form .gError,
}
#gDialog {
- font-family: inherit;
- font-size: inherit;
text-align: left;
}
-.rtl #gDialog {
- font-family: inherit;
- font-size: inherit;
- text-align: right;
-}
-
#gDialog li {
- padding-left: 0;
+ padding-left: 0;
}
#gDialog form input[type="text"],
@@ -904,10 +836,6 @@ form .gError,
float: left;
}
-.rtl .gButtonSet li {
- float: right;
-}
-
.gButtonSet .gButtonLink {
margin: 0;
}
@@ -917,19 +845,11 @@ form .gError,
margin-right: .2em;
}
-.rtl .ui-icon-left .ui-icon {
- float: right;
-}
-
.ui-icon-right .ui-icon {
float: right;
margin-left: .2em;
}
-.rtl .ui-icon-right .ui-icon {
- float: left;
-}
-
.ui-icon-rotate-ccw {
background-position: -192px -64px;
}
@@ -949,6 +869,7 @@ form .gError,
}
/* Server Add */
+
.gCheckboxTree input {
display: inline;
}
@@ -987,7 +908,7 @@ form .gError,
font-size: 1em;
padding: 0;
margin: 0;
- border-top-width: 0px;
+ border-top-width: 0;
}
#gServerAdd p {
@@ -998,18 +919,32 @@ form .gError,
padding: 10px 6px 10px 16px;
}
+/* Permissions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#gPermissions .gDenied,
+#gPermissions .gAllowed {
+ text-align: center;
+ vertical-align: middle;
+}
+#gPermissions .gDenied {
+ background-color: #fcc;
+}
+#gPermissions .gAllowed {
+ background-color: #cfc;
+}
/*************** STUFF THAT NEEDS A HOME ****************/
+
.gProgressBar {
height: 1em;
width: 100%;
- margin-top: 0.5em;
+ margin-top: .5em;
display: inline-block;
}
#gAddPhotos p {
- margin: 0px;
- padding: 0px;
+ margin: 0;
+ padding: 0;
}
#gAddPhotosCanvas {
@@ -1055,15 +990,68 @@ form .gError,
border: 1px solid #beb;
}
-/* Permissions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#gAdminG2ImportNotes {
+ padding-bottom: 20px;
+}
-#gPermissions .gDenied, #gPermissions .gAllowed {
- text-align: center;
- vertical-align: middle;
+#gAdminG2ImportDetails {
+ padding-top: 20px;
}
-#gPermissions .gDenied {
- background-color: #fcc;
+
+#gAdminG2ImportDetails .gWarning {
+ margin-top: 4px;
}
-#gPermissions .gAllowed {
- background-color: #cfc;
+
+#gAdminG2ImportDetails .gInfo {
+ padding: 2px;
+ border: 1px solid #999;
+ margin-bottom: 10px;
+}
+
+#gAdminG2ImportNotes p,
+#gAdminG2ImportDetails .gInfo p {
+ padding: 0;
+ margin: 0;
+}
+
+#gAdminG2ImportNotes ul li,
+#gAdminG2Import .gInfo ul li {
+ padding-left: 0;
+ margin-left: 20px;
+ list-style-type: disc;
+}
+
+/* Right to left styles ~~~~~~~~~~~~~~~~~~~~ */
+
+.rtl {
+ direction: rtl;
+}
+
+.rtl caption,
+.rtl th,
+.rtl #gDialog {
+ text-align: right;
+}
+
+.rtl #gHeader #gQuickSearchForm,
+.rtl #gForgotPasswordLink,
+.rtl #gHeader #gLoginMenu,
+.rtl .ui-icon-right .ui-icon {
+ clear: left;
+ float: left;
+}
+
+.rtl #gDialog .gCancel,
+.rtl form ul ul li,
+.rtl input[type="submit"],
+.rtl input[type="reset"],
+.rtl .gShortForm li,
+.rtl #gHeader #gLogo,
+.rtl #gContent #gAlbumGrid .gItem,
+.rtl #gSiteMenu,
+.rtl .gBreadcrumbs li,
+.rtl .gPager li,
+.rtl .gButtonSet li,
+.rtl .ui-icon-left .ui-icon {
+ float: right;
}
diff --git a/themes/default/images/ico-print.png b/themes/default/images/ico-print.png
new file mode 100644
index 00000000..b82a8e1e
--- /dev/null
+++ b/themes/default/images/ico-print.png
Binary files differ
diff --git a/themes/default/images/movie-placeholder.png b/themes/default/images/movie-placeholder.png
deleted file mode 100755
index fdc97779..00000000
--- a/themes/default/images/movie-placeholder.png
+++ /dev/null
Binary files differ
diff --git a/themes/default/views/album.html.php b/themes/default/views/album.html.php
index 7e6913df..46b0d29a 100644
--- a/themes/default/views/album.html.php
+++ b/themes/default/views/album.html.php
@@ -19,6 +19,7 @@
<?= $child->thumb_img(array("class" => "gThumbnail")) ?>
</a>
<?= $theme->thumb_bottom($child) ?>
+ <?= $theme->thumb_menu($child) ?>
<h2><span></span><a href="<?= $child->url() ?>"><?= p::clean($child->title) ?></a></h2>
<ul class="gMetadata">
<?= $theme->thumb_info($child) ?>
diff --git a/themes/default/views/footer.html.php b/themes/default/views/footer.html.php
index d7111922..040a4062 100644
--- a/themes/default/views/footer.html.php
+++ b/themes/default/views/footer.html.php
@@ -2,7 +2,9 @@
<?= $theme->footer() ?>
<? if ($footer_text = module::get_var("gallery", "footer_text")): ?>
<?= $footer_text ?>
-<? else: ?>
+<? endif ?>
+
+<? if (module::get_var("gallery", "show_credits")): ?>
<ul id="gCredits">
<?= $theme->credits() ?>
</ul>
diff --git a/themes/default/views/header.html.php b/themes/default/views/header.html.php
index 1e70b7ac..b38cffed 100644
--- a/themes/default/views/header.html.php
+++ b/themes/default/views/header.html.php
@@ -4,7 +4,7 @@
<?= $header_text ?>
<? else: ?>
<a href="<?= url::site("albums/1") ?>">
- <img id="gLogo" alt="<?= t("Gallery: Your photos on your web site") ?>" src="<?= $theme->url("images/logo.png") ?>" />
+ <img width="107" height="48" id="gLogo" alt="<?= t("Gallery: Your photos on your web site") ?>" src="<?= $theme->theme_url("images/logo.png") ?>" />
</a>
<? endif ?>
diff --git a/themes/default/views/movie.html.php b/themes/default/views/movie.html.php
index 0cdf63fa..134e3571 100644
--- a/themes/default/views/movie.html.php
+++ b/themes/default/views/movie.html.php
@@ -1,5 +1,4 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
-<script src="<?= url::file("lib/flowplayer.js") ?>" type="text/javascript"></script>
<div id="gItem">
<?= $theme->photo_top() ?>
@@ -25,7 +24,7 @@
},
controls: {
autoHide: 'always',
- hideDelay: 2000,
+ hideDelay: 2000
}
}
})
@@ -36,5 +35,8 @@
<div><?= p::clean($item->description) ?></div>
</div>
+ <script type="text/javascript">
+ var ADD_A_COMMENT = "<?= t("Add a comment") ?>";
+ </script>
<?= $theme->photo_bottom() ?>
</div>
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() ?>
diff --git a/themes/default/views/photo.html.php b/themes/default/views/photo.html.php
index 1c3b81a7..4765a4e3 100644
--- a/themes/default/views/photo.html.php
+++ b/themes/default/views/photo.html.php
@@ -2,7 +2,6 @@
<? if (access::can("view_full", $theme->item())): ?>
<!-- Use javascript to show the full size as an overlay on the current page -->
-<script src="<?= url::file("lib/gallery.show_full_size.js") ?>" type="text/javascript"></script>
<script>
$(document).ready(function() {
$(".gFullSizeLink").click(function() {
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-25 20:25:57 +0000