Ray's changes in structure

app/views/admin/items/_node.html.erb

@@ -10,6 +10,7 @@
       <span title="<%= t(:link) %>" class="item-type link tip"><i class="icon-link"></i></span>
     <% end %>
     <div class="item-title">
+      <%= content_tag(:em, node.url, class: "muted") if node.class.to_s.eql?('Link') %>
       <%= link_to node.title, "/" + node.path %>
       <div class="item-menu">
         <%= link_to content_tag(:i, nil, class: "icon-eye-open"), eval("admin_#{node.class.to_s.downcase}_path(node)"), class: "view-page open-slide tip", title: t(:view) if node.class.to_s.eql?('Page') %>
@@ -18,7 +19,6 @@
         <%= link_to content_tag(:i, nil, class: "icon-link"), new_admin_link_path(:parent_id => node.id), class: "open-slide tip", title: t(:add_link) if node.class.to_s.eql?('Page') %>
         <%= link_to content_tag(:i, nil, class: "icon-trash"), nil, rel: eval("admin_#{node.class.to_s.downcase}_path(node)"), class: "delete tip", title: t(:delete_) unless node.root? %>
       </div>
-      <%= content_tag(:em, node.url, class: "muted") if node.class.to_s.eql?('Link') %>
     </div>
     <div class="item-info pull-right">
       <% @site_valid_locales.each do |valid_locale| %>

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) %>

app/views/admin/page_parts/_custom_widget_setting.html.erb

@@ -1,4 +1,4 @@
-<div class="style_switch  control-group">
+<div class="style_switch control-group">
   <label class="control-label">
     <%= t("default_widget.select_widget_style") %>
   </label>
@@ -10,11 +10,11 @@
     <% end %>
   </div>
 </div>
-  <% if(@selected[:module_app] && @selected[:module_app].widget_options(@selected[:app_frontend_url])) %>
-    <div class="style_switch  control-group">
-      <label class="control-label"><%= t("default_widget.select_widget_ext_option") %></label>
-      <div class="controls well" >
-        <%= render :partial=> "widget_ext_options" %>  
-      </div>
+<% if(@selected[:module_app] && @selected[:module_app].widget_options(@selected[:app_frontend_url])) %>
+  <div class="style_switch control-group">
+    <label class="control-label"><%= t("default_widget.select_widget_ext_option") %></label>
+    <div class="controls well" >
+      <%= render :partial=> "widget_ext_options" %>  
     </div>
-    <% end %>
+  </div>
+<% end %>

app/views/admin/page_parts/_widget_data_source_category.html.erb

@@ -7,16 +7,14 @@
 
 
 <label  class="control-label"><%= t "default_widget.data_source.category" %></label>
-  <div class="controls"> 
-<% if @categories %>
-    <fieldset>
-        <%= nil_checkbox_button(object,:category) %>
-        <%= content_tag_for(:label, @categories,:class=>"radio inline") do |category|%>
-          <%= check_box_tag("#{field_name}[category][]", category.id,  category_checked_value(object,category.id),:class=>'select_option' )%>
-          <%= category.title%>
-        <% end %>
-    </fieldset>
+<p>
+  <% if @categories %>
+      <%= nil_checkbox_button(object,:category) %>
+      <%= content_tag_for(:label, @categories,:class=>"radio") do |category|%>
+        <%= check_box_tag("#{field_name}[category][]", category.id,  category_checked_value(object,category.id),:class=>'select_option' )%>
+        <%= category.title%>
+      <% end %>
   <% else %>
     <%= t("default_widget.no_support_setting")%>
   <% end %>
-</div>
+</p>

app/views/admin/page_parts/_widget_data_source_tag.html.erb

@@ -7,16 +7,14 @@
 
 
 <label class="control-label"><%= t "default_widget.data_source.tag" %></label>
-<div class="controls">
+<p>
   <% if @categories %>
-    <fieldset>
-        <%= nil_checkbox_button(object,:tag) %>
-        <%= content_tag_for(:label, @tags,:class=>"radio inline") do |tag|%>
-          <%= check_box_tag("#{field_name}[tag][]", tag.id,  tag_checked_value(object,tag.id),:class=>'select_option'  ) %>
-          <%= tag.name%>
-        <% end if @tags%>
-    </fieldset>
+      <%= nil_checkbox_button(object,:tag) %>
+      <%= content_tag_for(:label, @tags,:class=>"radio") do |tag|%>
+        <%= check_box_tag("#{field_name}[tag][]", tag.id,  tag_checked_value(object,tag.id),:class=>'select_option'  ) %>
+        <%= tag.name%>
+      <% end if @tags%>
   <% else %>
     <%= t("default_widget.no_support_setting")%>
   <% end %>
-</div>
+</p>

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

@@ -4,7 +4,7 @@
 <%= f.hidden_field :parent, :value => (@item.parent.id rescue nil) %>
 <%= f.hidden_field :id, :value => (@item.id), :id => "object_id" %>
 
-<%= f.label :name, '*' + 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>
 
@@ -87,4 +87,9 @@
         </label>
 		<% end %>
 		<%= hidden_field_tag 'page[enabled_for][]', '' %>
-</p>
+		<!-- <p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p> -->
+	</div>
+</div>
+
+<%=javascript_include_tag "inc/update_cates_and_tags.js" %>
+<%= javascript_include_tag "inc/page_widget_edit_interface.js" %>