moved 'like' link.

nahi · Jul 9, 2009 · 1eaff83 · 1eaff83
1 parent e0ee5db
commit 1eaff83
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -85,6 +85,10 @@ def inline_stylesheet
   p.header { font-size: #{h1_size}pt; }
   body { font-size: #{body_size}pt; }
   a img { border: none; }
+  p {
+    margin-top: 1ex;
+    margin-bottom: 1ex;
+  }
   img { margin-right: 0.3ex; }
   img.inline  { vertical-align: text-top; }
   img.media   { border: 1px solid #ccc; padding: 1px; }

diff --git a/app/helpers/entry_helper.rb b/app/helpers/entry_helper.rb
@@ -963,7 +963,7 @@ def page_links(opt = {})
         links << menu_link(menu_label('next', '1'), link_show(entry.id), accesskey('1'))
       end
     end
-    if ctx.inbox and opt[:for_top]
+    if ctx.inbox
       links << menu_link(menu_label('all', '7'), link_list(), accesskey('7'))
     end
     pin_label = 'pin'
@@ -1137,13 +1137,13 @@ def comment_url_link(comment)
 
   def url_link_to(link, query = nil)
     if link and ctx.link != link
-      link_to(inline_menu_label(:url, 'Search related entries'), link_list(:link => link, :query => query))
+      link_to(inline_menu_label(:url, 'Search link'), link_list(:link => link, :query => query))
     end
   end
 
   def delete_link(entry)
     if entry.nickname == auth.name
-      link_to(inline_menu_label(:delete, 'Delete entry'), link_action('delete', :id => u(entry.id)), :confirm => 'Delete?')
+      link_to(inline_menu_label(:delete, 'Delete'), link_action('delete', :id => u(entry.id)), :confirm => 'Delete?')
     end
   end
 

diff --git a/app/views/entry/_entry.html.erb b/app/views/entry/_entry.html.erb
@@ -18,11 +18,11 @@
 <%- end -%>
 <%= content(entry) %>
   <%= via(entry) %>
-<%= like_link(entry) -%>
 <%= published(entry, true) unless root.nil? -%>
 <%- if comment_inline?(entry) -%>
   -- <span class="comment"><%= inline_comment(entry.comments.first) %></span>
 <%- end -%>
+<%= like_link(entry) -%>
 <%= reshare_link(entry) -%>
 <%= friends_likes(entry) unless root.nil? -%>
   <%- comments = fold_comments(entry.comments) -%>

diff --git a/app/views/entry/_single.html.erb b/app/views/entry/_single.html.erb
@@ -49,6 +49,7 @@
             <%= hide_link(entry) %>
             <%= delete_link(entry) %>
             <%= reshare_link(entry) %>
+            <%= url_link(entry) %>
           </p>
         <%- end -%>
       </div>
@@ -57,6 +58,7 @@
   <%- else -%>
     <p>No feed is good feed.</p>
   <%- end -%>
+  </div>
 </div>
 <p>
   <%= original_link(entry) %>
@@ -73,7 +75,6 @@
     <%- else -%>
       <%= link_to(h('Pin this and Go Next'), link_show(next_entry.id, :pin => entry.id)) %><br />
     <%- end -%>
-    <%= link_to(h('Back'), :controller => 'entry') %>
   </p>
 <%- else -%>
   <p>
@@ -82,13 +83,11 @@
     <%- else -%>
       <%= link_to(h('Pin this and Back'), :controller => 'entry', :pin => entry.id) %><br />
     <%- end -%>
-    <%= link_to(h('Back'), :controller => 'entry') %>
   </p>
 <%- end -%>
   <p>
-    <%= url_link(entry) %>
+    <%= link_to(h('Back'), :controller => 'entry') %>
   </p>
-</div>
 <p><a name="bottom"></a>
   <%= page_links(:for_bottom => true, :threads => @threads) %>
 </p>