Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-12-16 05:20:28 +01:00
Code Issues Packages Projects Releases Activity

Show an icon for a bookmarked project in the projects list (#33908).

Browse Source 
Patch by Mizuki ISHIKAWA.


git-svn-id: http://svn.redmine.org/redmine/trunk@20051 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2020-09-20 03:08:08 +00:00
parent 681dc5cdf5
commit 0a5c96472a
5 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/helpers/projects_helper.rb
View File

@@ -73,8 +73,12 @@ module ProjectsHelper
# Renders the projects index # Renders the projects index
def render_project_hierarchy(projects) def render_project_hierarchy(projects)
bookmarked_project_ids = User.current.bookmarked_project_ids
render_project_nested_lists(projects) do |project| render_project_nested_lists(projects) do |project|
s = link_to_project(project, {}, :class => "#{project.css_classes} #{User.current.member_of?(project) ? 'icon icon-user my-project' : nil}") classes = project.css_classes.split
classes += %w(icon icon-user my-project) if User.current.member_of?(project)
classes += %w(icon icon-bookmarked-project) if bookmarked_project_ids.include?(project.id)
s = link_to_project(project, {}, :class => classes.uniq.join(' '))
if project.description.present? if project.description.present?
s << content_tag('div', textilizable(project.short_description, :project => project), :class => 'wiki description') s << content_tag('div', textilizable(project.short_description, :project => project), :class => 'wiki description')
end end

4
app/helpers/projects_queries_helper.rb
View File

@@ -23,7 +23,9 @@ module ProjectsQueriesHelper
if item.is_a?(Project) if item.is_a?(Project)
case column.name case column.name
when :name when :name
link_to_project(item) + (content_tag('span', '', :class => 'icon icon-user my-project', :title => l(:label_my_projects)) if User.current.member_of?(item)) link_to_project(item) +
(tag.span(class: 'icon icon-user my-project', title: l(:label_my_projects)) if User.current.member_of?(item)) +
(tag.span(class: 'icon icon-bookmarked-project', title: l(:label_my_bookmarks)) if User.current.bookmarked_project_ids.include?(item.id))
when :short_description when :short_description
item.description? ? content_tag('div', textilizable(item, :short_description), :class => "wiki") : '' item.description? ? content_tag('div', textilizable(item, :short_description), :class => "wiki") : ''
when :homepage when :homepage

1
app/views/projects/index.html.erb
View File

@@ -21,6 +21,7 @@
<% if User.current.logged? %> <% if User.current.logged? %>
<p style="text-align:right;"> <p style="text-align:right;">
<span class="icon icon-user my-project"><%= l(:label_my_projects) %></span> <span class="icon icon-user my-project"><%= l(:label_my_projects) %></span>
<span class="icon icon-bookmarked-project"><%= l(:label_my_bookmarks) %></span>
</p> </p>
<% end %> <% end %>

BIN
public/images/tag_blue.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 586 B

9
public/stylesheets/application.css
View File

@@ -695,7 +695,13 @@ ul.projects div.description li {list-style-type:initial;}
#projects-index ul.projects div.description { #projects-index ul.projects div.description {
padding-top: 0.5em; padding-top: 0.5em;
} }
#projects-index a.icon-user {padding-left:0; padding-right:20px; background-position:98% 50%;} #projects-index a.icon-user, a.icon-bookmarked-project {padding-left:0; padding-right:20px; background-position:98% 50%;}
#projects-index a.icon-user.icon-bookmarked-project {
background-image: url(../images/tag_blue.png), url(../images/user.png);
background-position: bottom 0px right 0px, bottom 0px right 20px;
padding-right: 40px;
padding-top: 4px;
}
#notified-projects>ul, #tracker_project_ids>ul, #custom_field_project_ids>ul {max-height:250px; overflow-y:auto;} #notified-projects>ul, #tracker_project_ids>ul, #custom_field_project_ids>ul {max-height:250px; overflow-y:auto;}
@@ -1566,6 +1572,7 @@ td.gantt_selected_column .gantt_hdr,.gantt_selected_column_container {
.icon-collapsed { background-image: url(../images/arrow_right.png); } .icon-collapsed { background-image: url(../images/arrow_right.png); }
.icon-bookmark { background-image: url(../images/tag_blue_delete.png); } .icon-bookmark { background-image: url(../images/tag_blue_delete.png); }
.icon-bookmark-off { background-image: url(../images/tag_blue_add.png); } .icon-bookmark-off { background-image: url(../images/tag_blue_add.png); }
.icon-bookmarked-project { background-image: url(../images/tag_blue.png); }
.icon-sorted-asc { background-image: url(../images/arrow_down.png); } .icon-sorted-asc { background-image: url(../images/arrow_down.png); }
.icon-sorted-desc { background-image: url(../images/arrow_up.png); } .icon-sorted-desc { background-image: url(../images/arrow_up.png); }
.icon-toggle-plus { background-image: url(../images/bullet_toggle_plus.png) } .icon-toggle-plus { background-image: url(../images/bullet_toggle_plus.png) }