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

* Fixed reference to parent site in Archive

Browse source 
* Fixed _children.filter in Archive
 * Added missing permission checks
 * Modified global defineConstants() method to return the getter function instead of automatically defining it with given argument
 * Added HopObject.macro_macro() method to display userland macro code
 * Removed colorpicker (will be replaced by third-party library)
 * Removed obsolete global constants and functions
 * Overhauled and tested global userland macros like story_macro(), image_macro() etc.
 * Implemented global list_macro() to replace any special listFoobar_macro() methods
 * Moved global autoLogin() method into User prototype
 * Overhauled global randomize_macro()
 * Renamed global evalURL() method to validateUrl() as well as evalEmail() to validateEmail()
 * Re-added accidentally removed subskins to Members.skin
 * Fixed some skin names which were changed recently
 * Remove delete_action() from Membership
 * Fixed foreign key of images collection in Membership
 * Removed global username_macro() and replaced it with appropriate membership macros
 * Moved contents of systemscripts.skin into javascript.skin in Root prototype
 * Removed main_css_action(), main_js_action() and sitecounter_macro() methods from Root
 * Added accessname to sites collection in Root
 * Upgraded jQuery to version 1.2.1
 * Replaced call for global history_macro() with corresponding list_macro() call
 * Renamed "public" collection of Stories prototype to "featured"
 * Moved a lot of styles from Root's style.skin to the one in Site
 * Added comments collection to Site
 * Moved embed.skin as subskin #embed into Site.skin
 * Fixed some minor issues in Story.js (removed check for creator before setting the story's mode)
 * Defined cookie names as constants of User which can be overriden via app.properties userCookie and hashCookie
 * Moved a lot of code into compatibility module
This commit is contained in:
Tobi Schäfer 2007-10-11 23:03:17 +00:00
parent ded7f5fcea
commit df9017ab77
38 changed files with 1154 additions and 1736 deletions
Download patch file Download diff file Expand all files Collapse all files

9
code/Image/Image.js
View file

@ -172,12 +172,9 @@ Image.prototype.url_macro = function() {
return res.write(this.url || this.getUrl());
};
Image.prototype.code_macro = function() {
res.write("<% ");
res.write(this.parent.constructor === Layout ? "layout.image " : "image ");
res.write(this.name);
res.write(" %>");
return;
Image.prototype.macro_macro = function() {
return HopObject.prototype.macro_macro.call(this, null,
this.parent.constructor === Layout ? "layout.image" : "image");
};
Image.prototype.thumbnail_macro = function() {

4
code/Image/Image.skin
View file

@ -1,7 +1,7 @@
<% #main %>
<p><% breadcrumbs %></p>
<p>To insert this image into a story, comment or skin copy/paste the following
code: <pre><% image.code %></pre></p>
code: <pre><% image.macro %></pre></p>
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td colspan="2" class="small">
@ -34,7 +34,7 @@ code: <pre><% image.code %></pre></p>
<table width="100%" cellspacing="0" cellpadding="0">
<tr>
<td colspan="2" class="small">
<strong>Macro:</strong> <% image.code %>
<strong>Macro:</strong> <% image.macro %>
<div class="ample"><strong>Format: </strong><% image.contentType %>,
<% image.width %>&times;<% image.height %> pixels</div>
</td>