From a9e3eaad9d066a8b3384f9b0f21c77c9e8b5d85e Mon Sep 17 00:00:00 2001 From: nccu Date: Fri, 6 Mar 2015 11:48:49 +0800 Subject: [PATCH] add changed files from 174 --- app/assets/javascripts/basic.js | 2 +- app/assets/javascripts/lib/pageslide.js | 2 +- app/assets/stylesheets/lib/fileupload.css | 6 +- app/controllers/application_controller.rb | 2 +- app/helpers/orbit_backend_helper.rb | 4 +- app/templates/nccu/assets/javascripts/app.js | 184 +++++++++--------- .../stylesheets/template/base/_default.scss | 1 + .../nccu/assets/stylesheets/template/ie.scss | 79 ++++++++ app/templates/nccu/home/index.html.erb | 1 + app/templates/nccu/partial/_head.html.erb | 3 +- .../orbit_bootstrap_m/partial/_head.html.erb | 20 -- app/views/admin/members/show.html.erb | 2 +- config/locales/en.yml | 8 + config/locales/zh_tw.yml | 7 + 14 files changed, 199 insertions(+), 122 deletions(-) create mode 100644 app/templates/nccu/assets/stylesheets/template/ie.scss delete mode 100644 app/templates/orbit_bootstrap_m/partial/_head.html.erb diff --git a/app/assets/javascripts/basic.js b/app/assets/javascripts/basic.js index ce73f8c..1b3f7b2 100644 --- a/app/assets/javascripts/basic.js +++ b/app/assets/javascripts/basic.js @@ -8,4 +8,4 @@ //= require basic/jquery.nanoscroller.js //= require basic/jquery.easing.1.3.js -//= require ckeditor/init \ No newline at end of file +//= require ckeditor/init diff --git a/app/assets/javascripts/lib/pageslide.js b/app/assets/javascripts/lib/pageslide.js index 1d62e5b..27b5820 100644 --- a/app/assets/javascripts/lib/pageslide.js +++ b/app/assets/javascripts/lib/pageslide.js @@ -342,4 +342,4 @@ function resetForm() { .end() .find("input[type=radio]") .prop('checked', false); -} \ No newline at end of file +} diff --git a/app/assets/stylesheets/lib/fileupload.css b/app/assets/stylesheets/lib/fileupload.css index 6dafbb8..0bde6a3 100644 --- a/app/assets/stylesheets/lib/fileupload.css +++ b/app/assets/stylesheets/lib/fileupload.css @@ -22,14 +22,14 @@ display: inline-block; margin-right: 5px; margin-bottom: 5px; - overflow: hidden; + /*overflow: hidden;*/ text-align: center; vertical-align: top; } .fileupload .thumbnail > img { display: inline-block; - max-height: 200px; + /*max-height: 200px;*/ vertical-align: top; } @@ -95,7 +95,7 @@ .fileupload-new, .fileupload-preview { /*max-width: 200px;*/ - max-height: 200px; + /*max-height: 200px;*/ } .thumbnail-borderless .thumbnail { diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index c64ab07..97da42f 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -15,7 +15,7 @@ class ApplicationController < ActionController::Base end 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[:last_request_at] = nil redirect_to root_url diff --git a/app/helpers/orbit_backend_helper.rb b/app/helpers/orbit_backend_helper.rb index 438e48f..dc1e1b1 100644 --- a/app/helpers/orbit_backend_helper.rb +++ b/app/helpers/orbit_backend_helper.rb @@ -131,7 +131,7 @@ module OrbitBackendHelper visits = Impression.where( created_at: { '$gte' => Time.now.beginning_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]) end @@ -231,4 +231,4 @@ module Orbit::FormBuilder def datetime_picker(method, options = {}) @template.datetime_picker(@object_name, method, objectify_options(options)) end -end \ No newline at end of file +end diff --git a/app/templates/nccu/assets/javascripts/app.js b/app/templates/nccu/assets/javascripts/app.js index 15ff790..2f84fbc 100644 --- a/app/templates/nccu/assets/javascripts/app.js +++ b/app/templates/nccu/assets/javascripts/app.js @@ -177,104 +177,104 @@ $(document).ready(function($) { init(); - getXmlFeedForCalendar(); + // getXmlFeedForCalendar(); }); }(jQuery)); -var getXmlFeedForCalendar = function(){ - var template = "
  • /06
    • ", - month = ['Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec']; - $.ajax({ - "url" : "/nccu_calendar.xml", - "dataType" : "xml", - "type" : "get" - }).done(function(data){ - xmldoc = $(data); - xmldoc.find("entry").each(function(i,entry){ - var el = $(entry), - li = $(template), - summary_text = el.find("summary").text(), - indexA = summary_text.indexOf("-"), - indexB = summary_text.indexOf(" "), - indexC = summary_text.indexOf("/"), - startDate_text = null, - startMon_text = null, - endDate_text = null, - time_text = null; - //清除前後空白字元 - summary_text = jQuery.trim(summary_text); - //篩選標題 - 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'){ - console.log("slice") - startMon_text = month[startMon_text.slice(1)-1]; - } else { - console.log("without slice") - startMon_text = month[startMon_text-1]; - } +// var getXmlFeedForCalendar = function(){ +// var template = "
  • /06
    • ", +// month = ['Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec']; +// $.ajax({ +// "url" : "/nccu_calendar.xml", +// "dataType" : "xml", +// "type" : "get" +// }).done(function(data){ +// xmldoc = $(data); +// xmldoc.find("entry").each(function(i,entry){ +// var el = $(entry), +// li = $(template), +// summary_text = el.find("summary").text(), +// indexA = summary_text.indexOf("-"), +// indexB = summary_text.indexOf(" "), +// indexC = summary_text.indexOf("/"), +// startDate_text = null, +// startMon_text = null, +// endDate_text = null, +// time_text = null; +// //清除前後空白字元 +// summary_text = jQuery.trim(summary_text); +// //篩選標題 +// 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'){ +// console.log("slice") +// startMon_text = month[startMon_text.slice(1)-1]; +// } else { +// console.log("without slice") +// startMon_text = month[startMon_text-1]; +// } - li.find("a").text(el.find("title").text()).attr("href", el.find("link").attr("href")); - li.find(".mon").text(startMon_text); - li.find(".day").text(startDay_text); - li.find(".event_info").text("時間：" + time_text); - $("#nccu_event_calendar").append(li); - }) - bindHandler(); - }) - var $next = $('.events .links_next'), - $prev = $('.events .links_prev'); - var bindHandler = function(){ - var page_number = 1, - total_pages = Math.ceil($("#nccu_event_calendar li").length / 3); - showLis(page_number, total_pages); - $next.on("click", function(){ - if(page_number < total_pages){ - page_number++; - showLis(page_number,total_pages); - } - return false; - }); - $prev.on("click", function(){ - if(page_number > 1){ - page_number--; - showLis(page_number,total_pages); - } - return false; - }); - } +// li.find("a").text(el.find("title").text()).attr("href", el.find("link").attr("href")); +// li.find(".mon").text(startMon_text); +// li.find(".day").text(startDay_text); +// li.find(".event_info").text("時間：" + time_text); +// $("#nccu_event_calendar").append(li); +// }) +// bindHandler(); +// }) +// var $next = $('.events .links_next'), +// $prev = $('.events .links_prev'); +// var bindHandler = function(){ +// var page_number = 1, +// total_pages = Math.ceil($("#nccu_event_calendar li").length / 3); +// showLis(page_number, total_pages); +// $next.on("click", function(){ +// if(page_number < total_pages){ +// page_number++; +// showLis(page_number,total_pages); +// } +// return false; +// }); +// $prev.on("click", function(){ +// if(page_number > 1){ +// page_number--; +// showLis(page_number,total_pages); +// } +// return false; +// }); +// } - var showLis = function(page_number,total_pages){ - var $ul = $("#nccu_event_calendar"), - start = (page_number - 1) * 3, - end = (page_number * 3) - 1; - $ul.find("li").hide(); - for(var i = start; i <= end; i++){ - $ul.find("li").eq(i).show(); - } - if(page_number == 1 && total_pages > 1){ - $prev.addClass("disabled"); - $next.removeClass("disabled"); - }else if(page_number > 1 && page_number < total_pages){ - $prev.removeClass("disabled"); - $next.removeClass("disabled"); - }else if(page_number == total_pages){ - $next.addClass("disabled"); - } - } +// var showLis = function(page_number,total_pages){ +// var $ul = $("#nccu_event_calendar"), +// start = (page_number - 1) * 3, +// end = (page_number * 3) - 1; +// $ul.find("li").hide(); +// for(var i = start; i <= end; i++){ +// $ul.find("li").eq(i).show(); +// } +// if(page_number == 1 && total_pages > 1){ +// $prev.addClass("disabled"); +// $next.removeClass("disabled"); +// }else if(page_number > 1 && page_number < total_pages){ +// $prev.removeClass("disabled"); +// $next.removeClass("disabled"); +// }else if(page_number == total_pages){ +// $next.addClass("disabled"); +// } +// } -} +// } var packagesJS = function() { $('.open-mune').on('click', function(event) { diff --git a/app/templates/nccu/assets/stylesheets/template/base/_default.scss b/app/templates/nccu/assets/stylesheets/template/base/_default.scss index 3a622da..67cee90 100644 --- a/app/templates/nccu/assets/stylesheets/template/base/_default.scss +++ b/app/templates/nccu/assets/stylesheets/template/base/_default.scss @@ -3432,6 +3432,7 @@ article.page_content .linkAndFile > div:last-child { margin: 0; padding: 0; width: 100%; + display: none; } .index_page .primary > .right .events .events_inner { diff --git a/app/templates/nccu/assets/stylesheets/template/ie.scss b/app/templates/nccu/assets/stylesheets/template/ie.scss new file mode 100644 index 0000000..5a55e5a --- /dev/null +++ b/app/templates/nccu/assets/stylesheets/template/ie.scss @@ -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; + } + } + } +} diff --git a/app/templates/nccu/home/index.html.erb b/app/templates/nccu/home/index.html.erb index 9dd937e..3ae6805 100644 --- a/app/templates/nccu/home/index.html.erb +++ b/app/templates/nccu/home/index.html.erb @@ -48,6 +48,7 @@ +
    diff --git a/app/templates/nccu/partial/_head.html.erb b/app/templates/nccu/partial/_head.html.erb index a33847b..5ebdb0b 100644 --- a/app/templates/nccu/partial/_head.html.erb +++ b/app/templates/nccu/partial/_head.html.erb @@ -1,5 +1,5 @@ - + <%= favicon_link_tag (current_site.favicon.blank? ? 'favicon.ico' : current_site.favicon.url) %> <%= render_site_title %> @@ -18,4 +18,5 @@ diff --git a/app/templates/orbit_bootstrap_m/partial/_head.html.erb b/app/templates/orbit_bootstrap_m/partial/_head.html.erb deleted file mode 100644 index b80dbf7..0000000 --- a/app/templates/orbit_bootstrap_m/partial/_head.html.erb +++ /dev/null @@ -1,20 +0,0 @@ - - - - <%= favicon_link_tag (current_site.favicon.blank? ? 'favicon.ico' : current_site.favicon.url) %> - <%= render_site_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 %> - diff --git a/app/views/admin/members/show.html.erb b/app/views/admin/members/show.html.erb index 473f796..4a58267 100644 --- a/app/views/admin/members/show.html.erb +++ b/app/views/admin/members/show.html.erb @@ -16,7 +16,7 @@ <%= @member.email %>
    <%= link_to(" #{t(:edit)}".html_safe,edit_admin_member_path(@member),:class=>"btn btn-mini" ) if has_access? %> - <%= link_to(" #{t("users.change_passwd")}".html_safe,admin_member_edit_passwd_path(@member),:class=>"btn btn-mini" ) if has_access? %> + <%= link_to(" #{t("users.setting_privilege")}".html_safe,admin_member_edit_privilege_path(@member),:class=>"btn btn-mini" ) if current_user.is_admin? %>
    diff --git a/config/locales/en.yml b/config/locales/en.yml index e3615fa..5901773 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -690,6 +690,14 @@ en: url: URL url_alt: Alternative text + drop_the_files_here: Drop the files here + views: + pagination: + first: First + previous: Previous + next: Next + last: Last + module_name: tag: Tag category: Category diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml index 4dad87b..34e06ab 100644 --- a/config/locales/zh_tw.yml +++ b/config/locales/zh_tw.yml @@ -680,3 +680,10 @@ zh_tw: sort_edit_order: 編輯排序 sort_manually: 手動排序 sort_by_role_fields: 依照身份欄位 + drop_the_files_here: Drop the files here + views: + pagination: + first: 第一頁 + previous: 上一頁 + next: 下一頁 + last: 最後一頁