title = $(":input[name='title']:enabled", this.form).val();
description = $(":input[name='description']:enabled", this.form).val();
ajaxGet("editImage.ajax", { "formPassword": getFormPassword(), "image": imageId, "title": title, "description": description }, function(data) {
- if (data && data.success) {
- getImage(data.imageId).find(".image-title").text(data.title);
- getImage(data.imageId).find(".image-description").html(data.parsedDescription);
- getImage(data.imageId).find(":input[name='title']").attr("defaultValue", title);
- getImage(data.imageId).find(":input[name='description']").attr("defaultValue", data.description);
+ var imageElement = getImage(data.imageId);
+ var imageTitleInput = imageElement.find(":input[name='title']");
+ var imageDescriptionInput = imageElement.find(":input[name='description']");
+ if (data && data.success) {
+ imageElement.find(".image-title").text(data.title);
+ imageElement.find(".image-description").html(data.parsedDescription);
+ imageTitleInput.attr("defaultValue", data.title);
+ imageDescriptionInput.attr("defaultValue", data.description);
cancelImageEditing();
- }
+ } else if (data && !data.success) {
+ imageTitleInput.attr("value", imageTitleInput.attr("defaultValue"));
+ imageDescriptionInput.attr("value", imageDescriptionInput.attr("defaultValue"));
+ cancelImageEditing();
+ }
});
return false;
});
title = $(":input[name='title']:enabled", this.form).val();
description = $(":input[name='description']:enabled", this.form).val();
ajaxGet("editAlbum.ajax", { "formPassword": getFormPassword(), "album": albumId, "title": title, "description": description }, function(data) {
- if (data && data.success) {
- getAlbum(data.albumId).find(".album-title").text(data.title);
- getAlbum(data.albumId).find(".album-description").text(data.description);
- getAlbum(data.albumId).find(":input[name='title']").attr("defaultValue", title);
- getAlbum(data.albumId).find(":input[name='description']").attr("defaultValue", description);
- cancelAlbumEditing();
- }
+ if (data) {
+ var albumTitleField = getAlbum(data.albumId).find(".album-title");
+ var albumDescriptionField = getAlbum(data.albumId).find(".album-description");
+ if (data.success) {
+ albumTitleField.text(data.title);
+ albumDescriptionField.text(data.description);
+ getAlbum(data.albumId).find(":input[name='title']").attr("defaultValue", title);
+ getAlbum(data.albumId).find(":input[name='description']").attr("defaultValue", description);
+ } else {
+ albumTitleField.attr("value", albumTitleField.attr("defaultValue"));
+ albumDescriptionField.attr("value", albumDescriptionField.attr("defaultValue"));
+ }
+ cancelAlbumEditing();
+ }
});
return false;
});
</div>
<%/if>
- <%foreach album.images image|paginate pageSize=core.preferences.imagesPerPage page=request.page>
+ <%foreach album.images image|paginate pageSize=core.preferences.imagesPerPage page=page>
<%first>
<h2><%= Page.ImageBrowser.Header.Images|l10n|html></h2>
<%include include/pagination.html pageParameter=="page">
<%last><%= true|store key==endRow><%/last>
<%if endRow>
</div>
- <%include include/pagination.html pageParameter=="page">
<%/if>
+ <%last><%include include/pagination.html pageParameter=="page"><%/last>
<%/foreach>
<%if album.sone.local>
<div class="backlink"><a href="imageBrowser.html?sone=<%sone.id|html>"><%sone.niceName|html></a></div>
</div>
- <%include include/browseAlbums.html albums=sone.albums>
+ <%include include/browseAlbums.html albums=sone.rootAlbum.albums>
<%if sone.local>
<div class="show-create-album hidden toggle-link"><a class="small-link">» <%= View.CreateAlbum.Title|l10n|html></a></div>
<%elseif galleryRequested>
- <%foreach albums album>
+ <%foreach albums album|paginate pageSize=core.preferences.imagesPerPage pageParameter=request.page pagination=albumPagination>
<%first>
<h2><%= Page.ImageBrowser.Header.Albums|l10n|html></h2>
<%include include/pagination.html pagination=albumPagination pageParameter=="page">
<%/first>
- <%if loop.count|mod divisor=3><div class="album-row"><%/if>
+ <%if loop.count|mod divisor==3><div class="album-row"><%/if>
<div id="album-<% album.id|html>" class="album">
<div class="album-id hidden"><% album.id|html></div>
<div class="album-container">
<%last><%= true|store key==endRow><%/last>
<%if endRow>
</div>
- <%include include/pagination.html pagination=albumPagination pageParameter=="page">
<%/if>
+ <%last>
+ <%include include/pagination.html pagination=albumPagination pageParameter=="page">
+ <%/last>
<%/foreach>
<%/if>