* Fixed reference to parent site in Archive
* 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:
parent
ded7f5fcea
commit
df9017ab77
38 changed files with 1154 additions and 1736 deletions
|
@ -62,9 +62,10 @@ Members.prototype.link_macro = function(param, action, text) {
|
|||
|
||||
Members.prototype.main_action = function() {
|
||||
res.data.title = gettext("Members of {0}", this._parent.title);
|
||||
res.data.list = renderList(this, "mgrlistitem", 10, req.data.page);
|
||||
res.data.pager = renderPageNavigation(this, this.href(req.action), 10,
|
||||
req.data.page);
|
||||
res.data.list = renderList(this, "Membership#members",
|
||||
10, req.queryParams.page);
|
||||
res.data.pager = renderPageNavigation(this, this.href(req.action),
|
||||
10, req.queryParams.page);
|
||||
res.data.body = this.renderSkinAsString("Members#main");
|
||||
res.handlers.site.renderSkin("page");
|
||||
return;
|
||||
|
@ -136,8 +137,8 @@ Members.prototype.logout_action = function() {
|
|||
session.user.name);
|
||||
session.logout();
|
||||
delete session.data.referrer;
|
||||
res.setCookie("avUsr", "");
|
||||
res.setCookie("avPw", "");
|
||||
res.setCookie(User.COOKIE, String.EMPTY);
|
||||
res.setCookie(User.HASHCOOKIE, String.EMPTY);
|
||||
}
|
||||
res.redirect(this._parent.href());
|
||||
return;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue