Merge branch 'design_team' into ldap
This commit is contained in:
commit
c65213c4f1
|
@ -2,9 +2,8 @@
|
||||||
<%= stylesheet_link_tag "inc/permission-checkbox" %>
|
<%= stylesheet_link_tag "inc/permission-checkbox" %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% content_for :page_specific_javascript do %>
|
<% content_for :page_specific_javascript do %>
|
||||||
<%= javascript_include_tag "bootstrap" %>
|
<%= javascript_include_tag "inc/permission-checkbox" %>
|
||||||
<%#= javascript_include_tag "inc/permission-checkbox" %>
|
<%= javascript_include_tag "inc/search" %>
|
||||||
<%#= javascript_include_tag "inc/search" %>
|
|
||||||
<% end %>
|
<% end %>
|
||||||
<%#= label_tag :fact_check_setting, t("announcement.bulletin.fact_check_setting") %>
|
<%#= label_tag :fact_check_setting, t("announcement.bulletin.fact_check_setting") %>
|
||||||
<%= form_tag('', :remote => true) %>
|
<%= form_tag('', :remote => true) %>
|
||||||
|
|
Loading…
Reference in New Issue