Merged r19383 and r19384 to 4.1-stable.

git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19388 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index 3377fd68192ab8817c12bea0b6894a3bfefe0edc..fccf118c94604b8dc88b1472a2cdcc3c852ece1f 100644 (file)
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -4,11 +4,11 @@
   <% end %>
   <%= actions_dropdown do %>
     <% if @project %>
-      <%= link_to l(:field_summary), project_issues_report_path(@project) %>
+      <%= link_to l(:field_summary), project_issues_report_path(@project), :class => 'icon icon-stats' %>
     <% end %>
 
     <% if User.current.allowed_to?(:import_issues, @project, :global => true) %>
-      <%= link_to l(:button_import), new_issues_import_path(:project_id => @project) %>
+      <%= link_to l(:button_import), new_issues_import_path(:project_id => @project), :class => 'icon icon-import' %>
     <% end %>
 
     <%= link_to_if_authorized l(:label_settings),

diff --git a/app/views/timelog/index.html.erb b/app/views/timelog/index.html.erb
index c34a2440914ccb9572dfc45b0eca6872d5ac7268..b9afc7475deca7545dd1f1627bf542732a44bf37 100644 (file)
--- a/app/views/timelog/index.html.erb
+++ b/app/views/timelog/index.html.erb
@@ -4,7 +4,7 @@
             :class => 'icon icon-time-add' if User.current.allowed_to?(:log_time, @project, :global => true) %>
 <%= actions_dropdown do %>
   <% if User.current.allowed_to?(:import_time_entries, @project, :global => true) %>
-    <%= link_to l(:button_import), new_time_entries_import_path(:project_id => @project) %>
+    <%= link_to l(:button_import), new_time_entries_import_path(:project_id => @project), :class => 'icon icon-import' %>
   <% end %>
 
   <%= link_to_if_authorized l(:label_settings),

diff --git a/public/images/database_go.png b/public/images/database_go.png
new file mode 100644 (file)
index 0000000..61a8556
Binary files /dev/null and b/public/images/database_go.png differ

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 834dead9d70b6177db138ee9d126c79ce6649a57..8975fe4c4f561fb48437d44cffe34b0fd6067c96 100644 (file)
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -210,7 +210,9 @@ div + .drdn-items {border-top:1px solid #ccc;}
 .drdn-items>span {color:#999;}
 
 .contextual .drdn-content {top:18px;}
-.contextual .drdn-items {padding:2px;}
+.contextual .drdn-items {padding:2px; min-width: 160px;}
+.contextual .drdn-items>a {padding: 5px 8px;}
+.contextual .drdn-items>a.icon {padding-left: 24px; background-position-x: 4px;}
 .contextual .drdn-items>a:hover {color:#2A5685; border:1px solid #628db6; background-color:#eef5fd; border-radius:3px;}
 
 #project-jump.drdn {width:200px;display:inline-block;}
@@ -1533,6 +1535,7 @@ td.gantt_selected_column .gantt_hdr,.gantt_selected_column_container {
 .icon-toggle-plus { background-image: url(../images/bullet_toggle_plus.png) }
 .icon-toggle-minus { background-image: url(../images/bullet_toggle_minus.png) }
 .icon-clear-query { background-image: url(../images/close_hl.png); }
+.icon-import { background-image: url(../images/database_go.png); }
 
 .icon-file { background-image: url(../images/files/default.png); }
 .icon-file.text-plain { background-image: url(../images/files/text.png); }