Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tool Tips : regular edit pencil-Edit this wiki page , Delete -Delete this wiki page ,etherpad -practice in a real time doc , revisions-View previous versions #2212

Merged
merged 5 commits into from
Feb 15, 2018
Merged

Tool Tips : regular edit pencil-Edit this wiki page , Delete -Delete this wiki page ,etherpad -practice in a real time doc , revisions-View previous versions #2212

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0fb5e83
Update _header.html.erb
Apoorva-13 Feb 3, 2018
26aaef8
Update _header.html.erb
Apoorva-13 Feb 3, 2018
14a7ded
Update _header.html.erb
Apoorva-13 Feb 5, 2018
fb8f273
Update _header.html.erb
Apoorva-13 Feb 8, 2018
01d3a60
adding "delete this wiki page" tooltip
Apoorva-13 Feb 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions app/views/wiki/_header.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
</li>
<% else %>
<li>
<a href="<%= @node.edit_path %>?t=<%= Time.now.to_i %>">
<a rel="tooltip" title="Edit this wiki page." data-placement="top" href="<%= @node.edit_path %>?t=<%= Time.now.to_i %>">
<i class="fa fa-pencil"></i>
<span class="hidden-xs hidden-sm hidden-md"></span>
</a>
Expand All @@ -70,22 +70,23 @@

<% if current_user && current_user.role == "admin" %>
<li>
<%= link_to url_for(action: :delete,id: @node.id),method: :delete, data: {confirm: I18n.t('wiki.show.are_you_sure_delete', path: @node.path)} do %>
<a rel="tooltip" title="Delete this wiki page." data-placement="top" %= link_to url_for(action: :delete,id: @node.id),method: :delete, data: {confirm: I18n.t('wiki.show.are_you_sure_delete', path: @node.path)} do %>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Umm, this is the culprit. You can either use a OR link_to. Not both.

<i class="fa fa-trash"></i>
<span class="hidden-xs hidden-sm hidden-md hidden-lg"> <%= t('wiki.show.delete') %></span>
</a>
<% end %>
</li>
<% end %>

<li>
<a href="/talk/<%= @node.slug_from_path %>">
<a rel="tooltip" title="Practice in a realtime doc." data-placement="top" href="/talk/<%= @node.slug_from_path %>">
<i class="fa fa-comments-o"></i>
<span class="hidden-xs hidden-sm hidden-md"> <%= t('wiki.show.talk') %></span>
</a>
</li>

<li>
<a href="/wiki/revisions/<%= @node.slug_from_path %>">
<a rel="tooltip" title="=View previous versions of this page." data-placement="top" href="/wiki/revisions/<%= @node.slug_from_path %>">
<span class="hidden-xs"><%= @node.revisions.length %> </span>
<i class="fa fa-list"></i>
</a>
Expand Down