Merge commit 'gallery3-contrib/master'
Conflicts: modules/tagfaces/views/drawfaces_highlight_block.html.php
This commit is contained in:
commit
1c4dfd6bef
@ -2,9 +2,9 @@
|
|||||||
<div class="gDisplayTagsBlock">
|
<div class="gDisplayTagsBlock">
|
||||||
<? for ($counter=0; $counter<count($tags); $counter++) { ?>
|
<? for ($counter=0; $counter<count($tags); $counter++) { ?>
|
||||||
<? if ($counter < count($tags)-1) { ?>
|
<? if ($counter < count($tags)-1) { ?>
|
||||||
<a href="<?= url::site("tags/$tags[$counter]") ?>"><?= p::clean($tags[$counter]->name) ?></a>,
|
<a href="<?= url::site("tags/$tags[$counter]") ?>"><?= html::clean($tags[$counter]->name) ?></a>,
|
||||||
<? } else {?>
|
<? } else {?>
|
||||||
<a href="<?= url::site("tags/$tags[$counter]") ?>"><?= p::clean($tags[$counter]->name) ?></a>
|
<a href="<?= url::site("tags/$tags[$counter]") ?>"><?= html::clean($tags[$counter]->name) ?></a>
|
||||||
<? } ?>
|
<? } ?>
|
||||||
<? } ?>
|
<? } ?>
|
||||||
</div>
|
</div>
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
<div id="gLatestUpdates">
|
<div id="gLatestUpdates">
|
||||||
<h1><?= t("Latest Updates") ?></h1>
|
<h1><?= t("Latest Updates") ?></h1>
|
||||||
<? array("term" => p::clean($q)) ?>
|
<? array("term" => html::clean($q)) ?>
|
||||||
<? if (count($items)): ?>
|
<? if (count($items)): ?>
|
||||||
<ul id="gAlbumGrid">
|
<ul id="gAlbumGrid">
|
||||||
<? foreach ($items as $item): ?>
|
<? foreach ($items as $item): ?>
|
||||||
@ -15,10 +15,10 @@
|
|||||||
<a href="<?= url::site("items/$item->id") ?>">
|
<a href="<?= url::site("items/$item->id") ?>">
|
||||||
<?= $item->thumb_img() ?>
|
<?= $item->thumb_img() ?>
|
||||||
<p>
|
<p>
|
||||||
<?= p::clean($item->title) ?>
|
<?= html::clean($item->title) ?>
|
||||||
</p>
|
</p>
|
||||||
<div>
|
<div>
|
||||||
<?= p::clean($item->description) ?>
|
<?= html::clean($item->description) ?>
|
||||||
</div>
|
</div>
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
|
@ -5,28 +5,28 @@
|
|||||||
if (count($tags) > 0) {
|
if (count($tags) > 0) {
|
||||||
for ($counter=0; $counter<count($tags); $counter++) {
|
for ($counter=0; $counter<count($tags); $counter++) {
|
||||||
if ($counter < count($tags)-1) {
|
if ($counter < count($tags)-1) {
|
||||||
$metaTags = $metaTags . p::clean($tags[$counter]->name) . ",";
|
$metaTags = $metaTags . html::clean($tags[$counter]->name) . ",";
|
||||||
} else {
|
} else {
|
||||||
$metaTags = $metaTags . p::clean($tags[$counter]->name);
|
$metaTags = $metaTags . html::clean($tags[$counter]->name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// If $metaTags is empty, use the item's title instead.
|
// If $metaTags is empty, use the item's title instead.
|
||||||
if ($metaTags == "") {
|
if ($metaTags == "") {
|
||||||
$metaTags = p::clean($item->title);
|
$metaTags = html::clean($item->title);
|
||||||
}
|
}
|
||||||
|
|
||||||
$metaDescription = "";
|
$metaDescription = "";
|
||||||
$metaDescription = trim(nl2br(p::purify($item->description)));
|
$metaDescription = trim(nl2br(html::purify($item->description)));
|
||||||
// If description is empty, use title instead.
|
// If description is empty, use title instead.
|
||||||
if ($metaDescription == "") {
|
if ($metaDescription == "") {
|
||||||
$metaDescription = p::clean($item->title);
|
$metaDescription = html::clean($item->title);
|
||||||
}
|
}
|
||||||
// If this page belongs to a tag, use the description of the first item instead.
|
// If this page belongs to a tag, use the description of the first item instead.
|
||||||
if ($theme->tag()) {
|
if ($theme->tag()) {
|
||||||
if (count($children) > 0) {
|
if (count($children) > 0) {
|
||||||
$metaDescription = trim(nl2br(p::purify($children[0]->description)));
|
$metaDescription = trim(nl2br(html::purify($children[0]->description)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// If it's still empty, use $metaTags.
|
// If it's still empty, use $metaTags.
|
||||||
|
@ -64,14 +64,14 @@
|
|||||||
<div id="gAlbumHeaderButtons">
|
<div id="gAlbumHeaderButtons">
|
||||||
<?= $theme->dynamic_top() ?>
|
<?= $theme->dynamic_top() ?>
|
||||||
</div>
|
</div>
|
||||||
<h1><?= p::clean($title) ?></h1>
|
<h1><?= html::clean($title) ?></h1>
|
||||||
</div>
|
</div>
|
||||||
<p><?=t("Use the mouse to select a face on the image below."); ?></p>
|
<p><?=t("Use the mouse to select a face on the image below."); ?></p>
|
||||||
|
|
||||||
<fieldset>
|
<fieldset>
|
||||||
<div id="gItem">
|
<div id="gItem">
|
||||||
<div id="gInfo">
|
<div id="gInfo">
|
||||||
<h2><?= p::purify($item->title) ?></h2>
|
<h2><?= html::purify($item->title) ?></h2>
|
||||||
</div>
|
</div>
|
||||||
<div id="gPhoto">
|
<div id="gPhoto">
|
||||||
<?= $item->resize_img(array("id" => "gPhotoId-{$item->id}", "class" => "gResize")) ?>
|
<?= $item->resize_img(array("id" => "gPhotoId-{$item->id}", "class" => "gResize")) ?>
|
||||||
|
@ -83,7 +83,11 @@
|
|||||||
foreach ($existingFaces as $oneFace) {
|
foreach ($existingFaces as $oneFace) {
|
||||||
$oneTag = ORM::factory("tag", $oneFace->tag_id)
|
$oneTag = ORM::factory("tag", $oneFace->tag_id)
|
||||||
?>
|
?>
|
||||||
|
<<<<<<< HEAD:modules/tagfaces/views/drawfaces_highlight_block.html.php
|
||||||
<area shape="rect" coords="<?=$oneFace->x1 ?>,<?=$oneFace->y1 ?>,<?=$oneFace->x2 ?>,<?=$oneFace->y2 ?>" href="<?=url::site("tags/$oneFace->tag_id") ?>" title="<?=p::clean($oneTag->name); ?>" alt="<?=p::clean($oneTag->name); ?>" onMouseOver="highlightbox(<?=$oneFace->x1 ?>,<?=$oneFace->y1 ?>,<?=$oneFace->x2 ?>,<?=$oneFace->y2 ?>,'<?=p::clean($oneTag->name); ?>', '<?=p::clean($oneFace->description); ?>', '<?=url::site("tags/$oneFace->tag_id") ?>')" />
|
<area shape="rect" coords="<?=$oneFace->x1 ?>,<?=$oneFace->y1 ?>,<?=$oneFace->x2 ?>,<?=$oneFace->y2 ?>" href="<?=url::site("tags/$oneFace->tag_id") ?>" title="<?=p::clean($oneTag->name); ?>" alt="<?=p::clean($oneTag->name); ?>" onMouseOver="highlightbox(<?=$oneFace->x1 ?>,<?=$oneFace->y1 ?>,<?=$oneFace->x2 ?>,<?=$oneFace->y2 ?>,'<?=p::clean($oneTag->name); ?>', '<?=p::clean($oneFace->description); ?>', '<?=url::site("tags/$oneFace->tag_id") ?>')" />
|
||||||
|
=======
|
||||||
|
<area shape="rect" coords="<?=$oneFace->x1 ?>,<?=$oneFace->y1 ?>,<?=$oneFace->x2 ?>,<?=$oneFace->y2 ?>" href="<?=url::site("tags/$oneFace->tag_id") ?>" title="<?=html::clean($oneTag->name); ?>" alt="<?=$oneTag->name; ?>" onMouseOver="highlightbox(<?=$oneFace->x1 ?>,<?=$oneFace->y1 ?>,<?=$oneFace->x2 ?>,<?=$oneFace->y2 ?>,'<?=html::clean($oneTag->name); ?>')" onMouseOut="hidebox()" />
|
||||||
|
>>>>>>> gallery3-contrib/master:modules/tagfaces/views/drawfaces_highlight_block.html.php
|
||||||
<? } ?>
|
<? } ?>
|
||||||
|
|
||||||
<?
|
<?
|
||||||
|
@ -42,7 +42,7 @@
|
|||||||
<? endif ?>
|
<? endif ?>
|
||||||
|
|
||||||
<li>
|
<li>
|
||||||
<?= p::clean($tag->name) ?>
|
<?= html::clean($tag->name) ?>
|
||||||
<span class="understate">(<?= $tag->count ?>)</span>
|
<span class="understate">(<?= $tag->count ?>)</span>
|
||||||
|
|
||||||
<a href="<?= url::site("admin/tagsmap/edit_gps/$tag->id") ?>"><?= t("Edit GPS") ?></a>
|
<a href="<?= url::site("admin/tagsmap/edit_gps/$tag->id") ?>"><?= t("Edit GPS") ?></a>
|
||||||
|
Reference in New Issue
Block a user