developers/orbit-basic
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nccu_master' into demo_site

Browse Source 
Conflicts:
	Gemfile
	app/assets/javascripts/tinymce_orbit.js.erb
	app/assets/stylesheets/style.css.erb
	app/controllers/admin/assets_controller.rb
	app/controllers/admin/module_apps_new_interface_controller.rb
	app/controllers/admin/page_parts_controller.rb
	app/jobs/sync_db.rb
	app/models/page.rb
	app/models/page_part.rb
	app/models/user/user.rb
	app/uploaders/image_uploader.rb
	app/views/admin/assets/create.js.erb
	app/views/admin/module_apps/reload_frontend_pages.js.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_side_bar.html.erb
	app/views/layouts/_users_checkbox_ary.html.erb
	app/views/shared/_privilege_user.html.erb
	config/mongoid.yml
	lib/parsers/parser_common.rb
	vendor/built_in_modules/announcement/announcement.json
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_link.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
This commit is contained in:
chris committed 2012-08-22 18:07:49 +08:00
2 parents 68aed18956 edf9d8a159
commit 7d5531bf01
432 files changed
+8773 -17035
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

public/static/kernel.js
+10 -7
View File
@@ -12,9 +12,9 @@ $(document).ready(function() {
});
function ajax_load_proc(wapper,url){
wapper.load(url,function(respText,textSta,XML){
wapper.load(encodeURI(url),function(respText,textSta,XML){
if(textSta == 'error')
wapper.html("Loading Failed");
wapper.html("Loading Failed<br/> <a href='"+$(this).attr('path')+"'>Go See</a>");
});
}
@@ -26,14 +26,17 @@ function getTimeout() {
$(document).ready(function() {
$('.slideshow').children('img').click(function()
{
if($(this).attr('link_open')=='new_window')
if($(this).attr('link_url')!='')
{
window.open($(this).attr('link_url'));
if($(this).attr('link_open')=='new_window')
{
window.open($(this).attr('link_url'));
}
else
{
document.location.href=$(this).attr('link_url')
else
{
document.location.href=$(this).attr('link_url')
}
}
})
});
// Ad Banner FX code [end]
public/static/nccu_calendar.xml
+94 -22
View File
@@ -2,63 +2,135 @@
<feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/">
<title>國立政治大學校園活動行事曆</title>
<link rel="alternate" href="http://events.nccu.edu.tw/" />
<subtitle>本日最新活動</subtitle>
<subtitle>本月最新活動</subtitle>
<dc:language>zh-tw</dc:language>
<entry>
<title>2012年世界狂歡節-「框」住瞬間「框」住世界</title>
<link rel="alternate" href="http://events.nccu.edu.tw/more.do?key=2901&amp;key2=20120508" />
<title>政大講座論壇：東亞模式的民法典？（蘇永欽講座教授）</title>
<link rel="alternate" href="http://events.nccu.edu.tw/more.do?key=2962&amp;key2=20120604" />
<author>
<name />
</author>
<summary type="text">101/05/01-101/05/08 00:00-23:59</summary>
<summary type="text">101/06/04 10:10-11:50</summary>
</entry>
<entry>
<title>2012年世界狂歡節-環友世界</title>
<link rel="alternate" href="http://events.nccu.edu.tw/more.do?key=2902&amp;key2=20120508" />
<title>文化講座【父親與民國】-白先勇</title>
<link rel="alternate" href="http://events.nccu.edu.tw/more.do?key=2976&amp;key2=20120606" />
<author>
<name />
</author>
<summary type="text">101/05/01-101/05/10 00:00-23:59</summary>
<summary type="text">101/06/06 14:00-16:00</summary>
</entry>
<entry>
<title>2012年世界狂歡節-從政大看台灣</title>
<link rel="alternate" href="http://events.nccu.edu.tw/more.do?key=2903&amp;key2=20120508" />
<title>鄭丁旺講座教授榮退專題演講-我國會計發展的回顧與前瞻</title>
<link rel="alternate" href="http://events.nccu.edu.tw/more.do?key=2974&amp;key2=20120607" />
<author>
<name />
</author>
<summary type="text">101/05/01-101/05/10 08:00-22:00</summary>
<summary type="text">101/06/07 10:00-12:30</summary>
</entry>
<entry>
<title>2012年世界狂歡節-美食嘉年華</title>
<link rel="alternate" href="http://events.nccu.edu.tw/more.do?key=2905&amp;key2=20120508" />
<title>弦樂社</title>
<link rel="alternate" href="http://events.nccu.edu.tw/more.do?key=2975&amp;key2=20120607" />
<author>
<name />
</author>
<summary type="text">101/05/08-101/05/10 12:00-14:00</summary>
<summary type="text">政大弦樂社期末成果發表音樂會</summary>
</entry>
<entry>
<title>2012年世界狂歡節-「原，夜」晚會</title>
<link rel="alternate" href="http://events.nccu.edu.tw/more.do?key=2906&amp;key2=20120508" />
<title>期末舞展</title>
<link rel="alternate" href="http://events.nccu.edu.tw/more.do?key=2980&amp;key2=20120607" />
<author>
<name />
</author>
<summary type="text">101/05/08 19:00-21:00</summary>
<summary type="text">政大國標社期末舞展 歡迎大家來共襄盛舉</summary>
</entry>
<entry>
<title>2012年世界狂歡節-開幕式</title>
<link rel="alternate" href="http://events.nccu.edu.tw/more.do?key=2907&amp;key2=20120508" />
<title>國際學院運動會</title>
<link rel="alternate" href="http://events.nccu.edu.tw/more.do?key=2951&amp;key2=20120609" />
<author>
<name />
</author>
<summary type="text">101/05/08 12:10-13:30</summary>
<summary type="text">101/06/09 08:00-17:00</summary>
</entry>
<entry>
<title>職場講座「數位文本實務課程」</title>
<link rel="alternate" href="http://events.nccu.edu.tw/more.do?key=2874&amp;key2=20120508" />
<title>IELTS雅思校園考</title>
<link rel="alternate" href="http://events.nccu.edu.tw/more.do?key=2871&amp;key2=20120609" />
<author>
<name />
</author>
<summary type="text">101/04/24-101/05/15 12:20-13:50</summary>
<summary type="text">101/06/09 09:00-17:00</summary>
</entry>
<entry>
<title>政橄隊慶</title>
<link rel="alternate" href="http://events.nccu.edu.tw/more.do?key=2952&amp;key2=20120609" />
<author>
<name />
</author>
<summary type="text">101/06/09 11:00-18:00</summary>
</entry>
<entry>
<title>傳院頂大計畫「與未來對話：新的使用者體驗」交流會</title>
<link rel="alternate" href="http://events.nccu.edu.tw/more.do?key=2939&amp;key2=20120609" />
<author>
<name />
</author>
<summary type="text">101/06/09 13:00-17:30</summary>
</entry>
<entry>
<title>2012年福祿貝爾恩物親子戲遊成長團體(下午)</title>
<link rel="alternate" href="http://events.nccu.edu.tw/more.do?key=2834&amp;key2=20120609" />
<author>
<name />
</author>
<summary type="text">101/04/07-101/06/09 14:00-16:00</summary>
</entry>
<entry>
<title>商院盃排球賽</title>
<link rel="alternate" href="http://events.nccu.edu.tw/more.do?key=2954&amp;key2=20120610" />
<author>
<name />
</author>
<summary type="text">101/06/10 08:00-17:00</summary>
</entry>
<entry>
<title>教職員羽球賽</title>
<link rel="alternate" href="http://events.nccu.edu.tw/more.do?key=2953&amp;key2=20120616" />
<author>
<name />
</author>
<summary type="text">101/06/16 08:00-12:00</summary>
</entry>
<entry>
<title>「樂活飲食•健康之鑰」系列活動--餐飲實務操作與食品安全</title>
<link rel="alternate" href="http://events.nccu.edu.tw/more.do?key=2753&amp;key2=20120622" />
<author>
<name />
</author>
<summary type="text">101/06/22 14:00-16:00</summary>
</entry>
<entry>
<title>學生議會預備會議</title>
<link rel="alternate" href="http://events.nccu.edu.tw/more.do?key=2984&amp;key2=20120622" />
<author>
<name />
</author>
<summary type="text">第13屆學生議會第1會期預備會議，將選舉新任學生議會議長、副議長，歡迎政大同學列席旁聽!!</summary>
</entry>
<entry>
<title>山水講堂：政大教學日</title>
<link rel="alternate" href="http://events.nccu.edu.tw/more.do?key=2972&amp;key2=20120626" />
<author>
<name />
</author>
<summary type="text">101/06/26 08:20-16:40</summary>
</entry>
<entry>
<title>「樂活飲食•健康之鑰」系列活動--廚房消毒與病媒防治</title>
<link rel="alternate" href="http://events.nccu.edu.tw/more.do?key=2757&amp;key2=20120629" />
<author>
<name />
</author>
<summary type="text">101/06/29 14:00-16:00</summary>
</entry>
</feed>