antville/antville
antville/antville
1
1
Fork 0
Code Issues 51 Pull requests 8 Projects Releases 9 Wiki Activity Actions

* Fixed notifcation skins in HopObject to prevent ugly "null" output; from now on only the ID of the created/modified object is displayed.

Browse source 
* Fixed bug in Story.summary_macro() preventing additional arguments from being used to render metadata content
 * Added root.sites to _parent mapping in Site.properties
This commit is contained in:
Tobi Schäfer 2008-12-14 12:50:52 +00:00
parent b5f3128757
commit 31251b6809
4 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
code/HopObject/$HopObject.skin
View file

@ -17,9 +17,9 @@ proceed.' %></p>
<% #notify_create %> <% #notify_create %>
<% gettext 'Hello {0}.' <% membership.name %> %> <% gettext 'Hello {0}.' <% membership.name %> %>
<% gettext 'This message wants to inform you that on {0} user {1} published the <% gettext 'This message wants to inform you that on {0} user {1} published a
{2} "{3}" [1].' <% this.modified short %> <% this.modifier %> new {2} [1].' <% this.modified short %> <% this.modifier %>
<% this.kind %> <% this.title %> %> <% this.kind %> %>
<% gettext "Best regards." %> <% gettext "Best regards." %>
<% gettext "The Management" %> <% gettext "The Management" %>
@ -31,9 +31,9 @@ proceed.' %></p>
<% #notify_edit %> <% #notify_edit %>
<% gettext 'Hello {0}.' <% membership.name %> %> <% gettext 'Hello {0}.' <% membership.name %> %>
<% gettext 'This message wants to inform you that on {0} user {1} modified the <% gettext 'This message wants to inform you that on {0} user {1} modified
{2} "{3}" [1].' <% this.modified short %> <% this.modifier %> {2} #{3} [1].' <% this.modified short %> <% this.modifier %>
<% this.kind %> <% this.title %> %> <% this.kind %> <% this.id %> %>
<% gettext "Best regards." %> <% gettext "Best regards." %>
<% gettext "The Management" %> <% gettext "The Management" %>

3
code/Image/Image.js
View file

@ -248,8 +248,7 @@ Image.prototype.tags_macro = function() {
} }
Image.prototype.contentLength_macro = function() { Image.prototype.contentLength_macro = function() {
res.write((this.contentLength / 1024).format("###,###") + " KB"); return res.write((this.contentLength / 1024).format("###,###") + " KB");
return;
} }
Image.prototype.url_macro = function() { Image.prototype.url_macro = function() {

2
code/Site/Site.properties
View file

@ -25,7 +25,7 @@
_db = antville _db = antville
_table = site _table = site
_id = id _id = id
_parent = root _parent = root, root.sites
name name
mode mode

2
code/Story/Story.js
View file

@ -327,7 +327,7 @@ Story.prototype.link_macro = function(param, action, text) {
Story.prototype.summary_macro = function(param) { Story.prototype.summary_macro = function(param) {
param.limit || (param.limit = 15); param.limit || (param.limit = 15);
var keys, summary; var keys, summary;
if (arguments > 1) { if (arguments.length > 1) {
res.push(); res.push();
var content; var content;
for (var i=1; i<arguments.length; i+=1) { for (var i=1; i<arguments.length; i+=1) {