diff --git a/app/controllers/school_controller.rb b/app/controllers/school_controller.rb index 749491b69..ec9913684 100644 --- a/app/controllers/school_controller.rb +++ b/app/controllers/school_controller.rb @@ -6,9 +6,11 @@ class SchoolController < ApplicationController options = "" @school.each do |s| - options << "" + #options << "" + options << "
  • #{s.name}
  • " end + render :text => options end diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb index 17109b256..92bc93c3e 100644 --- a/app/views/layouts/base.html.erb +++ b/app/views/layouts/base.html.erb @@ -10,6 +10,7 @@ <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan', :media => 'all' %> <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %> <%= javascript_heads %> +<%= javascript_include_tag "jquery.leanModal.min" %> <%= javascript_include_tag 'seems_rateable/jRating', 'seems_rateable/rateable'%> <%= heads_for_theme %> <%= call_hook :view_layouts_base_html_head %> diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb index e46b25fc4..6233772f4 100644 --- a/app/views/my/account.html.erb +++ b/app/views/my/account.html.erb @@ -1,3 +1,16 @@ + + + + + + @@ -88,12 +106,35 @@ --> + +

    <%= l(:field_occupation) %> *<%= select_tag "province", options_from_collection_for_select(School.find_by_sql("select distinct province from schools"), :province, :province), :onchange => "get_options(this.value)" %> <%= select_tag "occupation" %> +

    +
    + +

    学校列表

    +
    + +
    + +
    + + + + diff --git a/app/views/test/index.html.erb b/app/views/test/index.html.erb index 5b435085a..0aa1a5d95 100644 --- a/app/views/test/index.html.erb +++ b/app/views/test/index.html.erb @@ -12,12 +12,14 @@ <%= user.lastname %><%= user.firstname %> - <%= calculate_collaboration_count(user) %> + + <%= user.changesets.count %> <% end %>