Merge branch 'master' of github.com:Rulingcom/NCCU
This commit is contained in:
commit
9196deb997
19 files changed
+72
-14
No files matched your search
@@ -22,5 +22,7 @@ $(document).on('click', '.quick_edit_cancel', function(){
|
||||
$("tr#bulletin_file_" + $(this).prev().attr('value')).hide();
|
||||
$("tr#bulletin_link_" + $(this).prev().attr('value')).hide();
|
||||
});
|
||||
|
||||
$('.reject_info').tooltip({
|
||||
placement : 'bottom'
|
||||
});
|
||||
});
|
||||
@@ -23,4 +23,7 @@ $(document).on('click', '.quick_edit_cancel', function(){
|
||||
$("tr#news_bulletin_file_" + $(this).prev().attr('value')).hide();
|
||||
$("tr#news_bulletin_link_" + $(this).prev().attr('value')).hide();
|
||||
});
|
||||
$('.reject_info').tooltip({
|
||||
placement : 'bottom'
|
||||
});
|
||||
});
|
||||
@@ -227,4 +227,9 @@ module ApplicationHelper
|
||||
end
|
||||
end
|
||||
|
||||
def wrap_string_with(str,options={})
|
||||
line_width = options[:line_width] || 12
|
||||
wrap_mark = options[:wrap_mark] || "<br />"
|
||||
str.scan((/.{0,#{line_width}}/)).join(wrap_mark)
|
||||
end
|
||||
end
|
||||
Reference in new issue
Block a user