diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index e46485ade..09ec733fe 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -2521,7 +2521,7 @@ module ApplicationHelper # Returns the javascript tags that are included in the html layout head def javascript_heads - tags = javascript_include_tag('jquery-1.8.3-ui-1.9.2-ujs-2.0.3', 'application', 'jquery.colorbox-min') + tags = javascript_include_tag('jquery-1.8.3-ui-1.9.2-ujs-2.0.3', 'application', 'jquery.colorbox-min', 'jquery.min', 'jquery.tooltipster','scripts' ) unless User.current.pref.warn_on_leaving_unsaved == '0' tags << "\n".html_safe + javascript_tag("$(window).load(function(){ warnLeavingUnsaved('#{escape_javascript l(:text_warn_on_leaving_unsaved)}'); });") end diff --git a/app/views/layouts/_bigdata_header.html.erb b/app/views/layouts/_bigdata_header.html.erb index 4cf79ca30..bce467cfb 100644 --- a/app/views/layouts/_bigdata_header.html.erb +++ b/app/views/layouts/_bigdata_header.html.erb @@ -1,6 +1,6 @@
注册 diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb index b9866dc36..9d21af2af 100644 --- a/app/views/layouts/_footer.html.erb +++ b/app/views/layouts/_footer.html.erb @@ -8,26 +8,26 @@
- - + +
- <%= link_to image_tag("/images/bigdata/new-logo.png",width:"50px", height: "50px", alt:"高校教育大数据服务平台", class:"fl"), home_path %> - + <%= link_to image_tag("/images/bigdata/bigdata-logo.png",width:"50px", height: "50px", alt:"高校智能化教学与实训平台", class:"fl"), home_path %> +
diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb index 9ebef467a..013b2db4c 100644 --- a/app/views/layouts/_logined_header.html.erb +++ b/app/views/layouts/_logined_header.html.erb @@ -1,10 +1,10 @@
diff --git a/app/views/layouts/_unlogin_header.html.erb b/app/views/layouts/_unlogin_header.html.erb index 8b272823f..a8feb77e6 100644 --- a/app/views/layouts/_unlogin_header.html.erb +++ b/app/views/layouts/_unlogin_header.html.erb @@ -1,6 +1,6 @@
diff --git a/app/views/layouts/base_shixun.html.erb b/app/views/layouts/base_shixun.html.erb index 46fc3e9ba..39c321696 100644 --- a/app/views/layouts/base_shixun.html.erb +++ b/app/views/layouts/base_shixun.html.erb @@ -9,7 +9,7 @@ <%= favicon %> <%= javascript_heads %> <%= heads_for_theme %> - <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common', 'css/bigdata-common','css/bigdata-public', 'css/taskstyle', 'css/structure','scm','css/public', 'css/project','css/popup','repository','css/gantt', 'css/calendar', 'css/moduel', 'css/font-awesome' %> + <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common', 'css/bigdata-common','css/bigdata-public', 'css/taskstyle', 'css/structure','scm','css/public', 'css/project','css/popup','repository','css/gantt', 'css/calendar', 'css/moduel', 'css/font-awesome', 'css/bigdata-tooltipster' %> <%= call_hook :view_layouts_base_html_head %> <%= yield :header_tags -%> diff --git a/app/views/users/_user_message_applied.html.erb b/app/views/users/_user_message_applied.html.erb index 72799e63e..4d7a2bd0a 100644 --- a/app/views/users/_user_message_applied.html.erb +++ b/app/views/users/_user_message_applied.html.erb @@ -7,7 +7,7 @@ <% applied_user = User.find(ma.applied_user_id) %> <%= link_to image_tag(url_to_avatar(applied_user), :width => "30", :height => "30"), user_path(applied_user), :target => '_blank' %> <% else %> - <%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %> + <%= image_tag("/images/bigdata-logo.png", width: "30px", height: "30px", class: "mt3") %> <% end %>
  • diff --git a/app/views/users/_user_message_contest.html.erb b/app/views/users/_user_message_contest.html.erb index 5370ad218..ee66d8f57 100644 --- a/app/views/users/_user_message_contest.html.erb +++ b/app/views/users/_user_message_contest.html.erb @@ -69,7 +69,7 @@