Merge commit '008fe9c5e71c9986c5b052707adec0e083cb8b15'
This commit is contained in:
commit
3f987f91af
@ -631,7 +631,7 @@ tr.g-error td.g-error,
|
||||
.g-success,
|
||||
.g-allowed,
|
||||
#g-add-photos-status .g-success {
|
||||
background: #d9efc2 url('../images/ico-success.png') no-repeat .4em 50%;
|
||||
background: black url('../images/ico-success.png') no-repeat .4em 50%;
|
||||
}
|
||||
|
||||
tr.g-success {
|
||||
@ -756,6 +756,7 @@ form .g-error {
|
||||
top: 0;
|
||||
left: 0;
|
||||
position: absolute;
|
||||
z-index: 1;
|
||||
}
|
||||
|
||||
.g-item .g-context-menu {
|
||||
@ -1356,3 +1357,18 @@ div#g-action-status {
|
||||
padding-left: 1.2em !important;
|
||||
padding-right: 0;
|
||||
}
|
||||
|
||||
.uploadifyQueueItem {
|
||||
background-color: black;
|
||||
}
|
||||
.uploadifyError {
|
||||
background-color: #FDE5DD !important;
|
||||
color: black;
|
||||
}
|
||||
.uploadifyProgress {
|
||||
background-color: black;
|
||||
}
|
||||
.uploadifyProgressBar {
|
||||
background-color: black;
|
||||
}
|
||||
|
||||
|
@ -4,6 +4,7 @@
|
||||
_init: function() {
|
||||
var self = this;
|
||||
if (!self.options.immediate) {
|
||||
this.element.unbind('click');
|
||||
this.element.click(function(event) {
|
||||
event.preventDefault();
|
||||
self._show($(event.currentTarget).attr("href"));
|
||||
|
@ -20,7 +20,7 @@ $(document).ready(function() {
|
||||
$("#g-action-status li").gallery_show_message();
|
||||
|
||||
// Initialize dialogs
|
||||
//$(".g-dialog-link").gallery_dialog();
|
||||
$(".g-dialog-link").gallery_dialog();
|
||||
|
||||
// Initialize short forms
|
||||
$(".g-short-form").gallery_short_form();
|
||||
|
@ -87,7 +87,7 @@ endif;
|
||||
</div>
|
||||
</div>*/?>
|
||||
<? endforeach ?>
|
||||
<script>
|
||||
<script type="text/javascript">
|
||||
<? foreach ($children as $i => $child): ?>
|
||||
<? if(!($child->is_album() || $child->is_movie())): ?>
|
||||
slideshowImages.push(['<?= $child->resize_url() ?>', '<?= url::site("exif/show/$child->id") ?>', '<?= $child->width ?>','<?= $child->height ?>', '<?= htmlentities($child->title, ENT_QUOTES) ?>', '<?= $child->file_url() ?>', '<?= $child->url() ?>']);
|
||||
|
@ -2,18 +2,20 @@
|
||||
<? if ($theme->page_subtype == "photo"):
|
||||
foreach (end($parents)->viewable()->children() as $i => $child)
|
||||
if(!($child->is_album() || $child->is_movie()))
|
||||
if($child->url() == $_SERVER['REQUEST_URI']):?>
|
||||
<html><body>
|
||||
<script type="text/javascript">window.location = '<? echo end($parents)->url() . "#img=$i&viewMode=detail&redirected=true"?>';</script>
|
||||
</body></html>
|
||||
if($child->url() == $_SERVER['REQUEST_URI']):
|
||||
$page_size = module::get_var("gallery","page_size"); ?>
|
||||
<html><body>
|
||||
<script type="text/javascript">window.location = '<?= end($parents)->url() . "?page=".(int)($i/$page_size)."#img=".$i % $page_size ."&viewMode=detail&redirected=true"?>';</script>
|
||||
</body></html>
|
||||
<? die(0) ?>
|
||||
<? endif ?>
|
||||
<? endif ?>
|
||||
<? endif ?>
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
|
||||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml" <?= $theme->html_attributes() ?> xml:lang="en" lang="en">
|
||||
<head>
|
||||
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=Edge" />
|
||||
<? $theme->start_combining("script,css") ?>
|
||||
<title>
|
||||
<? if ($page_title): ?>
|
||||
|
Reference in New Issue
Block a user