public/gallery3-contrib
Archived
1
0
Fork 0
Code Releases Activity

Squashed '3.0/themes/pear4gallery3/' changes from 08def4b..d38c2c2

Browse Source 
d38c2c2 photo view with support for larger pages
0132438 better dialog support, context menu update when skimming and theming of upload dialog
92cdff3 validation fix and X-UA-Compatible flag for IE

git-subtree-dir: 3.0/themes/pear4gallery3
git-subtree-split: d38c2c22b219cd49dd18ff70989ae1a6d5c477bf
This commit is contained in:
Fredrik Erlandsson 2012-01-12 16:25:18 +01:00
parent 5929bd2774
commit 008fe9c5e7
5 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
css/screen.css
View File

@ -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;
}

3
js/gallery.dialog.js
View File

@ -4,7 +4,8 @@
_init: function() {
var self = this;
if (!self.options.immediate) {
this.element.click(function(event) {
this.element.unbind('click');
this.element.click(function(event) {
event.preventDefault();
self._show($(event.currentTarget).attr("href"));
return false;

2
js/ui.init.js
View File

@ -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();

2
views/album.html.php
View File

@ -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() ?>']);

18
views/page.html.php
View File

@ -1,19 +1,21 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
<? 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>
<? die(0) ?>
<? endif ?>
foreach (end($parents)->viewable()->children() as $i => $child)
if(!($child->is_album() || $child->is_movie()))
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 ?>
<!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): ?>