1
0

Removed preload

This commit is contained in:
3nids 2009-10-19 09:21:48 +02:00
parent e7c055c21c
commit f8575c67eb
118 changed files with 569 additions and 800 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 604 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 916 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 715 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 701 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 778 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 749 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 106 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 476 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 617 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 537 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 494 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 666 B

View File

@ -1,139 +0,0 @@
/**
* Initialize jQuery UI and Gallery Plugin elements
*/
var short_forms = new Array(
"#gQuickSearchForm",
"#gAddTagForm",
"#gSearchForm"
);
$(document).ready(function() {
$(".fancyclass").fancybox();
// Initialize Superfish menus
$("ul.gMenu").addClass("sf-menu");
$('ul.sf-menu').superfish({
delay: 500,
animation: {
opacity:'show',
height:'show'
},
speed: 'fast'
});
$("#gSiteMenu").css("display", "block");
// Initialize status message effects
$("#gMessage li").gallery_show_message();
// Initialize dialogs
$("#gLoginLink").addClass("gDialogLink");
$(".gDialogLink").gallery_dialog();
// Initialize view menu
if ($("#gViewMenu").length) {
$("#gViewMenu ul").removeClass("gMenu").removeClass("sf-menu");
$("#gViewMenu a").addClass("ui-icon");
}
// Initialize short forms
for (var i in short_forms) {
short_form_init(short_forms[i]);
$(short_forms[i]).addClass("gShortForm");
}
$(".gShortForm input[type=text]").addClass("ui-corner-left");
$(".gShortForm input[type=submit]").addClass("ui-state-default ui-corner-right");
// Apply jQuery UI button css to submit inputs
$("input[type=submit]:not(.gShortForm input)").addClass("ui-state-default ui-corner-all");
// Apply styles and icon classes to gContextMenu
if ($(".gContextMenu").length) {
$(".gContextMenu li").addClass("ui-state-default");
$(".gContextMenu a").addClass("gButtonLink ui-icon-left");
$(".gContextMenu a").prepend("<span class=\"ui-icon\"></span>");
$(".gContextMenu a span").each(function() {
var iconClass = $(this).parent().attr("class").match(/ui-icon-.[^\s]+/).toString();
$(this).addClass(iconClass);
});
}
// Album view only
if ($("#gAlbumGrid").length) {
// Vertical align thumbnails/metadata in album grid
$(".gItem").gallery_valign();
// Initialize context menus
$(".gItem").hover(
function(){
// Insert invisible placeholder to hold the item's position in the grid
var placeHolder = $(this).clone();
$(placeHolder).attr("id", "gPlaceHolder");
$(placeHolder).css("visibility", "hidden");
$(this).after($(placeHolder));
// Style and position the item
$(this).addClass("gHoverItem");
var position = $(this).position();
$(this).css("position", "absolute");
$(this).css("top", position.top);
$(this).css("left", position.left);
$(this).css("z-index", "1000");
// Initialize the contextual menu
$(this).gallery_context_menu();
// Set height based on height of descendents
var title = $(this).find("h2");
var meta = $(this).find(".gMetadata");
var context_label = $(this).find(".gContextMenu li:first");
var item_ht = $(this).height();
var title_ht = $(title).gallery_height();
var meta_ht = $(meta).gallery_height();
var context_label_ht = $(context_label).gallery_height();
$(this).height(item_ht + title_ht + meta_ht + context_label_ht);
$(".fancyclass").fancybox();
},
function() {
// Reset item height, position, and z-index
if ($(this).next().height()) {
var sib_height = $(this).next().height();
} else {
var sib_height = $(this).prev().height();
}
if ($.browser.msie && $.browser.version >= 8) {
sib_height = sib_height + 1;
}
$(this).css("height", sib_height);
$(this).css("position", "relative");
$(this).css("top", null);
$(this).css("left", null);
$(this).css("z-index", 1);
// Remove the placeholder and hover class from the item
$("#gPlaceHolder").remove();
$(this).removeClass("gHoverItem");
$(".fancyclass").fancybox();
}
);
}
// Photo/Item item view
if ($("#gItem").length) {
// Ensure the resized image fits within its container
$("#gItem").gallery_fit_photo();
// Initialize context menus
var resize = $("#gItem").gallery_get_photo();
$(resize).hover(function(){
$(this).gallery_context_menu();
});
// Add scroll effect for links to named anchors
$.localScroll({
queue: true,
duration: 1000,
hash: true
});
}
// Initialize button hover effect
$.fn.gallery_hover_init();
});

View File

@ -1,37 +0,0 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
<div id="gItem">
<?= $theme->photo_top() ?>
<? /*
<ul class="gPager">
<li>
<? if ($previous_item): ?>
<a href="<?= $previous_item->url() ?>" class="gButtonLink ui-icon-left ui-state-default ui-corner-all">
<span class="ui-icon ui-icon-triangle-1-w"></span><?= t("previous") ?></a>
<? else: ?>
<a class="gButtonLink ui-icon-left ui-state-disabled ui-corner-all">
<span class="ui-icon ui-icon-triangle-1-w"></span><?= t("previous") ?></a>
<? endif; ?>
</li>
<li class="gInfo"><?= t("%position of %total", array("position" => $position, "total" => $sibling_count)) ?></li>
<li class="txtright">
<? if ($next_item): ?>
<a href="<?= $next_item->url() ?>" class="gButtonLink ui-icon-right ui-state-default ui-corner-all">
<span class="ui-icon ui-icon-triangle-1-e"></span><?= t("next") ?></a>
<? else: ?>
<a class="gButtonLink ui-icon-right ui-state-disabled ui-corner-all">
<span class="ui-icon ui-icon-triangle-1-e"></span><?= t("next") ?></a>
<? endif ?>
</li>
</ul>
*/ ?>
<?= $item->movie_img(array("class" => "gMovie", "id" => "gMovieId-{$item->id}")) ?>
<div id="gInfo">
<h1><?= html::purify($item->title) ?></h1>
<div><?= nl2br(html::purify($item->description)) ?></div>
</div>
<?= $theme->context_menu($item, "#gMovieId-{$item->id}") ?>
</div>

View File

@ -0,0 +1,40 @@
/* 3nids specific */
.gHeadMap img {
display: block;
margin: 3px;
}
.gHeadMap a {
float: right;
}
.gCommentThumb{
padding: 5px;
text-align: left;
}
.modcontent{
background-color: #333333;
}
#mod_frame{
background-color: #333333;
}
.g-comment-box {
border-bottom: 1px solid #555;
}
.g-comment-box:hover{
background-color: black;
color: #ffffcc;
}
#g-comment-detail {
width: 360px;
height: 100%;
background-color: #333333;
padding: 10px;
text-align: left;
margin-top: 30px;
}

View File

@ -2,15 +2,11 @@
* Fix display in IE 6, 7 * Fix display in IE 6, 7
*/ */
#gBanner, .g-clearfix {
.gBreadcrumbs,
#gAlbumGrid,
#gPager,
#gViewMenu {
zoom: 1; zoom: 1;
} }
#gBanner { #g-banner {
z-index: 2; z-index: 2;
} }
@ -19,19 +15,19 @@ input.submit {
display: inline !important; display: inline !important;
} }
#gAddTagForm input.textbox { #g-add-tag-form input.textbox {
width: 110px; width: 110px;
} }
#gDialog a.gCancel { #g-dialog a.g-cancel {
display: inline-block !important; display: inline-block !important;
float: none !important; float: none !important;
} }
.gPager .txtright { .g-pager .g-txt-right {
width: 29%; width: 29%;
} }
.gPager .ui-icon-right { .g-pager .ui-icon-right {
width: 60px; width: 60px;
} }

View File

@ -48,14 +48,6 @@ div#fancy_loading_overlay {
z-index: 30; z-index: 30;
} }
div#fancy_loading_icon {
position: absolute;
background: url('../images/fancy_loading.gif') no-repeat;
z-index: 35;
width: 16px;
height: 16px;
}
div#fancy_outer { div#fancy_outer {
position: absolute; position: absolute;
top: 0; top: 0;
@ -135,7 +127,7 @@ a#fancy_left, a#fancy_right {
cursor: pointer; cursor: pointer;
z-index: 111; z-index: 111;
display: none; display: none;
background-image: url(data:image/gif;base64,AAAA); background-image: url('data:image/gif;base64,AAAA');
outline: none; outline: none;
} }
@ -406,14 +398,6 @@ div#mod_loading_overlay {
z-index: 1030; z-index: 1030;
} }
div#mod_loading_icon {
position: absolute;
background: url('../images/fancy_loading.gif') no-repeat;
z-index: 1035;
width: 16px;
height: 16px;
}
div#mod_outer { div#mod_outer {
position: absolute; position: absolute;
top: 0; top: 0;
@ -493,7 +477,7 @@ a#mod_left, a#mod_right {
cursor: pointer; cursor: pointer;
z-index: 10111; z-index: 10111;
display: none; display: none;
background-image: url(data:image/gif;base64,AAAA); background-image: url('data:image/gif;base64,AAAA');
outline: none; outline: none;
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 119 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 95 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 115 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 145 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 106 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 140 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

View File

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

View File

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

View File

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

View File

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

View File

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

View File

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

Before

Width:  |  Height:  |  Size: 146 B

After

Width:  |  Height:  |  Size: 146 B

View File

Before

Width:  |  Height:  |  Size: 129 B

After

Width:  |  Height:  |  Size: 129 B

View File

Before

Width:  |  Height:  |  Size: 245 B

After

Width:  |  Height:  |  Size: 245 B

View File

Before

Width:  |  Height:  |  Size: 207 B

After

Width:  |  Height:  |  Size: 207 B

View File

Before

Width:  |  Height:  |  Size: 136 B

After

Width:  |  Height:  |  Size: 136 B

View File

Before

Width:  |  Height:  |  Size: 239 B

After

Width:  |  Height:  |  Size: 239 B

View File

Before

Width:  |  Height:  |  Size: 221 B

After

Width:  |  Height:  |  Size: 221 B

View File

Before

Width:  |  Height:  |  Size: 140 B

After

Width:  |  Height:  |  Size: 140 B

View File

Before

Width:  |  Height:  |  Size: 556 B

After

Width:  |  Height:  |  Size: 556 B

View File

Before

Width:  |  Height:  |  Size: 149 B

After

Width:  |  Height:  |  Size: 149 B

View File

Before

Width:  |  Height:  |  Size: 559 B

After

Width:  |  Height:  |  Size: 559 B

View File

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

View File

Before

Width:  |  Height:  |  Size: 786 B

After

Width:  |  Height:  |  Size: 786 B

View File

Before

Width:  |  Height:  |  Size: 989 B

After

Width:  |  Height:  |  Size: 989 B

View File

Before

Width:  |  Height:  |  Size: 768 B

After

Width:  |  Height:  |  Size: 768 B

View File

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

View File

Before

Width:  |  Height:  |  Size: 960 B

After

Width:  |  Height:  |  Size: 960 B

View File

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

View File

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@ -0,0 +1,127 @@
/**
* Initialize jQuery UI and Gallery Plugin elements
*/
$(document).ready(function() {
$(".fancyclass").fancybox();
// Initialize Superfish menus
$("ul.g-menu").addClass("sf-menu");
$('ul.sf-menu').superfish({
delay: 500,
animation: {
opacity:'show',
height:'show'
},
speed: 'fast'
});
$("#g-site-menu").css("display", "block");
// Initialize status message effects
$("#g-action-status li").gallery_show_message();
// Initialize dialogs
$("#g-login-link").addClass("g-dialog-link");
$(".g-dialog-link").gallery_dialog();
// Initialize view menu
if ($("#g-view-menu").length) {
$("#g-view-menu ul").removeClass("g-menu").removeClass("sf-menu");
$("#g-view-menu a").addClass("ui-icon");
}
// Initialize short forms
var short_forms = new Array(
"#g-quick-search-form",
"#g-add-tag-form",
"#g-search-form"
);
for (var i in short_forms) {
short_form_init(short_forms[i]);
$(short_forms[i]).addClass("g-short-form");
}
$(".g-short-form input[type=text]").addClass("ui-corner-left");
$(".g-short-form input[type=submit]").addClass("ui-state-default ui-corner-right");
// Apply jQuery UI button css to submit inputs
$("input[type=submit]:not(.g-short-form input)").addClass("ui-state-default ui-corner-all");
// Apply styles and icon classes to g-context-menu
if ($(".g-context-menu").length) {
$(".g-context-menu li").addClass("ui-state-default");
$(".g-context-menu a").addClass("g-button ui-icon-left");
$(".g-context-menu a").prepend("<span class=\"ui-icon\"></span>");
$(".g-context-menu a span").each(function() {
var iconClass = $(this).parent().attr("class").match(/ui-icon-.[^\s]+/).toString();
$(this).addClass(iconClass);
});
}
// Album view only
if ($("#g-album-grid").length) {
// Set equal height for album items and vertically align thumbnails/metadata
$('.g-item').equal_heights().gallery_valign();
// Initialize thumbnail hover effect
$(".g-item").hover(
function() {
// Insert a placeholder to hold the item's position in the grid
var placeHolder = $(this).clone().attr("id", "g-place-holder");
$(this).after($(placeHolder));
// Style and position the hover item
var position = $(this).position();
$(this).css("top", position.top).css("left", position.left);
$(this).addClass("g-hover-item");
// Initialize the contextual menu
$(this).gallery_context_menu();
// Set the hover item's height
//$(this).height("auto");
var context_menu = $(this).find(".g-context-menu");
var adj_height = $(this).height() + context_menu.height();
$(this).height(adj_height);
},
function() {
// Reset item height and position
if ($(this).next().height()) {
var sib_height = $(this).next().height();
} else {
var sib_height = $(this).prev().height();
}
if ($.browser.msie && $.browser.version >= 8) {
sib_height = sib_height + 1;
}
$(this).css("height", sib_height);
$(this).css("position", "relative");
$(this).css("top", 0).css("left", 0);
// Remove the placeholder and hover class from the item
$(this).removeClass("g-hover-item");
$("#g-place-holder").remove();
$(".fancyclass").fancybox();
}
);
}
// Photo/Item item view
if ($("#g-item").length) {
// Ensure the resized image fits within its container
$("#g-item").gallery_fit_photo();
// Initialize context menus
var resize = $("#g-item").gallery_get_photo();
$(resize).hover(function(){
$(this).gallery_context_menu();
});
// Add scroll effect for links to named anchors
$.localScroll({
queue: true,
duration: 1000,
hash: true
});
}
// Initialize button hover effect
$.fn.gallery_hover_init();
});

View File

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

View File

@ -1,16 +1,17 @@
<?php defined("SYSPATH") or die("No direct script access.") ?> <?php defined("SYSPATH") or die("No direct script access.") ?>
<? // @todo Set hover on AlbumGrid list items for guest users ?> <? // @todo Set hover on AlbumGrid list items for guest users ?>
<div id="gInfo"> <div id="g-info">
<?= $theme->album_top() ?> <?= $theme->album_top() ?>
<h1><?= html::purify($item->title) ?></h1> <h1><?= html::purify($item->title) ?></h1>
<div class="gDescription"><?= nl2br(html::purify($item->description)) ?></div> <div class="g-description"><?= nl2br(html::purify($item->description)) ?></div>
</div> </div>
<? $children_all = $item->viewable()->children(); <? $children_all = $item->viewable()->children();
$theme->pagination = new Pagination(); $theme->pagination = new Pagination();
$theme->pagination->initialize(array("query_string" => "page","total_items" => $children_count,"items_per_page" => $page_size,"style" => "classic")); $theme->pagination->initialize(array("query_string" => "page","total_items" => $children_count,"items_per_page" => $page_size,"style" => "classic"));
$children_offset = ($theme->pagination->current_page -1) * $page_size ; ?> $children_offset = ($theme->pagination->current_page -1) * $page_size ; ?>
<ul id="gAlbumGrid">
<ul id="g-album-grid" class="g-clearfix">
<? if (count($children)): ?> <? if (count($children)): ?>
<? for($i=0;$i<$children_offset;$i++): ?> <? for($i=0;$i<$children_offset;$i++): ?>
<? $child = $children_all[$i] ?> <? $child = $children_all[$i] ?>
@ -22,31 +23,31 @@
<? endif ?> <? endif ?>
<? endfor ?> <? endfor ?>
<? foreach ($children as $i => $child): ?> <? foreach ($children as $i => $child): ?>
<? $item_class = "gPhoto"; ?> <? $item_class = "g-photo"; ?>
<? if ($child->is_album()): ?> <? if ($child->is_album()): ?>
<? $item_class = "gAlbum"; ?> <? $item_class = "g-album"; ?>
<? endif ?> <? endif ?>
<li id="gItemId-<?= $child->id ?>" class="gItem <?= $item_class ?>"> <li id="g-item-id-<?= $child->id ?>" class="g-item <?= $item_class ?>">
<?= $theme->thumb_top($child) ?> <?= $theme->thumb_top($child) ?>
<? if ($child->is_photo()): ?> <? if ($child->is_photo()): ?>
<? $fancymodule = ""; ?> <? $fancymodule = ""; ?>
<? if (module::is_active("exif")){$fancymodule .= "exif::" . url::site("exif/show/{$child->id}") . ";;";} ?> <? if (module::is_active("exif")){$fancymodule .= "exif::" . url::site("exif/show/{$child->id}") . ";;";} ?>
<? if (module::is_active("comment") && module::is_active("comment_3nids")){$fancymodule .= "comment::" . url::site("comments_3nids?item_id={$child->id}") . ";;comment_count::" . comment_3nids::count($child) . ";;" ;} ?> <? if (module::is_active("comment") && module::is_active("comment_3nids")){$fancymodule .= "comment::" . url::site("comments_3nids?item_id={$child->id}") . ";;comment_count::" . comment_3nids::count($child) . ";;" ;} ?>
<a href="<?=$child->file_url()?>" rel="fancygroup" class="fancyclass" title="<?= $child->parent()->title ?>, <?=$child->parent()->description?>" name="<?=$fancymodule ?>"> <a href="<?=$child->file_url()?>" rel="fancygroup" class="fancyclass" title="<?= $child->parent()->title ?>, <?=$child->parent()->description?>" name="<?=$fancymodule ?>">
<?= $child->thumb_img(array("class" => "gThumbnail")) ?></a> <?= $child->thumb_img(array("class" => "g-thumbnail")) ?></a>
<? if ($user->admin): ?> <? if ($user->admin): ?>
<br><a href="<?=$child->url()?>">view/edit</a> <br><a href="<?=$child->url()?>">view/edit</a>
<? endif ?> <? endif ?>
<? else: ?> <? else: ?>
<a href="<?= $child->url() ?>"> <a href="<?= $child->url() ?>">
<?= $child->thumb_img(array("class" => "gThumbnail")) ?> <?= $child->thumb_img(array("class" => "g-thumbnail")) ?>
<h2><span></span><?= html::clean($child->title) ?></h2> <h2><span></span><?= html::clean($child->title) ?></h2>
</a> </a>
<? endif ?> <? endif ?>
<?= $theme->thumb_bottom($child) ?> <?= $theme->thumb_bottom($child) ?>
<?= $theme->context_menu($child, "#gItemId-{$child->id} .gThumbnail") ?> <?= $theme->context_menu($child, "#g-item-id-{$child->id} .g-thumbnail") ?>
<? if ($child->is_photo() && module::is_active("comment") && module::is_active("comment_3nids")) :?> <? if ($child->is_photo() && module::is_active("comment") && module::is_active("comment_3nids")) :?>
<ul class="gMetadata"> <ul class="g-metadata">
<li><a href="<?=url::site("comments_3nids?item_id={$child->id}")?>" class="iframe fancyclass"><?=comment_3nids::count($child) ?> <?=t("comments")?></a></li> <li><a href="<?=url::site("comments_3nids?item_id={$child->id}")?>" class="iframe fancyclass"><?=comment_3nids::count($child) ?> <?=t("comments")?></a></li>
</ul> </ul>
<? endif ?> <? endif ?>
@ -65,7 +66,7 @@
<? if ($user->admin || access::can("add", $item)): ?> <? if ($user->admin || access::can("add", $item)): ?>
<? $addurl = url::file("index.php/simple_uploader/app/$item->id") ?> <? $addurl = url::file("index.php/simple_uploader/app/$item->id") ?>
<li><?= t("There aren't any photos here yet! <a %attrs>Add some</a>.", <li><?= t("There aren't any photos here yet! <a %attrs>Add some</a>.",
array("attrs" => html::mark_clean("href=\"$addurl\" class=\"gDialogLink\""))) ?></li> array("attrs" => html::mark_clean("href=\"$addurl\" class=\"g-dialog-link\""))) ?></li>
<? else: ?> <? else: ?>
<li><?= t("There aren't any photos here yet!") ?></li> <li><?= t("There aren't any photos here yet!") ?></li>
<? endif; ?> <? endif; ?>

View File

@ -2,9 +2,9 @@
<? if ($anchor): ?> <? if ($anchor): ?>
<a name="<?= $anchor ?>"></a> <a name="<?= $anchor ?>"></a>
<? endif ?> <? endif ?>
<div id="<?= $css_id ?>" class="gBlock"> <div id="<?= $css_id ?>" class="g-block">
<h2><?= $title ?></h2> <h2><?= $title ?></h2>
<div class="gBlockContent"> <div class="g-block-content">
<?= $content ?> <?= $content ?>
</div> </div>
</div> </div>

View File

@ -28,21 +28,21 @@
<?= $theme->head() ?> <?= $theme->head() ?>
</head> </head>
<body class="modcontent"> <body class="modcontent">
<div class="gCommentThumb"> <img src="<?=$thumb?>"></div> <div class="g-CommentThumb"> <img src="<?=$thumb?>"></div>
<a href="<?= url::site("form/add/comments_3nids/{$item_id}") ?>" id="gAddCommentButton" <a href="<?= url::site("form/add/comments_3nids/{$item_id}") ?>" id="gAddCommentButton"
class="gButtonLink ui-corner-all ui-icon-left ui-state-default right"> class="g-ButtonLink ui-corner-all ui-icon-left ui-state-default right">
<span class="ui-icon ui-icon-comment"></span> <span class="ui-icon ui-icon-comment"></span>
<?= t("Add a comment") ?> <?= t("Add a comment") ?>
</a> </a>
<div id="gCommentDetail"> <div id="gCommentDetail">
<? if (!$comments->count()): ?> <? if (!$comments->count()): ?>
<p id="gNoCommentsYet"> <p id="g-NoCommentsYet">
<?= t("No comments yet.") ?> <?= t("No comments yet.") ?>
</p> </p>
<? endif ?> <? endif ?>
<ul> <ul>
<? foreach ($comments as $comment): ?> <? foreach ($comments as $comment): ?>
<li id="gComment-<?= $comment->id ?>" class="gCommentBox"> <li id="g-Comment-<?= $comment->id ?>" class="g-CommentBox">
<?= t('<b>%name</b> <small>%date</small>: ', <?= t('<b>%name</b> <small>%date</small>: ',
array("date" => date(module::get_var("gallery", "date_time_format", "Y-M-d H:i:s"), $comment->created), array("date" => date(module::get_var("gallery", "date_time_format", "Y-M-d H:i:s"), $comment->created),
"name" => html::clean($comment->author_name()))); ?> "name" => html::clean($comment->author_name()))); ?>

View File

@ -1,6 +1,6 @@
<?php defined("SYSPATH") or die("No direct script access.") ?> <?php defined("SYSPATH") or die("No direct script access.") ?>
<div id="gAlbumHeader"> <div id="g-album-header">
<div id="gAlbumHeaderButtons"> <div id="g-album-header-buttons">
<?= $theme->dynamic_top() ?> <?= $theme->dynamic_top() ?>
</div> </div>
<h1><?= html::clean($title) ?></h1> <h1><?= html::clean($title) ?></h1>
@ -11,7 +11,7 @@
$children_offset = ($theme->pagination->current_page -1) * $page_size ; ?> $children_offset = ($theme->pagination->current_page -1) * $page_size ; ?>
<ul id="gAlbumGrid"> <ul id="g-album-grid">
<? for($i=0;$i<$children_offset;$i++): ?> <? for($i=0;$i<$children_offset;$i++): ?>
<? $child = $children_all[$i] ?> <? $child = $children_all[$i] ?>
<? if ($child->is_photo()): ?> <? if ($child->is_photo()): ?>
@ -24,8 +24,8 @@
<? foreach ($children as $i => $child): ?> <? foreach ($children as $i => $child): ?>
<!--<li class="gItem <?= $child->is_album() ? "gAlbum" : "" ?>">!--> <!--<li class="g-Item <?= $child->is_album() ? "g-album" : "" ?>">!-->
<li id="gItemId-<?= $child->id ?>" class="gItem gAlbum"> <li id="g-item-id-<?= $child->id ?>" class="g-item g-album">
<?= $theme->thumb_top($child) ?> <?= $theme->thumb_top($child) ?>
<? if (!($child->is_album())): ?> <? if (!($child->is_album())): ?>
<? if ($child->is_photo()): ?> <? if ($child->is_photo()): ?>
@ -36,7 +36,7 @@
<? else: ?> <? else: ?>
<a href="<?= $child->url() ?>"> <a href="<?= $child->url() ?>">
<? endif ?> <? endif ?>
<img id="gPhotoId-<?= $child->id ?>" class="gThumbnail" <img id="g-photo-id-<?= $child->id ?>" class="g-Thumbnail"
alt="photo" src="<?= $child->thumb_url() ?>" alt="photo" src="<?= $child->thumb_url() ?>"
width="<?= $child->thumb_width ?>" width="<?= $child->thumb_width ?>"
height="<?= $child->thumb_height ?>" /> height="<?= $child->thumb_height ?>" />
@ -47,7 +47,7 @@
<? endif ?> <? endif ?>
<? else: ?> <? else: ?>
<a href="<?= $child->url() ?>"> <a href="<?= $child->url() ?>">
<img id="gPhotoId-<?= $child->id ?>" class="gThumbnail" <img id="g-photo-id-<?= $child->id ?>" class="g-thumbnail"
alt="photo" src="<?= $child->thumb_url() ?>" alt="photo" src="<?= $child->thumb_url() ?>"
width="<?= $child->thumb_width ?>" width="<?= $child->thumb_width ?>"
height="<?= $child->thumb_height ?>" /> height="<?= $child->thumb_height ?>" />
@ -55,9 +55,9 @@
</a> </a>
<? endif ?> <? endif ?>
<?= $theme->thumb_bottom($child) ?> <?= $theme->thumb_bottom($child) ?>
<?= $theme->context_menu($child, "#gItemId-{$child->id} .gThumbnail") ?> <?= $theme->context_menu($child, "#g-ItemId-{$child->id} .g-Thumbnail") ?>
<? if ($child->is_photo() && module::is_active("comment") && module::is_active("comment_3nids")) :?> <? if ($child->is_photo() && module::is_active("comment") && module::is_active("comment_3nids")) :?>
<ul class="gMetadata"> <ul class="g-metadata">
<li><a href="<?=url::site("comments_3nids?item_id={$child->id}")?>" class="iframe fancyclass"><?=comment_3nids::count($child) ?> <?=t("comments")?></a></li> <li><a href="<?=url::site("comments_3nids?item_id={$child->id}")?>" class="iframe fancyclass"><?=comment_3nids::count($child) ?> <?=t("comments")?></a></li>
</ul> </ul>
<? endif ?> <? endif ?>

View File

@ -5,34 +5,34 @@
<head> <head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" /> <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<style> <style>
#gExifData { width: 100%; height: 100%; } #g-exif-data { width: 100%; height: 100%; }
.gOdd {background-color: #484848; color: #e8e8e8; height:35px; padding:5px; font-family:arial; font-size: 10px;} .g-odd {background-color: #484848; color: #e8e8e8; height:35px; padding:5px; font-family:arial; font-size: 10px;}
.gEven {background-color: #333333; color: #e8e8e8; height:35px; padding:5px; font-family:arial; font-size: 10px;} .g-even {background-color: #333333; color: #e8e8e8; height:35px; padding:5px; font-family:arial; font-size: 10px;}
.gExifInfoTable { width: 100%; height: 100%; background-color: #e8e8e8; border-spacing: 1px; text-align: left;} .g-exif-info-table { width: 100%; height: 100%; background-color: #e8e8e8; border-spacing: 1px; text-align: left;}
</style> </style>
</head> </head>
<body> <body>
<div id="gExifData"> <div id="g-exif-data">
<center> <center>
<table class="gExifInfoTable"> <table class="g-exif-info-table">
<tbody> <tbody>
<? for ($i = 0; $i < count($details); $i++): ?> <? for ($i = 0; $i < count($details); $i++): ?>
<tr> <tr>
<td class="gEven"> <td class="g-even">
<?= $details[$i]["caption"] ?> <?= $details[$i]["caption"] ?>
</td> </td>
<td class="gOdd"> <td class="g-odd">
<?= html::clean($details[$i]["value"]) ?> <?= html::clean($details[$i]["value"]) ?>
</td> </td>
<? if (!empty($details[++$i])): ?> <? if (!empty($details[++$i])): ?>
<td class="gEven"> <td class="g-even">
<?= $details[$i]["caption"] ?> <?= $details[$i]["caption"] ?>
</td> </td>
<td class="gOdd"> <td class="g-odd">
<?= html::clean($details[$i]["value"]) ?> <?= html::clean($details[$i]["value"]) ?>
</td> </td>
<? else: ?> <? else: ?>
<td class="gEven"></td><td class="gOdd"></td> <td class="g-even"></td><td class="g-odd"></td>
<? endif ?> <? endif ?>
</tr> </tr>
<? endfor ?> <? endfor ?>

View File

@ -4,13 +4,13 @@
<? if (module::is_active("exif")){$fancymodule .= "exif::" . url::site("exif/show/{$item->id}") . ";;";} ?> <? if (module::is_active("exif")){$fancymodule .= "exif::" . url::site("exif/show/{$item->id}") . ";;";} ?>
<? if (module::is_active("comment") && module::is_active("comment_3nids")){$fancymodule .= "comment::" . url::site("comments_3nids?item_id={$item->id}") . ";;comment_count::" . comment_3nids::count($item) . ";;" ;} ?> <? if (module::is_active("comment") && module::is_active("comment_3nids")){$fancymodule .= "comment::" . url::site("comments_3nids?item_id={$item->id}") . ";;comment_count::" . comment_3nids::count($item) . ";;" ;} ?>
<div class="gImageBlock"> <div class="g-image-block">
<a href="<?= $item->file_url() ?>" class="fancyclass" title="<?= $item->parent()->title ?>, <?=$item->parent()->description?>" name="<?=$fancymodule?>"> <a href="<?= $item->file_url() ?>" class="fancyclass" title="<?= $item->parent()->title ?>, <?=$item->parent()->description?>" name="<?=$fancymodule?>">
<?= $item->thumb_img(array("class" => "gThumbnail")) ?> <?= $item->thumb_img(array("class" => "g-thumbnail")) ?>
</a> </a>
<div class="gParentAlbum"> <div class="g-parent-album">
<a href="<?= $item->parent()->url() ?>?show=<?= $item->id?>"><h4><span></span><?= $item->parent()->title ?></h4></a> <a href="<?= $item->parent()->url() ?>?show=<?= $item->id?>"><h4><span></span><?= $item->parent()->title ?></h4></a>
</div> </div>
</div> </div>

View File

@ -0,0 +1,39 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
<div id="g-item">
<?= $theme->photo_top() ?>
<? /*
<ul class="g-pager">
<li>
<? if ($previous_item): ?>
<a href="<?= $previous_item->url() ?>" class="g-button ui-icon-left ui-state-default ui-corner-all">
<span class="ui-icon ui-icon-triangle-1-w"></span><?= t("previous") ?></a>
<? else: ?>
<a class="g-button ui-icon-left ui-state-disabled ui-corner-all">
<span class="ui-icon ui-icon-triangle-1-w"></span><?= t("previous") ?></a>
<? endif; ?>
</li>
<li class="g-info"><?= t("%position of %total", array("position" => $position, "total" => $sibling_count)) ?></li>
<li class="g-txt-right">
<? if ($next_item): ?>
<a href="<?= $next_item->url() ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
<span class="ui-icon ui-icon-triangle-1-e"></span><?= t("next") ?></a>
<? else: ?>
<a class="g-button ui-icon-right ui-state-disabled ui-corner-all">
<span class="ui-icon ui-icon-triangle-1-e"></span><?= t("next") ?></a>
<? endif ?>
</li>
</ul>
*/ ?>
<?= $item->movie_img(array("class" => "g-movie", "id" => "g-movie-id-{$item->id}")) ?>
<div id="g-info">
<h1><?= html::purify($item->title) ?></h1>
<div><?= nl2br(html::purify($item->description)) ?></div>
</div>
<?= $theme->photo_bottom() ?>
<?= $theme->context_menu($item, "#g-movie-id-{$item->id}") ?>
</div>

View File

@ -0,0 +1,6 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
<ul class="g-message-block">
<li class="g-warning"><?= t("No active sidebar blocks.<br/>
<a href=\"%url\">Add blocks</a>",
array("url" => html::mark_clean(url::site("admin/sidebar")))) ?></li>
</ul>

View File

@ -2,7 +2,6 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head> <head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" /> <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<title> <title>
@ -18,7 +17,7 @@
<?= t("Gallery :: %movie_title", array("movie_title" => $theme->item()->title)) ?> <?= t("Gallery :: %movie_title", array("movie_title" => $theme->item()->title)) ?>
<? endif ?> <? endif ?>
<? elseif ($theme->tag()): ?> <? elseif ($theme->tag()): ?>
<?= t("Gallery Tag :: %tag_title", array("tag_title" => $theme->tag()->name)) ?> <?= t("Gallery :: %tag_title", array("tag_title" => $theme->tag()->name)) ?>
<? else: /* Not an item, not a tag, no page_title specified. Help! */ ?> <? else: /* Not an item, not a tag, no page_title specified. Help! */ ?>
<?= t("Gallery") ?> <?= t("Gallery") ?>
<? endif ?> <? endif ?>
@ -28,8 +27,10 @@
<?= $theme->css("yui/reset-fonts-grids.css") ?> <?= $theme->css("yui/reset-fonts-grids.css") ?>
<?= $theme->css("superfish/css/superfish.css") ?> <?= $theme->css("superfish/css/superfish.css") ?>
<?= $theme->css("themeroller/ui.base.css") ?> <?= $theme->css("themeroller/ui.base.css") ?>
<?= $theme->css("screen.css") ?> <?= $theme->css("gallery.common.css") ?>
<?= $theme->css("jquery.fancybox.css") ?> <?= $theme->css("jquery.fancybox.css") ?>
<?= $theme->css("screen.css") ?>
<?= $theme->css("3nids.css") ?>
<!--[if lt IE 8]> <!--[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->url("css/fix-ie.css") ?>"
media="screen,print,projection" /> media="screen,print,projection" />
@ -37,11 +38,11 @@
<? if ($theme->page_type == 'album'): ?> <? if ($theme->page_type == 'album'): ?>
<? if ($thumb_proportion != 1): ?> <? if ($thumb_proportion != 1): ?>
<? $new_width = $thumb_proportion * 180 ?> <? $new_width = $thumb_proportion * 180 ?>
<? $new_height = $thumb_proportion * 180 ?> <? $new_height = $thumb_proportion * 230 ?>
<style type="text/css"> <style type="text/css">
#gContent #gAlbumGrid .gItem { /*#g-content #g-album-grid .g-item {
width: <?= $new_width ?>px; width: <?= $new_width ?>px;
height: <?= $new_height ?>px; height: <?= $new_height ?>px;*/
/* <?= $thumb_proportion ?> */ /* <?= $thumb_proportion ?> */
} }
</style> </style>
@ -77,19 +78,19 @@
<body <?= $theme->body_attributes() ?>> <body <?= $theme->body_attributes() ?>>
<?= $theme->page_top() ?> <?= $theme->page_top() ?>
<div id="doc4" class="yui-t5 gView"> <div id="doc4" class="yui-t5 g-view">
<?= $theme->site_status() ?> <?= $theme->site_status() ?>
<div id="gHeader"> <div id="g-header" class="g-clearfix">
<div id="gBanner"> <div id="g-banner">
<?= $theme->header_top() ?> <?= $theme->header_top() ?>
<? if ($header_text = module::get_var("gallery", "header_text")): ?> <? if ($header_text = module::get_var("gallery", "header_text")): ?>
<?= $header_text ?> <?= $header_text ?>
<? else: ?> <? else: ?>
<a id="gLogo" href="<?= item::root()->url() ?>" title="<?= t("go back to the Gallery home")->for_html_attr() ?>"> <a id="g-logo" href="<?= item::root()->url() ?>" title="<?= t("go back to the Gallery home")->for_html_attr() ?>">
<img src="<?= url::file("lib/images/logo.png") ?>" /> <img alt="<?= t("Gallery logo: Your photos on your web site")->for_html_attr() ?>" src="<?= url::file("lib/images/logo.png") ?>" />
</a> </a>
<? endif ?> <? endif ?>
<div id="gSiteMenu"> <div id="g-site-menu">
<? if ($user->admin): ?> <? if ($user->admin): ?>
<?= $theme->site_menu() ?> <?= $theme->site_menu() ?>
<? endif ?> <? endif ?>
@ -98,7 +99,7 @@
</div> </div>
<? if (!empty($parents)): ?> <? if (!empty($parents)): ?>
<ul class="gBreadcrumbs"> <ul class="g-breadcrumbs">
<? foreach ($parents as $parent): ?> <? foreach ($parents as $parent): ?>
<li> <li>
<!-- Adding ?show=<id> causes Gallery3 to display the page <!-- Adding ?show=<id> causes Gallery3 to display the page
@ -114,7 +115,7 @@
<li class="active"><?= html::purify($theme->item()->title) ?></li> <li class="active"><?= html::purify($theme->item()->title) ?></li>
</ul> </ul>
<? elseif ($theme->tag()): ?> <? elseif ($theme->tag()): ?>
<ul class="gBreadcrumbs"> <ul class="g-breadcrumbs">
<li> <li>
<a href="<?= url::site() ?>"> <a href="<?= url::site() ?>">
<?= t("Gallery") ?> <?= t("Gallery") ?>
@ -123,7 +124,7 @@
<li class="active"><?= html::purify($theme->tag()->name) ?></li> <li class="active"><?= html::purify($theme->tag()->name) ?></li>
</ul> </ul>
<? else: ?> <? else: ?>
<ul class="gBreadcrumbs"> <ul class="g-breadcrumbs">
<li> <li>
<a href="<?= url::site() ?>"> <a href="<?= url::site() ?>">
<?= t("Gallery") ?> <?= t("Gallery") ?>
@ -141,26 +142,26 @@
<div id="bd"> <div id="bd">
<div id="yui-main"> <div id="yui-main">
<div class="yui-b"> <div class="yui-b">
<div id="gContent" class="yui-g"> <div id="g-content" class="yui-g">
<?= $theme->messages() ?> <?= $theme->messages() ?>
<?= $content ?> <?= $content ?>
</div> </div>
</div> </div>
</div> </div>
<div id="gSidebar" class="yui-b"> <div id="g-sidebar" class="yui-b">
<? if ($theme->page_type != "login"): ?> <? if ($theme->page_type != "login"): ?>
<?= new View("sidebar.html") ?> <?= new View("sidebar.html") ?>
<? endif ?> <? endif ?>
</div> </div>
</div> </div>
<div id="gFooter"> <div id="g-footer">
<?= $theme->footer() ?> <?= $theme->footer() ?>
<? if ($footer_text = module::get_var("gallery", "footer_text")): ?> <? if ($footer_text = module::get_var("gallery", "footer_text")): ?>
<?= $footer_text ?> <?= $footer_text ?>
<? endif ?> <? endif ?>
<? if (module::get_var("gallery", "show_credits")): ?> <? if (module::get_var("gallery", "show_credits")): ?>
<ul id="gCredits"> <ul id="g-credits">
<?= $theme->credits() ?> <?= $theme->credits() ?>
</ul> </ul>
<? endif ?> <? endif ?>

View File

@ -1,6 +1,6 @@
<?php defined("SYSPATH") or die("No direct script access.") ?> <?php defined("SYSPATH") or die("No direct script access.") ?>
<? // See http://docs.kohanaphp.com/libraries/pagination ?> <? // See http://docs.kohanaphp.com/libraries/pagination ?>
<ul class="gPager"> <ul class="g-pager g-clearfix">
<? /* @todo This message isn't easily localizable */ <? /* @todo This message isn't easily localizable */
$from_to_msg = t2("%current_page / %total_pages", $from_to_msg = t2("%current_page / %total_pages",
"%current_page / %total_pages", "%current_page / %total_pages",
@ -9,34 +9,34 @@
"current_page" => $current_page)) ?> "current_page" => $current_page)) ?>
<li> <li>
<? if ($first_page): ?> <? if ($first_page): ?>
<a href="<?= str_replace('{page}', 1, $url) ?>" class="gButtonLink ui-icon-left ui-state-default ui-corner-all"> <a href="<?= str_replace('{page}', 1, $url) ?>" class="g-button ui-icon-left ui-state-default ui-corner-all">
<span class="ui-icon ui-icon-seek-first"></span><?= t("first") ?></a> <span class="ui-icon ui-icon-seek-first"></span><?= t("first") ?></a>
<? else: ?> <? else: ?>
<a class="gButtonLink ui-icon-left ui-state-disabled ui-corner-all"> <a class="g-button ui-icon-left ui-state-disabled ui-corner-all">
<span class="ui-icon ui-icon-seek-first"></span><?= t("first") ?></a> <span class="ui-icon ui-icon-seek-first"></span><?= t("first") ?></a>
<? endif ?> <? endif ?>
<? if ($previous_page): ?> <? if ($previous_page): ?>
<a href="<?= str_replace('{page}', $previous_page, $url) ?>" class="gButtonLink ui-icon-left ui-state-default ui-corner-all"> <a href="<?= str_replace('{page}', $previous_page, $url) ?>" class="g-button ui-icon-left ui-state-default ui-corner-all">
<span class="ui-icon ui-icon-seek-prev"></span><?= t("previous") ?></a> <span class="ui-icon ui-icon-seek-prev"></span><?= t("previous") ?></a>
<? else: ?> <? else: ?>
<a class="gButtonLink ui-icon-left ui-state-disabled ui-corner-all"> <a class="g-button ui-icon-left ui-state-disabled ui-corner-all">
<span class="ui-icon ui-icon-seek-prev"></span><?= t("previous") ?></a> <span class="ui-icon ui-icon-seek-prev"></span><?= t("previous") ?></a>
<? endif ?> <? endif ?>
</li> </li>
<li class="gInfo"><?= $from_to_msg ?></li> <li class="g-info"><?= $from_to_msg ?></li>
<li class="txtright"> <li class="g-txt-right">
<? if ($next_page): ?> <? if ($next_page): ?>
<a href="<?= str_replace('{page}', $next_page, $url) ?>" class="gButtonLink ui-icon-right ui-state-default ui-corner-all"> <a href="<?= str_replace('{page}', $next_page, $url) ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
<span class="ui-icon ui-icon-seek-next"></span><?= t("next") ?></a> <span class="ui-icon ui-icon-seek-next"></span><?= t("next") ?></a>
<? else: ?> <? else: ?>
<a class="gButtonLink ui-state-disabled ui-icon-right ui-corner-all"> <a class="g-button ui-state-disabled ui-icon-right ui-corner-all">
<span class="ui-icon ui-icon-seek-next"></span><?= t("next") ?></a> <span class="ui-icon ui-icon-seek-next"></span><?= t("next") ?></a>
<? endif ?> <? endif ?>
<? if ($last_page): ?> <? if ($last_page): ?>
<a href="<?= str_replace('{page}', $last_page, $url) ?>" class="gButtonLink ui-icon-right ui-state-default ui-corner-all"> <a href="<?= str_replace('{page}', $last_page, $url) ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
<span class="ui-icon ui-icon-seek-end"></span><?= t("last") ?></a> <span class="ui-icon ui-icon-seek-end"></span><?= t("last") ?></a>
<? else: ?> <? else: ?>
<a class="gButtonLink ui-state-disabled ui-icon-right ui-corner-all"> <a class="g-button ui-state-disabled ui-icon-right ui-corner-all">
<span class="ui-icon ui-icon-seek-end"></span><?= t("last") ?></a> <span class="ui-icon ui-icon-seek-end"></span><?= t("last") ?></a>
<? endif ?> <? endif ?>
</li> </li>

View File

@ -4,54 +4,56 @@
<!-- Use javascript to show the full size as an overlay on the current page --> <!-- Use javascript to show the full size as an overlay on the current page -->
<script> <script>
$(document).ready(function() { $(document).ready(function() {
$(".gFullSizeLink").click(function() { $(".g-fullsize-link").click(function() {
$.gallery_show_full_size(<?= html::js_string($theme->item()->file_url()) ?>, "<?= $theme->item()->width ?>", "<?= $theme->item()->height ?>"); $.gallery_show_full_size(<?= html::js_string($theme->item()->file_url()) ?>, "<?= $theme->item()->width ?>", "<?= $theme->item()->height ?>");
return false; return false;
}); });
}); });
</script> </script>
<? endif ?> <? endif ?>
<div id="gItem">
<div id="g-item">
<?= $theme->photo_top() ?> <?= $theme->photo_top() ?>
<ul class="gPager"> <ul class="g-pager">
<li> <li>
<? if ($previous_item): ?> <? if ($previous_item): ?>
<a href="<?= $previous_item->url() ?>" class="gButtonLink ui-icon-left ui-state-default ui-corner-all"> <a href="<?= $previous_item->url() ?>" class="g-button ui-icon-left ui-state-default ui-corner-all">
<span class="ui-icon ui-icon-triangle-1-w"></span><?= t("previous") ?></a> <span class="ui-icon ui-icon-triangle-1-w"></span><?= t("previous") ?></a>
<? else: ?> <? else: ?>
<a class="gButtonLink ui-icon-left ui-state-disabled ui-corner-all"> <a class="g-button ui-icon-left ui-state-disabled ui-corner-all">
<span class="ui-icon ui-icon-triangle-1-w"></span><?= t("previous") ?></a> <span class="ui-icon ui-icon-triangle-1-w"></span><?= t("previous") ?></a>
<? endif; ?> <? endif; ?>
</li> </li>
<li class="gInfo"><?= t("%position of %total", array("position" => $position, "total" => $sibling_count)) ?></li> <li class="g-info"><?= t("%position of %total", array("position" => $position, "total" => $sibling_count)) ?></li>
<li class="txtright"> <li class="g-txt-right">
<? if ($next_item): ?> <? if ($next_item): ?>
<a href="<?= $next_item->url() ?>" class="gButtonLink ui-icon-right ui-state-default ui-corner-all"> <a href="<?= $next_item->url() ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
<span class="ui-icon ui-icon-triangle-1-e"></span><?= t("next") ?></a> <span class="ui-icon ui-icon-triangle-1-e"></span><?= t("next") ?></a>
<? else: ?> <? else: ?>
<a class="gButtonLink ui-icon-right ui-state-disabled ui-corner-all"> <a class="g-button ui-icon-right ui-state-disabled ui-corner-all">
<span class="ui-icon ui-icon-triangle-1-e"></span><?= t("next") ?></a> <span class="ui-icon ui-icon-triangle-1-e"></span><?= t("next") ?></a>
<? endif ?> <? endif ?>
</li> </li>
</ul> </ul>
<div id="gPhoto"> <div id="g-photo">
<?= $theme->resize_top($item) ?> <?= $theme->resize_top($item) ?>
<? if (access::can("view_full", $item)): ?> <? if (access::can("view_full", $item)): ?>
<a href="<?= $item->file_url() ?>" class="gFullSizeLink" title="<?= t("View full size")->for_html_attr() ?>"> <a href="<?= $item->file_url() ?>" class="g-fullsize-link" title="<?= t("View full size")->for_html_attr() ?>">
<? endif ?> <? endif ?>
<?= $item->resize_img(array("id" => "gPhotoId-{$item->id}", "class" => "gResize")) ?> <?= $item->resize_img(array("id" => "g-photo-id-{$item->id}", "class" => "g-resize")) ?>
<? if (access::can("view_full", $item)): ?> <? if (access::can("view_full", $item)): ?>
</a> </a>
<? endif ?> <? endif ?>
<?= $theme->resize_bottom($item) ?> <?= $theme->resize_bottom($item) ?>
<?= $theme->context_menu($item, "#gPhotoId-{$item->id}") ?> <?= $theme->context_menu($item, "#g-photo-id-{$item->id}") ?>
</div> </div>
<div id="gInfo"> <div id="g-info">
<h1><?= html::purify($item->title) ?></h1> <h1><?= html::purify($item->title) ?></h1>
<div><?= nl2br(html::purify($item->description)) ?></div> <div><?= nl2br(html::purify($item->description)) ?></div>
</div> </div>
<?= $theme->photo_bottom() ?>
</div> </div>

View File

@ -6,11 +6,11 @@
$theme->pagination->initialize(array("query_string" => "page","total_items" => $children_count_true,"items_per_page" => $page_size,"style" => "classic")); $theme->pagination->initialize(array("query_string" => "page","total_items" => $children_count_true,"items_per_page" => $page_size,"style" => "classic"));
$children_offset = ($theme->pagination->current_page -1) * $page_size ; ?> $children_offset = ($theme->pagination->current_page -1) * $page_size ; ?>
<div id="gSearchResults"> <div id="g-search-results">
<h2><?= t("Results for <b>%term</b>", array("term" => $q)) ?></h2> <h2><?= t("Results for <b>%term</b>", array("term" => $q)) ?></h2>
<? if (count($items)): ?> <? if (count($items)): ?>
<ul id="gAlbumGrid"> <ul id="g-album-grid">
<? for($i=0;$i<$children_offset;$i++): ?> <? for($i=0;$i<$children_offset;$i++): ?>
<? $child = $children_all[$i] ?> <? $child = $children_all[$i] ?>
<? if ($child->is_photo()): ?> <? if ($child->is_photo()): ?>
@ -21,7 +21,7 @@
<? endif ?> <? endif ?>
<? endfor ?> <? endfor ?>
<? foreach ($items as $child): ?> <? foreach ($items as $child): ?>
<li id="gItemId-<?= $child->id ?>" class="gItem gAlbum"> <li id="g-item-id-<?= $child->id ?>" class="g-item g-album">
<?= $theme->thumb_top($child) ?> <?= $theme->thumb_top($child) ?>
<? if (!($child->is_album())): ?> <? if (!($child->is_album())): ?>
<? if ($child->is_photo()): ?> <? if ($child->is_photo()): ?>
@ -32,7 +32,7 @@
<? else: ?> <? else: ?>
<a href="<?= $child->url() ?>"> <a href="<?= $child->url() ?>">
<? endif ?> <? endif ?>
<img id="gPhotoId-<?= $child->id ?>" class="gThumbnail" <img id="g-photo-id-<?= $child->id ?>" class="g-thumbnail"
alt="photo" src="<?= $child->thumb_url() ?>" alt="photo" src="<?= $child->thumb_url() ?>"
width="<?= $child->thumb_width ?>" width="<?= $child->thumb_width ?>"
height="<?= $child->thumb_height ?>" /> height="<?= $child->thumb_height ?>" />
@ -43,7 +43,7 @@
<? endif ?> <? endif ?>
<? else: ?> <? else: ?>
<a href="<?= $child->url() ?>"> <a href="<?= $child->url() ?>">
<img id="gPhotoId-<?= $child->id ?>" class="gThumbnail" <img id="g-photo-id-<?= $child->id ?>" class="g-thumbnail"
alt="photo" src="<?= $child->thumb_url() ?>" alt="photo" src="<?= $child->thumb_url() ?>"
width="<?= $child->thumb_width ?>" width="<?= $child->thumb_width ?>"
height="<?= $child->thumb_height ?>" /> height="<?= $child->thumb_height ?>" />
@ -51,7 +51,7 @@
</a> </a>
<? endif ?> <? endif ?>
<?= $theme->thumb_bottom($child) ?> <?= $theme->thumb_bottom($child) ?>
<?= $theme->context_menu($child, "#gItemId-{$child->id} .gThumbnail") ?> <?= $theme->context_menu($child, "#g-item-id-{$child->id} .g-thumbnail") ?>
<? if ($child->is_photo() && module::is_active("comment") && module::is_active("comment_3nids")) :?> <? if ($child->is_photo() && module::is_active("comment") && module::is_active("comment_3nids")) :?>
<ul class="gMetadata"> <ul class="gMetadata">
<li><a href="<?=url::site("comments_3nids?item_id={$child->id}")?>" class="iframe fancyclass"><?=comment_3nids::count($child) ?> <?=t("comments")?></a></li> <li><a href="<?=url::site("comments_3nids?item_id={$child->id}")?>" class="iframe fancyclass"><?=comment_3nids::count($child) ?> <?=t("comments")?></a></li>

View File

@ -1,11 +1,13 @@
<?php defined("SYSPATH") or die("No direct script access.") ?> <?php defined("SYSPATH") or die("No direct script access.") ?>
<?= $theme->sidebar_top() ?> <?= $theme->sidebar_top() ?>
<div class="gToolbar"> <div class="g-toolbar">
<div id="gViewMenu" class="gButtonSet"> <div id="g-view-menu" class="g-buttonset g-clearfix">
<? if ($page_type == "album"):?> <? if ($page_type == "album"):?>
<?= $theme->album_menu() ?> <?= $theme->album_menu() ?>
<? elseif ($page_type == "photo") : ?> <? elseif ($page_type == "photo") : ?>
<?= $theme->photo_menu() ?> <?= $theme->photo_menu() ?>
<? elseif ($page_type == "movie") : ?>
<?= $theme->movie_menu() ?>
<? elseif ($page_type == "tag") : ?> <? elseif ($page_type == "tag") : ?>
<?= $theme->tag_menu() ?> <?= $theme->tag_menu() ?>
<? endif ?> <? endif ?>

View File

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

View File

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

View File

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

Some files were not shown because too many files have changed in this diff Show More