1
0

Merge branch 'master' into dialog

This commit is contained in:
Tim Almdal 2010-07-27 21:37:01 -07:00
commit b3861219f1
4 changed files with 2 additions and 40 deletions

View File

@ -24,7 +24,7 @@
/* ~browny~ */
body, html {
background-color: #5a3007;
font-family: 'Geeza Pro', Tahoma, 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
font-family: 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
}
p {

View File

@ -22,7 +22,7 @@
/* ~browny~ */
body, html {
background-color: #5a3007;
font-family: 'Geeza Pro', Tahoma, 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
font-family: 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
}
p {
@ -637,10 +637,6 @@ table.calendar td:hover {
background-image: url('../images/ico-view-downloadfullsize.png') !important;
}
/* DownloadAlbum */
#g-view-menu #g-download-album-link {
background-image: url('../images/ico-view-downloadalbum.png') !important;
}
/* DownloadAlbum */
#g-view-menu #g-download-album-link {
background-image: url('../images/ico-view-downloadalbum.png');

Binary file not shown.

Before

Width:  |  Height:  |  Size: 63 KiB

After

Width:  |  Height:  |  Size: 64 KiB

View File

@ -1,34 +0,0 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
<div class="g-display-tags-block" id="g-display-tags-block">
<? $not_first = 0; ?>
<? foreach ($tags as $tag): ?>
<?= ($not_first++) ? "," : "" ?>
<a href="<?= $tag->url() ?>"><?= html::clean($tag->name) ?></a>
<? endforeach ?>
</div>
<script type="text/javascript">
$("#g-add-tag-form").ready(function() {
var url = $("#g-tag-cloud").attr("ref") + "/autocomplete";
$("#g-add-tag-form input:text").autocomplete(
url, {
max: 30,
multiple: true,
multipleSeparator: ',',
cacheLength: 1
}
);
$("#g-add-tag-form").ajaxForm({
dataType: "json",
success: function(data) {
if (data.result == "success") {
var originalhtml = document.getElementById('g-display-tags-block').innerHTML;
$("#g-display-tags-block").html(originalhtml + ", " + document.getElementById('g-add-tag-form').name.value);
}
$("#g-add-tag-form").resetForm();
}
});
});
</script>
<?=tag::get_add_form($theme->item()); ?>