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

Merge commit 'gallery3-contrib/master'

Browse Source 
Conflicts:
	modules/tagfaces/views/drawfaces_highlight_block.html.php
This commit is contained in:
rWatcher 2009-08-31 13:47:19 -04:00
commit 1c4dfd6bef
6 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/displaytags/views/displaytags_block.html.php
View File

@ -2,9 +2,9 @@
<div class="gDisplayTagsBlock">
<? for ($counter=0; $counter<count($tags); $counter++) { ?>
<? 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 {?>
<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>

6
modules/latestupdates/views/updates.html.php
View File

@ -3,7 +3,7 @@
<div id="gLatestUpdates">
<h1><?= t("Latest Updates") ?></h1>
<? array("term" => p::clean($q)) ?>
<? array("term" => html::clean($q)) ?>
<? if (count($items)): ?>
<ul id="gAlbumGrid">
<? foreach ($items as $item): ?>
@ -15,10 +15,10 @@
<a href="<?= url::site("items/$item->id") ?>">
<?= $item->thumb_img() ?>
<p>
<?= p::clean($item->title) ?>
<?= html::clean($item->title) ?>
</p>
<div>
<?= p::clean($item->description) ?>
<?= html::clean($item->description) ?>
</div>
</a>
</li>

12
modules/metadescription/views/metadescription_block.html.php
View File

@ -5,28 +5,28 @@
if (count($tags) > 0) {
for ($counter=0; $counter<count($tags); $counter++) {
if ($counter < count($tags)-1) {
$metaTags = $metaTags . p::clean($tags[$counter]->name) . ",";
$metaTags = $metaTags . html::clean($tags[$counter]->name) . ",";
} 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 == "") {
$metaTags = p::clean($item->title);
$metaTags = html::clean($item->title);
}
$metaDescription = "";
$metaDescription = trim(nl2br(p::purify($item->description)));
$metaDescription = trim(nl2br(html::purify($item->description)));
// If description is empty, use title instead.
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 ($theme->tag()) {
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.

4
modules/tagfaces/views/drawfaces.html.php
View File

@ -64,14 +64,14 @@
<div id="gAlbumHeaderButtons">
<?= $theme->dynamic_top() ?>
</div>
<h1><?= p::clean($title) ?></h1>
<h1><?= html::clean($title) ?></h1>
</div>
<p><?=t("Use the mouse to select a face on the image below."); ?></p>
<fieldset>
<div id="gItem">
<div id="gInfo">
<h2><?= p::purify($item->title) ?></h2>
<h2><?= html::purify($item->title) ?></h2>
</div>
<div id="gPhoto">
<?= $item->resize_img(array("id" => "gPhotoId-{$item->id}", "class" => "gResize")) ?>

4
modules/tagfaces/views/drawfaces_highlight_block.html.php
View File

@ -83,7 +83,11 @@
foreach ($existingFaces as $oneFace) {
$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="<?=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
<? } ?>
<?

2
modules/tagsmap/views/admin_tagsmap.html.php
View File

@ -42,7 +42,7 @@
<? endif ?>
<li>
<?= p::clean($tag->name) ?>
<?= html::clean($tag->name) ?>
<span class="understate">(<?= $tag->count ?>)</span>
<a href="<?= url::site("admin/tagsmap/edit_gps/$tag->id") ?>"><?= t("Edit GPS") ?></a>