diff --git a/app/assets/javascripts/desktopload.js.erb b/app/assets/javascripts/desktopload.js.erb
index c4e9d1e7a..e0e914b9a 100644
--- a/app/assets/javascripts/desktopload.js.erb
+++ b/app/assets/javascripts/desktopload.js.erb
@@ -1,6 +1,6 @@
orbitDesktop.prototype.themefolder = "desktop_themes";
orbitDesktopAPI.prototype.notifyImgPath = "/assets/";
-alert("<%= @desktop.inspect %>")
+// alert("<%= @desktop.inspect %>")
var od = new orbitDesktop("#ajax_container");
diff --git a/app/assets/javascripts/event.js b/app/assets/javascripts/event.js
index 7db3e47c1..7efd1ce7d 100644
--- a/app/assets/javascripts/event.js
+++ b/app/assets/javascripts/event.js
@@ -55,7 +55,7 @@ $(document).ready(function(){
}
return false;
});
- getEvent(selet);
+
function resetText() {
$events.find('li').find($mon).html('');
$events.find('li').find($day).html('');
@@ -63,60 +63,4 @@ $(document).ready(function(){
$events.find('li').find($link_text).attr('href', '');
$events.find('li').find($time).html('');
}
- function getEvent(selet){
- $.ajax({
- type: "GET",
- url: "/static/nccu_calendar.xml",
- dataType: "xml",
- timeout: 1000,
- error: function(xml){
- $events.find('.links_next').addClass('disabled')
- $events.find('.error_mag').show();
- $events.find('ul').hide();
- $events.find('.error_mag').html("讀取錯誤");
- },
- success: function(xml) {
- xmlLength = $(xml).find('entry').length;
- $(xml).find('entry').slice(selet, selet+objLength).each(function(i){
- title_text = $(this).find('title').text()
- link_text = $(this).find('link').attr('href')
- summary_text = $(this).find('summary').text()
- indexA = summary_text.indexOf("-");
- indexB = summary_text.indexOf(" ");
- indexC = summary_text.indexOf("/");
- //清除前後空白字元
- summary_text = jQuery.trim(summary_text);
- //篩選標題
- title_text = title_text.slice(0, 16)
- if (summary_text.length == 31) {
- startDate_text = summary_text.slice(0, indexA);
- startMon_text = startDate_text.slice((indexC+1), (indexC+3));
- startDay_text = startDate_text.slice(7);
- endDate_text = summary_text.slice((indexA+1), indexB);
- time_text = summary_text.slice((indexB+1));
- } else {
- startDate_text = summary_text.slice(0, indexB);
- startMon_text = startDate_text.slice((indexC+1), (indexC+3));
- startDay_text = startDate_text.slice(7);
- endDate_text = '';
- time_text = summary_text.slice((indexB+1));
- }
- if(startMon_text.slice(0, 1) == '0'){
- startMon_text = month[startMon_text.slice(1)-1];
- } else {
- startMon_text = month[startMon_text-1];
- }
- $events.find('li').eq(i).find($mon).html(startMon_text);
- $events.find('li').eq(i).find($day).html(startDay_text);
- $events.find('li').eq(i).find($link_text).html(title_text+"…");
- $events.find('li').eq(i).find($link_text).attr('href', link_text);
- $events.find('li').eq(i).find($time).html('時間：'+time_text);
- //console.log();
- /*$('')
- .html(''+startMon_text+''+startDay_text+'
')
- .appendTo('.events ul');*/
- });//close each(
- }
- }); //close $.ajax(
- }
});
\ No newline at end of file
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 653300feb..5a8283ec5 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -2,24 +2,16 @@
- R4
-
+ <%= @title || APP_CONFIG['orbit'] %>
+ ">
<%= yield :page_specific_link %>
- <%= stylesheet_link_tag "application" %>
- <%= javascript_include_tag "application" %>
+ <%= stylesheet_link_tag "new_admin" %>
+ <%= javascript_include_tag "new_admin" %>
<%= csrf_meta_tag %>
-
+
+ <%= render 'layouts/orbit_bar' %>
-
-
-
-
<%= notice %>
<%= alert %>
@@ -27,10 +19,6 @@
<%= yield :secondary %>
<%= yield :tertiary %>
-
-
+
+
+
+
We're Sorry
+
You are not authorized to view this page
+
+
+
-
The page you were looking for doesn't exist.
-
You may have mistyped the address or the page may have moved.
-
+
+
+
+
We're Sorry
+
The page you were looking for doesn’t exist.
+
+
+
-
We're sorry, but something went wrong.
-
We've been notified about this issue and we'll take a look at it shortly.
-
+
+
+
+
We're Sorry
+
We’ve been notified about this issue and we’ll take a look at it shortly.
+
+
+