rad_users 0.0.1 → 0.0.2

data/app/static/themes/default/users.less

@@ -0,0 +1,4 @@
+@import "../../../../../common_interface/app/static/themes/default/style";
+
+.the_user       {.s_box; .s_round;
+  .l_properties {}}

data/app/views/controllers/identities/enter_email_form.html.haml

@@ -0,0 +1,6 @@
+= b.title t(:new_user_title)
+- b.narrow do
+  - b.form_for :token, @token, action: url_for(:enter_email) do |f|
+    = f.text_field :email, required: true, description: t(:signup_email_description)
+    = f.line
+    = f.line f.submit(t(:ok)), link_to(t(:cancel), :back)

data/app/views/controllers/identities/finish_email_registration_form.html.haml

@@ -0,0 +1,23 @@
+= b.title t(:new_user_title)
+- b.narrow do
+  - b.form_for :user, @user, action: finish_email_registration_identities_path do |f|
+    = f.hidden_field_tag :token, @token.token
+
+    = f.text_field :name, required: true, description: t(:choose_name_description)
+    = f.password_field :password, required: true
+    = f.password_field :password_confirmation, required: true
+
+    = f.line
+    = f.line f.submit(t(:ok)), link_to(t(:cancel), :back)
+
+    / - b.form_for @user, url: {action: (@user.new_record? ? 'create' : 'update')} do |f|
+    /   = f.error_messages
+    /
+    /   = f.text_field :name, required: true, label: t(:username)
+    /   = f.text_field :email, required: true
+    /   = f.password_field :password, required: true
+    /   = f.password_field :password_confirmation, required: true
+    /
+    /   = f.line
+    /
+    /   = f.line f.submit(t(:ok)), link_to(t(:cancel), :back)

data/app/views/controllers/identities/finish_open_id_registration_form.html.haml

@@ -0,0 +1,12 @@
+= b.title t(:choose_name)
+- b.narrow do
+  / - p persist_params?
+  / - p params
+  - b.form_for :user, @user, action: finish_open_id_registration_identities_path do |f|
+    = f.error_messages
+
+    = f.hidden_field_tag :token, @token.token
+
+    = f.text_field :name, required: true, description: t(:choose_name_description)
+
+    = f.line f.submit(t(:ok)), link_to(t(:cancel), :back)

data/app/views/controllers/identities/forgot_password_form.html.haml

@@ -0,0 +1,6 @@
+= b.title t(:forgot_password)
+- b.narrow do
+  - b.form_tag action: forgot_password_identities_path do |f|
+    = f.text_field_tag :email, @email, required: true, label: t(:email), description: t(:forgot_password_hint)
+
+    = f.line f.submit_tag(t(:ok)), link_to(t(:cancel), :back)

data/app/views/controllers/identities/reset_password_form.html.haml

@@ -0,0 +1,9 @@
+= b.title t(:reset_password)
+- b.narrow do
+  - b.form_for :user, @user, action: reset_password_identities_path do |f|
+    = f.hidden_field_tag :token, @token.token
+
+    = f.password_field :password, required: true, label: t(:new_password)
+    = f.password_field :password_confirmation, required: true #, label: t(:password_confirmation)
+
+    = f.line f.submit(t(:ok)), link_to(t(:cancel), :back)

data/app/views/controllers/identities/update_password_form.html.haml

@@ -0,0 +1,11 @@
+= b.title t(:edit_password_title)
+- b.narrow do
+  - b.form_for :user, @user, action: update_password_identities_path do |f|
+    = f.error_messages
+
+    = f.password_field_tag :old_password, '', label: t(:old_password), required: true
+
+    = f.password_field :password, required: true, label: t(:password)
+    = f.password_field :password_confirmation, required: true, label: t(:password_confirmation)
+
+    = f.line f.submit(t(:ok)), link_to(t(:cancel), :back)

data/app/views/controllers/profiles/_form.html.haml

@@ -0,0 +1,15 @@
+- b.form_for :user, @user, action: form_action, enctype: "multipart/form-data" do |f|
+  = f.error_messages
+
+  = f.text_field :first_name
+  = f.text_field :last_name
+
+  - if @user.avatar.blank?
+    = f.file_field :avatar
+  - else
+    - img = image_tag(Models::User.avatar_url(@user.name), style: 'max-width: 150px; max-height: 150px;')
+    = f.file_field :avatar, label: "#{t(:avatar)}#{"<br/>" + img}"
+
+  = f.line
+
+  = f.line ok_button, cancel_button

data/app/views/controllers/profiles/_roles.html.haml

@@ -0,0 +1,6 @@
+- unless @user.anonymous?
+  #user_roles
+    / = b.subtitle t(:roles)
+    - b.basic_list do
+      - roles_control_links_for(@user).each do |text|
+        = b.basic_list_item text

data/app/views/controllers/profiles/_user.html.haml

@@ -0,0 +1,24 @@
+- b.user id: @user.dom_id do |o|
+  - o.title @user.name
+
+  - o.controls do |a|
+    - a.add link_to(t(:edit), edit_profile_path(@user, format: :js)) if can?(:update_profile, @user) or (@user.anonymous? and user.roles.admin?)
+
+  - o.avatar image_tag(Models::User.avatar_url(@user.name))
+
+  - o.properties do
+    - b.basic_list do
+      = b.basic_list_item h("#{@user.first_name} #{@user.last_name}")
+
+    - b.text do
+      .todo= link_to(t(:update_password), update_password_form_identities_path) if owner? @user
+
+    .todo about
+
+    = render 'roles'
+
+  - o.content do
+    .todo
+      - b.basic_list do
+        = b.basic_list_item 'Latest Activity ...'
+        = b.basic_list_item 'Public Items ...'

data/app/views/controllers/profiles/actions.js.haml

@@ -0,0 +1,12 @@
+- case action_name
+
+- when :edit
+  - form = js render('form', locals: {form_action: update_profile_path(@user, format: :js)});
+  rad.dialog().show('#{form}');
+
+- when :update
+  - html = js render('user');
+  $('{@user.dom_id}').replaceWith("#{html}");
+
+- else
+  - must_be.never_called

data/app/views/controllers/profiles/all.html.haml

@@ -0,0 +1,3 @@
+- b.text do
+  - @users.each do |user|
+    = link_to user.name, user_path(user)

data/app/views/controllers/profiles/show.html.haml

@@ -0,0 +1 @@
+= render 'user'

data/app/views/controllers/sessions/_open_id_form.html.haml

@@ -0,0 +1,16 @@
+- content_for :head do
+  = stylesheet_link_tag *merged_stylesheets(:open_id)
+
+- content_for :bottom do
+  = javascript_include_tag *merged_javascripts(:open_id)
+  - javascript_tag do
+    $(function() {openid.init('openid_identifier')});
+  / openid.setDemoMode(true);
+
+- form_tag(action: login_path, id: "openid_form") do
+  #openid_choice
+    #openid_btns
+
+  #openid_input_area
+    %input{id: "openid_identifier", name: "openid_identifier", type: "text", value: "http://"}
+    %input{id: "openid_submit", type: "submit", value: "Sign-In"}

data/app/views/controllers/sessions/_password_form.html.haml

@@ -0,0 +1,13 @@
+- b.form_tag action: login_path do |f|
+  = f.error_messages @errors
+
+  = f.text_field_tag :name, @name, required: true, label: t(:username)
+  = f.password_field_tag :password, "", required: true, label: t(:password)
+
+  = f.line
+
+  = f.line ok_button, cancel_button
+
+  = f.line
+
+  = f.line link_to(t(:register_link), signup_path), link_to(t(:forgot_password_link), forgot_password_form_identities_path)

data/app/views/controllers/sessions/login.html.haml

@@ -0,0 +1,8 @@
+= b.title t(:login_title)
+- b.narrow do
+  = render 'password_form'
+
+/ - b.more name: t(:login_using_open_id), id: :open_id do
+/ = b.title t(:login_using_open_id)
+/ - b.narrow do
+/   = render 'open_id_form'

data/app/views/controllers/sessions/status.html.haml

@@ -0,0 +1 @@
+= "Hello, #{Models::User.current.name}."

data/app/views/themes/default/user.html.haml

@@ -0,0 +1,8 @@
+- tag :div, object.merge_html_attributes(class: " the_user") do
+  - if object.controls?
+    .l_controls= object.controls.join(' ')
+
+  .l_name= object.name
+  .l_avatar= object.avatar
+  .l_properties= object.properties
+  .l_content= object.content

data/app/views/users/_menu.html.haml

@@ -0,0 +1,6 @@
+/ TODO3 remove or refactor it
+- unless (menu = main_menu).blank?
+  - b.navigation do |o|
+    - o.items do |a|
+      - menu.each do |name, link, active|
+        = a.add content: link_to(name, link), active: active

data/app/views/users/layout.html.haml

@@ -0,0 +1,10 @@
+- content_for :nothing do
+  - content_for :css do
+    = stylesheet_link_tag '/themes/default/users.css'
+
+  - content_for :top_panel,    render('/kit/top_panel')
+  - content_for :navigation,   render('/users/menu')
+  - content_for :bottom_panel, render('/kit/bottom_panel')
+
+  - @build_layout = false
+= render '/kit/layout'

data/app/views/users/layout.js.haml

@@ -0,0 +1 @@
+= render '/kit/layout'

data/config/locales/en.yml

@@ -0,0 +1,103 @@
+en:
+  # General
+  anonymous: "Welcome, Guest"
+  are_you_shure: "Are you sure?"
+  avatar: "Avatar"
+  domains: "Domains"
+  email: "eMail"
+  home: "Home"
+  login: "Login"
+  login_not_required: "You are already logged in"
+  login_required: "You need to be logged in"
+  logout: "Logout"
+  name: "Name"
+  password: "Password"
+  show_more: "..."
+  signup: "Signup"
+  state: "State"
+  username: "Username"
+  users: "Users"
+
+  # User model
+  bad_email_message: "Invalid email"
+  bad_login_message: "Invalid login (use only 0-9, a-z, and .-_@ symbols)"
+  first_name: "First Name"
+  last_name: "Last Name"
+  password_confirmation: "Password confirmation"
+
+  # Space model
+  forbiden_to_change_default_space: "Forbidden to change default Space"
+
+  # Wigets
+  callback_error: "Service Mix callback error!"
+  callback_error_not_specified: "Callback error not defined!"
+
+  # Authorization
+  admin: "Admin"
+  add_admin_role: "Add to Admins"
+  add_custom_role: "Grant '%{role}' role"
+  add_manager_role: "Add to Managers"
+  add_member_role: "Add to Members"
+  custom_role: "%{role}"
+  manager: "Manager"
+  member: "Member"
+  remove_admin_role: "Remove from Admins"
+  remove_custom_role: "Remove '%{role}' role"
+  remove_manager_role: "Remove from Managers"
+  remove_member_role: "Remove from Members"
+  role_granted: "Role granted"
+  role_removed: "Role removed"
+  invalid_roles: "Invalid roles"
+
+  # Authentication
+  choose_name: "Choose username"
+  choose_name_description: "Choose username (can't be changed in future)"
+  edit_password_title: "Update password"
+  email_verification_code_sent: "To complete registration please follow the link sent to Your email %{email}."
+  failed_reset_password: "No user with such email %{email}!"
+  forgot_password_hint: "Link for password restore will be send to Your email"
+  forgot_password_link: "Forgot password?"
+  forgot_password: "Restore password"
+  invalid_email_verification_token: "Email confirmation code is invalid or expired"
+  invalid_identity: "No user with such ID (%{identity_url})"
+  invalid_login: "Invalid login or password"
+  invalid_old_password: "Invalid old password"
+  invalid_reset_password_token: "The code for password restoration is invalid or expired"
+  login_title: "Login"
+  login_using_open_id: "Login using OpenID"
+  new_password: "New password"
+  new_user_title: "Signup"
+  not_unique_email: "User with such email already exists"
+  old_password: "Old password"
+  open_id: "OpenID"
+  openid_identifier: "OpenID"
+  password_restored: "Password updated"
+  password_updated: "Pasword updated"
+  register_link: "Signup"
+  reset_password: "Reset password"
+  should_not_be_blank: "should not be blank"
+  signup_email_description: "To finish registration please follow the link that will be send to Your email"
+  successfully_identified_by_open_id: "Identification is successfully finished"
+  successfully_logged_in: "You are logged in"
+  successfully_logged_out: "You are logged out"
+  successfull_open_id_registration: "You are successfully registered and can log in"
+  successfully_registered: "You are successfully registered and can login"
+  sucessfully_reset_password: "Link for password restoration sent to Your email: %{email}"
+  update_password: "Update password"
+
+
+
+  #
+  # EMail
+  #
+  email_verification_title: "Registration on site %{host}"
+  email_verification_text: |
+    To finish registration on site %{host} please follow this link:
+    %{url}
+
+  forgot_password_title: "Password reset for %{name} on the %{host} site"
+  forgot_password_text: |
+    You (or somebody else by entering Your email) requested password reset for Your account %{name} on the %{host} site.
+
+    To reset password please follow this link %{url}
+    (or just delete this email and Your password will remain intact)

data/config/locales/ru.yml

@@ -0,0 +1,105 @@
+ru:
+  anonymous: "Добро пожаловать, Гость"
+  are_you_shure: "Уверены?"
+  avatar: "Аватар"
+  domains: "Домены"
+  email: "Почта"
+  home: "Главная"
+  login: "Войти"
+  login_not_required: "Вы уже вошли"
+  login_required: "Для получения доступа необходимо войти в систему"
+  logout: "Выйти"
+  name: "Имя"
+  password: "Пароль"
+  show_more: "..."
+  signup: "Регистрация"
+  state: "Статус"
+  username: "Логин"
+  users: "Пользователи"
+
+  # User model
+  bad_email_message: "Должен быть правильным почтовым адресом"
+  bad_login_message: "Используйте буквы, цифры и .-_@"
+  first_name: "Имя"
+  last_name: "Фамилия"
+  password_confirmation: "Подтверждение пароля"
+
+  # Space model
+  forbiden_to_change_default_space: "Нельзя менять дефолтную область"
+
+  # Wigets
+  callback_error: "Ошибка калбека Service Mix!"
+  callback_error_not_specified: "Ошибка калбека не определена!"
+
+  # Authorization
+  admin: "Админ"
+  add_admin_role: "Сделать Админом"
+  add_custom_role: "Сделать '%{role}'"
+  add_manager_role: "Сделать Менеджером"
+  add_member_role: "Принять в сообщество"
+  custom_role: "%{role}"
+  manager: "Менеджер"
+  member: "Участник"
+  remove_admin_role: "Убрать права Админа"
+  remove_custom_role: "Убрать права '%{role}'"
+  remove_manager_role: "Убрать права Менеджера"
+  remove_member_role: "Удалить из сообщества"
+  role_granted: "Права даны"
+  role_removed: "Права убраны"
+  invalid_roles: "Неверные роли"
+
+  # Authentication
+  choose_name: "Выберите имя пользователя"
+  choose_name_description: "Выберите имя пользователя (в дальнейшем изменить нельзя)"
+  edit_password_title: "Изменение пароля"
+  email_verification_code_sent: "Чтобы завершить регистрацию перейдите пожалуйста по ссылке высланной вам на почту %{email}"
+  failed_reset_password: "Пользвателя с почтой %{email} не существует!"
+  forgot_password_hint: "Ссылка для восстановления пароля будет выслана вам на почту"
+  forgot_password_link: "Забыли пароль?"
+  forgot_password: "Восстановление пароля"
+  invalid_email_verification_token: "Неверный код подтверждения почты, возможно у него истек срок действия"
+  invalid_identity: "Пользователя с таким ID не существует (%{identity_url})"
+  invalid_login: "Неверный логин или пароль"
+  invalid_old_password: "Неверный старый пароль"
+  invalid_reset_password_token: "Неверный код восстановления пароля, возможно у него истек срок действия"
+  login_title: "Войти"
+  login_using_open_id: "Войти используя OpenID"
+  new_password: "Новый пароль"
+  new_user_title: "Регистрация"
+  not_unique_email: "Пользователь с таким адресом уже существует"
+  old_password: "Старый пароль"
+  open_id: "OpenID"
+  openid_identifier: "OpenID"
+  password_restored: "Пароль изменен"
+  password_updated: "Пароль изменен"
+  register_link: "Регистрация"
+  reset_password: "Сброс пароля"
+  should_not_be_blank: "не заполнен"
+  signup_email_description: "Вам на почту будет выслана ссылка для завершения решистрации"
+  successfully_identified_by_open_id: "Идентификация успешно завершена"
+  successfully_logged_in: "Вы вошли"
+  successfully_logged_out: "Вы вышли"
+  successfull_open_id_registration: "Вы успешно зарегистрированы и можете войти"
+  successfully_registered: "Вы успешно зарегистрировались и можете войти в систему"
+  sucessfully_reset_password: "Ссылка для восстановления пароля выслана вам на почту: %{email}"
+  update_password: "Изменить пароль"
+
+
+  #
+  # EMail
+  #
+  email_verification_title: "Регистрация аккаунта на %{host}"
+  email_verification_text: |
+    Чтобы завершить решистрацию на %{host} перейдите пожалуйста по ссылке:
+    %{url}
+
+  # email_activation_title: "%{name}, ваш аккаунт на %{host} активирован"
+  # email_activation_text: |
+  #   %{name} ваш аккаунт на %{host} активирован.
+
+  forgot_password_title: "Сброс пароля пользователя %{name} на %{host}"
+  forgot_password_text: |
+    Вы (или кто-то другой введя вашу почту) запросили сброс пароля для вашего аккаунта %{name} на %{host}
+
+    Чтобы сбросить пароль перейдите по ссылке %{url}
+    (или просто удалите это письмо, ваш пароль останется как и раньше)

data/config/routes.rb

@@ -0,0 +1,18 @@
+url_root = rad.users.url_root
+
+rad.router.configure do |c|
+  c.persistent_params :l
+
+  c.with_options url_root: url_root do |c|
+    c.alias '/login', class_name: 'Controllers::Sessions', method: :login
+    c.alias '/logout', class_name: 'Controllers::Sessions', method: :logout
+    c.alias '/signup', class_name: 'Controllers::Identities', method: :enter_email_form
+
+    # c.resource :checks,     class_name: 'Users::Checks'
+
+    c.resource :identities, class_name: 'Controllers::Identities'
+    c.resource :sessions,   class_name: 'Controllers::Sessions'
+
+    c.resource :profiles,   class_name: 'Controllers::Profiles'
+  end
+end