hiro/Vulcan
1
0
Fork 0
mirror of https://github.com/vale981/Vulcan synced 2025-03-11 04:56:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/TelescopeJS/Telescope into telescope-master-seo2

Browse source
This commit is contained in:
Charlie DeTar 2014-12-16 09:04:47 -07:00
commit 46b7a3af34
8 changed files with 314 additions and 212 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
.editorconfig Normal file
View file

@ -0,0 +1,24 @@
# editorconfig.org
root = true
[*.js]
# Change these settings to your own preference
indent_style = space
indent_size = 2
# We recommend you to keep these unchanged
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
trim_trailing_whitespace = true
max_line_length = 80
indent_brace_style = 1TBS
spaces_around_operators = true
quote_type = auto
[*.md]
trim_trailing_whitespace = false

4
.meteor/packages
View file

@ -75,7 +75,7 @@ telescope-singleday
telescope-invites telescope-invites
# Accounts Templates # Accounts Templates
useraccounts:unstyled useraccounts:unstyled@1.4.0
telescope-datetimepicker telescope-datetimepicker
tsega:bootstrap3-datetimepicker@3.1.3_1 tsega:bootstrap3-datetimepicker@3.1.3_1

6
.meteor/versions
View file

@ -101,7 +101,7 @@ sacha:spin@2.0.4
service-configuration@1.0.2 service-configuration@1.0.2
session@1.0.4 session@1.0.4
sha@1.0.1 sha@1.0.1
softwarerero:accounts-t9n@1.0.2 softwarerero:accounts-t9n@1.0.4
spacebars-compiler@1.0.3 spacebars-compiler@1.0.3
spacebars@1.0.3 spacebars@1.0.3
spiderable@1.0.5 spiderable@1.0.5
@ -137,7 +137,7 @@ twitter@1.1.2
ui@1.0.4 ui@1.0.4
underscore@1.0.1 underscore@1.0.1
url@1.0.2 url@1.0.2
useraccounts:core@1.3.2 useraccounts:core@1.4.0
useraccounts:unstyled@1.3.2 useraccounts:unstyled@1.4.0
webapp-hashing@1.0.1 webapp-hashing@1.0.1
webapp@1.1.4 webapp@1.1.4

8
client/views/users/account/user_account.html
View file

@ -38,19 +38,19 @@
<div class="controls"><textarea name="bio" type="text">{{profile.bio}}</textarea></div> <div class="controls"><textarea name="bio" type="text">{{profile.bio}}</textarea></div>
</div> </div>
<div class="control-group"> <div class="control-group">
<label>Twitter Username</label> <label>{{_ "twitter_username"}}</label>
<div class="controls"> <div class="controls">
<input name="twitter" type="text" value="{{getTwitter}}" /> <input name="twitter" type="text" value="{{getTwitter}}" />
</div> </div>
</div> </div>
<div class="control-group"> <div class="control-group">
<label>GitHub Username</label> <label>{{_ "github_username"}}</label>
<div class="controls"> <div class="controls">
<input name="github" type="text" value="{{getGitHub}}" /> <input name="github" type="text" value="{{getGitHub}}" />
</div> </div>
</div> </div>
<div class="control-group"> <div class="control-group">
<label>Site</label> <label>{{_ "site_url"}}</label>
<div class="controls"> <div class="controls">
<input name="site" type="text" value="{{profile.site}}" /> <input name="site" type="text" value="{{profile.site}}" />
</div> </div>
@ -71,7 +71,7 @@
<div class="controls"> <div class="controls">
{{#if isAdmin}} {{#if isAdmin}}
<label class="checkbox"> <label class="checkbox">
<input id="notifications_users" type="checkbox" name="notifications_users" {{hasNotificationsUsers}} /> New Users <input id="notifications_users" type="checkbox" name="notifications_users" {{hasNotificationsUsers}} /> {{_ "new_users"}}
</label> </label>
{{/if}} {{/if}}
<label class="checkbox"> <label class="checkbox">

6
i18n/en.i18n.json
View file

@ -162,18 +162,22 @@
"point": "point", "point": "point",
"points": "points", "points": "points",
//User //User /client/views/users/account/user_account.html
"please_complete_your_profile_below_before_continuing": "Please complete your profile below before continuing.", "please_complete_your_profile_below_before_continuing": "Please complete your profile below before continuing.",
"account": "Account", "account": "Account",
"username": "Username", "username": "Username",
"display_name": "Display Name", "display_name": "Display Name",
"email": "Email", "email": "Email",
"bio": "Bio", "bio": "Bio",
"twitter_username": "Twitter Username",
"github_username": "GitHub Username",
"site_url" : "Site URL",
"password": "Password", "password": "Password",
"change_password": "Change Password?", "change_password": "Change Password?",
"old_password": "Old Password", "old_password": "Old Password",
"new_password": "New Password", "new_password": "New Password",
"email_notifications": "Email Notifications", "email_notifications": "Email Notifications",
"new_users" : "New users",
"new_posts": "New Posts", "new_posts": "New Posts",
"comments_on_my_posts": "Comments on my posts", "comments_on_my_posts": "Comments on my posts",
"replies_to_my_comments": "Replies to my comments", "replies_to_my_comments": "Replies to my comments",

377
i18n/ru.i18n.json
View file

@ -8,9 +8,9 @@
"digest": "Дайджест", "digest": "Дайджест",
"users": "Пользователи", "users": "Пользователи",
"settings": "Настройки", "settings": "Настройки",
"admin": "Админ", "admin": "Админка",
"post": "Пост", "post": "Пост",
"toolbox": "Toolbox", "toolbox": "Инструменты",
"sign_up_sign_in": "Вход/Регистрация", "sign_up_sign_in": "Вход/Регистрация",
"my_account": "Мой аккаунт", "my_account": "Мой аккаунт",
"view_profile": "Просмотр профиля", "view_profile": "Просмотр профиля",
@ -19,191 +19,268 @@
//Main //Main
"new_posts": "Новые посты", "new_posts": "Новые посты",
//Commments // Settings Schema
"your_comment_has_been_deleted": "Ваш комментарий удален.", "title": "Название",
"siteUrl": "URL сайта",
"tagline": "Теги",
"requireViewInvite": "Требуется инвайт для Вида",
"requirePostInvite": "Требуется инвайт для поста",
"requirePostsApproval": "Нужно утвердить посты",
"defaultEmail": "Email по-умолчанию",
"scoreUpdateInterval": "Интервал обновления очков",
"defaultView": "Вид по-умолчанию",
"postInterval": "Интервал между постами",
"commentInterval": "Интервал между комментариями",
"maxPostsPerDay": "Максимум постов за день",
"startInvitesCount": "Приглашает к старту счёта",
"postsPerPage": "Постов на странице",
"logoUrl": "URL лого",
"logoHeight": "Высота лого",
"logoWidth": "Ширина лого",
"language": "Язык",
"backgroundCSS": "CSS фона",
"buttonColor": "Цвет кнопок",
"buttonTextColor": "Цвет текста кнопок",
"headerColor": "Цвет заголовка",
"headerTextColor": "Цвет текста заголовка",
"twitterAccount": "Twitter аккаунт",
"googleAnalyticsId": "Google Analytics ID",
"mixpanelId": "Mixpanel ID",
"clickyId": "Clicky ID",
"footerCode": "Код футера",
"extraCode": "Дополнительный код",
"emailFooter": "Email футер",
"notes": "Замечания",
"debug": "Режим отладки",
// Settings Fieldsets
"general": "Главная",
"invites": "Инвайты",
"email": "Email",
"scoring": "Очки",
"posts": "Посты",
"comments": "Комментарии",
"logo": "Лого",
"extras": "Дополнения",
"colors": "Цвета",
"integrations": "Интеграции",
// Settings Help Text
// Post Schema
"createdAt": "Создан",
"postedAt": "Опубликован",
"url": "URL",
"title": "название",
"body": "Body",
"htmlBody": "HTML Body",
"viewCount": "Просмотров",
"commentCount": "Комментариве",
"commenters": "Комментаторов",
"lastCommentedAt": "Последний комментарий",
"clickCount": "Кликов",
"baseScore": "Базовый счёт",
"upvotes": "Голосов За",
"upvoters": "Поддержали",
"downvotes": "Голосов Против",
"downvoters": "Выступили против",
"score": "Счёт",
"status": "Статус",
"sticky": "Прилепило",
"inactive": "Неактивно",
"author": "Автор",
"userId": "Пользователь",
//Comments
"your_comment_has_been_deleted": "Ваш комментарий удалили.",
"comment_": "Комментарий", "comment_": "Комментарий",
"delete_comment": "Удалить комментарий", "delete_comment": "Удалить комментарий",
"add_comment": "Добавить комментарий", "add_comment": "Добавить комментарий",
"upvote": "за", "upvote": "за",
"downvote": "против", "downvote": "против",
"link": "ссылка", "link": "ссылка",
"edit": "Редактирование", "edit": "Редактировать",
"reply": "Ответить", "reply": "Ответить",
"no_comments": "Нет комментариев.", "no_comments": "Без комментариев.",
//Errors //Errors
"you_are_already_logged_in": "You are already logged in", "you_are_already_logged_in": "Вы уже вошли",
"sorry_this_is_a_private_site_please_sign_up_first": "Sorry, this is a private site. Please sign up first.", "sorry_this_is_a_private_site_please_sign_up_first": "Извините, это частный сайт. Вначале зарегистрируйтесь.",
"thanks_for_signing_up": "Thanks for signing up!", "thanks_for_signing_up": "Thanks for signing up!",
"the_site_is_currently_invite_only_but_we_will_let_you_know_as_soon_as_a_spot_opens_up": "The site is currently invite-only, but we will let you know as soon as a spot opens up.", "the_site_is_currently_invite_only_but_we_will_let_you_know_as_soon_as_a_spot_opens_up": "Сайт пока что только по инвайтам, но мы вам сообщим, если будет открыта регистрация.",
"sorry_you_dont_have_the_rights_to_view_this_page": "Sorry, you don't have the rights to view this page.", "sorry_you_dont_have_the_rights_to_view_this_page": "Извините, но у вас нет прав для просмотра страницы.",
"not_found": "Not Found!", "not_found": "Not Found!",
"were_sorry_whatever_you_were_looking_for_isnt_here": "We're sorry; whatever you were looking for isn't here..", "were_sorry_whatever_you_were_looking_for_isnt_here": "Извините, но что бы вы не искали, этого тут нет..",
//Notifications //Notifications
"no_notifications": "No notifications", "no_notifications": "Оповещений нет",
"1_notification": "1 notification", "1_notification": "1 оповещение",
"notifications": "notifications", "notifications": "оповещения",
"mark_all_as_read": "Mark all as read", "mark_all_as_read": "Отметить всё прочитанным",
// Post deleted // Post deleted
"your_post_has_been_deleted": "Your post has been deleted.", "your_post_has_been_deleted": "Ваш пост удалён.",
// Post submit & edit // Post submit & edit
"created": "Создан", "created": "Создан",
"title": "Заголовок", "title": "Заголовок",
"suggest_title": "Suggest title", "suggest_title": "Предложите название",
"url": "URL", "url": "URL",
"short_url": "Short URL", "short_url": "Короткий URL",
"body": "Тело", "body": "Body",
"category": "Категория", "category": "Категория",
"inactive_": "Inactive?", "inactive_": "Сделать неактивным?",
"sticky_": "Sticky?", "sticky_": "С закладкой?",
"submission_date": "Submission Date", "submission_date": "Дата отправки на утверждение",
"submission_time": "Submission Time", "submission_time": "Время отправки на утверждение",
"date": "Дата", "date": "Дата",
"submission": "Submission", "submission": "Утверждение",
"note_this_post_is_still_pending_so_it_has_no_submission_timestamp_yet": "Note: this post is still pending so it has no submission timestamp yet.", "note_this_post_is_still_pending_so_it_has_no_submission_timestamp_yet": "Заметка: этот пост находится на рассмотрении, поэтому время утверждения не указано.",
"user": "Пользователь", "user": "Пользователь",
"status_": "Статус", "status_": "Статус",
"approved": "Подтверждено", "approved": "Утверждён",
"rejected": "Отклонено", "rejected": "Отклонён",
"delete_post": "Удалить пост", "delete_post": "Удалить пост",
"thanks_your_post_is_awaiting_approval": "Thanks, your post is awaiting approval.", "thanks_your_post_is_awaiting_approval": "Спасибо, пост ожидает утверждения.",
"sorry_couldnt_find_a_title": "Sorry, couldn't find a title...", "sorry_couldnt_find_a_title": "Извините, не смог найти название...",
"please_fill_in_an_url_first": "Please fill in an URL first!", "please_fill_in_an_url_first": "Вначале укажите URL!",
// Post item // Post item
"share": "Share", "share": "Поделится",
"discuss": "Discuss", "discuss": "Обсудить",
"upvote_": "Upvote", "upvote_": "Проголосовать за",
"sticky": "Sticky", "sticky": "В закладки",
"status": "status", "status": "статус",
"votes": "votes", "votes": "голосов",
"basescore": "baseScore", "basescore": "базовые очки",
"score": "score", "score": "очки",
"clicks": "clicks", "clicks": "кликов",
"views": "views", "views": "просмотров",
"inactive": "inactive", "inactive": "неактивно",
"comment": "comment", "comment": "комментарий",
"comments": "comments", "comments": "комментариев",
"point": "point", "point": "бал",
"points": "points", "points": "баллов",
//User //User /client/views/users/account/user_account.html
"please_complete_your_profile_below_before_continuing": "Please complete your profile below before continuing.", "please_complete_your_profile_below_before_continuing": "Заполните ваш профиль перед тем, как продолжить.",
"account": "Account", "account": "Аккаунт",
"username": "Username", "username": "Имя пользователя",
"display_name": "Display Name", "display_name": "Показать имя",
"email": "Email", "email": "Email",
"bio": "Bio", "bio": "Обо мне",
"password": "Password", "twitter_username": "Имя в Twitter",
"change_password": "Change Password?", "github_username": "Имя в GitHub",
"old_password": "Old Password", "site_url": "URL сайта",
"new_password": "New Password", "password": "Пароль",
"email_notifications": "Email Notifications", "change_password": "Сменить пароль?",
"new_posts": "New Posts", "old_password": "Старый пароль",
"comments_on_my_posts": "Comments on my posts", "new_password": "Новый пароль",
"replies_to_my_comments": "Replies to my comments", "email_notifications": "Email оповещение",
"forgot_password": "Forgot password?", "new_users": "Новые пользователи",
"profile_updated": "Profile updated", "new_posts": "Новые посты",
"please_fill_in_your_email_below_to_finish_signing_up": "Please fill in your email below to finish signing up.", "comments_on_my_posts": "Комментариев под моими постами",
"invite": "Invite", "replies_to_my_comments": "Ответов на мои комментарии",
"uninvite": "Uninvite", "forgot_password": "Забыли пароль?",
"make_admin": "Make admin", "profile_updated": "Профиль обновлён",
"unadmin": "Unadmin", "please_fill_in_your_email_below_to_finish_signing_up": "Пожалуйста, укажите ваш email ниже для окончания регистрации.",
"delete_user": "Delete User", "invite": "Инвайт",
"are_you_sure_you_want_to_delete": "Are you sure you want to delete ", "uninvite": "Отменить инвайт",
"reset_password": "Reset Password", "make_admin": "Сделать админом",
"password_reset_link_sent": "Password reset link sent!", "unadmin": "Отметить админа",
"name": "Name", "delete_user": "Удалить пользователя",
"posts": "Posts", "are_you_sure_you_want_to_delete": "Уверены, что хотите удалить ",
"comments_": "Comments", "reset_password": "Сбросить пароль",
"karma": "Karma", "password_reset_link_sent": "Ссылка для сброса пароля отправлена!",
"is_invited": "Is Invited?", "name": "Имя",
"is_admin": "Is Admin?", "posts": "Посты",
"delete": "Delete", "comments_": "Комментарии",
"member_since": "Member since", "karma": "Карма",
"edit_profile": "Edit profile", "is_invited": "Приглашён?",
"sign_in": "Sign In", "is_admin": "Админ?",
"sign_in_": "Sign in!", "delete": "Удалить",
"sign_up_": "Sign up!", "member_since": "Является членом с",
"dont_have_an_account": "Don't have an account?", "edit_profile": "Редактировать профиль",
"already_have_an_account": "Already have an account?", "sign_in": "Войти",
"sign_up": "Sign Up", "sign_in_": "Войти!",
"please_fill_in_all_fields": "Please fill in all fields", "sign_up_": "Зарегистрироваться!",
"invite_": "Invite ", "dont_have_an_account": "Нет аккаунта?",
"left": " left", "already_have_an_account": "Уже есть аккаунт?",
"invite_none_left": "Invite (none left)", "sign_up": "Зарегистрироваться",
"all": "All", "please_fill_in_all_fields": "Заполните все поля",
"invited": "Invited", "invite_": "Пригласить ",
"uninvited": "Uninvited", "left": " покинул(а)",
"filter_by": "Filter by", "invite_none_left": "Пригласить (не осталось)",
"sort_by": "Sort by", "all": "Все",
"invited": "Приглашённые",
"uninvited": "Неприглашённые",
"filter_by": "Фильтровать по",
"sort_by": "Сортировать по",
//helpers //helpers
"sorry_you_do_not_have_access_to_this_page": "Sorry, you do not have access to this page", "sorry_you_do_not_have_access_to_this_page": "Извините, у вас нет доступа к этой странице",
"please_sign_in_first": "Please Sign In First.", "please_sign_in_first": "Вначале войдите.",
"sorry_you_have_to_be_an_admin_to_view_this_page": "Sorry, you have to be an admin to view this page.", "sorry_you_have_to_be_an_admin_to_view_this_page": "Извините, вы должны быть админом для просмотра этой страницы.",
"sorry_you_dont_have_permissions_to_add_new_items": "Sorry, you don't have permissions to add new items.", "sorry_you_dont_have_permissions_to_add_new_items": "Извините, у вас нет прав для добавления новых элементов.",
"sorry_you_cannot_edit_this_post": "Sorry, you cannot edit this post.", "sorry_you_cannot_edit_this_post": "Извините, вы не можете редактировать этот пост.",
"sorry_you_cannot_edit_this_comment": "Sorry, you cannot edit this comment.", "sorry_you_cannot_edit_this_comment": "Извините, вы не можете редактировать это.",
//Collections //Collections
"you_need_to_login_and_be_an_admin_to_add_a_new_category": "You need to login and be an admin to add a new category.", "you_need_to_login_and_be_an_admin_to_add_a_new_category": "Вам нужно войти и быть админом для создания новой категории.",
"you_need_to_login_or_be_invited_to_post_new_comments": "You need to login or be invited to post new comments.", "you_need_to_login_or_be_invited_to_post_new_comments": "Вам нужно войти или быть приглашённым для комментирования.",
"please_wait": "Please wait ", "please_wait": "Пожалуйста подождите ",
"seconds_before_commenting_again": " seconds before commenting again", "seconds_before_commenting_again": " секунд перед новым комментарием",
"your_comment_is_empty": "Your comment is empty.", "your_comment_is_empty": "Ваш комментарий пуст.",
"you_dont_have_permission_to_delete_this_comment": "You don't have permission to delete this comment.", "you_dont_have_permission_to_delete_this_comment": "У вас нет прав для удаления этого комментария.",
"you_need_to_login_or_be_invited_to_post_new_stories": "You need to login or be invited to post new stories.", "you_need_to_login_or_be_invited_to_post_new_stories": "Вам нужно войти или быть приглашённым, чтобы публиковать новые истории.",
"please_fill_in_a_headline": "Please fill in a headline", "please_fill_in_a_headline": "Заполните заголовок",
"this_link_has_already_been_posted": "This link has already been posted", "this_link_has_already_been_posted": "Эта ссылка уже была опубликована",
"sorry_you_cannot_submit_more_than": "Sorry, you cannot submit more than ", "sorry_you_cannot_submit_more_than": "Извините, вы не можете отправлять больше, чем ",
"posts_per_day": " posts per day", "posts_per_day": " постов за день",
"someone_replied_to_your_comment_on": "Someone replied to your comment on", "someone_replied_to_your_comment_on": "Кто-то ответил на ваш комментарий",
"has_replied_to_your_comment_on": " has replied to your comment on", "has_replied_to_your_comment_on": " ответил(а) на ваш комментарий по",
"read_more": "Read more", "read_more": "Подробнее",
"a_new_comment_on_your_post": "A new comment on your post", "a_new_comment_on_your_post": "Новый комментарий по вашему посту",
"you_have_a_new_comment_by": "You have a new comment by ", "you_have_a_new_comment_by": "У вас есть новый комментарий от ",
"on_your_post": " on your post", "on_your_post": " по вашему посту",
"has_created_a_new_post": " has created a new post", "has_created_a_new_post": " создал новый пост",
"your_account_has_been_approved": "Your account has been approved.", "your_account_has_been_approved": "Ваш аккаунт утвердили.",
"welcome_to": "Welcome to ", "welcome_to": "Добро пожаловать ",
"start_posting": "Start posting.", "start_posting": "Начать пост.",
// Translation needed (found during migration to tap:i18n) // Translation needed (found during migration to tap:i18n)
"please_fill_in_a_title": "Please fill in a title", "please_fill_in_a_title": "Заполните заголовок",
"seconds_before_posting_again": " seconds before posting again", "seconds_before_posting_again": " секунд перед новым постом",
"upvoted": "Upvoted", "upvoted": "За",
"posted_date": "Posted Date", "posted_date": "Дата поста",
"posted_time": "Posted Time", "posted_time": "Время поста",
"posted_date": "Posted Date", "posted_date": "Дата поста",
"posted_time": "Posted Time", "posted_time": "Время поста",
"profile": "Profile", "profile": "Профиль",
"sign_out": "Sign Out", "sign_out": "Выйти",
"invitedcount": "InvitedCount", "you_ve_been_signed_out": "Вы вышли. Возвращайтесь снова!",
"invites": "Invites", "invitedcount": "Подсчёт инвайтов",
"invited": "Invited?", "invites": "Инвайты",
"admin": "Admin", "invited": "Приглашены?",
"actions": "Actions", "admin": "Админ",
"invites_left": "invites left", "actions": "Действия",
"id": "ID", "invites_left": "осталось инвайтов",
"name": "Name:", "id": "ИД",
"bio": "Bio:", "name": "Имя:",
"bio": "Обо мне:",
"github": "GitHub", "github": "GitHub",
"site": "Site", "site": "Сайт",
"upvoted_posts": "Upvoted Posts", "upvoted_posts": "Постов За",
"downvoted_posts": "Downvoted Posts", "downvoted_posts": "Постов Против",
"mark_as_read": "Mark as read", "mark_as_read": "Отметить прочитанным",
//Common //Common
"pending": "В ожидании", "pending": "Ожидает",
"loading": "Загрузка...", "loading": "Загружается...",
"submit": "Отправить", "submit": "Отправить",
"you_must_be_logged_in": "You must be logged in.", "you_must_be_logged_in": "Вы должны залогиниться.",
"are_you_sure": "Вы уверены?", "are_you_sure": "Уверены?",
"please_log_in_first": "Please log in first", "please_log_in_first": "Войдите вначале",
"sign_in_sign_up_with_twitter": "Sign In/Sign Up with Twitter", "sign_in_sign_up_with_twitter": "Войти/зарегистрироваться с помощью Twitter",
"load_more": "Загрузить еще" "load_more": "Загрузить ещё"
} }

45
lib/config/at_config.js
View file

@ -5,9 +5,9 @@
//Fields //Fields
AccountsTemplates.addField({ AccountsTemplates.addField({
_id: "username", _id: 'username',
type: "text", type: 'text',
displayName: "username", displayName: 'username',
required: true, required: true,
minLength: 3, minLength: 3,
errStr: 'error.minChar' errStr: 'error.minChar'
@ -35,22 +35,22 @@ AccountsTemplates.addField({
/* /*
AccountsTemplates.addField({ AccountsTemplates.addField({
_id: "username_and_email", _id: 'username_and_email',
type: "text", type: 'text',
displayName: "Name or Email", displayName: 'Name or Email',
placeholder: "name or email", placeholder: 'name or email',
}); });
*/ */
//Routes //Routes
AccountsTemplates.configureRoute("signIn"); AccountsTemplates.configureRoute('signIn');
AccountsTemplates.configureRoute("signUp"); AccountsTemplates.configureRoute('signUp');
AccountsTemplates.configureRoute("forgotPwd"); AccountsTemplates.configureRoute('forgotPwd');
AccountsTemplates.configureRoute("resetPwd"); AccountsTemplates.configureRoute('resetPwd');
//AccountsTemplates.configureRoute("changePwd"); //AccountsTemplates.configureRoute('changePwd');
//AccountsTemplates.configureRoute("enrollAccount"); //AccountsTemplates.configureRoute('enrollAccount');
//AccountsTemplates.configureRoute("verifyEmail"); //AccountsTemplates.configureRoute('verifyEmail');
// Options // Options
@ -64,14 +64,11 @@ AccountsTemplates.configure({
positiveFeedback: false, positiveFeedback: false,
negativeValidation: true, negativeValidation: true,
positiveValidation: true positiveValidation: true
/*
sendVerificationEmail: true,
continuousValidation: false,
showLabels: true,
forbidClientAccountCreation: false,
formValidationFeedback: true,
homeRoutePath: "/",
showAddRemoveServices: false,
showPlaceholders: true,
*/
}); });
// hack to get signOut route not considered among previous paths
if (Meteor.isClient) {
Meteor.startup(function(){
AccountsTemplates.knownRoutes.push('/sign-out');
});
}

10
lib/vote.js
View file

@ -49,7 +49,7 @@
cancelDownvote(collection, item, user); cancelDownvote(collection, item, user);
// Votes & Score // Votes & Score
var result = collection.update({_id: item && item._id, upvoters: {$not: {$in: [user._id]}}},{ var result = collection.update({_id: item && item._id, upvoters: { $ne: user._id }},{
$addToSet: {upvoters: user._id}, $addToSet: {upvoters: user._id},
$inc: {upvotes: 1, baseScore: votePower}, $inc: {upvotes: 1, baseScore: votePower},
$set: {inactive: false} $set: {inactive: false}
@ -100,7 +100,7 @@
cancelUpvote(collection, item, user); cancelUpvote(collection, item, user);
// Votes & Score // Votes & Score
var result = collection.update({_id: item && item._id, downvoters: {$not: {$in: [user._id]}}},{ var result = collection.update({_id: item && item._id, downvoters: { $ne: user._id }},{
$addToSet: {downvoters: user._id}, $addToSet: {downvoters: user._id},
$inc: {downvotes: 1, baseScore: -votePower}, $inc: {downvotes: 1, baseScore: -votePower},
$set: {inactive: false} $set: {inactive: false}
@ -128,7 +128,7 @@
}; };
var cancelUpvote = function (collection, item) { var cancelUpvote = function (collection, item) {
var user = Meteor.user(); var user = Meteor.user(),
votePower = getVotePower(user), votePower = getVotePower(user),
collectionName = collection._name.slice(0,1).toUpperCase()+collection._name.slice(1); collectionName = collection._name.slice(0,1).toUpperCase()+collection._name.slice(1);
@ -137,7 +137,7 @@
return false; return false;
// Votes & Score // Votes & Score
var result = collection.update({_id: item && item._id, upvoters: { $in: [user._id]}},{ var result = collection.update({_id: item && item._id, upvoters: user._id},{
$pull: {upvoters: user._id}, $pull: {upvoters: user._id},
$inc: {upvotes: -1, baseScore: -votePower}, $inc: {upvotes: -1, baseScore: -votePower},
$set: {inactive: false} $set: {inactive: false}
@ -169,7 +169,7 @@
return false; return false;
// Votes & Score // Votes & Score
var result = collection.update({_id: item && item._id, downvoters: {$in: [user._id]}},{ var result = collection.update({_id: item && item._id, downvoters: user._id},{
$pull: {downvoters: user._id}, $pull: {downvoters: user._id},
$inc: {downvotes: 1, baseScore: votePower}, $inc: {downvotes: 1, baseScore: votePower},
$set: {inactive: false} $set: {inactive: false}