diff --git a/app/assets/javascripts/orbit-bar-search.js b/app/assets/javascripts/orbit-bar-search.js new file mode 100644 index 0000000..e0d9bf9 --- /dev/null +++ b/app/assets/javascripts/orbit-bar-search.js @@ -0,0 +1,10 @@ +$(document).ajaxStop(function() { + $('.nav').find('.dropdown').on({ + mouseleave: function() { + $(this).removeClass("open"); + }, + mouseenter: function() { + $(this).addClass("open") + } + }); +}); \ No newline at end of file diff --git a/app/assets/stylesheets/member_select.css b/app/assets/stylesheets/member_select.css index 0d4e9df..775bf93 100644 --- a/app/assets/stylesheets/member_select.css +++ b/app/assets/stylesheets/member_select.css @@ -85,7 +85,6 @@ width: auto; } - /* Check Box Card */ .checkbox-card { margin: 0; diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb new file mode 100644 index 0000000..927719b --- /dev/null +++ b/app/controllers/sessions_controller.rb @@ -0,0 +1,40 @@ +# encoding: utf-8 + +class SessionsController < Devise::SessionsController + prepend_before_filter :require_no_authentication, :only => [ :new, :create ] + + + def create + @site = Site.first + + private_key = OpenSSL::PKey::RSA.new(@site.private_key) + wresult = private_key.private_decrypt(request.params['wresult']) + + @ids = wresult.split("@") + + login_uid = @ids[0] + + resource = User.first(conditions:{user_id: login_uid}) + + if !resource.blank? + resource_name = resource.class.to_s.downcase + sign_in(resource_name, resource) + session[:user_id_type] = "myntu" + redirect_to after_sign_in_path_for(resource) + else + flash[:error] = "很抱歉,您無此權限或帳號登入本站,請洽本站管理員
Sorry, you don't have the account or authority to login. Please contact the website administrator." + redirect_to :root + end + end + + def destroy + @user_id_type = session[:user_id_type] + sign_out + if @user_id_type == "myntu" + redirect_to "https://adfs.ntu.edu.tw/adfs/ls/?wa=wsignout1.0&wreply=https://galogin.ntu.edu.tw" + else + redirect_to root_path + end + end + +end \ No newline at end of file diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 8bd19c1..e6f5a6b 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -194,8 +194,8 @@ module ApplicationHelper stylesheets << "\n" stylesheets << "\n" if page.design.css_reset # stylesheets << "\n" - # stylesheets << "\n" - stylesheets << "\n" + # stylesheets << "\n" + stylesheets << "\n" stylesheets << "\n" if page.design.css_default theme = page.design.themes.detect{ |d| d.id == page.theme_id } stylesheets << "\n" if theme @@ -204,9 +204,12 @@ module ApplicationHelper def page_javascripts(page, edit=nil) javascripts = '' + unless edit + javascripts << "\n" + end # javascripts << "\n" # javascripts << "\n" - javascripts << "\n" + javascripts << "\n" page.design.javascripts.each do |js| javascripts << "" end @@ -303,7 +306,7 @@ module ApplicationHelper # NTU link def get_link(site_number) - "http://#{request.host}:2#{site_number}00" + "http://#{site_number}.#{request.domain(3)}" end def sortable(column, title = nil, options = {}) diff --git a/app/views/admin/member_selects/_modal_select.html.erb b/app/views/admin/member_selects/_modal_select.html.erb index e8d14e7..99f4f02 100644 --- a/app/views/admin/member_selects/_modal_select.html.erb +++ b/app/views/admin/member_selects/_modal_select.html.erb @@ -28,7 +28,7 @@
<%= submit_tag t(:submit), class: "btn btn-primary" %> - <%= hidden_field_tag field, @field %> + <%= hidden_field_tag field, @field %>
<% end %> @@ -54,7 +54,7 @@
<%= submit_tag t(:submit), class: "btn btn-primary" %> - <%= hidden_field_tag field, @field %> + <%= hidden_field_tag field, @field %>
<% end %> diff --git a/app/views/admin/member_selects/_promoter_front.html.erb b/app/views/admin/member_selects/_promoter_front.html.erb new file mode 100644 index 0000000..f8bec0f --- /dev/null +++ b/app/views/admin/member_selects/_promoter_front.html.erb @@ -0,0 +1,14 @@ +<% unless users.blank? %> +
+

<%= t(:promoter) %>：

+ +
+<% end %> \ No newline at end of file diff --git a/app/views/admin/member_selects/_selection_box.html.erb b/app/views/admin/member_selects/_selection_box.html.erb index 428cc04..837bc4d 100644 --- a/app/views/admin/member_selects/_selection_box.html.erb +++ b/app/views/admin/member_selects/_selection_box.html.erb @@ -1,4 +1,5 @@ <% content_for :page_specific_javascript do -%> + <%= javascript_include_tag "member-selection" %> <%= javascript_include_tag "lib/jquery.nanoscroller" %> <%= javascript_include_tag "lib/checkbox.card" %> <% end -%> diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index 1b77fce..476b61f 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -12,10 +12,11 @@ - +
diff --git a/app/views/layouts/_right_menu.html.erb b/app/views/layouts/_right_menu.html.erb index e90dab1..d61751d 100644 --- a/app/views/layouts/_right_menu.html.erb +++ b/app/views/layouts/_right_menu.html.erb @@ -7,6 +7,16 @@
+ + +
  • <%= link_to content_tag(:i, nil, class: 'icons-screen') + ' ' + t(:desktop), desktop_path, tabindex: '-1' %>
    • <% end %> -
  • <%= link_to content_tag(:i, nil, class: 'icons-logout') + ' ' + t(:logout), destroy_user_session_path, tabindex: '-1' %>
    • +
  • <%= link_to content_tag(:i, nil, class: 'icons-logout') + ' ' + t(:logout), user_logout_path, tabindex: '-1' %>
  • <%= t(:help) %>
    • @@ -50,6 +60,12 @@
    <%= form_for :user, url: user_session_path, html: {class: 'container'} do |f| %> + +
    diff --git a/built_in_extensions.rb b/built_in_extensions.rb index 2e13080..104253d 100644 --- a/built_in_extensions.rb +++ b/built_in_extensions.rb @@ -1,10 +1,10 @@ #built-in-modules -gem 'archive', '0.0.1', :git => 'http://gitlab.tp.rulingcom.com/root/orbit-archive.git' -gem 'announcement', '0.0.1', :git => 'http://gitlab.tp.rulingcom.com/root/orbit-announcement.git' +gem 'archive', '0.0.1', :git => 'http://gitlab.tp.rulingcom.com/root/orbit-archive.git', :branch => 'ntu_ga' +gem 'announcement', '0.0.1', :git => 'http://gitlab.tp.rulingcom.com/root/orbit-announcement.git', :branch => 'ntu_ga' gem 'gallery', '0.0.1', :git => 'http://gitlab.tp.rulingcom.com/root/orbit-gallery.git' gem 'member', '0.0.1', :git => 'http://gitlab.tp.rulingcom.com/root/orbit-member.git' -gem 'member_staff', '0.0.1', :git => 'http://gitlab.tp.rulingcom.com/root/orbit-memberstaff.git' -gem 'page_content', '0.0.1', :git => 'http://gitlab.tp.rulingcom.com/root/orbit-pagecontent.git' +gem 'member_staff', '0.0.1', :git => 'http://gitlab.tp.rulingcom.com/root/orbit-memberstaff.git', :branch => 'ntu_ga' +gem 'page_content', '0.0.1', :git => 'http://gitlab.tp.rulingcom.com/root/orbit-pagecontent.git', :branch => 'ntu_ga' gem 'personal_book', '0.0.1', :git => 'http://gitlab.tp.rulingcom.com/root/orbit-personalbook.git' gem 'personal_conference', '0.0.1', :git => 'http://gitlab.tp.rulingcom.com/root/orbit-personalconference.git' gem 'personal_diploma', '0.0.1', :git => 'http://gitlab.tp.rulingcom.com/root/orbit-personaldiploma.git' @@ -15,4 +15,7 @@ gem 'personal_lab', '0.0.1', :git => 'http://gitlab.tp.rulingcom.com/root/orbit- gem 'personal_patent', '0.0.1', :git => 'http://gitlab.tp.rulingcom.com/root/orbit-personalpatent.git' gem 'personal_project', '0.0.1', :git => 'http://gitlab.tp.rulingcom.com/root/orbit-personalproject.git' gem 'personal_research', '0.0.1', :git => 'http://gitlab.tp.rulingcom.com/root/orbit-personalresearch.git' -gem 'web_resource', '0.0.1', :git => 'http://gitlab.tp.rulingcom.com/root/orbit-webresource.git' \ No newline at end of file +gem 'web_resource', '0.0.1', :git => 'http://gitlab.tp.rulingcom.com/root/orbit-webresource.git' + +gem 'ask', '0.0.1', :git => 'http://gitlab.tp.rulingcom.com/root/orbit-ask.git', :branch => 'ntu_ga' +gem 'survey', '0.0.1', :git => 'http://gitlab.tp.rulingcom.com/root/orbit-survey.git', :branch => 'ntu_ga' \ No newline at end of file diff --git a/config/locales/en.yml b/config/locales/en.yml index 139f1c7..84e60ce 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -397,6 +397,7 @@ en: system_email: System Email preview: Preview profile: Profile + promoter: Promoter publications: Publications purchase: Purchase quantity: Quantity diff --git a/config/locales/ntu.en.yml b/config/locales/ntu.en.yml new file mode 100644 index 0000000..ef8eb73 --- /dev/null +++ b/config/locales/ntu.en.yml @@ -0,0 +1,17 @@ +en: + + ntu: + rss_origin: Back to NTU Announcements + site_names: + "www": "Dean of General Affairs" + "sec": "Office of the Dean and Secretariat" + "doc": "Documentation Division" + "general": "General Service Division" + "property": "Property Management Division" + "construction": "Construction and Maintenance Division" + "cashier": "Cashier Division" + "procurement": "Procurement Division" + "fss": "Facilities Service Division" + "police": "Campus Security" + "social": "General Affairs Division, College of Social Science" + "medicine": "General Service Division, College of Medicine" diff --git a/config/locales/ntu.zh_tw.yml b/config/locales/ntu.zh_tw.yml new file mode 100644 index 0000000..a7768d2 --- /dev/null +++ b/config/locales/ntu.zh_tw.yml @@ -0,0 +1,17 @@ +zh_tw: + + ntu: + rss_origin: 回臺大校園公佈欄 + site_names: + "www": "總務處" + "sec": "總務長室暨總務處秘書室" + "doc": "文書組" + "general": "事務組" + "property": "保管組" + "construction": "營繕組" + "cashier": "出納組" + "procurement": "採購組" + "fss": "經營管理組" + "police": "駐警隊" + "social": "社科院總務分處" + "medicine": "醫學院總務分處" diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml index 847de14..0bd3008 100644 --- a/config/locales/zh_tw.yml +++ b/config/locales/zh_tw.yml @@ -397,6 +397,7 @@ zh_tw: sidebar_nav: 側欄導引 system_email: 系統信箱 profile: 基本資料 + promoter: 承辦人 publications: 著作 purchase: 購買 quantity: 數量 diff --git a/config/routes.rb b/config/routes.rb index b1c81d0..cbff1d6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -9,6 +9,11 @@ Orbit::Application.routes.draw do match "/users_passwd" => "desktop/registrations#update", :as => :users_passwd, :via => :put end + devise_scope :user do + get 'user_login' => 'sessions#create' + match 'user_logout' => 'sessions#destroy' + end + mount Resque::Server, :at => "/admin/resque" mount Rack::GridFS::Endpoint.new(:db => Mongoid.database,:lookup=>:path), :at => "gridfs"