saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Conflicts:
	app/assets/javascripts/bulletin_form.js.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb
	vendor/built_in_modules/announcement/config/routes.rb
This commit is contained in:
Christophe Vilayphiou 2012-03-27 18:37:14 +08:00
parent 33955b4554 e8d1352890
commit f9c5ee5d18
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/bulletin_form.js.erb
View File

@ -1,11 +1,9 @@
$('.bulletin_links_block a.delete').live('click', function(){ $('.bulletin_links_block a.delete').live('click', function(){
//$(this).parents('.list_item').remove(); $(this).parents('.list_item').remove();
$(this).parents('tr.list_item').remove();
}); });
$('.bulletin_files_block a.delete').live('click', function(){ $('.bulletin_files_block a.delete').live('click', function(){
//$(this).parents('.list_item').remove(); $(this).parents('.list_item').remove();
$(this).parents('tr.list_item').remove();
}); });
$('.action a.remove_existing_record').live('click', function(){ $('.action a.remove_existing_record').live('click', function(){

21
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb vendored
View File

@ -164,6 +164,9 @@
</div> </div>
<h3 class="widget-title"><i class="icons-link icons-white"></i>Link</h3> <h3 class="widget-title"><i class="icons-link icons-white"></i>Link</h3>
<div class="widget-content"> <div class="widget-content">
<div id='bulletin_links' class="bulletin_links_block">
<table class="table table-condensed"> <table class="table table-condensed">
<thead> <thead>
<tr> <tr>
@ -186,8 +189,6 @@
</tr> </tr>
</tfoot> </tfoot>
<tbody> <tbody>
<div id='bulletin_links' class="bulletin_links_block">
<% @bulletin.bulletin_links.each_with_index do |bulletin_link, i| %> <% @bulletin.bulletin_links.each_with_index do |bulletin_link, i| %>
<%#= fields_for "bulletin[bulletin_links][]", bulletin_link do |f| %> <%#= fields_for "bulletin[bulletin_links][]", bulletin_link do |f| %>
@ -195,11 +196,13 @@
<%= render :partial => 'form_bulletin_link', :object => bulletin_link, :locals => {:f => f, :i => i} %> <%= render :partial => 'form_bulletin_link', :object => bulletin_link, :locals => {:f => f, :i => i} %>
<% end %> <% end %>
<% end %> <% end %>
</div>
</tbody> </tbody>
</table> </table>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -212,6 +215,9 @@
</div> </div>
<h3 class="widget-title"><i class="icons-paperclip icons-white"></i>File</h3> <h3 class="widget-title"><i class="icons-paperclip icons-white"></i>File</h3>
<div class="widget-content"> <div class="widget-content">
<div id='bulletin_files' class="bulletin_files_block">
<table class="table table-condensed"> <table class="table table-condensed">
<thead> <thead>
<tr> <tr>
@ -232,8 +238,6 @@
</tr> </tr>
</tfoot> </tfoot>
<tbody> <tbody>
<div id='bulletin_files' class="bulletin_files_block">
<% @bulletin.bulletin_files.each_with_index do |bulletin_file, i| %> <% @bulletin.bulletin_files.each_with_index do |bulletin_file, i| %>
<%#= fields_for "bulletin[bulletin_files][]", bulletin_file do |f| %> <%#= fields_for "bulletin[bulletin_files][]", bulletin_file do |f| %>
@ -241,11 +245,12 @@
<%= render :partial => 'form_bulletin_file', :object => bulletin_file, :locals => {:f => f, :i => i} %> <%= render :partial => 'form_bulletin_file', :object => bulletin_file, :locals => {:f => f, :i => i} %>
<% end %> <% end %>
<% end %> <% end %>
</div>
</tbody> </tbody>
</table> </table>
</div>
</div> </div>
</div> </div>
</div> </div>