diff --git a/app/models/user.rb b/app/models/user.rb index 5fbb1e0..8c7dcb5 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -300,6 +300,10 @@ def sync_to_legacy_profile!(new_password = nil) p.mname = middle_name p.lname = last_name + unless self.roles.blank? + p.position = self.roles.map(&:full_name).join(', ') + end + p.save! # exec is a reserved word, has to be done separately diff --git a/app/views/layouts/_navigation.html.slim b/app/views/layouts/_navigation.html.slim index 4428eb3..c91236c 100644 --- a/app/views/layouts/_navigation.html.slim +++ b/app/views/layouts/_navigation.html.slim @@ -11,6 +11,10 @@ = active_link_to admin_root_path, wrap_tag: :li do i.glyphicon.glyphicon-cog> span Admin + li + = link_to 'http://wrektranet.wrek.org/staff/contactlist.php3' do + i.glyphicon.glyphicon-bookmark> + span Contacts li = link_to 'http://wrektranet.wrek.org/wiki/Main_Page' do i.glyphicon.glyphicon-book> diff --git a/app/views/layouts/staff.html.slim b/app/views/layouts/staff.html.slim index f973aa7..4c6dce6 100644 --- a/app/views/layouts/staff.html.slim +++ b/app/views/layouts/staff.html.slim @@ -5,6 +5,7 @@ ul.nav - if Settings.profiles_enabled? = active_link_to 'People', staff_users_path, wrap_tag: :li + = active_link_to 'Add An Op', 'http://wrektranet.wrek.org/staff/wreknewform.php3', wrap_tag: :li - if Settings.contest_book_enabled? = active_link_to 'Ticket Signups', staff_tickets_path, wrap_tag: :li = active_link_to 'Suggest Contests', staff_contest_suggestions_path, wrap_tag: :li diff --git a/app/views/users/help.html.slim b/app/views/users/help.html.slim index d239adc..904fdec 100644 --- a/app/views/users/help.html.slim +++ b/app/views/users/help.html.slim @@ -8,16 +8,21 @@ h1.page-header Help! .row .col-sm-6 - .row - .col-sm-4 - .alert.alert-info - p Need to reset your password? Just type in your username and we'll send you instructions. - .col-sm-8 - = simple_form_for(@user, url: reset_password_users_path, html: { class: 'form-horizontal' }, defaults: defaults) do |f| - = f.input :username, autofocus: true, placeholder: 'Username', input_html: { class: 'form-control' } - .form-group - .col-sm-8.col-sm-offset-4 - = f.button :submit, "Reset my password", class: 'btn-primary' + - if Settings.profiles_enabled? + .row + .col-sm-4 + .alert.alert-info + p Need to reset your password? Just type in your username and we'll send you instructions. + .col-sm-8 + = simple_form_for(@user, url: reset_password_users_path, html: { class: 'form-horizontal' }, defaults: defaults) do |f| + = f.input :username, autofocus: true, placeholder: 'Username', input_html: { class: 'form-control' } + .form-group + .col-sm-8.col-sm-offset-4 + = f.button :submit, "Reset my password", class: 'btn-primary' + + .lead + markdown: + If you're still having problems, please contact [wrektranet@wrek.org](mailto:wrektranet@wrek.org). .col-sm-6 .row @@ -30,8 +35,4 @@ h1.page-header Help! = f.input :current_password, placeholder: 'Password', required: true, input_html: { class: 'form-control' } .form-group .col-sm-8.col-sm-offset-4 - = f.button :submit, "Fix stuff!", class: 'btn-primary' - -.lead - markdown: - If you're still having problems, please contact [wrektranet@wrek.org](mailto:wrektranet@wrek.org). \ No newline at end of file + = f.button :submit, "Fix stuff!", class: 'btn-primary' \ No newline at end of file