Update icon classes from 'not-watch' until 'pulldown-arrow4'

pull/3873/head
Henriette Dinger 9 years ago committed by Oliver Günther
parent 67a18c91ed
commit 463aa185da
  1. 2
      app/assets/stylesheets/content/_action_menu_main.lsg
  2. 12
      app/assets/stylesheets/content/_modal.lsg
  3. 12
      app/assets/stylesheets/content/_work_packages_table.lsg
  4. 38
      app/assets/stylesheets/fonts/_openproject_icon_font.lsg
  5. 4
      app/helpers/repositories_helper.rb
  6. 2
      app/helpers/watchers_helper.rb
  7. 2
      app/views/admin/projects.html.erb
  8. 4
      app/views/common/_tabs.html.erb
  9. 2
      app/views/homescreen/blocks/_community.html.erb
  10. 6
      app/views/repositories/revision.html.erb
  11. 2
      app/views/repositories/show.html.erb
  12. 6
      config/initializers/menus.rb
  13. 2
      features/issues/issue_show.feature
  14. 2
      frontend/app/components/wp-table/directives/wp-table/wp-table.directive.html
  15. 2
      frontend/app/templates/components/selectable_title.html
  16. 2
      frontend/app/templates/timelines/timeline_table.html
  17. 2
      lib/open_project/text_formatting.rb
  18. 4
      spec/lib/open_project/text_formatting_spec.rb

@ -14,7 +14,7 @@
</li>
<li>
<a href="#"><i class="icon-priority icon-action-menu"></i>menu item with sub</a>
<i class="icon-pulldown-arrow4 icon-sub-menu"></i>
<i class="icon-arrow-right5 icon-sub-menu"></i>
<ul class="sub-menu">
<li>
<a href="#"><i class="icon-edit icon-action-menu"></i>menu item</a>

@ -12,37 +12,37 @@
<ul class="export-options">
<li>
<a>
<i class="icon-page-atom icon-big"></i>
<i class="icon-export-atom icon-big"></i>
<span class="export-label">ATOM</span>
</a>
</li>
<li>
<a>
<i class="icon-page-xls icon-big"></i>
<i class="icon-export-xls icon-big"></i>
<span class="export-label">XLS</span>
</a>
</li>
<li>
<a>
<i class="icon-page-xls-descr icon-big"></i>
<i class="icon-export-xls-descr icon-big"></i>
<span class="export-label">XLS with description</span>
</a>
</li>
<li>
<a>
<i class="icon-page-pdf icon-big"></i>
<i class="icon-export-pdf icon-big"></i>
<span class="export-label">PDF</span>
</a>
</li>
<li>
<a>
<i class="icon-page-pdf-descr icon-big"></i>
<i class="icon-export-pdf-descr icon-big"></i>
<span class="export-label">PDF with description</span>
</a>
</li>
<li>
<a>
<i class="icon-page-csv icon-big"></i>
<i class="icon-export-csv icon-big"></i>
<span class="export-label">CSV</span>
</a>
</li>

@ -24,7 +24,7 @@
<div class="generic-table--sort-header-outer">
<span class="generic-table--sort-header">
#
<span class="icon-context icon-button icon-pulldown-arrow1 dropdown-indicator"></span>
<span class="icon-context icon-button icon-pulldown dropdown-indicator"></span>
</span>
</div>
</th>
@ -32,7 +32,7 @@
<div class="generic-table--sort-header-outer">
<span class="generic-table--sort-header">
Subject
<span class="icon-context icon-button icon-pulldown-arrow1 dropdown-indicator"></span>
<span class="icon-context icon-button icon-pulldown dropdown-indicator"></span>
</span>
</div>
</th>
@ -40,7 +40,7 @@
<div class="generic-table--sort-header-outer">
<span class="generic-table--sort-header">
Type
<span class="icon-context icon-button icon-pulldown-arrow1 dropdown-indicator"></span>
<span class="icon-context icon-button icon-pulldown dropdown-indicator"></span>
</span>
</div>
</th>
@ -48,7 +48,7 @@
<div class="generic-table--sort-header-outer">
<span class="generic-table--sort-header">
Status
<span class="icon-context icon-button icon-pulldown-arrow1 dropdown-indicator"></span>
<span class="icon-context icon-button icon-pulldown dropdown-indicator"></span>
</span>
</div>
</th>
@ -56,7 +56,7 @@
<div class="generic-table--sort-header-outer">
<span class="generic-table--sort-header">
Priority
<span class="icon-context icon-button icon-pulldown-arrow1 dropdown-indicator"></span>
<span class="icon-context icon-button icon-pulldown dropdown-indicator"></span>
</span>
</div>
</th>
@ -64,7 +64,7 @@
<div class="generic-table--sort-header-outer">
<span class="generic-table--sort-header">
Assignee
<span class="icon-context icon-button icon-pulldown-arrow1 dropdown-indicator"></span>
<span class="icon-context icon-button icon-pulldown dropdown-indicator"></span>
</span>
</div>
</th>

@ -68,6 +68,7 @@
<li><span class="icon-fire"></span> fire</li>
<li><span class="icon-flag"></span> flag</li>
<li><span class="icon-folder"></span> folder</li>
<li><span class="icon-folder-open"></span> folder-open</li>
<li><span class="icon-view-fullscreen"></span> view-fullscreen</li>
<li><span class="icon-glossar"></span> glossar</li>
<li><span class="icon-google-plus"></span> google-plus</li>
@ -116,23 +117,21 @@
<li><span class="icon-new-planning-element"></span> new-planning-element</li>
<li><span class="icon-news"></span> news</li>
<li><span class="icon-not-supported"></span> not-supported</li>
<li><span class="icon-not-watch"></span> not-watch</li>
<li><span class="icon-notes1"></span> notes1</li>
<li><span class="icon-op-icon"></span> op-icon</li>
<li><span class="icon-open-folder"></span> open-folder</li>
<li><span class="icon-unwatched"></span> unwatched</li>
<li><span class="icon-notes"></span> notes</li>
<li><span class="icon-openproject"></span> openproject</li>
<li><span class="icon-folder-open"></span> folder-open</li>
<li><span class="icon-outline"></span> outline</li>
<li><span class="icon-page-atom"></span> page-atom</li>
<li><span class="icon-page-csv"></span> page-csv</li>
<li><span class="icon-page-pdf"></span> page-pdf</li>
<li><span class="icon-page-pdf-descr"></span> page-pdf-descr</li>
<li><span class="icon-page-xls"></span> page-xls</li>
<li><span class="icon-page-xls-descr"></span> page-xls-descr</li>
<li><span class="icon-paint"></span> paint</li>
<li><span class="icon-export-atom"></span> export-atom</li>
<li><span class="icon-export-csv"></span> export-csv</li>
<li><span class="icon-export-pdf"></span> export-pdf</li>
<li><span class="icon-export-pdf-descr"></span> export-pdf-descr</li>
<li><span class="icon-export-xls"></span> export-xls</li>
<li><span class="icon-export-xls-descr"></span> export-xls-descr</li>
<li><span class="icon-paragraph"></span> paragraph</li>
<li><span class="icon-paragraph-left"></span> paragraph-left</li>
<li><span class="icon-paragraph-right"></span> paragraph-right</li>
<li><span class="icon-payment-history"></span> payment-history</li>
<li><span class="icon-payment-history2"></span> payment-history2</li>
<li><span class="icon-phone"></span> phone</li>
<li><span class="icon-pin"></span> pin</li>
<li><span class="icon-play"></span> play</li>
@ -140,17 +139,14 @@
<li><span class="icon-pre"></span> pre</li>
<li><span class="icon-print"></span> print</li>
<li><span class="icon-priority"></span> priority</li>
<li><span class="icon-process-arrow1"></span> process-arrow1</li>
<li><span class="icon-process-arrow2"></span> process-arrow2</li>
<li><span class="icon-process-arrow3"></span> process-arrow3</li>
<li><span class="icon-process-arrow4"></span> process-arrow4</li>
<li><span class="icon-project-tree"></span> project-tree</li>
<li><span class="icon-roadmap"></span> roadmap</li>
<li><span class="icon-work-packages"></span> work-packages</li>
<li><span class="icon-projects"></span> projects</li>
<li><span class="icon-publish"></span> publish</li>
<li><span class="icon-pulldown-arrow1"></span> pulldown-arrow1</li>
<li><span class="icon-pulldown-arrow2"></span> pulldown-arrow2</li>
<li><span class="icon-pulldown-arrow3"></span> pulldown-arrow3</li>
<li><span class="icon-pulldown-arrow4"></span> pulldown-arrow4</li>
<li><span class="icon-pulldown"></span> pulldown</li>
<li><span class="icon-arrow-left4"></span> arrow-left4</li>
<li><span class="icon-pulldown-up"></span> pulldown-up</li>
<li><span class="icon-arrow-right5"></span> arrow-right5</li>
<li><span class="icon-quote"></span> quote</li>
<li><span class="icon-quote2"></span> quote2</li>
<li><span class="icon-redo"></span> redo</li>

@ -108,7 +108,7 @@ module RepositoriesHelper
project_id: @project,
path: path_param,
rev: @changeset.identifier)
output << "<li class='#{style} icon icon-open-folder'>#{text}</li>"
output << "<li class='#{style} icon icon-folder-open'>#{text}</li>"
output << render_changes_tree(s)
elsif c = tree[file][:c]
style << " change-#{c.action}"
@ -133,7 +133,7 @@ module RepositoriesHelper
when 'D'
output << "<li class='#{style} icon icon-delete'>#{text}</li>"
else
output << "<li class='#{style} icon icon-pulldown-arrow4'>#{text}</li>"
output << "<li class='#{style} icon icon-arrow-right5'>#{text}</li>"
end
end
end

@ -43,7 +43,7 @@ module WatchersHelper
path = send(:"#{(watched ? 'unwatch' : 'watch')}_path", object_type: object.class.to_s.underscore.pluralize,
object_id: object.id,
replace: options.delete('replace'))
html_options[:class] = html_options[:class].to_s + (watched ? ' icon-watch-1' : ' icon-not-watch')
html_options[:class] = html_options[:class].to_s + (watched ? ' icon icon-watch-1' : ' icon icon-unwatched')
method = watched ?
:delete :

@ -113,7 +113,7 @@ See doc/COPYRIGHT.rdoc for more details.
<tbody>
<% project_tree_when_sorted(@projects) do |project, level| %>
<tr class="<%= project.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>">
<td class="name project--hierarchy"><span class="<%= level > 0 ? 'icon-context icon-pulldown-arrow4' : nil %>"><%= link_to project, settings_project_path(project), title: project.short_description %></span></td>
<td class="name project--hierarchy"><span class="<%= level > 0 ? 'icon-context icon-arrow-right5' : nil %>"><%= link_to project, settings_project_path(project), title: project.short_description %></span></td>
<td><%= checked_image project.is_public? %></td>
<td><%= number_to_human_size(project.required_disk_space, precision: 2) if project.required_disk_space.to_i > 0 %></td>
<td><%= format_date(project.created_on) %></td>

@ -45,8 +45,8 @@ See doc/COPYRIGHT.rdoc for more details.
<% end %>
</ul>
<div class="tabs-buttons" style="display:none;">
<button class="tab-left icon-context icon-pulldown-arrow2" onclick="moveTabLeft(this);"></button>
<button class="tab-right icon-context icon-pulldown-arrow4" onclick="moveTabRight(this);"></button>
<button class="tab-left icon-context icon-arrow-left4" onclick="moveTabLeft(this);"></button>
<button class="tab-right icon-context icon-arrow-right5" onclick="moveTabRight(this);"></button>
</div>
</div>

@ -1,5 +1,5 @@
<h3 class="widget-box--header">
<span class="icon-context icon-op-icon"></span>
<span class="icon-context openproject"></span>
<span class="widget-box--header-title"><%= l('homescreen.blocks.community') %></span>
</h3>

@ -64,9 +64,9 @@ See doc/COPYRIGHT.rdoc for more details.
<h3><%= l(:label_attachment_plural) %></h3>
<ul id="changes-legend">
<li class="change change-A icon icon-add"><%= l(:label_added) %></li>
<li class="change change-M icon icon-pulldown-arrow4"><%= l(:label_modified) %></li>
<li class="change change-C icon icon-pulldown-arrow4"><%= l(:label_copied) %></li>
<li class="change change-R icon icon-pulldown-arrow4"><%= l(:label_renamed) %></li>
<li class="change change-M icon icon-arrow-right5"><%= l(:label_modified) %></li>
<li class="change change-C icon icon-arrow-right5"><%= l(:label_copied) %></li>
<li class="change change-R icon icon-arrow-right5"><%= l(:label_renamed) %></li>
<li class="change change-D icon icon-delete"><%= l(:label_deleted) %></li>
</ul>
<p><%= link_to(l(:label_view_diff), action: 'diff', project_id: @project, path: nil, rev: @changeset.identifier) if @changeset.file_changes.any? %></p>

@ -84,7 +84,7 @@ See doc/COPYRIGHT.rdoc for more details.
<%= link_to({ url: { action: 'revisions', project_id: @project,
key: User.current.rss_key } },
{ class: 'button', title: l('repositories.atom_revision_feed') }) do %>
<i class="button--icon icon-page-atom"></i>
<i class="button--icon icon-export-atom"></i>
<% end %>
</li>
<% end %>

@ -202,7 +202,7 @@ Redmine::MenuManager.map :project_menu do |menu|
{ controller: '/versions', action: 'index' },
param: :project_id,
if: Proc.new { |p| p.shared_versions.any? },
html: { class: 'icon2 icon-process-arrow1' }
html: { class: 'icon2 icon-roadmap' }
menu.push :work_packages,
{ controller: '/work_packages', action: 'index' },
@ -210,7 +210,7 @@ Redmine::MenuManager.map :project_menu do |menu|
caption: :label_work_package_plural,
html: {
id: 'main-menu-work-packages',
class: 'icon2 icon-project-tree',
class: 'icon2 icon-work-packages',
'data-ui-route' => '',
query_menu_item: 'query_menu_item'
}
@ -251,7 +251,7 @@ Redmine::MenuManager.map :project_menu do |menu|
{ controller: '/repositories', action: 'show' },
param: :project_id,
if: Proc.new { |p| p.repository && !p.repository.new_record? },
html: { class: 'icon2 icon-open-folder' }
html: { class: 'icon2 icon-folder-open' }
menu.push :time_entries,
{ controller: '/timelog', action: 'index' },

@ -57,7 +57,7 @@ Feature: Watch issues
Then I should find "#watch-button"
#Then I should see "Watch" within "#content > .action_menu_specific"
When I click on "watch-button" within "#toolbar-items"
Then I should find ".button--icon.icon-not-watch" within "#toolbar-items"
Then I should find ".button--icon.icon-unwatched" within "#toolbar-items"
#Then I should see "Unwatch" within "#content > .action_menu_specific"
# The space before and after 'Watch' is important as 'Unwatch' includes the
# string 'watch' if matched case insenstivive.

@ -119,7 +119,7 @@
column="column"
display-type="{{column.meta_data.data_type}}"
project-identifier="projectIdentifier"
ng-class="[row.level > 0 && column.name == 'subject' && 'icon-context icon-pulldown-arrow4']"/>
ng-class="[row.level > 0 && column.name == 'subject' && 'icon-context icon-arrow-right5']"/>
</td>
</tr>

@ -4,7 +4,7 @@
<span has-dropdown-menu target="QuerySelectDropdownMenu"
locals="selectedTitle,groups,transitionMethod">
<accessible-by-keyboard>
{{ selectedTitle | characters:50 }}<i class="icon-pulldown-arrow1 icon-button"></i>
{{ selectedTitle | characters:50 }}<i class="icon-pulldown icon-button"></i>
</accessible-by-keyboard>
</span>
</h2>

@ -37,7 +37,7 @@
'tl-indent-' + indent,
row.childNodes.length > 0 && (row.isExpanded() && 'tl-expanded' || 'tl-collapsed')
]">
<a ng-class="['icon-context', (row.isExpanded() && 'icon-pulldown-arrow1' || 'icon-pulldown-arrow4')]" ng-click="toggleRowExpansion(row)" ng-if="row.childNodes.length > 0"></a>
<a ng-class="['icon-context', (row.isExpanded() && 'icon-pulldown' || 'icon-arrow-right5')]" ng-click="toggleRowExpansion(row)" ng-if="row.childNodes.length > 0"></a>
<span class="tl-word-ellipsis">
<span ng-if="changeDetected">

@ -431,7 +431,7 @@ module OpenProject
out << "<legend class='form--fieldset-legend' title='" +
l(:description_toc_toggle) +
"' onclick='toggleFieldset(this);'>
<a class='icon-context icon-pulldown-arrow1' href='javascript:'>
<a class='icon-context icon-pulldown' href='javascript:'>
#{l(:label_table_of_contents)}
</a>
</legend><div>"

@ -587,7 +587,7 @@ WIKI_TEXT
expect(html).to be_html_eql(%{
<fieldset class='form--fieldset -collapsible'>
<legend class='form--fieldset-legend' title='Show/Hide table of contents' onclick='toggleFieldset(this);'>
<a class="icon-context icon-pulldown-arrow1" href='javascript:'>Table of Contents</a>
<a class="icon-context icon-pulldown" href='javascript:'>Table of Contents</a>
</legend>
<div>
<ul class="toc">
@ -626,7 +626,7 @@ WIKI_TEXT
expect(html).to be_html_eql(%{
<fieldset class='form--fieldset -collapsible'>
<legend class='form--fieldset-legend' title='Show/Hide table of contents' onclick='toggleFieldset(this);'>
<a class="icon-context icon-pulldown-arrow1" href='javascript:'>Table of Contents</a>
<a class="icon-context icon-pulldown" href='javascript:'>Table of Contents</a>
</legend>
<div>
<ul class="toc">

Loading…
Cancel
Save