Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team

app/jobs/fetch_time.rb

@@ -0,0 +1,15 @@
+# require 'open-uri'
+# require 'nokogiri'
+class FetchTime < Resque::Plugins::RestrictionJob
+  restrict :per_300 => 10
+  
+  @queue = :low
+
+  def self.perform()
+#    sleep 10
+    doc = Nokogiri::HTML(open('http://www.timeanddate.com/worldclock/city.html?n=241'))
+    CronMail.time_check(doc.at('#ct').children.first.text).deliver
+    puts "Mail Sent"
+    true
+  end
+end

app/jobs/nccu_calendar.rb

@@ -0,0 +1,12 @@
+class NccuCalendar 
+  require 'open-uri'
+  @queue = :high
+
+  def self.perform()
+  File.open(File.join(Rails.root, 'public/static', 'nccu_calendar.rss'),'w') do |file|
+    file << open('http://events.nccu.edu.tw/Feed').read
+    CronMail.time_check("NCCU Calendar synced").deliver
+  end
+    puts "NccuCalendar Synced"
+  end
+end

app/jobs/sync_db.rb

@@ -0,0 +1,15 @@
+class SyncDb 
+  
+  @queue = :high
+
+  def self.perform()
+    self.start_sync
+  end
+  
+  def self.start_sync
+    task = 'mid_site:sync'
+    args = []
+    %x[rake #{task} --trace  >> #{Rails.root}/log/rake.log]
+    puts "SyncDb Synced"
+  end
+end

app/mailer/cron_mail.rb

@@ -0,0 +1,8 @@
+class CronMail < ActionMailer::Base
+  default :from => "orbit_test@rulingcom.com"
+  
+  def time_check(msg)
+    #attachments["rails.png"] = File.read("#{Rails.root}/public/images/rails.png")
+    mail(:to => "Matt <matt@rulingcom.com>", :subject => msg)
+  end
+end

app/views/admin/sites/_side_bar.html.erb

@@ -0,0 +1,12 @@
+<%= content_tag :li, :class => active_for_controllers('sites') do -%>
+	<%= link_to content_tag(:i, nil, :class => 'icons-cog') + t('admin.site_settings'), admin_site_site_info_path(@site) %>
+
+	<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('sites')) do -%>
+		<%= content_tag :li, link_to(t('admin.site_info'), admin_site_site_info_path(@site)), :class => active_for_action('sites', 'site_info') %>
+		<%= content_tag :li, link_to(t('admin.system_info'), admin_site_system_info_path(@site)), :class => active_for_action('sites', 'system_info') %>
+		<%= content_tag :li, link_to(t('admin.language'), admin_site_language_path(@site)), :class => active_for_action('sites', 'language') %>
+		<%= content_tag :li, link_to(t('admin.mail_setting'), admin_site_mail_setting_path(@site)), :class => active_for_action('sites', 'mail_setting') %>
+		<%= content_tag :li, link_to(t('admin.ui_theme'), admin_site_ui_theme_path(@site)), :class => active_for_action('sites', 'ui_theme') %>
+	<% end -%>
+
+<% end -%>

app/views/admin/sites/language.html.erb

@@ -1 +1,5 @@
+<% content_for :side_bar do %>
+	<%= render 'side_bar' %>
+<% end %>
+
 language.html.erb

app/views/admin/sites/mail_setting.html.erb

@@ -1 +1,5 @@
+<% content_for :side_bar do %>
+	<%= render 'side_bar' %>
+<% end %>
+
 mail_setting.html.erb

app/views/admin/sites/site_info.html.erb

@@ -1,3 +1,7 @@
+<% content_for :side_bar do %>
+	<%= render 'side_bar' %>
+<% end %>
+
 <div id="poststuff">
 <%= form_for @site, :url => admin_site_path(@site), :html => {:class => "clear"} do |f| %>
 	<div id="post-body">

app/views/admin/sites/system_info.html.erb

@@ -1 +1,5 @@
+<% content_for :side_bar do %>
+	<%= render 'side_bar' %>
+<% end %>
+
 system_info.html.erb

app/views/admin/sites/ui_theme.html.erb

@@ -1 +1,5 @@
+<% content_for :side_bar do %>
+	<%= render 'side_bar' %>
+<% end %>
+
 ui_theme.html.erb

app/views/layouts/_orbit_bar.html.erb

@@ -10,6 +10,7 @@
 							<li><%#= link_to content_tag(:i, nil, :class => 'icons-asset') + t('admin.asset'), admin_assets_path %></li>
 			        <li class="divider"></li>
 							<li><%= link_to content_tag(:i, nil, :class => 'icons-structure') + t('admin.structure'), admin_items_path %></li>
+							<li><%= link_to content_tag(:i, nil, :class => 'icons-cog') + t('admin.site_settings'), admin_site_site_info_path(@site) %></li>
 			        <li><%#= link_to content_tag(:i, nil, :class => 'icons-plus-cube') + t('admin.add_item') %></li>
 			    </ul>
 			</div>

app/views/layouts/_side_bar.html.erb

@@ -67,14 +67,3 @@
 		<%= content_tag :li, link_to(t('announcement.tags'), panel_web_resource_back_end_tags_path), :class => active_for_action('/panel/web_resource/back_end/tags', 'index') %>
 	<% end -%>
 <% end -%>
-
-<%= content_tag :li, :class => active_for_controllers('sites') do -%>
-	<%= link_to content_tag(:i, nil, :class => 'icons-cog') + t('admin.site_settings'), admin_site_site_info_path(@site) %>
-	<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('sites')) do -%>
-		<%= content_tag :li, link_to(t('admin.site_info'), admin_site_site_info_path(@site)), :class => active_for_action('sites', 'site_info') %>
-		<%= content_tag :li, link_to(t('admin.system_info'), admin_site_system_info_path(@site)), :class => active_for_action('sites', 'system_info') %>
-		<%= content_tag :li, link_to(t('admin.language'), admin_site_language_path(@site)), :class => active_for_action('sites', 'language') %>
-		<%= content_tag :li, link_to(t('admin.mail_setting'), admin_site_mail_setting_path(@site)), :class => active_for_action('sites', 'mail_setting') %>
-		<%= content_tag :li, link_to(t('admin.ui_theme'), admin_site_ui_theme_path(@site)), :class => active_for_action('sites', 'ui_theme') %>
-	<% end -%>
-<% end -%>

app/views/layouts/new_admin.html.erb

@@ -26,7 +26,11 @@
 		<div class="viewport">
 			<div class="overview">
 				<ul class="nav nav-list">
-					<%= render 'layouts/side_bar' %>
+					<% if !(yield :side_bar).blank? %>
+					 	<%= yield :side_bar %>
+					<% else %>
+					 	<%= render 'layouts/side_bar' %>
+					<% end %>
 				</ul>
 			</div>
 		</div>