after merge
This commit is contained in:
		
							parent
							
								
									50a9f66269
								
							
						
					
					
						commit
						c7a333f990
					
				|  | @ -0,0 +1,27 @@ | |||
| 
 | ||||
| 		<div  id="<%= "bulletin_#{bulletin_link.id}" if !bulletin_link.new_record? %>" class='list_item'> | ||||
| 		  <div class="field"> | ||||
| 
 | ||||
| 			<%= f.label :link_url %> | ||||
| 			<%= f.text_field :url %> | ||||
| 
 | ||||
| 			<%= f.label :link_name %> | ||||
| 			<%#= f.text_field :name %>			 | ||||
| 			<%= f.fields_for :i18n_variable, (bulletin_link.new_record? ? bulletin_link.build_i18n_variable : bulletin_link.i18n_variable) do |f| %> | ||||
| 			  <% @site_valid_locales.each do |locale| %> | ||||
| 				<%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %> | ||||
| 				<%= f.text_field locale, :style => "width:130px" %> | ||||
| 			  <% end %> | ||||
| 			<% end %> | ||||
| 
 | ||||
| 			<span class="action"> | ||||
| 			<% if bulletin_link.new_record? %> | ||||
| 			  <a href="#" class="delete"><%= t(:delete) %></a> | ||||
| 			<% else %>	 | ||||
| 			  <%= f.hidden_field :id %> | ||||
| 			  <a href="#" class="remove_existing_record"><%= t(:delete) %></a> | ||||
| 			  <%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %> | ||||
| 			<% end %> | ||||
| 			</span> | ||||
| 		  </div> | ||||
| 		</div> | ||||
|  | @ -0,0 +1,16 @@ | |||
| 		 | ||||
| 				<tr id="<%= "bulletin_#{bulletin_link2.id}" %>"> | ||||
| 					<td><%= link_to bulletin_link2.i18n_variable.zh_tw, bulletin_link2.url, :target => '_blank' %></td> | ||||
| 					<td><%= link_to bulletin_link2.i18n_variable.en, bulletin_link2.url, :target => '_blank' %></td> | ||||
| 					<td><a href="#modal-link" data-toggle="modal" class="action"><i class="icon-pencil"></i></a> | ||||
| 					<span class="action"> | ||||
| 					 <%= f.hidden_field :id %> | ||||
| 					 <a href class="remove_existing_record"><i class="icon-remove"></i></a> | ||||
| 					 <%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %> | ||||
| 					 </span> | ||||
| 					</td> | ||||
| 				</tr> | ||||
| 
 | ||||
| 
 | ||||
| 				 | ||||
| 				 | ||||
|  | @ -0,0 +1,9 @@ | |||
| <%= render 'filter' %> | ||||
| <table id="bulettin_sort_list" class="table main-list"> | ||||
| 	<%= render 'bulletins' %> | ||||
| </table> | ||||
| 
 | ||||
| <div class="form-actions"> | ||||
| 	<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('admin.add'), new_panel_announcement_back_end_bulletin_path, :class => 'btn btn-primary' %> | ||||
| </div> | ||||
| 
 | ||||
		Loading…
	
		Reference in New Issue