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

Renaming MemberMgr prototype to Members

Browse source
This commit is contained in:
Tobi Schäfer 2007-09-14 13:21:21 +00:00
parent bed0524404
commit 07dfe70adc
8 changed files with 40 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
code/Global/Global.js
View file

@ -205,17 +205,17 @@ newSet.add(new Skinset("Root.various", ["Root.blocked", "Root.notfound", "Root.s
SKINSETS.push(newSet);
newSet = new Skinset("Site", ["Site.page", "Site.style", "Site.javascript", "Site.main", "Day.main", "Story.dayheader"]);
newSet.add(new Skinset("Site.navigation", ["Site.contribnavigation", "Site.adminnavigation", "Global.nextpagelink", "Global.prevpagelink", "Global.pagenavigation", "Global.pagenavigationitem", "MemberMgr.statusloggedin", "MemberMgr.statusloggedout"]));
newSet.add(new Skinset("Site.navigation", ["Site.contribnavigation", "Site.adminnavigation", "Global.nextpagelink", "Global.prevpagelink", "Global.pagenavigation", "Global.pagenavigationitem", "Members.statusloggedin", "Members.statusloggedout"]));
newSet.add(new Skinset("Site.topics", ["TopicMgr.main", "Topic.main"]));
newSet.add(new Skinset("Site.calendar", ["Site.calendar", "Site.calendardayheader", "Site.calendarweek", "Site.calendarday", "Site.calendarselday"]));
newSet.add(new Skinset("Site.rss", ["Site.rss", "Story.rssItem", "Story.rssResource"]));
newSet.add(new Skinset("Site.search", ["Site.searchresult", "Site.searchbox", "Story.searchview"]));
newSet.add(new Skinset("Site.referrers", ["Site.referrers", "Site.referrerItem"]));
newSet.add(new Skinset("Site.mostread", ["Site.mostread", "Story.mostread"]));
newSet.add(new Skinset("Site.mails", ["MemberMgr.mailregconfirm", "MemberMgr.mailpassword", "MemberMgr.mailnewmember", "Membership.mailstatuschange", "Membership.mailmessage", "Site.notificationMail"], "Root"));
newSet.add(new Skinset("Site.mails", ["Members.mailregconfirm", "Members.mailpassword", "Members.mailnewmember", "Membership.mailstatuschange", "Membership.mailmessage", "Site.notificationMail"], "Root"));
newSet.add(new Skinset("Site.preferences", ["Site.edit", "Site.notification"], "Root"));
newSet.add(new Skinset("Site.user", ["MemberMgr.login", "MemberMgr.register", "MemberMgr.sendpwd", "User.edit", "User.sitelist", "User.subscriptions", "Membership.subscriptionlistitem"], "Root"));
newSet.add(new Skinset("Site.membermgr", ["MemberMgr.main", "MemberMgr.new", "MemberMgr.membergroup", "MemberMgr.searchresult", "MemberMgr.searchresultitem", "Membership.mgrlistitem", "Membership.edit"], "Root"));
newSet.add(new Skinset("Site.user", ["Members.login", "Members.register", "Members.sendpwd", "User.edit", "User.sitelist", "User.subscriptions", "Membership.subscriptionlistitem"], "Root"));
newSet.add(new Skinset("Site.membermgr", ["Members.main", "Members.new", "Members.membergroup", "Members.searchresult", "Members.searchresultitem", "Membership.mgrlistitem", "Membership.edit"], "Root"));
newSet.add(new Skinset("Site.various", ["Site.robots"]));
SKINSETS.push(newSet);

4
code/Global/help.js
View file

@ -302,13 +302,13 @@ HELP.skins.LayoutMgr = {
// M E M B E R M G R
HELP.macros.MemberMgr = {
HELP.macros.Members = {
membership: 0,
subscribelink: 0,
subscriptionslink: 0
};
HELP.skins.MemberMgr = {
HELP.skins.Members = {
login: ["response.action"],
mailnewmember: ["param.creator", "param.account", "param.site", "param.url"],
mailpassword: ["param.text"],

2
code/HopObject/HopObject.js
View file

@ -44,7 +44,7 @@ HopObject.prototype.onRequest = function() {
if (req.postParams.cancel) {
switch (this.constructor) {
case Membership:
case MemberMgr:
case Members:
res.redirect(this._parent.href());
default:
res.redirect(this.href());

48
code/Members/MemberMgr.js → code/Members/Members.js
View file

@ -16,13 +16,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
//
// $Revision$
// $LastChangedBy$
// $LastChangedDate$
// $Revision:3329 $
// $LastChangedBy:piefke3000 $
// $LastChangedDate:2007-09-14 15:18:09 +0200 (Fri, 14 Sep 2007) $
// $URL$
//
MemberMgr.prototype.main_action = function() {
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,
@ -32,7 +32,7 @@ MemberMgr.prototype.main_action = function() {
return;
};
MemberMgr.prototype.register_action = function() {
Members.prototype.register_action = function() {
if (req.postParams.register) {
try {
var user = User.register(req.postParams);
@ -66,7 +66,7 @@ MemberMgr.prototype.register_action = function() {
return;
};
MemberMgr.prototype.login_action = function() {
Members.prototype.login_action = function() {
if (req.postParams.login) {
try {
var user = User.login(req.postParams);
@ -92,7 +92,7 @@ MemberMgr.prototype.login_action = function() {
return;
};
MemberMgr.prototype.logout_action = function() {
Members.prototype.logout_action = function() {
if (session.user) {
res.message = gettext("Good bye, {0}! Lookin' forward to seeing you again!",
session.user.name);
@ -105,7 +105,7 @@ MemberMgr.prototype.logout_action = function() {
return;
};
MemberMgr.prototype.edit_action = function() {
Members.prototype.edit_action = function() {
if (req.postParams.save) {
try {
session.user.update(req.postParams);
@ -124,7 +124,7 @@ MemberMgr.prototype.edit_action = function() {
return;
};
MemberMgr.prototype.salt_js_action = function() {
Members.prototype.salt_js_action = function() {
var user;
if (user = User.getByName(req.params.user)) {
res.write((user.value("salt") || String.EMPTY).toSource());
@ -132,7 +132,7 @@ MemberMgr.prototype.salt_js_action = function() {
return;
};
MemberMgr.prototype.subscribers_action = function() {
Members.prototype.subscribers_action = function() {
res.data.title = gettext("Subscribers of {0}", this._parent.title);
res.data.list = renderList(this.subscribers, "mgrlistitem", 10,
req.data.page);
@ -143,7 +143,7 @@ MemberMgr.prototype.subscribers_action = function() {
return;
};
MemberMgr.prototype.contributors_action = function() {
Members.prototype.contributors_action = function() {
res.data.title = gettext("Contributors of {0}", this._parent.title);
res.data.list = renderList(this.contributors, "mgrlistitem", 10,
req.data.page);
@ -154,7 +154,7 @@ MemberMgr.prototype.contributors_action = function() {
return;
};
MemberMgr.prototype.managers_action = function() {
Members.prototype.managers_action = function() {
res.data.title = gettext("Managers of {0}", this._parent.title);
res.data.list = renderList(this.managers, "mgrlistitem", 10,
req.data.page);
@ -165,7 +165,7 @@ MemberMgr.prototype.managers_action = function() {
return;
};
MemberMgr.prototype.owners_action = function() {
Members.prototype.owners_action = function() {
res.data.title = gettext("Owners of {0}", this._parent.title);
res.data.list = renderList(this.owners, "mgrlistitem", 10,
req.data.page);
@ -176,7 +176,7 @@ MemberMgr.prototype.owners_action = function() {
return;
};
MemberMgr.prototype.updated_action = function() {
Members.prototype.updated_action = function() {
res.data.title = gettext("Updated sites for user {0}", session.user.name);
res.data.list = session.user.renderSkinAsString("sitelist");
res.data.body = session.user.renderSkinAsString("subscriptions");
@ -184,7 +184,7 @@ MemberMgr.prototype.updated_action = function() {
return;
};
MemberMgr.prototype.subscriptions_action = function() {
Members.prototype.subscriptions_action = function() {
res.data.title = gettext("Subscriptions of user {0}", session.user.name);
res.data.list = renderList(session.user.subscriptions, "subscriptionlistitem");
res.data.body = session.user.renderSkinAsString("subscriptions");
@ -192,7 +192,7 @@ MemberMgr.prototype.subscriptions_action = function() {
return;
};
MemberMgr.prototype.memberships_action = function() {
Members.prototype.memberships_action = function() {
res.data.title = gettext("Memberships of user {0}", session.user.name);
res.data.list = renderList(session.user.memberships, "subscriptionlistitem");
res.data.body = session.user.renderSkinAsString("subscriptions");
@ -200,7 +200,7 @@ MemberMgr.prototype.memberships_action = function() {
return;
};
MemberMgr.prototype.add_action = function() {
Members.prototype.add_action = function() {
if (req.postParams.term) {
try {
var result = this.search(req.postParams.term);
@ -251,7 +251,7 @@ MemberMgr.prototype.add_action = function() {
return;
};
MemberMgr.prototype.search = function(searchString) {
Members.prototype.search = function(searchString) {
var mode = "= '";
if (searchString.contains("*")) {
searchString = searchString.replace(/\*/g, "%");
@ -279,7 +279,7 @@ MemberMgr.prototype.search = function(searchString) {
};
};
MemberMgr.prototype.addMembership = function(data) {
Members.prototype.addMembership = function(data) {
var user = root.users.get(data.name);
if (!user) {
throw Error(gettext("Sorry, your input did not match any registered user."));
@ -292,7 +292,7 @@ MemberMgr.prototype.addMembership = function(data) {
};
/* FIXME: obsolete?
MemberMgr.prototype.renderMemberlist = function() {
Members.prototype.renderMemberlist = function() {
var currLvl = null;
res.push();
for (var i=0;i<this.size();i++) {
@ -307,7 +307,7 @@ MemberMgr.prototype.renderMemberlist = function() {
};
*/
MemberMgr.prototype.getPermission = function(action) {
Members.prototype.getPermission = function(action) {
switch (action) {
case ".":
case "main":
@ -328,7 +328,7 @@ MemberMgr.prototype.getPermission = function(action) {
return true;
};
MemberMgr.prototype.modSorua_action = function() {
Members.prototype.modSorua_action = function() {
if (!app.data.modSorua) app.data.modSorua = new Array();
var returnUrl = req.data["sorua-return-url"];
var failUrl = req.data["sorua-fail-url"];
@ -373,7 +373,7 @@ MemberMgr.prototype.modSorua_action = function() {
}
};
MemberMgr.prototype.modSoruaLoginForm_action = function() {
Members.prototype.modSoruaLoginForm_action = function() {
if (!session.data.modSorua || !session.data.modSorua.returnUrl)
res.redirect(root.href()); // should not happen anyways
if (req.data.login) {
@ -390,7 +390,7 @@ MemberMgr.prototype.modSoruaLoginForm_action = function() {
this.renderSkin("modSorua");
};
MemberMgr.getByName = function(name) {
Members.getByName = function(name) {
var site = res.handlers.site;
if (site) {
return site.members.get(name);

2
code/Root/type.properties
View file

@ -30,7 +30,7 @@ _extends = Site
_parent =
manage = mountpoint(SysMgr)
members = mountpoint(MemberMgr)
members = mountpoint(Members)
#layouts = mountpoint(RootLayoutMgr)
blogger = mountpoint(BloggerApi)

2
code/Site/type.properties
View file

@ -36,7 +36,7 @@ modified
properties = mountpoint(Metadata)
properties_source = metadata
members = mountpoint(MemberMgr)
members = mountpoint(Members)
images = mountpoint(ImageMgr)
layouts = mountpoint(LayoutMgr)
files = mountpoint(FileMgr)

2
code/User/User.js
View file

@ -310,7 +310,7 @@ User.getPermission = function(status) {
User.getMembership = function() {
var membership;
if (session.user) {
membership = MemberMgr.getByName(session.user.name);
membership = Members.getByName(session.user.name);
}
return membership || new HopObject;
};

12
compatibility/MemberMgr/MemberMgr.js → compatibility/Members/MemberMgr.js
View file

@ -1,4 +1,4 @@
MemberMgr.prototype.sendpwd_action = function() {
Members.prototype.sendpwd_action = function() {
res.data.title = gettext("Recover your password");
res.data.body = gettext("Due to security reasons user passwords are not " +
"stored in the Antville database any longer. Thus, your password " +
@ -7,23 +7,23 @@ MemberMgr.prototype.sendpwd_action = function() {
return;
};
MemberMgr.prototype.subscribelink_macro = function(param) {
Members.prototype.subscribelink_macro = function(param) {
if (this._parent.online && res.data.memberlevel == null) {
Html.link({href: this._parent.href("subscribe")},
param.text ? param.text : getMessage("MemberMgr.signUp"));
param.text ? param.text : getMessage("Members.signUp"));
}
return;
};
MemberMgr.prototype.subscriptionslink_macro = function(param) {
Members.prototype.subscriptionslink_macro = function(param) {
if (session.user.size()) {
Html.link({href: this.href("updated")},
param.text ? param.text : getMessage("MemberMgr.subscriptions"));
param.text ? param.text : getMessage("Members.subscriptions"));
}
return;
};
MemberMgr.prototype.membership_macro = function(param) {
Members.prototype.membership_macro = function(param) {
res.write(res.handlers.membership.value());
return;
};