Remove tooltip feature, unused JavaScript code and change to show description with onclick event of preview icon. (Related: #45 / r-lab's issue 1323)

This commit is contained in:
Akiko Takano 2014-07-06 01:10:49 +09:00
parent 81a607af32
commit 7f8ab19831
3 changed files with 38 additions and 21 deletions

View File

@ -36,9 +36,13 @@
<% @global_issue_templates.each do |issue_template| %>
<tr class="<%= cycle("odd", "even") %> issue_template issue">
<td><%= link_to h(issue_template.id), {:controller => 'global_issue_templates',
:id => issue_template.id, :action => 'show'}, title: issue_template.title, tooltip: issue_template.note %></td>
:id => issue_template.id, :action => 'show'},
title: issue_template.title, tooltip: issue_template.note %></td>
<td><%= link_to h(issue_template.title), {:controller => 'global_issue_templates',
:id => issue_template.id, :action => 'show'}, title: textilizable(issue_template.description), class: "template_tooltip" %></td>
:id => issue_template.id, :action => 'show'},
title: "#{html_escape(issue_template.note)}" %>
<a class="icon template_tooltip" href="#" title="<%= l(:label_preview) %>"
onclick="checkExpand('global_template_description-<%= issue_template.id %>');"></a></td>
<td><%=h issue_template.tracker.name %></td>
<td><%=h issue_template.author %></td>
<td><%= format_time(issue_template.updated_on)%> </td>
@ -65,6 +69,10 @@
</td>
<% end %>
</tr>
<tr class="<%= current_cycle %>" style="display: none;" id="global_template_description-<%= issue_template.id %>">
<td class="description" colspan="8">
<div class="wiki"><%= textilizable(issue_template.description) %></div></td>
</tr>
<% end %>
</tbody>
</table>

View File

@ -48,7 +48,11 @@
:action => 'show', :id => issue_template.id, :project_id => @project}, {:title => issue_template.note } %></td>
<td><%= link_to h(issue_template.title), {:controller => 'issue_templates',
:id => issue_template.id, :action => 'show'},
title: "#{html_escape(issue_template.note)}", class: "template_tooltip" %></td>
title: "#{html_escape(issue_template.note)}" %>
<a class="icon template_tooltip" href="#" title="<%= l(:label_preview) %>"
onclick="checkExpand('template_description-<%= issue_template.id %>');"></a>
</td>
<td><%=h issue_template.tracker.name %></td>
<td><%=h issue_template.author %></td>
<td><%= format_time(issue_template.updated_on)%> </td>
@ -76,6 +80,11 @@
</td>
<% end %>
</tr>
<tr class="<%= current_cycle %>" style="display: none;" id="template_description-<%= issue_template.id %>">
<td class="description" colspan="8">
<div class="wiki"><%= textilizable(issue_template.description) %></div></td>
</tr>
<% end %>
</tbody>
</table>
@ -105,16 +114,23 @@
<td><%= link_to h(issue_template.id), {:controller => 'issue_templates',
:action => 'show', :id => issue_template.id,
:project_id => issue_template.project_id }, {:title => issue_template.note } %></td>
<td><%= link_to h(issue_template.title), {:controller => 'issue_templates',
:id => issue_template.id, :action => 'show'},
title: textilizable(issue_template.description), class: "template_tooltip" %></td>td>
:id => issue_template.id, :action => 'show'},
title: "#{html_escape(issue_template.note)}" %>
<a class="icon template_tooltip" href="#" title="<%= l(:label_preview) %>"
onclick="checkExpand('template_description-<%= issue_template.id %>');"></a>
</td>
<td><%=h issue_template.tracker.name %></td>
<td><%=h issue_template.author %></td>
<td><%= format_time(issue_template.updated_on)%> </td>
<td class="center"><%= checked_image issue_template.is_default? %></td>
<td class="center"><%= checked_image issue_template.enabled? %></td>
</tr>
<tr class="<%= current_cycle %>" style="display: none;" id="template_description-<%= issue_template.id %>">
<td class="description" colspan="8">
<div class="wiki"><%= textilizable(issue_template.description) %></div></td>
</tr>
<% end %>
</tbody>
</table>
@ -151,13 +167,19 @@
<td>
<%= link_to h(issue_template.title), {:controller => 'global_issue_templates',
:id => issue_template.id, :action => 'show'},
title: textilizable(issue_template.description), class: "template_tooltip" %>
:id => issue_template.id, :action => 'show'},
title: "#{html_escape(issue_template.note)}" %>
<a class="icon template_tooltip" href="#" title="<%= l(:label_preview) %>"
onclick="checkExpand('global_template_description-<%= issue_template.id %>');"></a>
</td>
<td><%=h issue_template.tracker.name %></td>
<td><%=h issue_template.author %></td>
<td><%= format_time(issue_template.updated_on)%> </td>
</tr>
<tr class="<%= current_cycle %>" style="display: none;" id="global_template_description-<%= issue_template.id %>">
<td class="description" colspan="8">
<div class="wiki"><%= textilizable(issue_template.description) %></div></td>
</tr>
<% end %>
</tbody>
</table>

View File

@ -4,19 +4,6 @@
*/
changeType = "";
$(function () {
$(".template_tooltip").tooltip({
position: {
my: "left top",
at: "right bottom"
},
content: function () {
return $(this).prop('title');
}
});
});
function checkExpand(ch) {
var obj=document.all && document.all(ch) || document.getElementById && document.getElementById(ch);
if(obj && obj.style) obj.style.display=