Changes for NTU common

Conflicts:
	lib/tasks/migrate.rake

Conflicts:
	lib/tasks/migrate.rake

Conflicts:
	config/resque_schedule.yml
	lib/tasks/migrate.rake
This commit is contained in:
chris committed 2013-09-13 15:10:10 +08:00
1 parent d5dc3ef793
commit d766eea9f4
15 files changed
+258 -20

No files matched your search

+7
View File
@@ -0,0 +1,7 @@
class GetAnnouncementFromRss
@queue = :high
def self.perform()
%x(ruby "#{Rails.root}/lib/rss_ntu_job.rb")
end
end
@@ -17,4 +17,4 @@
<%= render :partial=> "widget_ext_options" %>
</div>
</div>
<% end %>
<% end %>
+3 -5
View File
@@ -3,9 +3,7 @@
<% end %>
<ul>
<li>總機電話:<a href="tel:+886229393091">02-29393091</a></li>
<li>傳真:02-29379611</li>
<li>緊急重大事件通聯窗口:校內分機 66119、66110</li>
<li>總值日室:<a href="tel:+88229387132">02-29387132</a></li>
<li>駐警衛室:<a href="tel:+88229387129">02-29387129</a></li>
<li>總務處電話:<a href="tel:+886229393091">02-29393091</a></li>
<li>總務處傳真:02-29379611</li>
<li>總務處單一窗口 李梅森專員:<a href="tel:+886233662233">02-33662233</a></li>
</ul>
+1 -1
View File
@@ -5,6 +5,6 @@
<div id='map_canvas'></div>
<script type='text/javascript'>
var $map_center = "24.987449, 121.576117"
var $map_center = "25.015205, 121.535491"
var $map_zoom = 17
</script>