Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member

Conflicts:
	app/helpers/attribute_fields_helper.rb
	app/views/admin/infos/_form.html.erb
	config/locales/zh_tw.yml

app/views/admin/attributes/_attribute_field.html.erb

@@ -9,7 +9,6 @@
 	  <% end %>
 	<% end %>
   <td class='select_type'>
-
     <ul>
       <li>markup<%= f.select :markup, LIST[:markups].keys, {}, {:style => "width:90px"} %> </li>
       <li>markup_value<%= f.text_field :markup_value,:size=>50 %></li>
@@ -22,12 +21,9 @@
       <li>neutral_for<%= f.select :neutral_for, VALID_LOCALES, {}, {:style => "width:90px"} %> </li>
     <!--  
       <li><%#= attribute_field[:markup].eql?('select') ? nil : "style='display:none'"%> </li>
-      <li><%#= t('admin.options') %>: <%#= f.text_field :markup_value%></li>
+      <li><%#= t(:options) %>: <%#= f.text_field :markup_value%></li>
     -->
     </ul>
-    
-
-    
   </td>
   <td class="action">
 		<% if attribute_field.new_record? %>

app/views/admin/attributes/index.html.erb

@@ -4,13 +4,13 @@
 
 <div class="main_list">
 	<div class="button_bar up">
-		<%= link_to t("admin.new_#{@attribute_type}"), eval("new_admin_#{@attribute_type}_path"), :class => 'new' %>
+		<%= link_to t("new.#{@attribute_type}"), eval("new_admin_#{@attribute_type}_path"), :class => 'new' %>
 	</div>
 	<table>
 		<thead>
 		<tr>
-			<td class="<%= @attribute_type %>s"><%= t("admin.#{@attribute_type}") %></td>
-			<td class="action"><%= t('admin.action') %></td>
+			<td class="<%= @attribute_type %>s"><%= t("#{@attribute_type}") %></td>
+			<td class="action"><%= t(:action) %></td>
 		</tr>
 		</thead>
 		<tbody>
@@ -34,6 +34,6 @@
 		</tbody>	
 	</table>
 	<div class="button_bar">
-		<%= link_to t("admin.new_#{@attribute_type}"), eval("new_admin_#{@attribute_type}_path"), :class => 'new' %>
+		<%= link_to t("new.#{@attribute_type}"), eval("new_admin_#{@attribute_type}_path"), :class => 'new' %>
 	</div>
 </div>