Revision 809:7429d10cc491 vendor

View differences:

vendor/plugins/redmine_tags/app/views/projects/_filter_search_tags.html.erb
1 1
<p class='tag'>
2
  <% fields_for @project, :builder => TabularFormBuilder do |f| -%>
2
  <%- fields_for @project, :builder => TabularFormBuilder do |f| -%>
3 3
    <div>
4 4
      <p id="project_tags">
5
        <%= f.text_field :tag_list, :label => :label_tags_search, :size => 60, :class => 'hol' %>
5
        <%= f.text_field :tag_list, :label => :label_tags_search, :size => 60, :class => 'hol' -%>
6 6
      </p>
7 7
      <div id="project_tag_candidates" class="autocomplete"></div>
8
      <%= javascript_include_tag 'tags_input', :plugin => 'redmine_tags' %>
9

  
10
      <%= javascript_tag "observeProjectTagsField('#{url_for(:controller => 'auto_completes', :action => 'project_search_tags', :project_id => Project.first.id)}', true)" %>
8
      <%= javascript_include_tag 'tags_input', :plugin => 'redmine_tags' -%>
9
      <%= javascript_tag "observeProjectTagsField('#{url_for(:controller => 'auto_completes', :action => 'project_search_tags', :project_id => Project.first.id)}', true)" -%>
11 10
    </div>
12
  <% end -%>
11
  <%- end -%>
13 12
</p>
vendor/plugins/redmine_tags/app/views/projects/_my_projects.rhtml
1
<% if !@user_projects.empty? %>
1 2
<% if @myproj_status=="true" %>
2 3
<fieldset id="my_projects_fieldset" class="collapsible">
3 4
    <legend onclick="toggleFieldsetWithState(this);"><h2><%= l(:label_my_project_plural) %></h2></legend>
......
5 6
<fieldset id="my_projects_fieldset" class="collapsible collapsed">
6 7
    <legend onclick="toggleFieldsetWithState(this);"><h2><%= l(:label_my_project_plural) %></h2></legend>
7 8
    <div style="display: none;">    
8
<%  end%>
9
    <% if @user_projects %>  
9
<% end %>
10 10
    <div>
11 11
      <%= render_my_project_hierarchy_with_tags(@user_projects)%>
12 12
    </div>
13
  <% end %>
13
  <% unless @myproj_status=="true" %>
14
    </div>
15
  <%- end -%>
14 16
</fieldset>
17
<% end %>
vendor/plugins/redmine_tags/app/views/projects/index.rhtml
1 1
<% content_for :header_tags do %>
2 2
    <%= auto_discovery_link_tag(:atom, {:action => 'index', :format => 'atom', :key => User.current.rss_key}) %>
3
    <%= stylesheet_link_tag 'redmine_tags', :plugin => 'redmine_tags' %>
3 4
<% end %>
4 5
<%= javascript_include_tag 'projects_index', :plugin => 'redmine_tags' %>
5 6

  
......
22 23
</h2>
23 24

  
24 25
<div style="clear:both;"></div>
25
<% form_remote_tag(:controller => :projects, :action => :index, :method => :get, :html => {:id => :project_filtering_form}) do %>
26
  <%- form_remote_tag(:controller => :projects, :action => :index, :method => :get, :html => {:id => :project_filtering_form}) do -%>
26 27

  
27
<% if @filter_status=="true" %>
28
<fieldset id="filters_fieldset" class="collapsible">
29
  <legend onclick="toggleFieldsetWithState(this);"><%= l(:label_filter_plural) %></legend>
30
<% else %>
31
  <fieldset id="filters_fieldset" class="collapsible collapsed">
32
    <legend onclick="toggleFieldsetWithState(this);"><%= l(:label_filter_plural) %></legend>
28
    <% if @filter_status=="true" %>
29
      <fieldset id="filters_fieldset" class="collapsible">
30
      <legend onclick="toggleFieldsetWithState(this);"><%= l(:label_filter_plural) %></legend>
31
    <%- else -%>
32
      <fieldset id="filters_fieldset" class="collapsible collapsed">
33
      <legend onclick="toggleFieldsetWithState(this);"><%= l(:label_filter_plural) %></legend>
33 34
      <div style="display: none;">
34
<% end %>
35
    <div>
35
    <%- end -%>
36 36

  
37
      <div id='filter_tags'>
38
        <%= render :partial => 'filter_search_tags' %>
37
  <div>
38
    <div id='filter_tags'>
39
      <%= render :partial => 'filter_search_tags' -%>
40
    </div>
41

  
42
    <p class='q'>
43
      <%= label_tag 'q', l('project_filtering_q_label') %>
44
      <%= text_field_tag 'q', @question, :size => 30, :id => 'search-input' %>
45
    </p>
46

  
47
    <p style="display: none;"><%= submit_tag( l('button_filter'), :id => 'submitButton') -%></p>
48
    <%= link_to l(:button_apply), {}, :onclick => "$('submitButton').click(); return false;", :class => 'icon icon-checked' -%>
49
    <%= link_to l(:button_clear), {}, :class => 'icon icon-reload'  %>                         
50
  </div>
51
  
52
    <% unless @filter_status=="true" %>
39 53
      </div>
54
    <%- end -%>
40 55

  
41
      <p class='q'>
42
        <%= label_tag 'q', l('project_filtering_q_label') %>
43
        <%= text_field_tag 'q', @question, :size => 30, :id => 'search-input' %>
44
      </p>
45 56

  
46
      <p style="display: none;"><%= submit_tag( l('button_filter'), :id => 'submitButton') -%></p>
47
      <%= link_to l(:button_apply), {}, :onclick => "$('submitButton').click(); return false;", :class => 'icon icon-checked' %>      
48
      <%= link_to l(:button_clear), {}, :class => 'icon icon-reload'  %>                         
49
    </div>
50
  </fieldset>
51
<% end %>
57
<%- end -%>
58
</fieldset>
52 59

  
53 60
<div id="projects">
54 61
  <%= render :partial => 'filtered_projects' %>
vendor/plugins/redmine_tags/assets/stylesheets/redmine_tags.css
33 33
div.tags .tag-nube-8 { font-size: 1.5em; }
34 34

  
35 35
.tag-count { font-size: .75em; margin-left: .5em; }
36

  
37
ul.projects .tags, ul.projects .no-tags { padding-left: 0.5em; color: #3e442c; font-size: 0.95em }
38
table.projects th.tags { color: #3e442c; }
39

  
vendor/plugins/redmine_tags/config/locales/en.yml
23 23
  tags: Tags
24 24
  field_tags: Tags
25 25
  field_tag_list: Tags
26
  field_no_tags: "No tags"
26 27
  label_tags_search: "Tags: "
27 28
  setting_issue_tags: Issues Tags
28 29
  issues_sidebar: Display tags on sidebar as
......
35 36

  
36 37
  auto_complete_new_tag: Add new...
37 38
  
38
  project_filtering_q_label: "Textual search"
39
  project_filtering_q_label: "Search for text:"
39 40
  project_filter_no_results: "No matching projects found"
40 41
  button_filter: "Filter"
vendor/plugins/redmine_tags/lib/redmine_tags/patches/projects_helper_patch.rb
29 29
            s << "<thead><tr>"
30 30
        
31 31
            s << sort_header_tag('name', :caption => l("field_name"))
32
            s << "<th class='tags'>" << l("tags") << "</th>"
32 33
            s << "<th class='managers'>" << l("label_managers") << "</th>"
33
            s << "<th class='tags'>" << l("tags") << "</th>"
34 34
            s << sort_header_tag('created_on', :default_order => 'desc')
35 35
            s << sort_header_tag('updated_on', :default_order => 'desc')
36 36
        
......
65 65
          s << "'>" << link_to( highlight_tokens(project.name, tokens), {:controller => 'projects', :action => 'show', :id => project}, :class => "project #{User.current.member_of?(project) ? 'my-project' : nil}")
66 66
          s << "</div>"
67 67
          s << highlight_tokens(render_project_short_description(project), tokens)
68
          s << "</td>"
69

  
70
          # taglist
71
          s << "<td class='tags' align=top>" << project.tag_counts.collect{ |t| render_project_tag_link(t) }.join(', ') << "</td>"
72

  
68 73
          s << "<td class='managers' align=top>"
69 74
           
70 75
          u = project.users_by_role
......
86 91

  
87 92
          s << "</td>"
88 93
          
89
          # taglist
90
          s << "<td class='tags' align=top>" << project.tag_counts.collect{ |t| render_project_tag_link(t) }.join(', ') << "</td>"
91 94
          s << "<td class='created_on' align=top>" << format_date(project.created_on) << "</td>"
92 95
          s << "<td class='updated_on' align=top>" << format_date(project.updated_on) << "</td>"
93 96

  
......
207 210
            s << "<li class='#{classes}'><div class='#{classes}'>" +
208 211
              link_to_project(project, {}, :class => "project my-project")
209 212
            if project.is_public?
210
              s << " <span class='public'>" << l("field_is_public") << "</span>"
213
              s << " <span class='public'>" << l(:field_is_public) << "</span>"
211 214
            else
212
              s << " <span class='private'>" << l("field_is_private") << "</span>"
215
              s << " <span class='private'>" << l(:field_is_private) << "</span>"
213 216
            end
217
           
218
            tc = project.tag_counts
219
            if tc.empty?
220
              s << " <span class='no-tags'>" << l(:field_no_tags) << "</span>"
221
            else
222
              s << " <span class='tags'>" << tc.collect{ |t| render_project_tag_link(t) }.join(', ') << "</span>"
223
            end
224

  
214 225
            s << render_project_short_description(project)
215 226

  
216
            s << l(:tags) << ":&nbsp"
217
            s << project.tag_counts.collect{ |t| render_project_tag_link(t) }.join(', ')
218

  
219 227
            s << "</div>\n"
220 228

  
221 229
            cs = ''
222 230
            project.children.each do |child|
223
              cs << render_my_project_in_hierarchy(child)
231
              cs << render_my_project_in_hierarchy_with_tags(child)
224 232
            end
225 233

  
226 234
            if cs != ''

Also available in: Unified diff