##// END OF EJS Templates
[#20288] Update styles to match CodeRay 1.1.0 (preserving changes of r10132)....
[#20288] Update styles to match CodeRay 1.1.0 (preserving changes of r10132). This commit updates the CSS styles to match with CodeRay 1.1.0, while it preserves the custom changes applied in r10132. The CSS styles were still based on CodeRay 1.0.6 (included since Redmine 1.4.0) with the custom changes from r10132 (included since Redmine 2.1.0). Redmine 2.3.2 till 2.3.4 came with CodeRay 1.0.9, an upgrade that didn't needed changes in the CSS styles. Starting with 2.4.0 Redmine comes with CodeRay 1.1.0, a minor upgrade that came with new/changed token_kinds and lots of changes in the alpha stylesheet, that in turn is used as a base for Redmine's own CodeRay CSS styles. As such, this upgrade needed CSS stylesheet changes like done before in r7618 and r7623 (for 1.0.0 upgrade) and r9389 (for 1.0.6 upgrade). But these changes, plus an update of the Redmine core documentation that is shipped along the core (wiki_syntax_detailed_[markdown|textile].html), aren't integrated up untill today. Contributed by Mischa The Evil. git-svn-id: http://svn.redmine.org/redmine/trunk@14488 e93f8b46-1217-0410-a6f0-8f06a7374b81

File last commit:

r13504:e3618bdbecd9
r14106:6fbb56e55735
Show More
users_helper.rb
60 lines | 2.6 KiB | text/x-ruby | RubyLexer
Jean-Philippe Lang
Added encoding comment to helpers (#9792)....
r8090 # encoding: utf-8
#
Toshi MARUYAMA
remove trailing white-spaces from app/helpers/users_helper.rb....
r6790 # Redmine - project management software
Jean-Philippe Lang
Copyright update....
r13490 # Copyright (C) 2006-2015 Jean-Philippe Lang
Jean-Philippe Lang
added svn:eol-style native property on /app files...
r330 #
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
Toshi MARUYAMA
remove trailing white-spaces from app/helpers/users_helper.rb....
r6790 #
Jean-Philippe Lang
added svn:eol-style native property on /app files...
r330 # This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
Toshi MARUYAMA
remove trailing white-spaces from app/helpers/users_helper.rb....
r6790 #
Jean-Philippe Lang
added svn:eol-style native property on /app files...
r330 # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
Jean-Philippe Lang
Initial commit...
r2 module UsersHelper
Jean-Philippe Lang
Adds user count in status drop down on admin user list....
r1734 def users_status_options_for_select(selected)
Toshi MARUYAMA
Rails4: replace deprecated Relation#count with finder options at UsersHelper#users_status_options_for_select...
r12337 user_count_by_status = User.group('status').count.to_hash
Toshi MARUYAMA
remove trailing white-spaces from app/helpers/users_helper.rb....
r6790 options_for_select([[l(:label_all), ''],
Jean-Philippe Lang
Adds named scopes for users index....
r7961 ["#{l(:status_active)} (#{user_count_by_status[1].to_i})", '1'],
["#{l(:status_registered)} (#{user_count_by_status[2].to_i})", '2'],
["#{l(:status_locked)} (#{user_count_by_status[3].to_i})", '3']], selected.to_s)
Jean-Philippe Lang
added a status filter on users/list...
r344 end
Toshi MARUYAMA
remove trailing white-spaces from app/helpers/users_helper.rb....
r6790
Jean-Philippe Lang
Code cleanup....
r4383 def user_mail_notification_options(user)
user.valid_notification_options.collect {|o| [l(o.last), o.first]}
end
Toshi MARUYAMA
remove trailing white-spaces from app/helpers/users_helper.rb....
r6790
Jean-Philippe Lang
Preserve status filter and page number when using lock/unlock/activate links on the users list (closes #998)....
r1319 def change_status_link(user)
Eric Davis
Refactor: split UsersController#edit into #edit and #update...
r4116 url = {:controller => 'users', :action => 'update', :id => user, :page => params[:page], :status => params[:status], :tab => nil}
Toshi MARUYAMA
remove trailing white-spaces from app/helpers/users_helper.rb....
r6790
Jean-Philippe Lang
Preserve status filter and page number when using lock/unlock/activate links on the users list (closes #998)....
r1319 if user.locked?
Eric Davis
Refactor: split UsersController#edit into #edit and #update...
r4116 link_to l(:button_unlock), url.merge(:user => {:status => User::STATUS_ACTIVE}), :method => :put, :class => 'icon icon-unlock'
Jean-Philippe Lang
Preserve status filter and page number when using lock/unlock/activate links on the users list (closes #998)....
r1319 elsif user.registered?
Eric Davis
Refactor: split UsersController#edit into #edit and #update...
r4116 link_to l(:button_activate), url.merge(:user => {:status => User::STATUS_ACTIVE}), :method => :put, :class => 'icon icon-unlock'
Jean-Philippe Lang
Prevent admin users from locking their own account (#1276)....
r1434 elsif user != User.current
Eric Davis
Refactor: split UsersController#edit into #edit and #update...
r4116 link_to l(:button_lock), url.merge(:user => {:status => User::STATUS_LOCKED}), :method => :put, :class => 'icon icon-lock'
Jean-Philippe Lang
Preserve status filter and page number when using lock/unlock/activate links on the users list (closes #998)....
r1319 end
end
Toshi MARUYAMA
remove trailing white-spaces from app/helpers/users_helper.rb....
r6790
Jean-Philippe Lang
Add support for multiple email addresses per user (#4244)....
r13504 def additional_emails_link(user)
if user.email_addresses.count > 1 || Setting.max_additional_emails.to_i > 0
link_to l(:label_email_address_plural), user_email_addresses_path(@user), :class => 'icon icon-email-add', :remote => true
end
end
Jean-Philippe Lang
Split user edit screen into tabs....
r1389 def user_settings_tabs
tabs = [{:name => 'general', :partial => 'users/general', :label => :label_general},
{:name => 'memberships', :partial => 'users/memberships', :label => :label_project_plural}
]
Jean-Philippe Lang
Adds buit-in groups to give specific permissions to anonymous and non members users per project (#17976)....
r13053 if Group.givable.any?
Jean-Philippe Lang
Hide "Groups" tab on user form if no group exist....
r3123 tabs.insert 1, {:name => 'groups', :partial => 'users/groups', :label => :label_group_plural}
end
tabs
Jean-Philippe Lang
Split user edit screen into tabs....
r1389 end
Jean-Philippe Lang
Initial commit...
r2 end