Merge branch 'ad_banner' into ldap
This commit is contained in:
commit
7d6b82d9dd
|
@ -1,4 +1,4 @@
|
||||||
$('#submit_button').live('click', function(){
|
$(document).on('click', '#ajax_form_submit', function(){
|
||||||
$('#ajaxForm').ajaxSubmit({
|
$('#ajaxForm').ajaxSubmit({
|
||||||
beforeSubmit: function(a,f,o) {
|
beforeSubmit: function(a,f,o) {
|
||||||
o.dataType = 'script';
|
o.dataType = 'script';
|
||||||
|
|
|
@ -6,10 +6,9 @@ $('.bulletin_files_block a.delete').live('click', function(){
|
||||||
$(this).parents('.list_item').remove();
|
$(this).parents('.list_item').remove();
|
||||||
});
|
});
|
||||||
|
|
||||||
$('.action a.remove_existing_record').live('click', function(){
|
$(document).on('click', '.action a.remove_existing_record', function(){
|
||||||
$(this).next('.should_destroy').attr('value', 1);
|
$(this).next('.should_destroy').attr('value', 1);
|
||||||
//$("#bulletin_" + $(this).prev().attr('value')).hide();
|
$("tr #" + $(this).prev().attr('value')).hide();
|
||||||
$("tr#bulletin_" + $(this).prev().attr('value')).hide();
|
|
||||||
});
|
});
|
||||||
|
|
||||||
$('.quick_edit_cancel').live('click', function(){
|
$('.quick_edit_cancel').live('click', function(){
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
//
|
//
|
||||||
//= require jquery
|
//= require jquery
|
||||||
//= require jquery_ujs
|
//= require jquery_ujs
|
||||||
|
//= require jquery.form
|
||||||
//= require bootstrap
|
//= require bootstrap
|
||||||
//= require jquery.isotope.min
|
//= require jquery.isotope.min
|
||||||
//= require jquery.tinyscrollbar.min
|
//= require jquery.tinyscrollbar.min
|
||||||
|
@ -14,3 +15,4 @@
|
||||||
//= require tinymce_orbit
|
//= require tinymce_orbit
|
||||||
//= require orbit-bar-search
|
//= require orbit-bar-search
|
||||||
//= require side_bar_history
|
//= require side_bar_history
|
||||||
|
//= require ajax_form
|
|
@ -1,28 +1,28 @@
|
||||||
var history_edited = false;
|
var history_edited = false;
|
||||||
|
|
||||||
// $('#back_sidebar a, #back_main a.nav').live('click',
|
$('#back_sidebar a, #back_main a.nav').live('click',
|
||||||
// function () {
|
function () {
|
||||||
// $.getScript(this.href);
|
$.getScript(this.href);
|
||||||
// history.pushState(null, document.title, this.href);
|
history.pushState(null, document.title, this.href);
|
||||||
// history_edited = true;
|
history_edited = true;
|
||||||
// return false;
|
return false;
|
||||||
// }
|
}
|
||||||
// );
|
);
|
||||||
|
|
||||||
// $('#back_main a.reload').live('click',
|
$('#back_main a.reload').live('click',
|
||||||
// function () {
|
function () {
|
||||||
// $.getScript(this.href);
|
$.getScript(this.href);
|
||||||
// history.replaceState(null, document.title, this.href);
|
history.replaceState(null, document.title, this.href);
|
||||||
// history_edited = true;
|
history_edited = true;
|
||||||
// return false;
|
return false;
|
||||||
// }
|
}
|
||||||
// );
|
);
|
||||||
|
|
||||||
// $('.form').live('submit', function () {
|
$('#back_main .form').live('submit', function () {
|
||||||
// $.post(this.action, $(this).serialize(), null, 'script');
|
$.post(this.action, $(this).serialize(), null, 'script');
|
||||||
// history_edited = true;
|
history_edited = true;
|
||||||
// return false;
|
return false;
|
||||||
// });
|
});
|
||||||
|
|
||||||
$(document).on('click', '.js_history',
|
$(document).on('click', '.js_history',
|
||||||
function () {
|
function () {
|
||||||
|
|
|
@ -6,6 +6,10 @@
|
||||||
//
|
//
|
||||||
//= require jquery
|
//= require jquery
|
||||||
//= require jquery_ujs
|
//= require jquery_ujs
|
||||||
//= require page_edit
|
//= require bootstrap
|
||||||
|
//= require jquery.isotope.min
|
||||||
|
//= require jquery.tinyscrollbar.min
|
||||||
|
//= require orbit-1.0
|
||||||
|
//= require orbit-bar-search
|
||||||
//= require side_bar_history
|
//= require side_bar_history
|
||||||
//= require new_admin
|
//= require page_edit
|
|
@ -5,6 +5,10 @@
|
||||||
*= require reset
|
*= require reset
|
||||||
*= require_self
|
*= require_self
|
||||||
*= require message
|
*= require message
|
||||||
|
*= require bootstrap
|
||||||
|
*= require style
|
||||||
|
*= require bootstrap-orbit
|
||||||
|
*= require scroll_style
|
||||||
*= require site_items
|
*= require site_items
|
||||||
*= require sidebar
|
*= require sidebar
|
||||||
*/
|
*/
|
|
@ -124,11 +124,13 @@ module ApplicationHelper
|
||||||
"<title>#{page.title ? page.title[I18n.locale] : page.i18n_variable[I18n.locale]}</title>\n"
|
"<title>#{page.title ? page.title[I18n.locale] : page.i18n_variable[I18n.locale]}</title>\n"
|
||||||
end
|
end
|
||||||
|
|
||||||
def page_stylesheets(page)
|
def page_stylesheets(page, edit=nil)
|
||||||
stylesheets = ''
|
stylesheets = ''
|
||||||
|
unless edit
|
||||||
stylesheets << "<link href='/assets/bootstrap.css' rel='stylesheet' type='text/css' />\n"
|
stylesheets << "<link href='/assets/bootstrap.css' rel='stylesheet' type='text/css' />\n"
|
||||||
stylesheets << "<link href='/assets/bootstrap-orbit.css' rel='stylesheet' type='text/css' />\n"
|
stylesheets << "<link href='/assets/bootstrap-orbit.css' rel='stylesheet' type='text/css' />\n"
|
||||||
stylesheets << "<link href='/assets/style.css' rel='stylesheet' type='text/css' />\n"
|
stylesheets << "<link href='/assets/style.css' rel='stylesheet' type='text/css' />\n"
|
||||||
|
end
|
||||||
stylesheets << "<link href='#{page.design.reset_css.file.url}' rel='stylesheet' type='text/css' />\n" if page.design.reset_css
|
stylesheets << "<link href='#{page.design.reset_css.file.url}' rel='stylesheet' type='text/css' />\n" if page.design.reset_css
|
||||||
stylesheets << "<link href='#{page.design.default_css.file.url}' rel='stylesheet' type='text/css' />\n" if page.design.default_css
|
stylesheets << "<link href='#{page.design.default_css.file.url}' rel='stylesheet' type='text/css' />\n" if page.design.default_css
|
||||||
theme = page.design.themes.detect{ |d| d.id == page.theme_id }
|
theme = page.design.themes.detect{ |d| d.id == page.theme_id }
|
||||||
|
@ -136,17 +138,19 @@ module ApplicationHelper
|
||||||
stylesheets
|
stylesheets
|
||||||
end
|
end
|
||||||
|
|
||||||
def page_javascripts(page)
|
def page_javascripts(page, edit=nil)
|
||||||
javascripts = ''
|
javascripts = ''
|
||||||
|
unless edit
|
||||||
javascripts << "<script type='text/javascript' src='/static/jquery.js'></script>\n"
|
javascripts << "<script type='text/javascript' src='/static/jquery.js'></script>\n"
|
||||||
javascripts << "<script type='text/javascript' src='/static/jquery.cycle.all.latest.js'></script>\n"
|
javascripts << "<script type='text/javascript' src='/static/jquery.cycle.all.latest.js'></script>\n"
|
||||||
javascripts << "<script type='text/javascript' src='/static/kernel.js'></script>\n"
|
|
||||||
javascripts << "<script type='text/javascript' src='/assets/bootstrap.js'></script>\n"
|
javascripts << "<script type='text/javascript' src='/assets/bootstrap.js'></script>\n"
|
||||||
javascripts << "<script type='text/javascript' src='/assets/jquery.tinyscrollbar.min.js'></script>\n"
|
javascripts << "<script type='text/javascript' src='/assets/jquery.tinyscrollbar.min.js'></script>\n"
|
||||||
javascripts << "<script type='text/javascript' src='/assets/jquery.isotope.min.js'></script>\n"
|
javascripts << "<script type='text/javascript' src='/assets/jquery.isotope.min.js'></script>\n"
|
||||||
javascripts << "<script type='text/javascript' src='/assets/orbit-bar-member.js'></script>\n"
|
javascripts << "<script type='text/javascript' src='/assets/orbit-bar-member.js'></script>\n"
|
||||||
javascripts << "<script type='text/javascript' src='/assets/orbit-bar-search.js'></script>\n"
|
javascripts << "<script type='text/javascript' src='/assets/orbit-bar-search.js'></script>\n"
|
||||||
javascripts << "<script type='text/javascript' src='/assets/orbit_bar.js'></script>\n"
|
javascripts << "<script type='text/javascript' src='/assets/orbit_bar.js'></script>\n"
|
||||||
|
end
|
||||||
|
javascripts << "<script type='text/javascript' src='/static/kernel.js'></script>\n"
|
||||||
javascripts << "<script type='text/javascript' src='/assets/event.js'></script>\n"
|
javascripts << "<script type='text/javascript' src='/assets/event.js'></script>\n"
|
||||||
page.design.javascripts.each do |js|
|
page.design.javascripts.each do |js|
|
||||||
# javascripts << "<script type='text/javascript' src='#{js.file.url}'></script>"
|
# javascripts << "<script type='text/javascript' src='#{js.file.url}'></script>"
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<div class="tab-pane fade <%= "active in" if ad_banner_tab==@active%>" id=<%= ad_banner_tab.title %>>
|
<div class="tab-pane fade <%= "active in" if ad_banner_tab==@active%>" id=<%= ad_banner_tab.title.dehumanize %>>
|
||||||
|
|
||||||
<%= form_for ad_banner_tab,:url=> admin_ad_banner_path(ad_banner_tab),:method => :put,:class=>"input-medium" do |f| -%>
|
<%= form_for ad_banner_tab,:url=> admin_ad_banner_path(ad_banner_tab),:method => :put,:class=>"input-medium" do |f| -%>
|
||||||
<div class="adbanner-setup well">
|
<div class="adbanner-setup well">
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
<div class="modal-body">
|
<div class="modal-body">
|
||||||
<p class="ad_banner_slideshow">
|
<p class="ad_banner_slideshow">
|
||||||
<% preview_block_ad_images_helper(ad_banner).each do |ad_image| -%>
|
<% preview_block_ad_images_helper(ad_banner).each do |ad_image| -%>
|
||||||
<%= image_tag ad_image.file,:alt => (ad_image.title[locale] || " "),:time_to_next => ad_banner.transition_sec,:link_open=> ad_image.link_open, :link_url =>((ad_image.out_link || ad_banner.context || " ")) %>
|
<%= image_tag ad_image.file,:alt => (ad_image.title[locale] || " "),:time_to_next => ad_banner.transition_msec,:link_open=> ad_image.link_open, :link_url =>((ad_image.out_link || ad_banner.context || " ")) %>
|
||||||
<% end -%>
|
<% end -%>
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
<div class="modal-body">
|
<div class="modal-body">
|
||||||
<p class="ad_banner_slideshow">
|
<p class="ad_banner_slideshow">
|
||||||
<% preview_block_ad_images_helper(ad_banner).each do |ad_image| -%>
|
<% preview_block_ad_images_helper(ad_banner).each do |ad_image| -%>
|
||||||
<%= image_tag ad_image.file,:alt => (ad_image.title[locale] || ' '),:time_to_next => ad_banner.transition_sec,:link_open=> ad_image.link_open, :link_url =>((ad_image.out_link || ad_banner.context || ' ')) %>
|
<%= image_tag ad_image.file,:alt => (ad_image.title[locale] || ' '),:time_to_next => ad_banner.transition_msec,:link_open=> ad_image.link_open, :link_url =>((ad_image.out_link || ad_banner.context || ' ')) %>
|
||||||
<% end -%>
|
<% end -%>
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
<div id="post-body-content" class="clear">
|
<div id="post-body-content" class="clear">
|
||||||
<ul class="nav nav-tabs">
|
<ul class="nav nav-tabs">
|
||||||
<% @ad_banners.each do |ab| %>
|
<% @ad_banners.each do |ab| %>
|
||||||
<%= content_tag :li,link_to(ab.title,"##{ab.title}",:data=>{:toggle=>"tab"}),:class => (ab == @active ? 'active' : nil ) %>
|
<%= content_tag :li,link_to(ab.title,"##{ab.title.dehumanize}",:data=>{:toggle=>"tab"}),:class => (ab == @active ? 'active' : nil ) %>
|
||||||
<% end -%>
|
<% end -%>
|
||||||
<%= content_tag :li,link_to(t("admin.ad.new_banner"),"#new-a-banner",:data=>{:toggle=>"tab"}),:id=>'new_ad_banner_tab_but',:class => (@active.nil? ? 'active' : nil ) %>
|
<%= content_tag :li,link_to(t("admin.ad.new_banner"),"#new-a-banner",:data=>{:toggle=>"tab"}),:id=>'new_ad_banner_tab_but',:class => (@active.nil? ? 'active' : nil ) %>
|
||||||
|
|
||||||
|
|
|
@ -157,7 +157,7 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-actions">
|
<div class="form-actions">
|
||||||
<%= link_to t("modal.preview"), admin_realtime_preview_ad_banner_path(@ad_image.ad_banner.title) ,:class=>"preview_trigger btn btn-success" rescue nil%>
|
<%#= link_to t("modal.preview"), admin_realtime_preview_ad_banner_path(@ad_image.ad_banner.title) ,:class=>"preview_trigger btn btn-success" rescue nil%>
|
||||||
<%= f.submit t("submit"),:class=>"btn btn-primary" %>
|
<%= f.submit t("submit"),:class=>"btn btn-primary" %>
|
||||||
<%= f.submit t("cancel"),:class=>"btn ",:type => 'reset' %>
|
<%= f.submit t("cancel"),:class=>"btn ",:type => 'reset' %>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
<%= link_back %>
|
<%= link_back %>
|
||||||
<%= f.submit t(:edit) %>
|
<%= f.submit t(:edit) %>
|
||||||
<% else %>
|
<% else %>
|
||||||
<a id='submit_button'><%= t(:edit) %></a>
|
<a id='ajax_form_submit'><%= t(:edit) %></a>
|
||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
<%= link_back %>
|
<%= link_back %>
|
||||||
<%= f.submit t(:create) %>
|
<%= f.submit t(:create) %>
|
||||||
<% else %>
|
<% else %>
|
||||||
<a id='submit_button' class="new"><%= t(:create) %></a>
|
<a id='ajax_form_submit' class="new"><%= t(:create) %></a>
|
||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<%= flash_messages %>
|
<%= flash_messages %>
|
||||||
|
|
||||||
|
|
||||||
<%= page_stylesheets(@item).html_safe %>
|
<%= page_stylesheets(@item, true).html_safe %>
|
||||||
<%= page_javascripts(@item).html_safe %>
|
<%= page_javascripts(@item, true).html_safe %>
|
||||||
|
|
||||||
<%= parse_page_edit_noko(@item).html_safe %>
|
<%= parse_page_edit_noko(@item).html_safe %>
|
|
@ -1,5 +1 @@
|
||||||
<% content_for :sidebar do %>
|
|
||||||
<%= render 'admin/items/site_map_left_bar' %>
|
|
||||||
<% end -%>
|
|
||||||
|
|
||||||
<%= render 'show' %>
|
<%= render 'show' %>
|
|
@ -33,8 +33,8 @@
|
||||||
<%= link_to content_tag(:i, nil, :class => 'icons-link') + t('admin.ad_banner'), admin_ad_banners_path %>
|
<%= link_to content_tag(:i, nil, :class => 'icons-link') + t('admin.ad_banner'), admin_ad_banners_path %>
|
||||||
<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('ad_banners', 'ad_images')) do -%>
|
<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('ad_banners', 'ad_images')) do -%>
|
||||||
<%= content_tag :li, link_to(t('admin.ad.all_banners'), admin_ad_banners_path), :class => active_for_action('ad_banners', 'index') %>
|
<%= content_tag :li, link_to(t('admin.ad.all_banners'), admin_ad_banners_path), :class => active_for_action('ad_banners', 'index') %>
|
||||||
<%= content_tag :li, link_to(t('admin.ad.new_banner'), new_admin_ad_banner_path), :class => active_for_action('ad_banners', 'new') %>
|
<%#= content_tag :li, link_to(t('admin.ad.new_banner'), new_admin_ad_banner_path), :class => active_for_action('ad_banners', 'new') %>
|
||||||
<%= content_tag :li, link_to(t('admin.ad.new_image'), new_ad_image_admin_ad_banners_path), :class => active_for_action('ad_images', 'new') %>
|
<%#= content_tag :li, link_to(t('admin.ad.new_image'), new_ad_image_admin_ad_banners_path), :class => active_for_action('ad_images', 'new') %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
|
|
|
@ -9,31 +9,30 @@
|
||||||
<![endif]-->
|
<![endif]-->
|
||||||
<%= stylesheet_link_tag "site_editor" %>
|
<%= stylesheet_link_tag "site_editor" %>
|
||||||
<%= javascript_include_tag "site_editor" %>
|
<%= javascript_include_tag "site_editor" %>
|
||||||
<%= yield :page_specific_css %>
|
|
||||||
<%= yield :page_specific_javascript %>
|
|
||||||
<%= csrf_meta_tag %>
|
<%= csrf_meta_tag %>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<!--
|
<%= render 'layouts/orbit_bar' %>
|
||||||
<header id="back_banner_link" class="fixed clear" >
|
<nav id="main-sidebar" class="my_scroll">
|
||||||
<nav id="back_orbit">
|
<div class="scrollbar">
|
||||||
<span>Orbit Icon</span>
|
<div class="track">
|
||||||
<%= render 'layouts/drop_down_menu' %>
|
<div class="thumb">
|
||||||
|
<div class="end"></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="viewport">
|
||||||
|
<div id='back_sidebar' class="overview">
|
||||||
|
<ul class="nav nav-list">
|
||||||
|
<%= yield :sidebar %>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</nav>
|
</nav>
|
||||||
<div class="hmenu">
|
|
||||||
<%= render 'devise/menu/login_items' %>
|
|
||||||
<div class="lang"><%= render 'layouts/lang_menu' %></div>
|
|
||||||
</div>
|
|
||||||
</header>
|
|
||||||
-->
|
|
||||||
<div id="main-wrap">
|
<div id="main-wrap">
|
||||||
<div id="main-sidebar"><%= yield :sidebar %></div>
|
<div id='back_main'>
|
||||||
<div class="main"><div id='back_main' class="main2">
|
|
||||||
<%= yield %>
|
<%= yield %>
|
||||||
</div></div>
|
|
||||||
<div class="tertiary"><%= yield :tertiary %></div>
|
|
||||||
<div id="back_footer"><p><%= APP_CONFIG['ruling_digital'] %></p></div>
|
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
@ -66,7 +66,7 @@ module ParserCommon
|
||||||
printable_ad_images.each do |ad_image| #TODO Need Reflact
|
printable_ad_images.each do |ad_image| #TODO Need Reflact
|
||||||
res << "<img src='#{ad_image.file}' "
|
res << "<img src='#{ad_image.file}' "
|
||||||
res << "alt='#{ad_image.title || ' '}' "
|
res << "alt='#{ad_image.title || ' '}' "
|
||||||
res << "time_to_next='#{ad_banner.transition_sec}' "
|
res << "time_to_next='#{ad_banner.transition_msec}' "
|
||||||
res << "link_open='#{ad_image.link_open}' "
|
res << "link_open='#{ad_image.link_open}' "
|
||||||
# res << "link_url='#{(ad_image.direct_to_after_click?? ad_image.out_link : ad_banner.context) || ' '}' "
|
# res << "link_url='#{(ad_image.direct_to_after_click?? ad_image.out_link : ad_banner.context) || ' '}' "
|
||||||
res << "link_url='#{(ad_image.out_link || ad_banner.context || ' ')}' "
|
res << "link_url='#{(ad_image.out_link || ad_banner.context || ' ')}' "
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<% # encoding: utf-8 %>
|
<% # encoding: utf-8 %>
|
||||||
|
|
||||||
<%= form_for(@bulletin_file, :remote => true, :url => @file_url) do |f| %>
|
<%= form_for @bulletin_file, :url => @file_url, :html => {:id => 'ajaxForm', :multipart => true} do |f| %>
|
||||||
|
|
||||||
<div class="modal-header">
|
<div class="modal-header">
|
||||||
<a class="close" data-dismiss="modal">×</a>
|
<a class="close" data-dismiss="modal">×</a>
|
||||||
|
@ -39,7 +39,7 @@
|
||||||
|
|
||||||
<div class="modal-footer">
|
<div class="modal-footer">
|
||||||
<%= hidden_field_tag 'bulletin_file[bulletin_id]', @bulletin_file.bulletin_id %>
|
<%= hidden_field_tag 'bulletin_file[bulletin_id]', @bulletin_file.bulletin_id %>
|
||||||
<%= f.submit t('submit'), :class=>'btn btn-primary' %>
|
<a class="btn btn-primary" id='ajax_form_submit'><%= t('submit')%></a>
|
||||||
<a class="btn" data-dismiss="modal"><%= t('cancel')%></a>
|
<a class="btn" data-dismiss="modal"><%= t('cancel')%></a>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
|
|
||||||
<tr id="<%= dom_id list_bulletin_file %>">
|
<tr id="<%= dom_id list_bulletin_file %>">
|
||||||
<td><%= list_bulletin_file.file.file ? ( link_to list_bulletin_file.filetitle.zh_tw, list_bulletin_file.file.url, {:target => '_blank', :title => list_bulletin_file.description.zh_tw} ) : list_bulletin_file.filetitle.zh_tw %></td>
|
<td><%= list_bulletin_file.file.file ? ( link_to list_bulletin_file.filetitle.zh_tw, list_bulletin_file.file.url, {:target => '_blank', :title => list_bulletin_file.description.zh_tw} ) : list_bulletin_file.filetitle.zh_tw %></td>
|
||||||
<td><%= list_bulletin_file.file.file ? ( link_to list_bulletin_file.filetitle.en, list_bulletin_file.file.url, {:target => '_blank', :title => list_bulletin_file.description.en} ) : list_bulletin_file.filetitle.en %></td>
|
<td><%= list_bulletin_file.file.file ? ( link_to list_bulletin_file.filetitle.en, list_bulletin_file.file.url, {:target => '_blank', :title => list_bulletin_file.description.en} ) : list_bulletin_file.filetitle.en %></td>
|
||||||
<td>
|
<td>
|
||||||
|
@ -7,12 +7,13 @@
|
||||||
<span class="action">
|
<span class="action">
|
||||||
<%= fields_for "bulletin[bulletin_files_attributes][]", list_bulletin_file, :index => list_bulletin_file_counter do |f| %>
|
<%= fields_for "bulletin[bulletin_files_attributes][]", list_bulletin_file, :index => list_bulletin_file_counter do |f| %>
|
||||||
<%= f.hidden_field :id %>
|
<%= f.hidden_field :id %>
|
||||||
<a href class="remove_existing_record"><i class="icon-remove"></i></a>
|
<%= hidden_field_tag :tr, (dom_id list_bulletin_file) %>
|
||||||
<%= f.hidden_field :should_destroy, :value => nil , :class => 'should_destroy' %>
|
<a class="remove_existing_record"><i class="icon-remove"></i></a>
|
||||||
|
<%= f.hidden_field :_destroy, :value => nil , :class => 'should_destroy' %>
|
||||||
<% end %>
|
<% end %>
|
||||||
</span>
|
</span>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
|
<tr id="<%= dom_id list_bulletin_link %>">
|
||||||
<tr id="<%= dom_id list_bulletin_link %>">
|
|
||||||
<td><%= link_to list_bulletin_link.i18n_variable.zh_tw, list_bulletin_link.url, :target => '_blank' %></td>
|
<td><%= link_to list_bulletin_link.i18n_variable.zh_tw, list_bulletin_link.url, :target => '_blank' %></td>
|
||||||
<td><%= link_to list_bulletin_link.i18n_variable.en, list_bulletin_link.url, :target => '_blank' %></td>
|
<td><%= link_to list_bulletin_link.i18n_variable.en, list_bulletin_link.url, :target => '_blank' %></td>
|
||||||
<td>
|
<td>
|
||||||
|
@ -7,13 +6,10 @@
|
||||||
<span class="action">
|
<span class="action">
|
||||||
<%= fields_for "bulletin[bulletin_links_attributes][]", list_bulletin_link, :index => list_bulletin_link_counter do |f| %>
|
<%= fields_for "bulletin[bulletin_links_attributes][]", list_bulletin_link, :index => list_bulletin_link_counter do |f| %>
|
||||||
<%= f.hidden_field :id %>
|
<%= f.hidden_field :id %>
|
||||||
<a href class="remove_existing_record"><i class="icon-remove"></i></a>
|
<%= hidden_field_tag :tr, (dom_id list_bulletin_link) %>
|
||||||
<%= f.hidden_field :should_destroy, :value => nil , :class => 'should_destroy' %>
|
<a class="remove_existing_record"><i class="icon-remove"></i></a>
|
||||||
|
<%= f.hidden_field :_destroy, :value => nil, :class => 'should_destroy' %>
|
||||||
<% end %>
|
<% end %>
|
||||||
</span>
|
</span>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<div id="qe-file" class="qe-edit-div">
|
<div id="qe-file" class="qe-edit-div">
|
||||||
<div id="widget-file">
|
<div id="widget-file">
|
||||||
<div class="control-group">
|
<div class="control-group">
|
||||||
<table class="table table-condensed">
|
<table id="bulletin_files" class="table table-condensed">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th>Chinese</th>
|
<th>Chinese</th>
|
||||||
|
|
|
@ -15,6 +15,12 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div id="bulletin_file_qe">
|
||||||
|
<div id="modal-file" class="modal fade">
|
||||||
|
<%= render :partial => "bulletin_file_qe" %>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="form-actions">
|
<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' %>
|
<%= 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>
|
</div>
|
||||||
|
|
Loading…
Reference in New Issue