Ray's changes in structure

app/views/admin/links/_edit.html.erb

@@ -7,4 +7,4 @@
       <%= f.submit t(:update_), class: 'btn btn-primary btn-small' %>
     </div>
   </fieldset>
-<% end %>
+<% end %>

app/views/admin/links/_form.html.erb

@@ -3,8 +3,14 @@
 
 <%= f.hidden_field :parent, :value => (@item.parent.id rescue nil) %>
 
+<<<<<<< Updated upstream
 <%= f.label :name, t(:name) %>
 <%= f.text_field :name, class: 'input-xlarge', placeholder: t(:name) %>
+=======
+<%= f.label :name, content_tag(:i, nil, :class => "icons-star") + t(:name) %>
+<%= f.text_field :name, class: 'input-xlarge', placeholder: t(:name) %>
+<span class="help-block"><%= I18n.t("front_page.name_field_helper") %></span>
+>>>>>>> Stashed changes
 
 <%= f.label :url, t(:url) %>
 <%= f.text_field :url, :class => 'input-xlarge', placeholder: t(:url) %>