alex
/
orbit4-5
forked from saurabh/orbit4-5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add changed files from 174

This commit is contained in:
nccu 2015-03-06 11:48:49 +08:00
parent 007a46a373
commit a9e3eaad9d
14 changed files with 199 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/stylesheets/lib/fileupload.css
View File

@ -22,14 +22,14 @@
display: inline-block; display: inline-block;
margin-right: 5px; margin-right: 5px;
margin-bottom: 5px; margin-bottom: 5px;
overflow: hidden; /*overflow: hidden;*/
text-align: center; text-align: center;
vertical-align: top; vertical-align: top;
} }
.fileupload .thumbnail > img { .fileupload .thumbnail > img {
display: inline-block; display: inline-block;
max-height: 200px; /*max-height: 200px;*/
vertical-align: top; vertical-align: top;
} }
@ -95,7 +95,7 @@
.fileupload-new, .fileupload-new,
.fileupload-preview { .fileupload-preview {
/*max-width: 200px;*/ /*max-width: 200px;*/
max-height: 200px; /*max-height: 200px;*/
} }
.thumbnail-borderless .thumbnail { .thumbnail-borderless .thumbnail {

2
app/controllers/application_controller.rb
View File

@ -15,7 +15,7 @@ class ApplicationController < ActionController::Base
end end
def timedout def timedout
if !session[:last_request_at].blank? && Time.now >= (session[:last_request_at] + 10.minutes) if !session[:last_request_at].blank? && Time.now >= (session[:last_request_at] + 20.minutes)
session[:user_id] = nil session[:user_id] = nil
session[:last_request_at] = nil session[:last_request_at] = nil
redirect_to root_url redirect_to root_url

2
app/helpers/orbit_backend_helper.rb
View File

@ -131,7 +131,7 @@ module OrbitBackendHelper
visits = Impression.where( created_at: { visits = Impression.where( created_at: {
'$gte' => Time.now.beginning_of_day-i.days, '$gte' => Time.now.beginning_of_day-i.days,
'$lte' => Time.now.end_of_day-i.days} '$lte' => Time.now.end_of_day-i.days}
).distinct(:request_hash).count ).count
site.month_traffic_cache['result'].push([ Time.now.beginning_of_day-i.days, visits]) site.month_traffic_cache['result'].push([ Time.now.beginning_of_day-i.days, visits])
end end

184
app/templates/nccu/assets/javascripts/app.js
View File

@ -177,104 +177,104 @@
$(document).ready(function($) { $(document).ready(function($) {
init(); init();
getXmlFeedForCalendar(); // getXmlFeedForCalendar();
}); });
}(jQuery)); }(jQuery));
var getXmlFeedForCalendar = function(){ // var getXmlFeedForCalendar = function(){
var template = "<li><div class='event_date'><div class='mon'></div><div class='day'>/06</div></div><a class='event_name' href='' target='_blank'></a><div class='event_info'></div></li>", // var template = "<li><div class='event_date'><div class='mon'></div><div class='day'>/06</div></div><a class='event_name' href='' target='_blank'></a><div class='event_info'></div></li>",
month = ['Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec']; // month = ['Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec'];
$.ajax({ // $.ajax({
"url" : "/nccu_calendar.xml", // "url" : "/nccu_calendar.xml",
"dataType" : "xml", // "dataType" : "xml",
"type" : "get" // "type" : "get"
}).done(function(data){ // }).done(function(data){
xmldoc = $(data); // xmldoc = $(data);
xmldoc.find("entry").each(function(i,entry){ // xmldoc.find("entry").each(function(i,entry){
var el = $(entry), // var el = $(entry),
li = $(template), // li = $(template),
summary_text = el.find("summary").text(), // summary_text = el.find("summary").text(),
indexA = summary_text.indexOf("-"), // indexA = summary_text.indexOf("-"),
indexB = summary_text.indexOf(" "), // indexB = summary_text.indexOf(" "),
indexC = summary_text.indexOf("/"), // indexC = summary_text.indexOf("/"),
startDate_text = null, // startDate_text = null,
startMon_text = null, // startMon_text = null,
endDate_text = null, // endDate_text = null,
time_text = null; // time_text = null;
//清除前後空白字元 // //清除前後空白字元
summary_text = jQuery.trim(summary_text); // summary_text = jQuery.trim(summary_text);
//篩選標題 // //篩選標題
if (summary_text.length == 31) { // if (summary_text.length == 31) {
startDate_text = summary_text.slice(0, indexA); // startDate_text = summary_text.slice(0, indexA);
startMon_text = startDate_text.slice((indexC+1), (indexC+3)); // startMon_text = startDate_text.slice((indexC+1), (indexC+3));
startDay_text = startDate_text.slice(7); // startDay_text = startDate_text.slice(7);
endDate_text = summary_text.slice((indexA+1), indexB); // endDate_text = summary_text.slice((indexA+1), indexB);
time_text = summary_text.slice((indexB+1)); // time_text = summary_text.slice((indexB+1));
} else { // } else {
startDate_text = summary_text.slice(0, indexB); // startDate_text = summary_text.slice(0, indexB);
startMon_text = startDate_text.slice((indexC+1), (indexC+3)); // startMon_text = startDate_text.slice((indexC+1), (indexC+3));
startDay_text = startDate_text.slice(7); // startDay_text = startDate_text.slice(7);
endDate_text = ''; // endDate_text = '';
time_text = summary_text.slice((indexB+1)); // time_text = summary_text.slice((indexB+1));
} // }
if(startMon_text.slice(0, 1) == '0'){ // if(startMon_text.slice(0, 1) == '0'){
console.log("slice") // console.log("slice")
startMon_text = month[startMon_text.slice(1)-1]; // startMon_text = month[startMon_text.slice(1)-1];
} else { // } else {
console.log("without slice") // console.log("without slice")
startMon_text = month[startMon_text-1]; // startMon_text = month[startMon_text-1];
} // }
li.find("a").text(el.find("title").text()).attr("href", el.find("link").attr("href")); // li.find("a").text(el.find("title").text()).attr("href", el.find("link").attr("href"));
li.find(".mon").text(startMon_text); // li.find(".mon").text(startMon_text);
li.find(".day").text(startDay_text); // li.find(".day").text(startDay_text);
li.find(".event_info").text("時間：" + time_text); // li.find(".event_info").text("時間：" + time_text);
$("#nccu_event_calendar").append(li); // $("#nccu_event_calendar").append(li);
}) // })
bindHandler(); // bindHandler();
}) // })
var $next = $('.events .links_next'), // var $next = $('.events .links_next'),
$prev = $('.events .links_prev'); // $prev = $('.events .links_prev');
var bindHandler = function(){ // var bindHandler = function(){
var page_number = 1, // var page_number = 1,
total_pages = Math.ceil($("#nccu_event_calendar li").length / 3); // total_pages = Math.ceil($("#nccu_event_calendar li").length / 3);
showLis(page_number, total_pages); // showLis(page_number, total_pages);
$next.on("click", function(){ // $next.on("click", function(){
if(page_number < total_pages){ // if(page_number < total_pages){
page_number++; // page_number++;
showLis(page_number,total_pages); // showLis(page_number,total_pages);
} // }
return false; // return false;
}); // });
$prev.on("click", function(){ // $prev.on("click", function(){
if(page_number > 1){ // if(page_number > 1){
page_number--; // page_number--;
showLis(page_number,total_pages); // showLis(page_number,total_pages);
} // }
return false; // return false;
}); // });
} // }
var showLis = function(page_number,total_pages){ // var showLis = function(page_number,total_pages){
var $ul = $("#nccu_event_calendar"), // var $ul = $("#nccu_event_calendar"),
start = (page_number - 1) * 3, // start = (page_number - 1) * 3,
end = (page_number * 3) - 1; // end = (page_number * 3) - 1;
$ul.find("li").hide(); // $ul.find("li").hide();
for(var i = start; i <= end; i++){ // for(var i = start; i <= end; i++){
$ul.find("li").eq(i).show(); // $ul.find("li").eq(i).show();
} // }
if(page_number == 1 && total_pages > 1){ // if(page_number == 1 && total_pages > 1){
$prev.addClass("disabled"); // $prev.addClass("disabled");
$next.removeClass("disabled"); // $next.removeClass("disabled");
}else if(page_number > 1 && page_number < total_pages){ // }else if(page_number > 1 && page_number < total_pages){
$prev.removeClass("disabled"); // $prev.removeClass("disabled");
$next.removeClass("disabled"); // $next.removeClass("disabled");
}else if(page_number == total_pages){ // }else if(page_number == total_pages){
$next.addClass("disabled"); // $next.addClass("disabled");
} // }
} // }
} // }
var packagesJS = function() { var packagesJS = function() {
$('.open-mune').on('click', function(event) { $('.open-mune').on('click', function(event) {

1
app/templates/nccu/assets/stylesheets/template/base/_default.scss
View File

@ -3432,6 +3432,7 @@ article.page_content .linkAndFile > div:last-child {
margin: 0; margin: 0;
padding: 0; padding: 0;
width: 100%; width: 100%;
display: none;
} }
.index_page .primary > .right .events .events_inner { .index_page .primary > .right .events .events_inner {

79
app/templates/nccu/assets/stylesheets/template/ie.scss Normal file
View File

@ -0,0 +1,79 @@
.main_header .page_sub_menu {
margin-top: 36px;
}
.main_menu.collapse {
.page_menu.level_1 {
position: absolute;
right: 0;
bottom: 5px;
display: block;
background: none;
li + li {
border: none;
}
& > li {
position: relative;
float: left;
border-bottom: 4px solid transparent;
&:hover {
border-bottom: 4px solid #820323;
background-color: #c03;
.page_menu.level_2 {
position: absolute;
z-index: 1;
top: 100%;
left: 0;
display: block;
padding: 5px;
text-align: left;
border: 1px solid gray;
background-color: #fff;
li {
border-bottom: 1px solid #f2f3f3;
}
a {
font-size: 12px;
font-weight: normal;
line-height: 1;
display: block;
float: none;
margin: 5px 0;
padding: 5px;
white-space: nowrap;
border-left: 3px solid #cc0033;
color: #08c;
&:hover {
color: #000;
background-color: #ebebeb;
}
}
}
a {
color: #fff;
}
}
.dot {
display: none;
}
a {
font-size: 15px;
font-weight: bold;
line-height: 46px;
padding: 0 .5em;
letter-spacing: .05em;
color: #000;
}
}
.last {
border-bottom: 4px solid #f90;
background-color: #f90;
&:hover {
border-bottom: 4px solid #ff7a00;
background-color: #f90;
}
a {
color: #fff;
}
}
}
}

1
app/templates/nccu/home/index.html.erb
View File

@ -48,6 +48,7 @@
</ul> </ul>
</div> </div>
</div> </div>
<div class="extra" data-pp="7"></div>
</div> </div>
</div> </div>
</div> </div>

3
app/templates/nccu/partial/_head.html.erb
View File

@ -1,5 +1,5 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
<%= favicon_link_tag (current_site.favicon.blank? ? 'favicon.ico' : current_site.favicon.url) %> <%= favicon_link_tag (current_site.favicon.blank? ? 'favicon.ico' : current_site.favicon.url) %>
<title><%= render_site_title %></title> <title><%= render_site_title %></title>
@ -18,4 +18,5 @@
<!--[if lt IE 9]> <!--[if lt IE 9]>
<%= javascript_include_tag "plugin/html5shiv" %> <%= javascript_include_tag "plugin/html5shiv" %>
<%= javascript_include_tag "plugin/response.min" %> <%= javascript_include_tag "plugin/response.min" %>
<%= stylesheet_link_tag "template/ie"%>
<![endif]--> <![endif]-->

20
app/templates/orbit_bootstrap_m/partial/_head.html.erb
View File

@ -1,20 +0,0 @@
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
<%= favicon_link_tag (current_site.favicon.blank? ? 'favicon.ico' : current_site.favicon.url) %>
<title><%= render_site_title %></title>
<%= stylesheet_link_tag "fontawesome/font-awesome"%>
<%= stylesheet_link_tag "bootstrap/bootstrap"%>
<%= stylesheet_link_tag "template/template"%>
<%= javascript_include_tag "lib/jquery-1.11.0.min"%>
<%= javascript_include_tag "bootstrap"%>
<%= javascript_include_tag "plugin/modernizr"%>
<%= javascript_include_tag "plugin/jquery-bullseye-min"%>
<%= javascript_include_tag "plugin/jquery.cycle2.min"%>
<%= javascript_include_tag "app"%>
<%= javascript_include_tag "#{@dataApi}" if @dataApi != nil%>
<%= render_google_analytics %>
<!--[if lt IE 9]>
<%= javascript_include_tag "plugin/html5shiv" %>
<%= javascript_include_tag "plugin/response.min" %>
<![endif]-->

2
app/views/admin/members/show.html.erb
View File

@ -16,7 +16,7 @@
<small class="muted"><%= @member.email %></small> <small class="muted"><%= @member.email %></small>
<div class="btn-group"> <div class="btn-group">
<%= link_to("<i class='icon-edit'></i> #{t(:edit)}".html_safe,edit_admin_member_path(@member),:class=>"btn btn-mini" ) if has_access? %> <%= link_to("<i class='icon-edit'></i> #{t(:edit)}".html_safe,edit_admin_member_path(@member),:class=>"btn btn-mini" ) if has_access? %>
<%= link_to("<i class='icons-cycle'></i> #{t("users.change_passwd")}".html_safe,admin_member_edit_passwd_path(@member),:class=>"btn btn-mini" ) if has_access? %> <!-- <%= link_to("<i class='icons-cycle'></i> #{t("users.change_passwd")}".html_safe,admin_member_edit_passwd_path(@member),:class=>"btn btn-mini" ) if has_access? %> -->
<%= link_to("<i class='icons-lock-open'></i> #{t("users.setting_privilege")}".html_safe,admin_member_edit_privilege_path(@member),:class=>"btn btn-mini" ) if current_user.is_admin? %> <%= link_to("<i class='icons-lock-open'></i> #{t("users.setting_privilege")}".html_safe,admin_member_edit_privilege_path(@member),:class=>"btn btn-mini" ) if current_user.is_admin? %>
</div> </div>
</div> </div>

8
config/locales/en.yml
View File

@ -690,6 +690,14 @@ en:
url: URL url: URL
url_alt: Alternative text url_alt: Alternative text
drop_the_files_here: Drop the files here
views:
pagination:
first: First
previous: Previous
next: Next
last: Last
module_name: module_name:
tag: Tag tag: Tag
category: Category category: Category

7
config/locales/zh_tw.yml
View File

@ -680,3 +680,10 @@ zh_tw:
sort_edit_order: 編輯排序 sort_edit_order: 編輯排序
sort_manually: 手動排序 sort_manually: 手動排序
sort_by_role_fields: 依照身份欄位 sort_by_role_fields: 依照身份欄位
drop_the_files_here: Drop the files here
views:
pagination:
first: 第一頁
previous: 上一頁
next: 下一頁
last: 最後一頁