From 5e25cf584908abe7872129ed25958daf53d8d42f Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Fri, 26 Oct 2012 19:04:51 +0800 Subject: [PATCH 01/30] lot of updates --- .../app/assets/javascripts/calendarAPI.js.erb | 130 +++++++++++++++-- .../calendar/app/assets/javascripts/cals.js | 8 ++ .../app/assets/stylesheets/calendar.css | 2 +- .../calendar/app/assets/stylesheets/cals.css | 8 ++ .../calendar/back_end/cals_controller.rb | 4 +- .../calendar/back_end/events_controller.rb | 121 +++++++++++++++- .../panel/calendar/back_end/cals_helper.rb | 9 ++ .../calendar/back_end/cals/day_view.html.erb | 10 +- .../calendar/back_end/cals/index.html.erb | 10 +- .../calendar/back_end/cals/week_view.html.erb | 16 ++- .../calendar/back_end/events/create.js.erb | 14 +- .../calendar/back_end/events/edit.html.erb | 133 ++++++++++++++++++ .../calendar/back_end/events/new.html.erb | 84 ++++------- .../calendar/back_end/events/show.html.erb | 4 +- .../calendar/back_end/events/update.js.erb | 15 ++ 15 files changed, 471 insertions(+), 97 deletions(-) create mode 100644 vendor/built_in_modules/calendar/app/assets/javascripts/cals.js create mode 100644 vendor/built_in_modules/calendar/app/assets/stylesheets/cals.css create mode 100644 vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/events/edit.html.erb create mode 100644 vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/events/update.js.erb diff --git a/vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb b/vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb index d023a0fa..09ef0195 100644 --- a/vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb +++ b/vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb @@ -6,8 +6,7 @@ Date.prototype.getWeek = function (dowOffset) { var newYear = new Date(this.getFullYear(),0,1); var day = newYear.getDay() - dowOffset; //the day of week the year begins on day = (day >= 0 ? day : day + 7); - var daynum = Math.floor((this.getTime() - newYear.getTime() - - (this.getTimezoneOffset()-newYear.getTimezoneOffset())*60000)/86400000) + 1; + var daynum = Math.floor((this.getTime() - newYear.getTime() - (this.getTimezoneOffset()-newYear.getTimezoneOffset())*60000)/86400000) + 1; var weeknum; //if the year starts before the middle of a week if(day < 4) { @@ -49,8 +48,8 @@ var calendarAPI = function(){ this.initialize = function(){ $(window).load(function(){ // c.loadMonthView(c.cur_month,c.cur_year); - // c.loadWeekView(c.cur_week,c.cur_year); - c.loadDayView(c.cur_date,c.cur_month,c.cur_year); + c.loadWeekView(c.cur_week,c.cur_year); + // c.loadDayView(c.cur_date,c.cur_month,c.cur_year); bindHandlers(); }) var bindHandlers = function(){ @@ -61,16 +60,46 @@ var calendarAPI = function(){ $("#create_event_btn").click(function(){ if(!$(this).hasClass("active")){ - c.newEvent($(this).attr("href"),$(this).attr("ref"),c.today.getDate(),c.today.getMonth()+1,c.today.getFullYear()); + c.newEvent($(this).attr("href"),$(this).attr("ref"),c.today.getDate(),c.today.getMonth()+1,c.today.getFullYear(),10.5,"AM"); }else{ c.event_create_div.hide().empty(); } $(this).toggleClass("active"); return false; }) - $("td.click_event").live("click",function(){ - c.newEvent($(this).attr("link"),$(this).attr("ref"),$(this).attr("date"),c.cur_month,c.cur_year); + $(".click_event").live("click",function(e){ + var dt = $(this).attr("date"); + if(!dt){ + var w = $("td.week_day_body").width(); + var parentOffset = $("table.cell_map").offset(); + var relX = e.pageX - parentOffset.left; + var t = 60; + for (var i = 0; i <= 6; i++) { + if(relX > t && relX < (t + w)){ + console.log(i); + dt = $("td.week_day_body").eq(i).attr("date"); + break; + } + t = t + w; + }; + } + var time = $(this).attr("time"); + var ses = $(this).attr("ses"); + if (!time) + time = 10.5; + if(!ses) + ses = "AM"; + + c.newEvent($(this).attr("link"),$(this).attr("ref"),dt,c.cur_month,c.cur_year,time,ses); $("#create_event_btn").toggleClass("active"); + e.stopPropagation(); + }) + $("#edit_event_btn").live("ajax:success",function(evt,form){ + c.event_quick_view_div.empty().hide(); + c.updateEvent(form); + }) + $("#refresh_btn").click(function(){ + c.refresh(); }) $('.mode_switch').click(function(){ @@ -262,7 +291,7 @@ var calendarAPI = function(){ curparent.append($eventrow); } $eventrow = null; - $eventrow = $(""); + $eventrow = $(""); allow = true; }else if(evnt.start_date > curdate){ allow = true; @@ -358,7 +387,7 @@ var calendarAPI = function(){ var height = 15; var full_day_count = 0; var rowcount = 7; - var tr = $(""); + var tr = $(""); var pre = true; $.each(events,function(i,evnt){ // console.log("rowcount: "+rowcount); @@ -371,7 +400,7 @@ var calendarAPI = function(){ $("table.all_day_event_holder").append(tr); } tr = null; - tr = $(''); + tr = $(''); pre = true; } @@ -440,7 +469,7 @@ var calendarAPI = function(){ if(h == 0.5) halfhour = "half"; h = 17 + 20 + (((h-1) * 2) * 20) + 1; - var eventdom = $('
'+displaystarttime+' - '+displayendtime+'
'+evnt.title+'
'); + var eventdom = $('
'+displaystarttime+' - '+displayendtime+'
'+evnt.title+'
'); $(".week_day_body[date="+evnt.start_date+"] .inner").append(eventdom); } if(full_day_count == 0){ @@ -480,7 +509,7 @@ var calendarAPI = function(){ $.getJSON("cals/getDayEvents",{"date":day,"month":month,"year":year},function(events){ $.each(events,function(i,evnt){ if(evnt.all_day){ - $(".all_day_event").append('
'+evnt.title+'
') + $(".all_day_event").append('
'+evnt.title+'
') }else{ var starttime,endtime,displaystarttime,displayendtime; if(evnt.start_am_pm == "AM"){ @@ -521,7 +550,7 @@ var calendarAPI = function(){ if(h == 0.5) halfhour = "half"; h = 17 + 20 + (((h-1) * 2) * 20) + 1; - var eventdom = $('
'+displaystarttime+' - '+displayendtime+'
'+evnt.title+'
'); + var eventdom = $('
'+displaystarttime+' - '+displayendtime+'
'+evnt.title+'
'); $(".event_holder").append(eventdom); } @@ -534,7 +563,7 @@ var calendarAPI = function(){ $('.current_day_title').text('September 2, 2012'); }) } - this.newEvent = function(url,ref,date,month,year){ + this.newEvent = function(url,ref,date,month,year,time,ses){ var bindHandlers = function(){ c.event_create_div.find("button.btn-close").click(function(){ c.event_create_div.hide().empty(); @@ -546,14 +575,67 @@ var calendarAPI = function(){ else c.event_create_div.find("#non_all_day").show() }) + $( "#dpfrom" ).datepicker({ + defaultDate: "+1w", + changeMonth: true, + numberOfMonths: 3, + onSelect: function( selectedDate ) { + $( "#dpto" ).datepicker( "option", "minDate", selectedDate ); + } + }); + $( "#dpto" ).datepicker({ + defaultDate: "+1w", + changeMonth: true, + numberOfMonths: 3, + onSelect: function( selectedDate ) { + $( "#dpfrom" ).datepicker( "option", "maxDate", selectedDate ); + } + }); } - c.event_create_div.load(url+"?ref="+ref+"&date="+date+"&month="+month+"&year="+year,function(){ + c.event_create_div.load(url+"?ref="+ref+"&date="+date+"&month="+month+"&year="+year+"&time="+time+"&ses="+ses,function(){ c.event_create_div.show(); bindHandlers(); }) } + + this.updateEvent = function(form){ + var bindHandlers = function(){ + c.event_create_div.find("button.btn-close").click(function(){ + c.event_create_div.hide().empty(); + $("#create_event_btn").removeClass("active"); + $("#create_event_btn").show(); + }) + c.event_create_div.find("input[for=all_day][type=checkbox]").click(function(){ + if($(this).is(":checked")) + c.event_create_div.find("#non_all_day").hide() + else + c.event_create_div.find("#non_all_day").show() + }) + $( "#dpfrom" ).datepicker({ + defaultDate: "+1w", + changeMonth: true, + numberOfMonths: 3, + onSelect: function( selectedDate ) { + $( "#dpto" ).datepicker( "option", "minDate", selectedDate ); + } + }); + $( "#dpto" ).datepicker({ + defaultDate: "+1w", + changeMonth: true, + numberOfMonths: 3, + onSelect: function( selectedDate ) { + $( "#dpfrom" ).datepicker( "option", "maxDate", selectedDate ); + } + }); + } + c.event_create_div.html(form); + $("#create_event_btn").hide(); + c.event_create_div.show(); + bindHandlers(); + } + this.newCalendars = function(){ if($('.color-picker').length > 0){ $('.color-picker').miniColors(); // just in category view @@ -586,8 +668,26 @@ var calendarAPI = function(){ c.event_quick_view_div.find(".event-close-btn").click(function(){ c.event_quick_view_div.empty().hide(); }) + c.event_quick_view_div.find(".bt-del").bind("ajax:success",function(){ + c.event_quick_view_div.empty().hide(); + dom.remove(); + }) }) } + this.refresh = function(){ + $(".destroy").remove(); + switch (c.view){ + case "week": + c.loadWeekView(c.cur_week,c.cur_year); + break; + case "month": + c.loadMonthView(c.cur_month,c.cur_year); + break; + case "day": + c.loadDayView(c.cur_date,c.cur_month,c.cur_year); + break; + } + } c.initialize(); } diff --git a/vendor/built_in_modules/calendar/app/assets/javascripts/cals.js b/vendor/built_in_modules/calendar/app/assets/javascripts/cals.js new file mode 100644 index 00000000..0443e53a --- /dev/null +++ b/vendor/built_in_modules/calendar/app/assets/javascripts/cals.js @@ -0,0 +1,8 @@ +// This is a manifest file that'll be compiled into including all the files listed below. +// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically +// be included in the compiled file accessible from http://example.com/assets/application.js +// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the +// the compiled file. +// +//= require jquery-ui +//= require calendarAPI \ No newline at end of file diff --git a/vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css b/vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css index 874904a5..3c528bea 100644 --- a/vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css +++ b/vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css @@ -71,7 +71,7 @@ } #calendar_day .event_holder { width: 100%; - height: 100%; + /*height: 100%;*/ position: absolute; top: 0; z-index: 1; diff --git a/vendor/built_in_modules/calendar/app/assets/stylesheets/cals.css b/vendor/built_in_modules/calendar/app/assets/stylesheets/cals.css new file mode 100644 index 00000000..f07975b5 --- /dev/null +++ b/vendor/built_in_modules/calendar/app/assets/stylesheets/cals.css @@ -0,0 +1,8 @@ +/* + *This is a manifest file that'll automatically include all the stylesheets available in this directory + *and any sub-directories. You're free to add application-wide styles to this file and they'll appear at + *the top of the compiled file, but it's generally better to create a new file per style scope. + *= font-awesome + *= calendar + *= bootstrap-responsive +*/ \ No newline at end of file diff --git a/vendor/built_in_modules/calendar/app/controllers/panel/calendar/back_end/cals_controller.rb b/vendor/built_in_modules/calendar/app/controllers/panel/calendar/back_end/cals_controller.rb index fdf712aa..33cb286d 100644 --- a/vendor/built_in_modules/calendar/app/controllers/panel/calendar/back_end/cals_controller.rb +++ b/vendor/built_in_modules/calendar/app/controllers/panel/calendar/back_end/cals_controller.rb @@ -39,10 +39,10 @@ class Panel::Calendar::BackEnd::CalsController < OrbitBackendController end def day_view - date = params[:date].to_i + @date = params[:date].to_i month = params[:month].to_i year = params[:year].to_i - @cur_day = getDayName(date,month,year) + " " + month.to_s + "/" + date.to_s + " - " + year.to_s + @cur_day = getDayName(@date,month,year) + " " + month.to_s + "/" + @date.to_s + " - " + year.to_s @hours = getHours(12) render :layout => false end diff --git a/vendor/built_in_modules/calendar/app/controllers/panel/calendar/back_end/events_controller.rb b/vendor/built_in_modules/calendar/app/controllers/panel/calendar/back_end/events_controller.rb index 41ffa151..4e477ded 100644 --- a/vendor/built_in_modules/calendar/app/controllers/panel/calendar/back_end/events_controller.rb +++ b/vendor/built_in_modules/calendar/app/controllers/panel/calendar/back_end/events_controller.rb @@ -8,10 +8,47 @@ class Panel::Calendar::BackEnd::EventsController < OrbitBackendController else @all_day_disabled = false end - @placeholder = params[:date]+"/"+params[:month]+"/"+params[:year] + @hours = getHoursForForm + if params[:time] + + @hours.each_with_index do |h,i| + if h['val'].to_s == params[:time].to_s + @sindex = i + @eindex = i + 2 + break + end + end + else + @sindex = 16 + @eindex = 18 + end + @ampm = Array.new + @ampm << "AM" + @ampm << "PM" + if params[:ses] + @sampm = params[:ses] + @eampm = params[:ses] + if @eindex >= 22 + @eampm = "PM" + end + end + @placeholder = params[:month]+"/"+params[:date]+"/"+params[:year] render :layout => false end - + def edit + @calendars = Cal.all + @event = Event.find(params[:id]) + if @event.all_day + @all_day_disabled = true + else + @all_day_disabled = false + end + @hours = getHoursForForm + @ampm = Array.new + @ampm << "AM" + @ampm << "PM" + render :layout => false + end def create title = params[:event][:title] note = params[:event][:note] @@ -21,14 +58,14 @@ class Panel::Calendar::BackEnd::EventsController < OrbitBackendController $endtime = params[:end_time] temp = $start.split("/") - start_date = temp[0] - start_month = temp[1] + start_month = temp[0] + start_date = temp[1] start_year = temp[2] @m = start_month @y = start_year temp = $end.split("/") - end_date = temp[0] - end_month = temp[1] + end_month = temp[0] + end_date = temp[1] end_year = temp[2] start_am_pm = params[:start_am_pm] @@ -81,6 +118,78 @@ class Panel::Calendar::BackEnd::EventsController < OrbitBackendController h.js end end + + def update + + title = params[:event][:title] + note = params[:event][:note] + $start = params[:start_date] + $end = params[:end_date] + $starttime = params[:start_time] + $endtime = params[:end_time] + + temp = $start.split("/") + start_month = temp[0] + start_date = temp[1] + start_year = temp[2] + @m = start_month + @y = start_year + temp = $end.split("/") + end_month = temp[0] + end_date = temp[1] + end_year = temp[2] + + start_am_pm = params[:start_am_pm] + end_am_pm = params[:end_am_pm] + + cal_id = params[:event][:cal_id] + + # if start_am_pm == "PM" + # temp_start_time = $starttime + 12 + # end + # if end_am_pm == "PM" + # temp_end_time = $endtime + 12 + # end + if params[:all_day] + all_day = true + $starttime = 0 + $endtime = 0 + else + all_day = false + end + + final_start_time = Date.new(start_year.to_i,start_month.to_i,start_date.to_i) + final_end_time = Date.new(end_year.to_i,end_month.to_i,end_date.to_i) + start_week = final_start_time.strftime("%U") + end_week = final_end_time.strftime("%U") + total_days = final_end_time - final_start_time + @event = Event.find(params[:id]) + @event.title = title + @event.note = note + @event.start_year = start_year + @event.end_year = end_year + @event.start_month = start_month + @event.end_month = end_month + @event.start_date = start_date + @event.end_date = end_date + @event.start_time = $starttime + @event.start_am_pm = start_am_pm + @event.end_time = $endtime + @event.end_am_pm = end_am_pm + @event.cal_id = cal_id + @event.final_start_time = final_start_time + @event.final_end_time = final_end_time + @event.total_days = total_days + @event.start_week = start_week + @event.end_week = end_week + @event.all_day = all_day + @event.save! + + respond_to do |h| + h.js + end + end + def show @event = Event.find(params[:id]) @start_month_name = Date::ABBR_MONTHNAMES[@event.start_month] diff --git a/vendor/built_in_modules/calendar/app/helpers/panel/calendar/back_end/cals_helper.rb b/vendor/built_in_modules/calendar/app/helpers/panel/calendar/back_end/cals_helper.rb index fc349ecd..6377debb 100644 --- a/vendor/built_in_modules/calendar/app/helpers/panel/calendar/back_end/cals_helper.rb +++ b/vendor/built_in_modules/calendar/app/helpers/panel/calendar/back_end/cals_helper.rb @@ -180,6 +180,15 @@ module Panel::Calendar::BackEnd::CalsHelper end hours end + + def getHoursForForm + hours = Array.new + for i in 1..12 + hours << {"val"=>i,"title"=>i.to_s+":00"} + hours << {"val"=>i+0.5,"title"=>i.to_s+":30"} + end + hours + end end diff --git a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/day_view.html.erb b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/day_view.html.erb index 709437c7..2edd9e7c 100644 --- a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/day_view.html.erb +++ b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/day_view.html.erb @@ -28,11 +28,13 @@
<% @hours.each do |hour| %> -
-
+
" ref="add-btn" link="<%= new_panel_calendar_back_end_event_path %>" date="<%= @date.to_s %>" ses="AM"> +
-
-
+ <% end %> + <% @hours.each do |hour| %> +
" ref="add-btn" link="<%= new_panel_calendar_back_end_event_path %>" date="<%= @date.to_s %>" ses="PM"> +
<% end %>
diff --git a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/index.html.erb b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/index.html.erb index 791cfe19..3e9c36d7 100644 --- a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/index.html.erb +++ b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/index.html.erb @@ -1,10 +1,8 @@ <%= stylesheet_link_tag "font-awesome" %> <%= stylesheet_link_tag "calendar" %> <%= stylesheet_link_tag "bootstrap-responsive" %> -<% content_for :page_specific_javascript do %> - <%= javascript_include_tag "calendarAPI" %> -<% end %> - +<%= javascript_include_tag "cals" %> +
+
+ +
+
diff --git a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/week_view.html.erb b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/week_view.html.erb index 62b28113..a7287ba5 100644 --- a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/week_view.html.erb +++ b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/week_view.html.erb @@ -62,13 +62,15 @@
<% @hours.each do |hour| %> -
-
-
-
-
-
- <% end %> +
" ref="add-btn" link="<%= new_panel_calendar_back_end_event_path %>" date="<%= @date.to_s %>" ses="AM"> +
+
+ <% end %> + <% @hours.each do |hour| %> +
" ref="add-btn" link="<%= new_panel_calendar_back_end_event_path %>" date="<%= @date.to_s %>" ses="PM"> +
+
+ <% end %>
diff --git a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/events/create.js.erb b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/events/create.js.erb index 98703270..a07068ca 100644 --- a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/events/create.js.erb +++ b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/events/create.js.erb @@ -1,4 +1,14 @@ $("#event_create").empty().hide(); $("#create_event_btn").removeClass("active"); -$("#calendar_month tr.event_row").remove(); -calendar.getEventsForMonth(<%= @m %>,<%= @y %>); \ No newline at end of file +$(".destroy").remove(); +switch (c.view){ + case "week": + c.loadWeekView(c.cur_week,c.cur_year); + break; + case "month": + c.loadMonthView(c.cur_month,c.cur_year); + break; + case "day": + c.loadDayView(c.cur_date,c.cur_month,c.cur_year); + break; +} diff --git a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/events/edit.html.erb b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/events/edit.html.erb new file mode 100644 index 00000000..3db09901 --- /dev/null +++ b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/events/edit.html.erb @@ -0,0 +1,133 @@ +
+
+ + <%= form_for @event, :url =>panel_calendar_back_end_event_path(@event), :class=>"form-horizontal", :remote => true do |f| %> +
+ +
+
+ <%= f.text_field :title, :class=>"span12", :placeholder => "Event Name",:value=>@event.title %> +
+
+ + +
+ <% if !@event.all_day %> +
+
+ +
+ " name="start_date"> + + +
+
+
+ +
+ " name="end_date"> + + +
+
+
+ <% else %> + + <% end %> +
+ +
+ <%= f.select(:cal_id, Cal.all.collect {|p| [ p.name, p.id ] },{:prompt => t("calendar.select_calendar")},:class => "validate", :selected => @event.cal_id) %> +
+
+
+ +
+ <%= f.text_area :note, :class=>"span12", :cols=>"30", :rows=>"3", :value => @event.note %> +
+
+
+
+ + <%= f.submit t("calendar.save"), :class=>"btn" %> +
+
+<% end %> + +
+
\ No newline at end of file diff --git a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/events/new.html.erb b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/events/new.html.erb index 5fd5870e..df23e2bf 100644 --- a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/events/new.html.erb +++ b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/events/new.html.erb @@ -22,72 +22,48 @@
- +
- +
diff --git a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/events/show.html.erb b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/events/show.html.erb index 6f731784..a52b9f35 100644 --- a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/events/show.html.erb +++ b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/events/show.html.erb @@ -13,6 +13,6 @@
- <%= link_to "Delete", panel_calendar_back_end_event_path(@event),:class => "btn", :method => :delete, :remote => true %> - Edit + <%= link_to t("calendar.delete"), panel_calendar_back_end_event_path(@event),:class => "btn bt-del", :method => :delete, :remote => true %> + <%= link_to t("calendar.edit"), edit_panel_calendar_back_end_event_path(@event),:class => "btn btn-primary",:id=>"edit_event_btn" ,:remote => true %>
diff --git a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/events/update.js.erb b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/events/update.js.erb new file mode 100644 index 00000000..8875d214 --- /dev/null +++ b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/events/update.js.erb @@ -0,0 +1,15 @@ +$("#event_create").empty().hide(); +$("#create_event_btn").removeClass("active"); +$(".destroy").remove(); +$("#create_event_btn").show(); +switch (c.view){ + case "week": + c.loadWeekView(c.cur_week,c.cur_year); + break; + case "month": + c.loadMonthView(c.cur_month,c.cur_year); + break; + case "day": + c.loadDayView(c.cur_date,c.cur_month,c.cur_year); + break; +} From 12b7618cc7ca7d0e50179769cceef665c0d601f1 Mon Sep 17 00:00:00 2001 From: devin Date: Sat, 27 Oct 2012 00:11:26 +0800 Subject: [PATCH 02/30] calendar agenda view update --- .../app/assets/stylesheets/calendar.css | 29 ++ .../back_end/cals/agenda_view.html.erb | 488 ++++++++---------- .../calendar/back_end/cals/index.html.erb | 2 +- .../assets/images/personal_patent/.gitkeep | 0 .../javascripts/personal_patent/.gitkeep | 0 .../stylesheets/personal_patent/.gitkeep | 0 .../app - %BDƻs/controllers/.gitkeep | 0 .../controllers/application_controller.rb | 23 - .../back_end/tags_controller.rb | 8 - .../writing_patent_categorys_controller.rb | 119 ----- .../back_end/writing_patents_controller.00.rb | 244 --------- .../back_end/writing_patents_controller.rb | 244 --------- .../plugin/writing_patents_controller.rb | 181 ------- .../app - %BDƻs/helpers/.gitkeep | 0 .../app - %BDƻs/mailers/.gitkeep | 0 .../app - %BDƻs/models/.gitkeep | 0 .../app - %BDƻs/models/personal_patent_tag.rb | 9 - .../app - %BDƻs/models/writing_patent.rb | 108 ---- .../models/writing_patent_category.rb | 28 - .../app - %BDƻs/models/writing_patent_file.rb | 14 - .../app - %BDƻs/views/.gitkeep | 0 .../writing_patent_categorys/_form.html.erb | 30 -- .../_writing_patent_category.html.erb | 16 - .../writing_patent_categorys/create.js.erb | 2 - .../writing_patent_categorys/destroy.js.erb | 1 - .../writing_patent_categorys/edit.js.erb | 1 - .../writing_patent_categorys/index.html.erb | 23 - .../writing_patent_categorys/new.js.erb | 1 - .../writing_patent_categorys/update.js.erb | 4 - .../back_end/writing_patents/_filter.html.erb | 11 - .../back_end/writing_patents/_form.html.erb | 209 -------- .../writing_patents/_form_file.html.erb | 50 -- .../_list_writing_patent_category.html.erb | 11 - .../writing_patents/_sort_headers.html.erb | 8 - .../writing_patents/_writing_patent.html.erb | 25 - .../_writing_patent_category_qe.html.erb | 34 -- .../create_writing_patent_setting.js.erb | 5 - .../back_end/writing_patents/destroy.js.erb | 1 - .../back_end/writing_patents/edit.html.erb | 5 - .../back_end/writing_patents/index.html.erb | 22 - .../back_end/writing_patents/index.js.erb | 3 - .../back_end/writing_patents/new.html.erb | 10 - .../back_end/writing_patents/show.html.erb | 0 .../writing_patents/toggle_enable.js.erb | 3 - .../update_writing_patent_setting.js.erb | 5 - .../writing_patent_category_quick_add.js.erb | 1 - .../writing_patent_category_quick_edit.js.erb | 1 - .../writing_patent_setting.html.erb | 113 ---- .../plugin/writing_patents/_filter.html.erb | 11 - .../plugin/writing_patents/_form.html.erb | 209 -------- .../plugin/writing_patents/_form_file.html.erb | 50 -- .../writing_patents/_sort_headers.html.erb | 7 - .../writing_patents/_writing_patent.html.erb | 24 - .../plugin/writing_patents/destroy.js.erb | 1 - .../plugin/writing_patents/edit.html.erb | 5 - .../plugin/writing_patents/index.html.erb | 22 - .../plugin/writing_patents/index.js.erb | 3 - .../plugin/writing_patents/new.html.erb | 10 - .../plugin/writing_patents/show.html.erb | 0 .../writing_patents/toggle_enable.js.erb | 3 - 60 files changed, 253 insertions(+), 2184 deletions(-) delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/assets/images/personal_patent/.gitkeep delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/assets/javascripts/personal_patent/.gitkeep delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/assets/stylesheets/personal_patent/.gitkeep delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/.gitkeep delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/application_controller.rb delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/back_end/tags_controller.rb delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/back_end/writing_patent_categorys_controller.rb delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/back_end/writing_patents_controller.00.rb delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/back_end/writing_patents_controller.rb delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/plugin/writing_patents_controller.rb delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/helpers/.gitkeep delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/mailers/.gitkeep delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/models/.gitkeep delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/models/personal_patent_tag.rb delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/models/writing_patent.rb delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/models/writing_patent_category.rb delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/models/writing_patent_file.rb delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/views/.gitkeep delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/_form.html.erb delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/_writing_patent_category.html.erb delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/create.js.erb delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/destroy.js.erb delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/edit.js.erb delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/index.html.erb delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/new.js.erb delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/update.js.erb delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_filter.html.erb delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form.html.erb delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form_file.html.erb delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_list_writing_patent_category.html.erb delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_sort_headers.html.erb delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_writing_patent.html.erb delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_writing_patent_category_qe.html.erb delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/create_writing_patent_setting.js.erb delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/destroy.js.erb delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/edit.html.erb delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/index.html.erb delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/index.js.erb delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/new.html.erb delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/show.html.erb delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/toggle_enable.js.erb delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/update_writing_patent_setting.js.erb delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/writing_patent_category_quick_add.js.erb delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/writing_patent_category_quick_edit.js.erb delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/writing_patent_setting.html.erb delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_filter.html.erb delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form_file.html.erb delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_sort_headers.html.erb delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_writing_patent.html.erb delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/destroy.js.erb delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/edit.html.erb delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/index.html.erb delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/index.js.erb delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/new.html.erb delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/show.html.erb delete mode 100644 vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/toggle_enable.js.erb diff --git a/vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css b/vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css index 874904a5..686cd600 100644 --- a/vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css +++ b/vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css @@ -169,14 +169,43 @@ #calendar_agenda .table { margin-bottom: 0; } +#calendar_agenda .tiny_calendar { + border: solid 1px #eee; +} +#calendar_agenda .tiny_calendar .table th { + border-top: 0; +} +#calendar_agenda .tiny_calendar .table td { + text-align: center; +} #calendar_agenda .event { -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; } +#calendar_agenda .row-fluid { + margin-top: 20px; + padding-top: 20px; + border-top: dashed 1px #ddd; +} +#calendar_agenda .row-fluid:first-child { + border-top: 0; + padding-top: 0; + margin-top: 0; +} +#calendar_agenda .table.event_list .span2, #calendar_agenda .table.event_list thead th { + min-height: 0 !important; + height: 0 !important; + line-height: 0; + padding: 0; +} .event_time { font-family: Tahoma, sans-serif; } +.has_event { + background-color: #08c; + color: #fff; +} /* day view */ #calendar_day .header { diff --git a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/agenda_view.html.erb b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/agenda_view.html.erb index 57bb1bf9..8d217587 100644 --- a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/agenda_view.html.erb +++ b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/agenda_view.html.erb @@ -1,267 +1,225 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Thu, Sep 69:00am - 9:30am -
Commuting time, from home to RD
-
9:30am - 12:00am -
Work on Thu project, and ask ika for help if possible
-
13:30pm - 18:00pm -
Template design, at least finish 2 template
-
Fri, Sep 79:00am - 18:00pm -
Take a day off
-
Sat, Sep 87:00am - 7:50pm -
Work out with Joseph
-
-
- \ No newline at end of file +
+
+

October

+
+ tiny calendar goes here +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Thu, Sep 69:00am - 9:30am +
Commuting time, from home to RD
+
9:30am - 12:00am +
Work on Thu project, and ask ika for help if possible
+
13:30pm - 18:00pm +
Template design, at least finish 2 template
+
Fri, Sep 79:00am - 18:00pm +
Take a day off
+
Sat, Sep 87:00am - 7:50pm +
Work out with Joseph
+
+
+
+
+
+

November

+
+ tiny calendar goes here +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Thu, Sep 69:00am - 9:30am +
Commuting time, from home to RD
+
9:30am - 12:00am +
Work on Thu project, and ask ika for help if possible
+
13:30pm - 18:00pm +
Template design, at least finish 2 template
+
Fri, Sep 79:00am - 18:00pm +
Take a day off
+
Sat, Sep 87:00am - 7:50pm +
Work out with Joseph
+
+
+
+
\ No newline at end of file diff --git a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/index.html.erb b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/index.html.erb index 791cfe19..7c708f81 100644 --- a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/index.html.erb +++ b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/index.html.erb @@ -1,6 +1,6 @@ <%= stylesheet_link_tag "font-awesome" %> -<%= stylesheet_link_tag "calendar" %> <%= stylesheet_link_tag "bootstrap-responsive" %> +<%= stylesheet_link_tag "calendar" %> <% content_for :page_specific_javascript do %> <%= javascript_include_tag "calendarAPI" %> <% end %> diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/assets/images/personal_patent/.gitkeep b/vendor/built_in_modules/personal_patent/app - %BDƻs/assets/images/personal_patent/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/assets/javascripts/personal_patent/.gitkeep b/vendor/built_in_modules/personal_patent/app - %BDƻs/assets/javascripts/personal_patent/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/assets/stylesheets/personal_patent/.gitkeep b/vendor/built_in_modules/personal_patent/app - %BDƻs/assets/stylesheets/personal_patent/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/.gitkeep b/vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/application_controller.rb b/vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/application_controller.rb deleted file mode 100644 index 307a4acd..00000000 --- a/vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/application_controller.rb +++ /dev/null @@ -1,23 +0,0 @@ -class ApplicationController < ActionController::Base - protect_from_forgery - before_filter :set_locale - - # Set I18n.locale - def set_locale - # update session if passed - session[:locale] = params[:locale] if params[:locale] - - # set locale based on session or default - begin - # check if locale is valid for non site pages - if !VALID_LOCALES.include?(session[:locale]) - I18n.locale = I18n.default_locale - else - I18n.locale = session[:locale] - end - rescue - I18n.locale = I18n.default_locale - end - end - -end diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/back_end/tags_controller.rb b/vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/back_end/tags_controller.rb deleted file mode 100644 index b7479e8c..00000000 --- a/vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/back_end/tags_controller.rb +++ /dev/null @@ -1,8 +0,0 @@ -class Panel::PersonalPatent::BackEnd::TagsController < Admin::TagsController - - def initialize - super - @app_title = 'personal_patent' - end - -end diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/back_end/writing_patent_categorys_controller.rb b/vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/back_end/writing_patent_categorys_controller.rb deleted file mode 100644 index fe7bc853..00000000 --- a/vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/back_end/writing_patent_categorys_controller.rb +++ /dev/null @@ -1,119 +0,0 @@ -class Panel::PersonalPatent::BackEnd::WritingPatentCategorysController < OrbitBackendController - include OrbitControllerLib::DivisionForDisable - - before_filter :force_order_for_visitor,:only=>[:index,:show] - before_filter :force_order_for_user,:except => [:index,:show] - before_filter :for_app_manager,:except => [:index] - - def index - - @writing_patent_categorys = WritingPatentCategory.all - @writing_patent_category = WritingPatentCategory.new(:display => 'List') - - @url = panel_personal_patent_back_end_writing_patent_categorys_path - - respond_to do |format| - format.html # index.html.erb - format.js - end - end - - # GET /projects/1 - # GET /projects/1.xml - def show - - @writing_patent_category = WritingPatentCategory.find(params[:id]) - - respond_to do |format| - format.html # show.html.erb - format.js - end - end - - # GET /projects/new - # GET /projects/new.xml - def new - - @writing_patent_category = WritingPatentCategory.new(:display => 'List') - - @verb = :post - - respond_to do |format| - format.html # new.html.erb - format.js - end - end - - # GET /projects/1/edit - def edit - - @writing_patent_category = WritingPatentCategory.find(params[:id]) - - @url = panel_personal_patent_back_end_writing_patent_category_path(@writing_patent_category) - - @verb = :put - - respond_to do |format| - format.html - format.js - end - end - - # POST /projects - # POST /projects.xml - def create - - @writing_patent_category = WritingPatentCategory.new(params[:writing_patent_category]) - - respond_to do |format| - if @writing_patent_category.save - format.html { redirect_to(panel_personal_patent_back_end_writing_patent_categorys_url, :notice => t('writing_patent_category.create_writing_patent_category_success')) } - format.js - else - format.html { render :action => "new" } - format.js { render action: "new" } - end - end - end - - # PUT /projects/1 - # PUT /projects/1.xml - def update - - @writing_patent_category = WritingPatentCategory.find(params[:id]) - # debugger - @url = panel_personal_patent_back_end_writing_patent_category_path(@writing_patent_category) - - respond_to do |format| - if @writing_patent_category.update_attributes(params[:writing_patent_category]) - format.html { redirect_to(panel_personal_patent_back_end_writing_patent_categorys_url, :notice => t('writing_patent_category.update_writing_patent_category_success')) } - # format.xml { head :ok } - format.js - else - format.html { render :action => "edit" } - format.js { render :action => "edit" } - end - end - end - - # DELETE /projects/1 - # DELETE /projects/1.xml - def destroy - - @writing_patent_category = WritingPatentCategory.find(params[:id]) - @writing_patent_category.disable = @writing_patent_category.disable ? false : true - - if @writing_patent_category.save! - respond_to do |format| - format.html { redirect_to(panel_personal_patent_back_end_writing_patent_categorys_url) } - # format.xml { head :ok } - format.js - end - else - flash[:error] = t("writing_patent_category.update_failed") - format.html { render :action => "index" } - end - - end - -end diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/back_end/writing_patents_controller.00.rb b/vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/back_end/writing_patents_controller.00.rb deleted file mode 100644 index d038e1b8..00000000 --- a/vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/back_end/writing_patents_controller.00.rb +++ /dev/null @@ -1,244 +0,0 @@ -class Panel::PersonalPatent::BackEnd::WritingPatentsController < OrbitBackendController - include AdminHelper - include OrbitControllerLib::DivisionForDisable - - before_filter :authenticate_user! - before_filter :force_order_for_visitor,:only=>[:index,:show] - before_filter :force_order_for_user,:except => [:index,:show] - # before_filter :for_app_manager,:except => [:index,:show] - before_filter :only => [ :new,:create,:edit,:update,:create] do |controller| - controller.get_categorys('WritingPatentCategory') - end - - def index - - get_categorys("WritingPatentCategory",params[:writing_patent_category_id]) - @filter = params[:filter] - new_filter = params[:new_filter] - - if @filter && params[:clear] - @filter.delete(params[:type]) - elsif @filter && new_filter - if @filter.has_key?(new_filter[:type]) && @filter[new_filter[:type]].include?(new_filter[:id].to_s) - @filter[new_filter[:type]].delete(new_filter[:id].to_s) - elsif @filter.has_key?(new_filter[:type]) - @filter[new_filter[:type]] << new_filter[:id].to_s - else - @filter.merge!({new_filter[:type] => [new_filter[:id].to_s]}) - end - elsif new_filter - @filter = {new_filter[:type] => [new_filter[:id].to_s]} - end - - - @writing_patent_categorys = get_categories_for_index("WritingPatentCategory") - @writing_patent_category_ids = @writing_patent_categorys.collect{|t| t.id.to_s} + [nil] - - @writing_patents = (params[:sort] || @filter) ? get_sorted_and_filtered("writing_patent",:writing_patent_category_id.in => @writing_patent_category_ids) : get_viewable("writing_patent",:writing_patent_category_id.in => @writing_patent_category_ids) - - get_tags - - respond_to do |format| - format.html # index.html.erb - format.xml { render :xml => @writing_patents } - format.js - end - end - - def writing_patent_setting - - @writing_patent_categorys = WritingPatentCategory.all - - get_tags - - @set_writing_patent_category = WritingPatentCategory.new(:display => 'List') - @writing_patent_category_url = panel_personal_patent_back_end_writing_patents_path - - - end - - def writing_patent_category_quick_add - @set_writing_patent_category = WritingPatentCategory.new(:display => 'List') - @writing_patent_category_url = panel_personal_patent_back_end_writing_patents_path - @set_writing_patent_category.id = params[:id] - - respond_to do |format| - format.js - end - - end - - def writing_patent_category_quick_edit - - @set_writing_patent_category = WritingPatentCategory.find(params[:writing_patent_id]) - @writing_patent_category_url = panel_personal_patent_back_end_writing_patent_path(@set_writing_patent_category) - - respond_to do |format| - format.js - end - end - - # GET /writing_patents/1 - # GET /writing_patents/1.xml - def show - @writing_patent = WritingPatent.find(params[:id]) - respond_to do |format| - format.html # show.html.erb - format.xml { render :xml => @writing_patent } - end - end - - # GET /writing_patents/new - # GET /writing_patents/new.xml - def new - - @writing_patent = WritingPatent.new - debugger - @writing_patent_categorys = WritingPatentCategory.all - - get_tags - - respond_to do |format| - format.html # new.html.erb - format.xml { render :xml => @writing_patent } - end - end - - # GET /writing_patents/1/edit - def edit - @writing_patent = WritingPatent.find(params[:id]) - - @writing_patent_categorys = WritingPatentCategory.all - - get_tags - end - - # POST /writing_patents - # POST /writing_patents.xml - def create - - if params[:writing_patent_category] - - @writing_patent_category = WritingPatentCategory.new(params[:writing_patent_category]) - - respond_to do |format| - if @writing_patent_category.save - format.js { render 'create_writing_patent_setting' } - end - end - - else - - - @writing_patent_categorys = WritingPatentCategory.all - get_tags - - @writing_patent = WritingPatent.new(params[:writing_patent]) - - @writing_patent.create_user_id = current_user.id - @writing_patent.update_user_id = current_user.id - - respond_to do |format| - if @writing_patent.save - format.html { redirect_to(panel_personal_patent_back_end_writing_patents_url) } - format.xml { render :xml => @writing_patent, :status => :created, :location => @writing_patent } - else - format.html { render :action => "new" } - format.xml { render :xml => @writing_patent.errors, :status => :unprocessable_entity } - end - end - end - - end - - # PUT /writing_patents/1 - # PUT /writing_patents/1.xml - def update - - if params[:writing_patent_category] - - @writing_patent_category = WritingPatentCategory.find(params[:id]) - - respond_to do |format| - - if @writing_patent_category.update_attributes(params[:writing_patent_category]) - # format.html { redirect_to(panel_announcement_back_end_bulletins_url) } - format.js { render 'update_writing_patent_setting' } - end - end - - else - - @writing_patent = WritingPatent.find(params[:id]) - - @writing_patent.update_user_id = current_user.id - - params[:writing_patent][:tag_ids] ||=[] - - respond_to do |format| - if @writing_patent.update_attributes(params[:writing_patent]) - format.html { redirect_to(panel_personal_patent_back_end_writing_patents_url) } - # format.js { render 'toggle_enable' } - format.xml { head :ok } - else - format.html { render :action => "edit" } - format.xml { render :xml => @writing_patent.errors, :status => :unprocessable_entity } - end - end - end - - end - - # DELETE /writing_patents/1 - # DELETE /writing_patents/1.xml - def destroy - @writing_patent = WritingPatent.find(params[:id]) - @writing_patent.destroy - - respond_to do |format| - format.html { redirect_to(panel_personal_patent_back_end_writing_patents_url) } - # format.xml { head :ok } - format.js - end - end - - def delete - if params[:ids] - writing_patents = WritingPatent.any_in(:_id => params[:ids]).delete_all - end - redirect_to panel_personal_patent_back_end_writing_patents_url(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]) - end - - protected - - - # def get_index_categories(id = nil) - # @bulletin_categorys = [] - # if(is_manager? || is_admin?) - # @bulletin_categorys = (id ? BulletinCategory.admin_manager_all.find(id).to_a : BulletinCategory.admin_manager_all) - # elsif is_sub_manager? - # @bulletin_categorys = BulletinCategory.all - # end - # @bulletin_categorys - # end - - - # def get_categorys(id = nil) - # @writing_patent_categorys = [] - # if(is_manager? || is_admin?) - # @writing_patent_categorys = (id ? WritingPatent.admin_manager_all.find(id).to_a : WritingPatent.admin_manager_all)) - # elsif is_sub_manager? - # @writing_patent_categorys = WritingPatent.all.authed_for_user(current_user,'edit') - # end - # if @writing_patent_categorys.empty? && params[:action] != "index" - # flash[:alert] = t("announcement.error.no_avilb_cate_for_posting") - # redirect_to :action => :index - # end - # end - - def get_tags - module_app = ModuleApp.first(:conditions => {:key => 'personal_patent'}) - @tags = Tag.all(:conditions => {:module_app_id => module_app.id}) - end - -end diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/back_end/writing_patents_controller.rb b/vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/back_end/writing_patents_controller.rb deleted file mode 100644 index a0bec01b..00000000 --- a/vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/back_end/writing_patents_controller.rb +++ /dev/null @@ -1,244 +0,0 @@ -class Panel::PersonalPatent::BackEnd::WritingPatentsController < OrbitBackendController - include AdminHelper - include OrbitControllerLib::DivisionForDisable - - before_filter :authenticate_user! - before_filter :force_order_for_visitor,:only=>[:index,:show] - before_filter :force_order_for_user,:except => [:index,:show] - # before_filter :for_app_manager,:except => [:index,:show] - before_filter :only => [ :new,:create,:edit,:update,:create] do |controller| - controller.get_categorys('WritingPatentCategory') - end - - def index - - get_categorys("WritingPatentCategory",params[:writing_patent_writing_patent_category_id]) - @filter = params[:filter] - new_filter = params[:new_filter] - - if @filter && params[:clear] - @filter.delete(params[:type]) - elsif @filter && new_filter - if @filter.has_key?(new_filter[:type]) && @filter[new_filter[:type]].include?(new_filter[:id].to_s) - @filter[new_filter[:type]].delete(new_filter[:id].to_s) - elsif @filter.has_key?(new_filter[:type]) - @filter[new_filter[:type]] << new_filter[:id].to_s - else - @filter.merge!({new_filter[:type] => [new_filter[:id].to_s]}) - end - elsif new_filter - @filter = {new_filter[:type] => [new_filter[:id].to_s]} - end - - - @writing_patent_categorys = get_categories_for_index("WritingPatentCategory") - @writing_patent_category_ids = @writing_patent_categorys.collect{|t| t.id.to_s} + [nil] - - @writing_patents = (params[:sort] || @filter) ? get_sorted_and_filtered("writing_patent",:writing_patent_category_id.in => @writing_patent_category_ids) : get_viewable("writing_patent",:writing_patent_category_id.in => @writing_patent_category_ids) - - get_tags - - respond_to do |format| - format.html # index.html.erb - format.xml { render :xml => @writing_patents } - format.js - end - end - - def writing_patent_setting - - @writing_patent_categorys = WritingPatentCategory.all - - get_tags - - @set_writing_patent_category = WritingPatentCategory.new(:display => 'List') - @writing_patent_category_url = panel_personal_patent_back_end_writing_patents_path - - - end - - def writing_patent_category_quick_add - @set_writing_patent_category = WritingPatentCategory.new(:display => 'List') - @writing_patent_category_url = panel_personal_patent_back_end_writing_patents_path - @set_writing_patent_category.id = params[:id] - - respond_to do |format| - format.js - end - - end - - def writing_patent_category_quick_edit - - @set_writing_patent_category = WritingPatentCategory.find(params[:writing_patent_id]) - @writing_patent_category_url = panel_personal_patent_back_end_writing_patent_path(@set_writing_patent_category) - - respond_to do |format| - format.js - end - end - - # GET /writing_patents/1 - # GET /writing_patents/1.xml - def show - @writing_patent = Project.find(params[:id]) - respond_to do |format| - format.html # show.html.erb - format.xml { render :xml => @writing_patent } - end - end - - # GET /writing_patents/new - # GET /writing_patents/new.xml - def new - - @writing_patent = Project.new - - @writing_patent_categorys = WritingPatentCategory.all - - get_tags - - respond_to do |format| - format.html # new.html.erb - format.xml { render :xml => @writing_patent } - end - end - - # GET /writing_patents/1/edit - def edit - @writing_patent = Project.find(params[:id]) - - @writing_patent_categorys = WritingPatentCategory.all - - get_tags - end - - # POST /writing_patents - # POST /writing_patents.xml - def create - - if params[:writing_patent_category] - - @writing_patent_category = WritingPatentCategory.new(params[:writing_patent_category]) - - respond_to do |format| - if @writing_patent_category.save - format.js { render 'create_writing_patent_setting' } - end - end - - else - - - @writing_patent_categorys = WritingPatentCategory.all - get_tags - - @writing_patent = Project.new(params[:writing_patent]) - - @writing_patent.create_user_id = current_user.id - @writing_patent.update_user_id = current_user.id - - respond_to do |format| - if @writing_patent.save - format.html { redirect_to(panel_personal_patent_back_end_writing_patents_url) } - format.xml { render :xml => @writing_patent, :status => :created, :location => @writing_patent } - else - format.html { render :action => "new" } - format.xml { render :xml => @writing_patent.errors, :status => :unprocessable_entity } - end - end - end - - end - - # PUT /writing_patents/1 - # PUT /writing_patents/1.xml - def update - - if params[:writing_patent_category] - - @writing_patent_category = WritingPatentCategory.find(params[:id]) - - respond_to do |format| - - if @writing_patent_category.update_attributes(params[:writing_patent_category]) - # format.html { redirect_to(panel_announcement_back_end_bulletins_url) } - format.js { render 'update_writing_patent_setting' } - end - end - - else - - @writing_patent = Project.find(params[:id]) - - @writing_patent.update_user_id = current_user.id - - params[:writing_patent][:tag_ids] ||=[] - - respond_to do |format| - if @writing_patent.update_attributes(params[:writing_patent]) - format.html { redirect_to(panel_personal_patent_back_end_writing_patents_url) } - # format.js { render 'toggle_enable' } - format.xml { head :ok } - else - format.html { render :action => "edit" } - format.xml { render :xml => @writing_patent.errors, :status => :unprocessable_entity } - end - end - end - - end - - # DELETE /writing_patents/1 - # DELETE /writing_patents/1.xml - def destroy - @writing_patent = Project.find(params[:id]) - @writing_patent.destroy - - respond_to do |format| - format.html { redirect_to(panel_personal_patent_back_end_writing_patents_url) } - # format.xml { head :ok } - format.js - end - end - - def delete - if params[:ids] - writing_patents = Project.any_in(:_id => params[:ids]).delete_all - end - redirect_to panel_personal_patent_back_end_writing_patents_url(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]) - end - - protected - - - # def get_index_categories(id = nil) - # @bulletin_categorys = [] - # if(is_manager? || is_admin?) - # @bulletin_categorys = (id ? BulletinCategory.admin_manager_all.find(id).to_a : BulletinCategory.admin_manager_all) - # elsif is_sub_manager? - # @bulletin_categorys = BulletinCategory.all - # end - # @bulletin_categorys - # end - - - # def get_categorys(id = nil) - # @writing_patent_categorys = [] - # if(is_manager? || is_admin?) - # @writing_patent_categorys = (id ? Project.admin_manager_all.find(id).to_a : Project.admin_manager_all)) - # elsif is_sub_manager? - # @writing_patent_categorys = Project.all.authed_for_user(current_user,'edit') - # end - # if @writing_patent_categorys.empty? && params[:action] != "index" - # flash[:alert] = t("announcement.error.no_avilb_cate_for_posting") - # redirect_to :action => :index - # end - # end - - def get_tags - module_app = ModuleApp.first(:conditions => {:key => 'personal_patent'}) - @tags = Tag.all(:conditions => {:module_app_id => module_app.id}) - end - -end diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/plugin/writing_patents_controller.rb b/vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/plugin/writing_patents_controller.rb deleted file mode 100644 index 1acab41d..00000000 --- a/vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/plugin/writing_patents_controller.rb +++ /dev/null @@ -1,181 +0,0 @@ -class Panel::PersonalPatent::Plugin::WritingPatentsController < OrbitBackendController - include AdminHelper - include OrbitControllerLib::DivisionForDisable - - before_filter :authenticate_user! - before_filter :force_order_for_visitor,:only=>[:index,:show] - before_filter :force_order_for_user,:except => [:index,:show] - # before_filter :for_app_manager,:except => [:index,:show] - before_filter :only => [ :new,:create,:edit,:update,:create] do |controller| - controller.get_categorys('WritingPatentCategory') - end - - def index - - get_categorys("WritingPatentCategory",params[:writing_patent_writing_patent_category_id]) - @filter = params[:filter] - new_filter = params[:new_filter] - - if @filter && params[:clear] - @filter.delete(params[:type]) - elsif @filter && new_filter - if @filter.has_key?(new_filter[:type]) && @filter[new_filter[:type]].include?(new_filter[:id].to_s) - @filter[new_filter[:type]].delete(new_filter[:id].to_s) - elsif @filter.has_key?(new_filter[:type]) - @filter[new_filter[:type]] << new_filter[:id].to_s - else - @filter.merge!({new_filter[:type] => [new_filter[:id].to_s]}) - end - elsif new_filter - @filter = {new_filter[:type] => [new_filter[:id].to_s]} - end - - - @writing_patent_categorys = get_categories_for_index("WritingPatentCategory") - @writing_patent_category_ids = @writing_patent_categories.collect{|t| t.id.to_s} + [nil] - - @writing_patents = (params[:sort] || @filter) ? get_sorted_and_filtered("writing_patent",:create_user_id => current_user.id) : get_viewable("writing_patent", :create_user_id => current_user.id) - - get_tags - - respond_to do |format| - format.html # index.html.erb - format.xml { render :xml => @writing_patents } - format.js - end - end - - # GET /writing_patents/1 - # GET /writing_patents/1.xml - def show - @writing_patent = Project.find(params[:id]) - respond_to do |format| - format.html # show.html.erb - format.xml { render :xml => @writing_patent } - end - end - - # GET /writing_patents/new - # GET /writing_patents/new.xml - def new - - @writing_patent = Project.new - - @writing_patent_categorys = WritingPatentCategory.all - - get_tags - - respond_to do |format| - format.html # new.html.erb - format.xml { render :xml => @writing_patent } - end - end - - # GET /writing_patents/1/edit - def edit - @writing_patent = Project.find(params[:id]) - - @writing_patent_categorys = WritingPatentCategory.all - - get_tags - end - - # POST /writing_patents - # POST /writing_patents.xml - def create - - @writing_patent_categorys = WritingPatentCategory.all - get_tags - - @writing_patent = Project.new(params[:writing_patent]) - - @writing_patent.create_user_id = current_user.id - @writing_patent.update_user_id = current_user.id - - respond_to do |format| - if @writing_patent.save - format.html { redirect_to(panel_personal_writing_patent_plugin_writing_patents_url) } - format.xml { render :xml => @writing_patent, :status => :created, :location => @writing_patent } - else - format.html { render :action => "new" } - format.xml { render :xml => @writing_patent.errors, :status => :unprocessable_entity } - end - end - end - - - # PUT /writing_patents/1 - # PUT /writing_patents/1.xml - def update - - @writing_patent = Project.find(params[:id]) - - @writing_patent.update_user_id = current_user.id - - params[:writing_patent][:tag_ids] ||=[] - - respond_to do |format| - if @writing_patent.update_attributes(params[:writing_patent]) - format.html { redirect_to(panel_personal_writing_patent_plugin_writing_patents_url) } - # format.js { render 'toggle_enable' } - format.xml { head :ok } - else - format.html { render :action => "edit" } - format.xml { render :xml => @writing_patent.errors, :status => :unprocessable_entity } - end - end - end - - # DELETE /writing_patents/1 - # DELETE /writing_patents/1.xml - def destroy - @writing_patent = Project.find(params[:id]) - @writing_patent.destroy - - respond_to do |format| - format.html { redirect_to(panel_personal_writing_patent_plugin_writing_patents_url) } - # format.xml { head :ok } - format.js - end - end - - def delete - if params[:ids] - writing_patents = Project.any_in(:_id => params[:ids]).delete_all - end - redirect_to panel_personal_writing_patent_plugin_writing_patents_url(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]) - end - - protected - - - # def get_index_categories(id = nil) - # @bulletin_categorys = [] - # if(is_manager? || is_admin?) - # @bulletin_categorys = (id ? BulletinCategory.admin_manager_all.find(id).to_a : BulletinCategory.admin_manager_all) - # elsif is_sub_manager? - # @bulletin_categorys = BulletinCategory.all - # end - # @bulletin_categorys - # end - - - # def get_categorys(id = nil) - # @writing_patent_categorys = [] - # if(is_manager? || is_admin?) - # @writing_patent_categorys = (id ? Project.admin_manager_all.find(id).to_a : Project.admin_manager_all)) - # elsif is_sub_manager? - # @writing_patent_categorys = Project.all.authed_for_user(current_user,'edit') - # end - # if @writing_patent_categorys.empty? && params[:action] != "index" - # flash[:alert] = t("announcement.error.no_avilb_cate_for_posting") - # redirect_to :action => :index - # end - # end - - def get_tags - module_app = ModuleApp.first(:conditions => {:key => 'personal_patent'}) - @tags = Tag.all(:conditions => {:module_app_id => module_app.id}) - end - -end diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/helpers/.gitkeep b/vendor/built_in_modules/personal_patent/app - %BDƻs/helpers/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/mailers/.gitkeep b/vendor/built_in_modules/personal_patent/app - %BDƻs/mailers/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/models/.gitkeep b/vendor/built_in_modules/personal_patent/app - %BDƻs/models/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/models/personal_patent_tag.rb b/vendor/built_in_modules/personal_patent/app - %BDƻs/models/personal_patent_tag.rb deleted file mode 100644 index 752e62e6..00000000 --- a/vendor/built_in_modules/personal_patent/app - %BDƻs/models/personal_patent_tag.rb +++ /dev/null @@ -1,9 +0,0 @@ -class PersonalPatentTag < Tag - - has_and_belongs_to_many :writing_patents - - def get_visible_links(sort = :title) - self.writing_patents.where(:is_hidden => false).desc(:is_top, sort) - end - -end \ No newline at end of file diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/models/writing_patent.rb b/vendor/built_in_modules/personal_patent/app - %BDƻs/models/writing_patent.rb deleted file mode 100644 index 75bc5054..00000000 --- a/vendor/built_in_modules/personal_patent/app - %BDƻs/models/writing_patent.rb +++ /dev/null @@ -1,108 +0,0 @@ -# encoding: utf-8 - -class WritingPatent - include Mongoid::Document - include Mongoid::Timestamps - include Mongoid::MultiParameterAttributes - - # scope :available_for_lang, ->(locale){ where("available_for_#{locale}".to_sym => true) } - - LANGUAGE_TYPES = [ "English", "Chinese" ] - - - field :patent_title, localize: true - field :authors, localize: true - - has_and_belongs_to_many :tags, :class_name => "PersonalPatentTag" - - belongs_to :writing_patent_category - - field :year - field :language - field :keywords - field :patent_no - field :patent_country - field :publish_date , :type => Date - field :url - field :note - field :create_user_id - field :update_user_id - - # field :is_top, :type => Boolean, :default => false - # field :is_hot, :type => Boolean, :default => false - # field :is_hidden, :type => Boolean, :default => false - - has_many :writing_patent_files, :autosave => true, :dependent => :destroy - - accepts_nested_attributes_for :writing_patent_files, :allow_destroy => true - - # before_save :update_avliable_language, :clean_checkboxs - - validates :writing_patent_title, :at_least_one => true - - before_validation :add_http - - after_save :save_writing_patent_files - - validates :url, :format => /^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(([0-9]{1,5})?\/.*)?$/ix, :unless => Proc.new{self.url.blank?} - - def self.search( category_id = nil ) - - if category_id.to_s.size > 0 - - find(:all, :conditions => {writing_patent_category_id: category_id}).desc( :is_top, :title ) - - else - - find(:all).desc( :is_top, :title) - - end - - end - - - def self.widget_datas - - where( :is_hidden => false ).desc(:is_top, :created_at) - - end - - def is_top? - self.is_top - end - - def sorted_tags - tags.order_by(I18n.locale, :asc) - end - - def update_avliable_language - VALID_LOCALES.each do |locale| - if (title_translations[locale].blank? rescue true) - self["available_for_#{locale}".to_sym] = false - else - self["available_for_#{locale}".to_sym] = true - end - end - end - - def save_writing_patent_files - self.writing_patent_files.each do |t| - if t.should_destroy - t.destroy - end - end - end - - protected - - def add_http - unless self.url.blank? || self.url[/^http:\/\//] || self.url[/^https:\/\//] - self.url = 'http://' + self.url - end - end - - def clean_checkboxs - self.tag_ids.delete('') - end - -end \ No newline at end of file diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/models/writing_patent_category.rb b/vendor/built_in_modules/personal_patent/app - %BDƻs/models/writing_patent_category.rb deleted file mode 100644 index e1dfcab0..00000000 --- a/vendor/built_in_modules/personal_patent/app - %BDƻs/models/writing_patent_category.rb +++ /dev/null @@ -1,28 +0,0 @@ -# encoding: utf-8 - -class WritingPatentCategory - include Mongoid::Document - include Mongoid::Timestamps - include OrbitCoreLib::ObjectAuthable - include OrbitCoreLib::ObjectDisable - # include Mongoid::MultiParameterAttributes - AfterObjectAuthUrl = '/panel/personal_patent/back_end/writing_patent_categorys' - APP_NAME = 'project' - # ObjectAuthTitlesOptions = %W{edit} - ObjectAuthTitlesOptions = %W{submit_new fact_check} - - field :key - - field :title, localize: true - - has_many :writing_patents - - def pp_object - title - end - - def self.from_id(id) - WritingPatentCategory.find(id) rescue nil - end - -end \ No newline at end of file diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/models/writing_patent_file.rb b/vendor/built_in_modules/personal_patent/app - %BDƻs/models/writing_patent_file.rb deleted file mode 100644 index df7c5b45..00000000 --- a/vendor/built_in_modules/personal_patent/app - %BDƻs/models/writing_patent_file.rb +++ /dev/null @@ -1,14 +0,0 @@ -class WritingPatentFile - - include Mongoid::Document - include Mongoid::Timestamps - - mount_uploader :file, AssetUploader - - # field :description, localize: true - field :should_destroy, :type => Boolean - field :title, localize: true - - belongs_to :writing_patent - -end diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/.gitkeep b/vendor/built_in_modules/personal_patent/app - %BDƻs/views/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/_form.html.erb b/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/_form.html.erb deleted file mode 100644 index c3542e8b..00000000 --- a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/_form.html.erb +++ /dev/null @@ -1,30 +0,0 @@ -<% # encoding: utf-8 %> - -<%= form_for(@writing_patent_category, :remote => true, :url => @url) do |f| %> - -

<%= (@writing_patent_category.new_record? ? 'Add' : 'Edit') %>

- -
- <%= f.label :key %> - <%= f.text_field :key %> -
- -
- <%= f.fields_for :title_translations do |f| %> - <% @site_valid_locales.each do |locale| %> -
- <%= label_tag "name-#{locale}", "Name-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %> -
- <%= f.text_field locale, :class => 'input-xxlarge', :value => (@web_link_category.title_translations[locale] rescue nil) %> -
-
- <% end %> - <% end %> -
- -
- <%= f.submit 'Submit/送出', :class=>'btn btn-primary' %> -
- -<% end %> - \ No newline at end of file diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/_writing_patent_category.html.erb b/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/_writing_patent_category.html.erb deleted file mode 100644 index 08396d9b..00000000 --- a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/_writing_patent_category.html.erb +++ /dev/null @@ -1,16 +0,0 @@ - - - - - <%= writing_patent_category.key %> -
- -
- - <% @site_valid_locales.each do |locale| %> - <%= writing_patent_category.title_translations[locale] %> - <% end %> - \ No newline at end of file diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/create.js.erb b/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/create.js.erb deleted file mode 100644 index 9a4eb545..00000000 --- a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/create.js.erb +++ /dev/null @@ -1,2 +0,0 @@ -$('<%= j render :partial => 'writing_patent_category', :collection => [@writing_patent_category] %>').appendTo('#writing_patent_categorys').hide().fadeIn(); -$("#new_writing_patent_category")[0].reset(); \ No newline at end of file diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/destroy.js.erb b/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/destroy.js.erb deleted file mode 100644 index 8bd6da01..00000000 --- a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/destroy.js.erb +++ /dev/null @@ -1 +0,0 @@ -$("#<%= dom_id @writing_patent_category %>").remove(); \ No newline at end of file diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/edit.js.erb b/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/edit.js.erb deleted file mode 100644 index eaff01fa..00000000 --- a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/edit.js.erb +++ /dev/null @@ -1 +0,0 @@ -$("#form > form").replaceWith("<%= j render "form" %>"); \ No newline at end of file diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/index.html.erb b/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/index.html.erb deleted file mode 100644 index 41adf614..00000000 --- a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/index.html.erb +++ /dev/null @@ -1,23 +0,0 @@ - - -<%= flash_messages %> - - - - - - <% @site_valid_locales.each do |locale| %> - - <% end %> - - - - - <%= render :partial => 'writing_patent_category', :collection => @writing_patent_categorys %> - - -
<%= t('writing_patent_category.key') %><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %>
- -
<%= render :partial => "form" %>
- - diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/new.js.erb b/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/new.js.erb deleted file mode 100644 index 40061b9f..00000000 --- a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/new.js.erb +++ /dev/null @@ -1 +0,0 @@ -$("#form > form").replaceWith("<%= j render "form" %>"); diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/update.js.erb b/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/update.js.erb deleted file mode 100644 index 299b38a7..00000000 --- a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/update.js.erb +++ /dev/null @@ -1,4 +0,0 @@ -$("#<%= dom_id @writing_patent_category %>").replaceWith("<%= j render :partial => 'link_category', :collection => [@writing_patent_category] %>"); -<% @writing_patent_category = ProjectCategory.new(:display => 'List') # reset for new form %> -$(".edit_writing_patent_category").replaceWith("<%= j render "form" %>") -$(".new_writing_patent_category")[0].reset(); \ No newline at end of file diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_filter.html.erb b/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_filter.html.erb deleted file mode 100644 index 63882b8f..00000000 --- a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_filter.html.erb +++ /dev/null @@ -1,11 +0,0 @@ - - -<% content_for :page_specific_javascript do %> - <%= javascript_include_tag "sort_header" %> -<% end %> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form.html.erb b/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form.html.erb deleted file mode 100644 index 22022c21..00000000 --- a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form.html.erb +++ /dev/null @@ -1,209 +0,0 @@ -<% # encoding: utf-8 %> - - <%= f.error_messages %> - - - -
- -
-
- -
-

Tags

-
- <% @tags.each do |tag| %> - <%= content_tag :label,:class => "checkbox inline" do -%> - <%= check_box_tag 'writing_patent[tag_ids][]', tag.id, @writing_patent.tag_ids.include?(tag.id)%> - <%= tag[I18n.locale] %> - <%= hidden_field_tag 'writing_patent[tag_ids][]', '' %> - <% end %> - <% end %> -
-
- -
- - - - - -
-
- -
- <%= f.label :year ,t("personal_patent.year")%> - <%= select_year((@writing_patent.year ? @writing_patent.year.to_i : DateTime.now.year), {:start_year => DateTime.now.year, :end_year => 1930}, {:name => 'writing_patent[year]'} ) %> -
- -
- <%= f.label :writing_patent_category ,t("personal_patent.writing_patent_category")%> - <%= f.select :writing_patent_category_id, @writing_patent_categorys.collect {|t| [ t.title, t.id ]} %> -
- -
- <%= f.label :period_start_date ,t("personal_patent.period_start_date")%> - <%= f.date_select :period_start_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1890, :order => [:year, :month], :discard_day => true }, {:class => 'span1'} %> -
- -
- <%= f.label :period_end_date ,t("personal_patent.period_end_date")%> - <%= f.date_select :period_end_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1890, :order => [:year, :month], :discard_day => true }, {:class => 'span1'} %> -
- - - -
- - <% @site_valid_locales.each_with_index do |locale, i| %> - -
"> - -
- <%= f.label :writing_patent_title ,t("personal_patent.writing_patent_title")%> - <%= f.fields_for :writing_patent_title_translations do |f| %> - <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale, :class=>'post-title', :value => (@writing_patent.writing_patent_title_translations[locale] rescue nil) %> - <% end %> -
- -
- <%= f.label :job_title ,t("personal_patent.job_title")%> - <%= f.fields_for :job_title_translations do |f| %> - <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale, :class=>'post-title', :value => (@writing_patent.job_title_translations[locale] rescue nil) %> - <% end %> -
- -
- <%= f.label :participator ,t("personal_patent.participator")%> - <%= f.fields_for :participator_translations do |f| %> - <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale, :class=>'post-title', :value => (@writing_patent.participator_translations[locale] rescue nil) %> - <% end %> -
- -
- <%= f.label :unit ,t("personal_patent.unit")%> - <%= f.fields_for :unit_translations do |f| %> - <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale, :class=>'post-title', :value => (@writing_patent.unit_translations[locale] rescue nil) %> - <% end %> -
- -
- - <% end %> - -
- -
- <%= f.label :url, t("personal_patent.url") %> - <%= f.text_field :url %> -
- -
- <%= f.label :keywords, t("personal_patent.keywords") %> - <%= f.text_field :keywords %> -
- -
- <%= f.label :abstract, t("personal_patent.abstract") %> - <%= f.text_field :abstract %> -
- -
- <%= f.label :language, t("personal_patent.language") %> - <%= f.radio_button :language, "Chinese" %> <%= t("personal_patent.Chinese") %> - <%= f.radio_button :language, "English" %> <%= t("personal_patent.English") %> -
- -
- <%= f.label :note, t("personal_patent.note") %> - <%= f.text_area :note, :size => "60x3" %> -
- -
- - - - - -
- -
- - - - - - - - - - - - - - - - - - <% @writing_patent.writing_patent_files.each_with_index do |writing_patent_file, i| %> - <%= f.fields_for :writing_patent_files, writing_patent_file do |f| %> - <%= render :partial => 'form_file', :object => writing_patent_file, :locals => {:f => f, :i => i} %> - <% end %> - <% end %> - -
FileFile Name
-
- <%= hidden_field_tag 'plugin_file_field_count', @writing_patent.writing_patent_files.count %> - ADD/新增 -
-
- -
- -
- - - - - - -
- - - - -
- <%= f.submit t('submit'), :class=>'btn btn-primary' %> - <%= link_to t('cancel'), get_go_back, :class=>"btn" %> -
- - -<% content_for :page_specific_javascript do %> - <%= javascript_include_tag "archive_plugin_form" %> - -<% end %> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form_file.html.erb b/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form_file.html.erb deleted file mode 100644 index a91d6a85..00000000 --- a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form_file.html.erb +++ /dev/null @@ -1,50 +0,0 @@ -<% # encoding: utf-8 %> - - " class='list_item'> - -
-
- <%= f.file_field :file %> - <%= form_file.file.file ? ( link_to t(:view), form_file.file.url, {:class => 'btn', :target => '_blank', :title => t(:view)} ) : '' %> -
-
- - - -
- - <% @site_valid_locales.each_with_index do |locale, i| %> - -
"> - <%#= f.fields_for :i18n_variable, (form_file.new_record? ? form_file.build_i18n_variable : form_file.i18n_variable ) do |f| %> - <%= f.fields_for :file_title_translations do |f| %> -
- -
- <%= f.text_field locale, :class=>'post-file_title', :value => (form_file.file_title_translations[locale] rescue nil) %> -
-
- <% end %> - -
- - <% end %> - -
- - - - - - <% if form_file.new_record? %> - - <% else %> - <%= f.hidden_field :id %> - - <%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %> - <% end %> - - - - - diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_list_writing_patent_category.html.erb b/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_list_writing_patent_category.html.erb deleted file mode 100644 index 97db4523..00000000 --- a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_list_writing_patent_category.html.erb +++ /dev/null @@ -1,11 +0,0 @@ -<% # encoding: utf-8 %> - - - <%= list_writing_patent_category.title %> - - - <%= t('edit')%> - <%= link_to show_toggle_archive_btn(list_writing_patent_category), - polymorphic_path([:panel, :personal_patent, :back_end, list_writing_patent_category]), :confirm => t('announcement.sure?'), :method => :delete, :remote => true,:class=>"archive_toggle action" %> - - \ No newline at end of file diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_sort_headers.html.erb b/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_sort_headers.html.erb deleted file mode 100644 index a6dad620..00000000 --- a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_sort_headers.html.erb +++ /dev/null @@ -1,8 +0,0 @@ -<%= render_sort_bar(true, delete_panel_personal_patent_back_end_writing_patents_path(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]), - ['publish_date', 'publish_date', 'span1', 'writing_patent.publish_date'], - ['patent_title', 'patent_title','span3', 'writing_patent.patent_title'], - ['patent_no', 'patent_no','span3', 'writing_patent.patent_no'], - ['patent_country', 'patent_country','span3', 'writing_patent.patent_country'], - ['authors', 'authors','span3', 'writing_patent.authors'], - ['url', 'url','span3', 'writing_patent.url'], - ['create_modified', 'create_user_id','span1-3', 'writing_patent.create_modified']).html_safe %> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_writing_patent.html.erb b/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_writing_patent.html.erb deleted file mode 100644 index f0257dd6..00000000 --- a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_writing_patent.html.erb +++ /dev/null @@ -1,25 +0,0 @@ - - - <% if (writing_patent.create_user_id == current_user.id) || is_manager? %> - <%= check_box_tag 'to_delete[]', writing_patent.id, false, :class => "checkbox_in_list" %> - <% end -%> - - <%= writing_patent.publish_date.strftime("%Y.%m") %> - - <%= link_to writing_patent.patent_title, panel_personal_patent_front_end_writing_patent_path(writing_patent) %> -
- -
- - <%= writing_patent.patent_no %> - <%= writing_patent.patent_country %> - <%= writing_patent.authors %> - <%= writing_patent.url %> - <%= User.from_id(writing_patent.create_user_id).name rescue ''%> - - diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_writing_patent_category_qe.html.erb b/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_writing_patent_category_qe.html.erb deleted file mode 100644 index f16154c3..00000000 --- a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_writing_patent_category_qe.html.erb +++ /dev/null @@ -1,34 +0,0 @@ -<% # encoding: utf-8 %> - -<%= form_for(@set_writing_patent_category, :remote => true, :url => @writing_patent_category_url ) do |f| %> - -
- -

<%= (@set_writing_patent_category.new_record? ? 'Add 專利類別' : 'Edit 專利類別') %>

-
-
- -
- -
- <%= f.text_field :key %> -
- - <%= f.fields_for :title_translations do |f| %> - <% @site_valid_locales.each do |locale| %> -
- <%= label_tag "link-#{locale}", "Name-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %> -
- <%= f.text_field locale, :class => 'control-label', :value => (@set_writing_patent_category.title_translations[locale] rescue nil) %> -
-
- <% end %> - <% end %> - -
- <%= hidden_field_tag 'writing_patent_category[writing_patent_category]', @set_writing_patent_category.id %> - <%= f.submit t('submit'), :class=>'btn btn-primary' %> - <%= t('cancel')%> -
-<% end %> - \ No newline at end of file diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/create_writing_patent_setting.js.erb b/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/create_writing_patent_setting.js.erb deleted file mode 100644 index d4748390..00000000 --- a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/create_writing_patent_setting.js.erb +++ /dev/null @@ -1,5 +0,0 @@ - -<% if !@writing_patent_category.blank? %> -$("#myModal1").modal('hide'); -$('<%= j render :partial => 'list_writing_patent_category', :collection => [@writing_patent_category] %>').appendTo('#writing_patent_categorys').hide().fadeIn(); -<% end %> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/destroy.js.erb b/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/destroy.js.erb deleted file mode 100644 index 0443940f..00000000 --- a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/destroy.js.erb +++ /dev/null @@ -1 +0,0 @@ -$("#<%= dom_id @writing_patent %>").remove(); \ No newline at end of file diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/edit.html.erb b/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/edit.html.erb deleted file mode 100644 index 54a7462a..00000000 --- a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/edit.html.erb +++ /dev/null @@ -1,5 +0,0 @@ -

<%= t('personal_patent.editing_personal_patent') %>

- -<%= form_for @writing_patent, :url => panel_personal_patent_back_end_writing_patent_path(@writing_patent), :html => {:class => 'clear'} do |f| %> - <%= render :partial => 'form', :locals => {:f => f} %> -<% end %> diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/index.html.erb b/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/index.html.erb deleted file mode 100644 index bc9a626c..00000000 --- a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/index.html.erb +++ /dev/null @@ -1,22 +0,0 @@ -<%= render 'filter' %> - - - - - - - - - - - - <%= render :partial => 'writing_patent', :collection => @writing_patents %> - -
- -
- <%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_personal_patent_back_end_writing_patent_path, :class => 'btn btn-primary pull-right' %> -
- <%= paginate @writing_patents, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %> -
-
diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/index.js.erb b/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/index.js.erb deleted file mode 100644 index 8b9ad8e1..00000000 --- a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/index.js.erb +++ /dev/null @@ -1,3 +0,0 @@ -$("#sort_headers").html("<%= j render 'sort_headers' %>"); -$("#tbody_writing_patents").html("<%= j render :partial => 'writing_patent', :collection => @writing_patents %>"); -$("#writing_patent_pagination").html("<%= j paginate @writing_patents, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>"); \ No newline at end of file diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/new.html.erb b/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/new.html.erb deleted file mode 100644 index 8f2b9edf..00000000 --- a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/new.html.erb +++ /dev/null @@ -1,10 +0,0 @@ - -<%= flash_messages %> -
-

<%= t('writing_patent.new_personal_patent') %>

-<%= form_for @writing_patent, :url => panel_personal_patent_back_end_writing_patents_path, :html => {:class => 'clear'} do |f| %> - <%= render :partial => 'form', :locals => {:f => f} %> -<% end %> -
-<%#= link_back %> - diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/show.html.erb b/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/show.html.erb deleted file mode 100644 index e69de29b..00000000 diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/toggle_enable.js.erb b/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/toggle_enable.js.erb deleted file mode 100644 index b00cfa07..00000000 --- a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/toggle_enable.js.erb +++ /dev/null @@ -1,3 +0,0 @@ -$("#enable_<%= @bulletin.id %>").toggle(); -$("#disable_<%= @bulletin.id %>").toggle(); -$("#bulletin_<%= @bulletin.id %>").toggleClass('disable'); \ No newline at end of file diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/update_writing_patent_setting.js.erb b/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/update_writing_patent_setting.js.erb deleted file mode 100644 index 6254a28d..00000000 --- a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/update_writing_patent_setting.js.erb +++ /dev/null @@ -1,5 +0,0 @@ - -<% if !@writing_patent_category.blank? %> -$("#myModal1").modal('hide'); -$("#<%= dom_id @writing_patent_category %>").replaceWith("<%= j render :partial => 'list_writing_patent_category', :collection => [@writing_patent_category] %>"); -<% end %> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/writing_patent_category_quick_add.js.erb b/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/writing_patent_category_quick_add.js.erb deleted file mode 100644 index 94e56050..00000000 --- a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/writing_patent_category_quick_add.js.erb +++ /dev/null @@ -1 +0,0 @@ -$("#myModal1").html("<%= j render "writing_patent_category_qe" %>"); diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/writing_patent_category_quick_edit.js.erb b/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/writing_patent_category_quick_edit.js.erb deleted file mode 100644 index 94e56050..00000000 --- a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/writing_patent_category_quick_edit.js.erb +++ /dev/null @@ -1 +0,0 @@ -$("#myModal1").html("<%= j render "writing_patent_category_qe" %>"); diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/writing_patent_setting.html.erb b/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/writing_patent_setting.html.erb deleted file mode 100644 index 479991b7..00000000 --- a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/writing_patent_setting.html.erb +++ /dev/null @@ -1,113 +0,0 @@ -<% # encoding: utf-8 %> - - -
-
-
-

- <%= t('add')%> - 專利類別 -

-
-
-
-
-
-
-
-
-
-
- - - <%= render :partial => 'list_writing_patent_category', :collection => @writing_patent_categorys %> - -
-
-
-
-
-
- -
-
-

- - 領域 -

- -
-
-
-
-
-
-
-
-
-
- - - - - - - - - - - -
Corresponding Author編輯　刪除
First Author, Co- Authors編輯　刪除
-
-
-
-
-
-
-
- 匯出  - 匯入  - 新增  - 設定　 -
- -
- -
- - - - - - -<% content_for :page_specific_css do %> - <%= stylesheet_link_tag "item" %> -<% end %> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_filter.html.erb b/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_filter.html.erb deleted file mode 100644 index 63882b8f..00000000 --- a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_filter.html.erb +++ /dev/null @@ -1,11 +0,0 @@ - - -<% content_for :page_specific_javascript do %> - <%= javascript_include_tag "sort_header" %> -<% end %> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb b/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb deleted file mode 100644 index 22022c21..00000000 --- a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb +++ /dev/null @@ -1,209 +0,0 @@ -<% # encoding: utf-8 %> - - <%= f.error_messages %> - - - -
- -
-
- -
-

Tags

-
- <% @tags.each do |tag| %> - <%= content_tag :label,:class => "checkbox inline" do -%> - <%= check_box_tag 'writing_patent[tag_ids][]', tag.id, @writing_patent.tag_ids.include?(tag.id)%> - <%= tag[I18n.locale] %> - <%= hidden_field_tag 'writing_patent[tag_ids][]', '' %> - <% end %> - <% end %> -
-
- -
- - - - - -
-
- -
- <%= f.label :year ,t("personal_patent.year")%> - <%= select_year((@writing_patent.year ? @writing_patent.year.to_i : DateTime.now.year), {:start_year => DateTime.now.year, :end_year => 1930}, {:name => 'writing_patent[year]'} ) %> -
- -
- <%= f.label :writing_patent_category ,t("personal_patent.writing_patent_category")%> - <%= f.select :writing_patent_category_id, @writing_patent_categorys.collect {|t| [ t.title, t.id ]} %> -
- -
- <%= f.label :period_start_date ,t("personal_patent.period_start_date")%> - <%= f.date_select :period_start_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1890, :order => [:year, :month], :discard_day => true }, {:class => 'span1'} %> -
- -
- <%= f.label :period_end_date ,t("personal_patent.period_end_date")%> - <%= f.date_select :period_end_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1890, :order => [:year, :month], :discard_day => true }, {:class => 'span1'} %> -
- - - -
- - <% @site_valid_locales.each_with_index do |locale, i| %> - -
"> - -
- <%= f.label :writing_patent_title ,t("personal_patent.writing_patent_title")%> - <%= f.fields_for :writing_patent_title_translations do |f| %> - <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale, :class=>'post-title', :value => (@writing_patent.writing_patent_title_translations[locale] rescue nil) %> - <% end %> -
- -
- <%= f.label :job_title ,t("personal_patent.job_title")%> - <%= f.fields_for :job_title_translations do |f| %> - <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale, :class=>'post-title', :value => (@writing_patent.job_title_translations[locale] rescue nil) %> - <% end %> -
- -
- <%= f.label :participator ,t("personal_patent.participator")%> - <%= f.fields_for :participator_translations do |f| %> - <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale, :class=>'post-title', :value => (@writing_patent.participator_translations[locale] rescue nil) %> - <% end %> -
- -
- <%= f.label :unit ,t("personal_patent.unit")%> - <%= f.fields_for :unit_translations do |f| %> - <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale, :class=>'post-title', :value => (@writing_patent.unit_translations[locale] rescue nil) %> - <% end %> -
- -
- - <% end %> - -
- -
- <%= f.label :url, t("personal_patent.url") %> - <%= f.text_field :url %> -
- -
- <%= f.label :keywords, t("personal_patent.keywords") %> - <%= f.text_field :keywords %> -
- -
- <%= f.label :abstract, t("personal_patent.abstract") %> - <%= f.text_field :abstract %> -
- -
- <%= f.label :language, t("personal_patent.language") %> - <%= f.radio_button :language, "Chinese" %> <%= t("personal_patent.Chinese") %> - <%= f.radio_button :language, "English" %> <%= t("personal_patent.English") %> -
- -
- <%= f.label :note, t("personal_patent.note") %> - <%= f.text_area :note, :size => "60x3" %> -
- -
- - - - - -
- -
- - - - - - - - - - - - - - - - - - <% @writing_patent.writing_patent_files.each_with_index do |writing_patent_file, i| %> - <%= f.fields_for :writing_patent_files, writing_patent_file do |f| %> - <%= render :partial => 'form_file', :object => writing_patent_file, :locals => {:f => f, :i => i} %> - <% end %> - <% end %> - -
FileFile Name
-
- <%= hidden_field_tag 'plugin_file_field_count', @writing_patent.writing_patent_files.count %> - ADD/新增 -
-
- -
- -
- - - - - - -
- - - - -
- <%= f.submit t('submit'), :class=>'btn btn-primary' %> - <%= link_to t('cancel'), get_go_back, :class=>"btn" %> -
- - -<% content_for :page_specific_javascript do %> - <%= javascript_include_tag "archive_plugin_form" %> - -<% end %> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form_file.html.erb b/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form_file.html.erb deleted file mode 100644 index a91d6a85..00000000 --- a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form_file.html.erb +++ /dev/null @@ -1,50 +0,0 @@ -<% # encoding: utf-8 %> - - " class='list_item'> - -
-
- <%= f.file_field :file %> - <%= form_file.file.file ? ( link_to t(:view), form_file.file.url, {:class => 'btn', :target => '_blank', :title => t(:view)} ) : '' %> -
-
- - - -
- - <% @site_valid_locales.each_with_index do |locale, i| %> - -
"> - <%#= f.fields_for :i18n_variable, (form_file.new_record? ? form_file.build_i18n_variable : form_file.i18n_variable ) do |f| %> - <%= f.fields_for :file_title_translations do |f| %> -
- -
- <%= f.text_field locale, :class=>'post-file_title', :value => (form_file.file_title_translations[locale] rescue nil) %> -
-
- <% end %> - -
- - <% end %> - -
- - - - - - <% if form_file.new_record? %> - - <% else %> - <%= f.hidden_field :id %> - - <%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %> - <% end %> - - - - - diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_sort_headers.html.erb b/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_sort_headers.html.erb deleted file mode 100644 index 9caebecc..00000000 --- a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_sort_headers.html.erb +++ /dev/null @@ -1,7 +0,0 @@ -<%= render_sort_bar(true, delete_panel_personal_patent_back_end_writing_patents_path(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]), - ['publish_date', 'publish_date', 'span1', 'writing_patent.publish_date'], - ['patent_title', 'patent_title','span3', 'writing_patent.patent_title'], - ['patent_no', 'patent_no','span3', 'writing_patent.patent_no'], - ['patent_country', 'patent_country','span3', 'writing_patent.patent_country'], - ['authors', 'authors','span3', 'writing_patent.authors'], - ['url', 'url','span3', 'writing_patent.url']).html_safe %> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_writing_patent.html.erb b/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_writing_patent.html.erb deleted file mode 100644 index 3bd0fa74..00000000 --- a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_writing_patent.html.erb +++ /dev/null @@ -1,24 +0,0 @@ - - - <% if (writing_patent.create_user_id == current_user.id) || is_manager? %> - <%= check_box_tag 'to_delete[]', writing_patent.id, false, :class => "checkbox_in_list" %> - <% end -%> - - <%= writing_patent.period_start_date.strftime("%Y.%m") %> ~ <%= writing_patent.period_end_date.strftime("%Y.%m") %> - - <%= link_to writing_patent.writing_patent_title, panel_personal_patent_front_end_writing_patent_path(writing_patent) %> -
-
    - <%if at_least_module_manager || writing_patent.writing_patent_category.cur_user_is_sub_manager_of(:edit)%> -
  • <%= link_to t('edit'), edit_panel_personal_patent_plugin_writing_patent_path(writing_patent) %>
    • -
  • <%= link_to t('delete'), panel_personal_patent_plugin_writing_patent_path(writing_patent), :confirm => t('sure?'), :method => :delete, :remote => true %>
    • - <% end -%> -
-
- - <%= writing_patent.participator %> - <%= writing_patent.job_title %> - <%= writing_patent.unit %> - <%= User.from_id(writing_patent.create_user_id).name rescue ''%> - - diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/destroy.js.erb b/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/destroy.js.erb deleted file mode 100644 index 0443940f..00000000 --- a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/destroy.js.erb +++ /dev/null @@ -1 +0,0 @@ -$("#<%= dom_id @writing_patent %>").remove(); \ No newline at end of file diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/edit.html.erb b/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/edit.html.erb deleted file mode 100644 index 98cf411a..00000000 --- a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/edit.html.erb +++ /dev/null @@ -1,5 +0,0 @@ -

<%= t('personal_patent.editing_personal_patent') %>

- -<%= form_for @writing_patent, :url => panel_personal_patent_plugin_writing_patent_path(@writing_patent), :html => {:class => 'clear'} do |f| %> - <%= render :partial => 'form', :locals => {:f => f} %> -<% end %> diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/index.html.erb b/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/index.html.erb deleted file mode 100644 index 53c077a0..00000000 --- a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/index.html.erb +++ /dev/null @@ -1,22 +0,0 @@ -<%= render 'filter' %> - - - - - - - - - - - - <%= render :partial => 'writing_patent', :collection => @writing_patents %> - -
- -
- <%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_personal_patent_plugin_writing_patent_path, :class => 'btn btn-primary pull-right' %> -
- <%= paginate @writing_patents, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %> -
-
diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/index.js.erb b/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/index.js.erb deleted file mode 100644 index 8b9ad8e1..00000000 --- a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/index.js.erb +++ /dev/null @@ -1,3 +0,0 @@ -$("#sort_headers").html("<%= j render 'sort_headers' %>"); -$("#tbody_writing_patents").html("<%= j render :partial => 'writing_patent', :collection => @writing_patents %>"); -$("#writing_patent_pagination").html("<%= j paginate @writing_patents, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>"); \ No newline at end of file diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/new.html.erb b/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/new.html.erb deleted file mode 100644 index 71524776..00000000 --- a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/new.html.erb +++ /dev/null @@ -1,10 +0,0 @@ - -<%= flash_messages %> -
-

<%= t('writing_patent.new_personal_patent') %>

-<%= form_for @writing_patent, :url => panel_personal_patent_plugin_writing_patents_path, :html => {:class => 'clear'} do |f| %> - <%= render :partial => 'form', :locals => {:f => f} %> -<% end %> -
-<%#= link_back %> - diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/show.html.erb b/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/show.html.erb deleted file mode 100644 index e69de29b..00000000 diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/toggle_enable.js.erb b/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/toggle_enable.js.erb deleted file mode 100644 index b00cfa07..00000000 --- a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/toggle_enable.js.erb +++ /dev/null @@ -1,3 +0,0 @@ -$("#enable_<%= @bulletin.id %>").toggle(); -$("#disable_<%= @bulletin.id %>").toggle(); -$("#bulletin_<%= @bulletin.id %>").toggleClass('disable'); \ No newline at end of file From 5da35ee65bc61b841933051983c70f281743b4c9 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Mon, 29 Oct 2012 19:52:34 +0800 Subject: [PATCH 03/30] Agenda View --- .../app/assets/javascripts/calendarAPI.js.erb | 66 ++++- .../calendar/back_end/cals_controller.rb | 122 +++++++- .../panel/calendar/back_end/cals_helper.rb | 22 +- .../back_end/cals/agenda_view.html.erb | 271 +++++------------- .../calendar/back_end/cals/index.html.erb | 17 +- 5 files changed, 283 insertions(+), 215 deletions(-) diff --git a/vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb b/vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb index 09ef0195..31ef39ba 100644 --- a/vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb +++ b/vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb @@ -44,12 +44,17 @@ var calendarAPI = function(){ this.cur_week = c.today.getWeek(); this.cur_date = c.today.getDate(); this.view = null; + this.calendars = new Array(); this.monthlist = ["","January","February","March","April","May","June","July","August","September","October","November","December"]; this.initialize = function(){ $(window).load(function(){ // c.loadMonthView(c.cur_month,c.cur_year); - c.loadWeekView(c.cur_week,c.cur_year); + // c.loadWeekView(c.cur_week,c.cur_year); // c.loadDayView(c.cur_date,c.cur_month,c.cur_year); + c.loadAgendaView(); + $(".calendar-filter-btn").each(function(){ + c.calendars.push($(this).attr("href")); + }) bindHandlers(); }) var bindHandlers = function(){ @@ -94,6 +99,16 @@ var calendarAPI = function(){ $("#create_event_btn").toggleClass("active"); e.stopPropagation(); }) + $(".calendar-filter-btn").click(function(){ + $(this).toggleClass("active"); + c.calendars = []; + $(".calendar-filter-btn").each(function(){ + if($(this).hasClass("active")) + c.calendars.push($(this).attr("href")); + }) + c.refresh(); + }) + $("#edit_event_btn").live("ajax:success",function(evt,form){ c.event_quick_view_div.empty().hide(); c.updateEvent(form); @@ -225,6 +240,10 @@ var calendarAPI = function(){ } } this.loadMonthView = function(month,year){ + $("#range_selection").hide(); + $("#navigation").show(); + $("#sec1").removeClass("span8").addClass("span3"); + $("#sec2").show(); c.view = "month"; if(!month){ var dt = new Date(); @@ -265,7 +284,7 @@ var calendarAPI = function(){ this.getEventsForMonth = function(month,year){ - $.getJSON("cals/getMonthEvents",{"month":month,"year":year},function(events){ + $.getJSON("cals/getMonthEvents",{"month":month,"year":year,"calendars":c.calendars},function(events){ makerow(events); }) var doneEventArray = new Array(); @@ -367,6 +386,10 @@ var calendarAPI = function(){ } this.loadWeekView = function(week,year){ + $("#range_selection").hide(); + $("#navigation").show(); + $("#sec1").removeClass("span8").addClass("span3"); + $("#sec2").show(); c.view = "week"; if(!week){ var dt = new Date(); @@ -383,7 +406,7 @@ var calendarAPI = function(){ }) } this.getEventsForWeek = function(week,year){ - $.getJSON("cals/getWeekEvents",{"week":week,"year":year},function(events){ + $.getJSON("cals/getWeekEvents",{"week":week,"year":year,"calendars":c.calendars},function(events){ var height = 15; var full_day_count = 0; var rowcount = 7; @@ -487,6 +510,10 @@ var calendarAPI = function(){ }) } this.loadDayView = function(day,month,year){ + $("#range_selection").hide(); + $("#navigation").show(); + $("#sec1").removeClass("span8").addClass("span3"); + $("#sec2").show(); c.view = "day"; if(!day){ var dt = new Date(); @@ -506,7 +533,7 @@ var calendarAPI = function(){ }) } this.getEventsForDay = function(day,month,year){ - $.getJSON("cals/getDayEvents",{"date":day,"month":month,"year":year},function(events){ + $.getJSON("cals/getDayEvents",{"date":day,"month":month,"year":year,"calendars":c.calendars},function(events){ $.each(events,function(i,evnt){ if(evnt.all_day){ $(".all_day_event").append('
'+evnt.title+'
') @@ -558,10 +585,35 @@ var calendarAPI = function(){ }) } - this.loadAgendaView = function(){ - $('#view_holder').load("cals/agenda_view", function() { - $('.current_day_title').text('September 2, 2012'); + this.loadAgendaView = function(start_month,start_year,end_month,end_year){ + c.view = "agenda"; + var url = "cals/agenda_view"; + if(start_month && start_year && end_month && end_year) + var url = "cals/agenda_view?s_month="+start_month+"&s_year="+start_year+"&e_month="+end_month+"&e_year="+end_year ; + + $('#view_holder').load(url, function() { + $("#navigation").hide(); + $("#range_selection").html($("#agenda_date_range").html()).show(); + $("#sec1").removeClass("span3").addClass("span8"); + $("#sec2").hide(); + bindHandlers(); }) + var bindHandlers = function(){ + $("select[name=start_year]").change(function(){ + var x = parseInt($(this).val()) - parseInt($(this).find("option").eq(0).val()); + $("select[name=end_year] option").removeAttr("disabled"); + for(i=0;i false end def agenda_view + @start_year = params[:s_year].to_i + @start_month = params[:s_month].to_i + @end_year = params[:e_year].to_i + @end_month = params[:e_month].to_i + t = Time.now + if !params[:s_year] + @start_year = t.year + end + if !params[:s_month] + @start_month = t.month + @end_month = t.month + 3 + if @end_month > 12 + @end_month = @end_month - 12 + @end_year = @start_year + 1 + end + end + + startdt = Date.new(@start_year,@start_month,1) + temp = getMonthDays(@end_year) + enddt = Date.new(@end_year,@end_month,temp[@end_month]) + diff = enddt - startdt + diff = diff.to_i / 30 + + + @d_s_year = @start_year - 5 + @datesets = Array.new + @calendartitle = Array.new + @events = Array.new + events = Event.all.asc(:start_date).desc(:total_days) + @calevents = Array.new + y = @start_year + m = @start_month + for i in 0..diff-1 + if m == 13 + m = 1 + y = y + 1 + end + @calendartitle << [m,y] + @datesets << getDateSet(m,y,false) + e = Array.new + h = Array.new + events.each_with_index do |event,i| + # @temp = Array.new + startdt = Date.new(event.start_year,event.start_month) + enddt = Date.new(event.end_year,event.end_month) + range = startdt..enddt + dt = Date.new(y,m) + if range === dt + no_of_days = event.total_days + start_date = event.start_date + + if event.start_year < y + no_of_days = temp[m] - event.start_date + no_of_days += 1 + temp = m + 12 + if event.start_month < temp + start_date = 1 + end + end + if event.end_year > y + no_of_days = temp[m] - event.start_date + no_of_days += 1 + temp = m + 12 + end + if event.end_month > m + no_of_days = temp[m] - event.start_date + no_of_days += 1 + elsif event.end_month == m + no_of_days = event.end_date + end + + if event.start_month == m && event.end_month == m + no_of_days = event.total_days + no_of_days += 1 + end + + if event.start_month < m + start_date = 1 + end + + if event.start_date == event.end_date + display_date = getDayName(event.start_date,event.start_month,event.start_year) + ", " + Date::ABBR_MONTHNAMES[event.start_month] + " " + event.start_date.to_s + else + display_date = getDayName(event.start_date,event.start_month,event.start_year) + ", " + Date::ABBR_MONTHNAMES[event.start_month].to_s + " " + event.start_date.to_s + " - " + getDayName(event.end_date,event.end_month,event.end_year) + ", " + Date::ABBR_MONTHNAMES[event.end_month] + " " + event.end_date.to_s + end + if event.all_day + display_time = "All Day" + else + x = event.start_time.to_i + if event.start_time > x + est = x.to_s + ":30" + else + est = x.to_s + end + x = event.end_time.to_i + if event.end_time > x + eet = x.to_s + ":30" + else + eet = x.to_s + end + display_time = est + " " + event.start_am_pm + " - " + eet + " " + event.end_am_pm + end + for c in start_date..(start_date + no_of_days) + if h.index(c) == nil + h << c + end + end + color = Cal.find(event.cal_id).color + e << {"display_date"=>display_date,"show_link"=>panel_calendar_back_end_event_path(event), "display_time"=>display_time, "start_date"=>start_date,"end_date"=>event.end_date,"start_month"=>event.start_month,"end_month"=>event.end_month,"title" => event.title,"color"=>color} + end + end + @events << e + @calevents << h + m = m + 1 + end render :layout => false end def get_month_events month = params[:month].to_i year = params[:year].to_i + fromcalendars = params[:calendars] # events = Event.where(:start_month.lt => month).and(:start_year => year).and(:end_month.gte => month).asc(:start_date).desc(:total_days) @events = Array.new @@ -121,7 +237,7 @@ class Panel::Calendar::BackEnd::CalsController < OrbitBackendController # color = Cal.find(event.cal_id).color # @events << {"id"=>event.id,"index"=>i,"start_date"=>event.start_date, "total_days" => no_of_days, "title" => event.title,"color"=>color,"show_link"=>panel_calendar_back_end_event_path(event)} # end - events = Event.all.asc(:start_date).desc(:total_days) + events = Event.all.where(:cal_id.in=>fromcalendars).asc(:start_date).desc(:total_days) events.each_with_index do |event,i| # @temp = Array.new startdt = Date.new(event.start_year,event.start_month) diff --git a/vendor/built_in_modules/calendar/app/helpers/panel/calendar/back_end/cals_helper.rb b/vendor/built_in_modules/calendar/app/helpers/panel/calendar/back_end/cals_helper.rb index 6377debb..17760629 100644 --- a/vendor/built_in_modules/calendar/app/helpers/panel/calendar/back_end/cals_helper.rb +++ b/vendor/built_in_modules/calendar/app/helpers/panel/calendar/back_end/cals_helper.rb @@ -6,7 +6,7 @@ module Panel::Calendar::BackEnd::CalsHelper return startday end - def getDateSet(month,year) + def getDateSet(month,year,prepost) dateset = Array.new startday = monthStartDay(month,year) monthsdays = getMonthDays(year) @@ -20,7 +20,11 @@ module Panel::Calendar::BackEnd::CalsHelper i = prev_month_days_to_add while i > 0 do i -= 1 - dateset << prev_month_days - i + if prepost + dateset << prev_month_days - i + else + dateset << "NaN" + end end i = 0 @@ -29,11 +33,21 @@ module Panel::Calendar::BackEnd::CalsHelper i += 1 end - next_month_days_to_add = 42 - (prev_month_days_to_add + cur_month_days) + total_days = 42 + if !prepost + if (prev_month_days_to_add + cur_month_days) < 35 + total_days = 35 + end + end + next_month_days_to_add = total_days - (prev_month_days_to_add + cur_month_days) i = 0 while i < next_month_days_to_add do - dateset << i + 1 + if prepost + dateset << i + 1 + else + dateset << "NaN" + end i += 1 end diff --git a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/agenda_view.html.erb b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/agenda_view.html.erb index 8d217587..d6761d88 100644 --- a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/agenda_view.html.erb +++ b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/agenda_view.html.erb @@ -1,7 +1,49 @@ +
+ <% @datesets.each_with_index do |dateset,i| %>
-

September

+

<%= Date::MONTHNAMES[@calendartitle[i][0]] + " - " + @calendartitle[i][1].to_s %>

@@ -13,51 +55,19 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + <% x = 0 %> + <% dateset.each do |date| %> + <% x = x + 1 %> + <% if x == 1 %> + + <% end %> + + <% if x == 7 %> + <% x = 0 %> + + <% end %> + <% end %> +
Fri Sat
12
3456789
10111213141516
17181920212223
24252627282930
><%= (date=="NaN"? "" : date ) %>
@@ -71,155 +81,30 @@ - - Thu, Sep 6 - 9:00am - 9:30am - -
Commuting time, from home to RD
- - - - - 9:30am - 12:00am - -
Work on Thu project, and ask ika for help if possible
- - - - - 13:30pm - 18:00pm - -
Template design, at least finish 2 template
- - - - Fri, Sep 7 - 9:00am - 18:00pm - -
Take a day off
- - - - Sat, Sep 8 - 7:00am - 7:50pm - -
Work out with Joseph
- - - - -
-
-
-
-

October

-
- tiny calendar goes here -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Thu, Sep 69:00am - 9:30am -
Commuting time, from home to RD
-
9:30am - 12:00am -
Work on Thu project, and ask ika for help if possible
-
13:30pm - 18:00pm -
Template design, at least finish 2 template
-
Fri, Sep 79:00am - 18:00pm -
Take a day off
-
Sat, Sep 87:00am - 7:50pm -
Work out with Joseph
-
-
-
-
-
-

November

-
- tiny calendar goes here -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + <% lastday = "" %> + <% if @events[i].count > 0 %> + <% @events[i].each do |event| %> + + + + + + <% lastday = event['display_date'] %> + <% end %> + <% else %> + + + + <% end %>
Thu, Sep 69:00am - 9:30am -
Commuting time, from home to RD
-
9:30am - 12:00am -
Work on Thu project, and ask ika for help if possible
-
13:30pm - 18:00pm -
Template design, at least finish 2 template
-
Fri, Sep 79:00am - 18:00pm -
Take a day off
-
Sat, Sep 87:00am - 7:50pm -
Work out with Joseph
-
+ <% if event['display_date'] != lastday %> + <%= event['display_date'] %> + <% end %> + <%= event['display_time'] %> +
<%= event['title'] %>
+
No events for this month.
+ <% end %>
\ No newline at end of file diff --git a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/index.html.erb b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/index.html.erb index 1cc46655..19aac840 100644 --- a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/index.html.erb +++ b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/index.html.erb @@ -3,7 +3,6 @@ <%= stylesheet_link_tag "calendar" %> <%= javascript_include_tag "cals" %> ->>>>>>> gallery_orbit - <%= post.archive_file_category.i18n_variable[I18n.locale] %> + <%= post.archive_file_category.title %> <%= link_to post.title, panel_archive_front_end_archive_file_path(post) %> diff --git a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb index 09357f82..6a634ce5 100644 --- a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb +++ b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb @@ -43,7 +43,7 @@
<%= f.label :category %> - <%= f.select :archive_file_category_id, @archive_file_categorys.collect {|t| [ t.i18n_variable[I18n.locale], t.id ]} %> + <%= f.select :archive_file_category_id, @archive_file_categorys.collect {|t| [ t.title, t.id ]} %>
    <% @site_valid_locales.each_with_index do |locale, i| %> @@ -74,7 +74,7 @@
    -
    +
    diff --git a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/js/jquery.fileupload-fp.js b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/js/jquery.fileupload-fp.js deleted file mode 100644 index 634fb5e4..00000000 --- a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/js/jquery.fileupload-fp.js +++ /dev/null @@ -1,219 +0,0 @@ -/* - * jQuery File Upload File Processing Plugin 1.0 - * https://github.com/blueimp/jQuery-File-Upload - * - * Copyright 2012, Sebastian Tschan - * https://blueimp.net - * - * Licensed under the MIT license: - * http://www.opensource.org/licenses/MIT - */ - -/*jslint nomen: true, unparam: true, regexp: true */ -/*global define, window, document */ - -(function (factory) { - 'use strict'; - if (typeof define === 'function' && define.amd) { - // Register as an anonymous AMD module: - define([ - 'jquery', - 'load-image', - 'canvas-to-blob', - './jquery.fileupload' - ], factory); - } else { - // Browser globals: - factory( - window.jQuery, - window.loadImage - ); - } -}(function ($, loadImage) { - 'use strict'; - - // The File Upload IP version extends the basic fileupload widget - // with file processing functionality: - $.widget('blueimpFP.fileupload', $.blueimp.fileupload, { - - options: { - // The list of file processing actions: - process: [ - /* - { - action: 'load', - fileTypes: /^image\/(gif|jpeg|png)$/, - maxFileSize: 20000000 // 20MB - }, - { - action: 'resize', - maxWidth: 1920, - maxHeight: 1200, - minWidth: 800, - minHeight: 600 - }, - { - action: 'save' - } - */ - ], - - // The add callback is invoked as soon as files are added to the - // fileupload widget (via file input selection, drag & drop or add - // API call). See the basic file upload widget for more information: - add: function (e, data) { - $(this).fileupload('process', data).done(function () { - data.submit(); - }); - } - }, - - processActions: { - // Loads the image given via data.files and data.index - // as canvas element. - // Accepts the options fileTypes (regular expression) - // and maxFileSize (integer) to limit the files to load: - load: function (data, options) { - var that = this, - file = data.files[data.index], - dfd = $.Deferred(); - if (window.HTMLCanvasElement && - window.HTMLCanvasElement.prototype.toBlob && - ($.type(options.maxFileSize) !== 'number' || - file.size < options.maxFileSize) && - (!options.fileTypes || - options.fileTypes.test(file.type))) { - loadImage( - file, - function (canvas) { - data.canvas = canvas; - dfd.resolveWith(that, [data]); - }, - {canvas: true} - ); - } else { - dfd.rejectWith(that, [data]); - } - return dfd.promise(); - }, - // Resizes the image given as data.canvas and updates - // data.canvas with the resized image. - // Accepts the options maxWidth, maxHeight, minWidth and - // minHeight to scale the given image: - resize: function (data, options) { - if (data.canvas) { - var canvas = loadImage.scale(data.canvas, options); - if (canvas.width !== data.canvas.width || - canvas.height !== data.canvas.height) { - data.canvas = canvas; - data.processed = true; - } - } - return data; - }, - // Saves the processed image given as data.canvas - // inplace at data.index of data.files: - save: function (data, options) { - // Do nothing if no processing has happened: - if (!data.canvas || !data.processed) { - return data; - } - var that = this, - file = data.files[data.index], - name = file.name, - dfd = $.Deferred(), - callback = function (blob) { - if (!blob.name) { - if (file.type === blob.type) { - blob.name = file.name; - } else if (file.name) { - blob.name = file.name.replace( - /\..+$/, - '.' + blob.type.substr(6) - ); - } - } - // Store the created blob at the position - // of the original file in the files list: - data.files[data.index] = blob; - dfd.resolveWith(that, [data]); - }; - // Use canvas.mozGetAsFile directly, to retain the filename, as - // Gecko doesn't support the filename option for FormData.append: - if (data.canvas.mozGetAsFile) { - callback(data.canvas.mozGetAsFile( - (/^image\/(jpeg|png)$/.test(file.type) && name) || - ((name && name.replace(/\..+$/, '')) || - 'blob') + '.png', - file.type - )); - } else { - data.canvas.toBlob(callback, file.type); - } - return dfd.promise(); - } - }, - - // Resizes the file at the given index and stores the created blob at - // the original position of the files list, returns a Promise object: - _processFile: function (files, index, options) { - var that = this, - dfd = $.Deferred().resolveWith(that, [{ - files: files, - index: index - }]), - chain = dfd.promise(); - that._processing += 1; - $.each(options.process, function (i, settings) { - chain = chain.pipe(function (data) { - return that.processActions[settings.action] - .call(this, data, settings); - }); - }); - chain.always(function () { - that._processing -= 1; - if (that._processing === 0) { - that.element - .removeClass('fileupload-processing'); - } - }); - if (that._processing === 1) { - that.element.addClass('fileupload-processing'); - } - return chain; - }, - - // Processes the files given as files property of the data parameter, - // returns a Promise object that allows to bind a done handler, which - // will be invoked after processing all files (inplace) is done: - process: function (data) { - var that = this, - options = $.extend({}, this.options, data); - if (options.process && options.process.length && - this._isXHRUpload(options)) { - $.each(data.files, function (index, file) { - that._processingQueue = that._processingQueue.pipe( - function () { - var dfd = $.Deferred(); - that._processFile(data.files, index, options) - .always(function () { - dfd.resolveWith(that); - }); - return dfd.promise(); - } - ); - }); - } - return this._processingQueue; - }, - - _create: function () { - $.blueimp.fileupload.prototype._create.call(this); - this._processing = 0; - this._processingQueue = $.Deferred().resolveWith(this) - .promise(); - } - - }); - -})); diff --git a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/js/jquery.fileupload-ui.js b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/js/jquery.fileupload-ui.js deleted file mode 100644 index 4c36f008..00000000 --- a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/js/jquery.fileupload-ui.js +++ /dev/null @@ -1,736 +0,0 @@ -/* - * jQuery File Upload User Interface Plugin 6.9.4 - * https://github.com/blueimp/jQuery-File-Upload - * - * Copyright 2010, Sebastian Tschan - * https://blueimp.net - * - * Licensed under the MIT license: - * http://www.opensource.org/licenses/MIT - */ - -/*jslint nomen: true, unparam: true, regexp: true */ -/*global define, window, document, URL, webkitURL, FileReader */ - -(function (factory) { - 'use strict'; - if (typeof define === 'function' && define.amd) { - // Register as an anonymous AMD module: - define([ - 'jquery', - 'tmpl', - 'load-image', - './jquery.fileupload-fp' - ], factory); - } else { - // Browser globals: - factory( - window.jQuery, - window.tmpl, - window.loadImage - ); - } -}(function ($, tmpl, loadImage) { - 'use strict'; - - // The UI version extends the FP (file processing) version or the basic - // file upload widget and adds complete user interface interaction: - var parentWidget = ($.blueimpFP || $.blueimp).fileupload; - $.widget('blueimpUI.fileupload', parentWidget, { - - options: { - // By default, files added to the widget are uploaded as soon - // as the user clicks on the start buttons. To enable automatic - // uploads, set the following option to true: - autoUpload: false, - // The following option limits the number of files that are - // allowed to be uploaded using this widget: - maxNumberOfFiles: undefined, - // The maximum allowed file size: - maxFileSize: undefined, - // The minimum allowed file size: - minFileSize: undefined, - // The regular expression for allowed file types, matches - // against either file type or file name: - acceptFileTypes: /.+$/i, - // The regular expression to define for which files a preview - // image is shown, matched against the file type: - previewSourceFileTypes: /^image\/(gif|jpeg|png)$/, - // The maximum file size of images that are to be displayed as preview: - previewSourceMaxFileSize: 5000000, // 5MB - // The maximum width of the preview images: - previewMaxWidth: 80, - // The maximum height of the preview images: - previewMaxHeight: 80, - // By default, preview images are displayed as canvas elements - // if supported by the browser. Set the following option to false - // to always display preview images as img elements: - previewAsCanvas: true, - // The ID of the upload template: - uploadTemplateId: 'template-upload', - // The ID of the download template: - downloadTemplateId: 'template-download', - // The container for the list of files. If undefined, it is set to - // an element with class "files" inside of the widget element: - filesContainer: undefined, - // By default, files are appended to the files container. - // Set the following option to true, to prepend files instead: - prependFiles: false, - // The expected data type of the upload response, sets the dataType - // option of the $.ajax upload requests: - dataType: 'json', - - // The add callback is invoked as soon as files are added to the fileupload - // widget (via file input selection, drag & drop or add API call). - // See the basic file upload widget for more information: - add: function (e, data) { - var that = $(this).data('fileupload'), - options = that.options, - files = data.files; - $(this).fileupload('process', data).done(function () { - that._adjustMaxNumberOfFiles(-files.length); - data.maxNumberOfFilesAdjusted = true; - data.files.valid = data.isValidated = that._validate(files); - data.context = that._renderUpload(files).data('data', data); - options.filesContainer[ - options.prependFiles ? 'prepend' : 'append' - ](data.context); - that._renderPreviews(files, data.context); - that._forceReflow(data.context); - that._transition(data.context).done( - function () { - if ((that._trigger('added', e, data) !== false) && - (options.autoUpload || data.autoUpload) && - data.autoUpload !== false && data.isValidated) { - data.submit(); - } - } - ); - }); - }, - // Callback for the start of each file upload request: - send: function (e, data) { - var that = $(this).data('fileupload'); - if (!data.isValidated) { - if (!data.maxNumberOfFilesAdjusted) { - that._adjustMaxNumberOfFiles(-data.files.length); - data.maxNumberOfFilesAdjusted = true; - } - if (!that._validate(data.files)) { - return false; - } - } - if (data.context && data.dataType && - data.dataType.substr(0, 6) === 'iframe') { - // Iframe Transport does not support progress events. - // In lack of an indeterminate progress bar, we set - // the progress to 100%, showing the full animated bar: - data.context - .find('.progress').addClass( - !$.support.transition && 'progress-animated' - ) - .attr('aria-valuenow', 100) - .find('.bar').css( - 'width', - '100%' - ); - } - return that._trigger('sent', e, data); - }, - // Callback for successful uploads: - done: function (e, data) { - var that = $(this).data('fileupload'), - template; - if (data.context) { - data.context.each(function (index) { - var file = ($.isArray(data.result) && - data.result[index]) || {error: 'emptyResult'}; - if (file.error) { - that._adjustMaxNumberOfFiles(1); - } - that._transition($(this)).done( - function () { - var node = $(this); - template = that._renderDownload([file]) - .replaceAll(node); - that._forceReflow(template); - that._transition(template).done( - function () { - data.context = $(this); - that._trigger('completed', e, data); - } - ); - } - ); - }); - } else { - if ($.isArray(data.result)) { - $.each(data.result, function (index, file) { - if (data.maxNumberOfFilesAdjusted && file.error) { - that._adjustMaxNumberOfFiles(1); - } else if (!data.maxNumberOfFilesAdjusted && - !file.error) { - that._adjustMaxNumberOfFiles(-1); - } - }); - data.maxNumberOfFilesAdjusted = true; - } - template = that._renderDownload(data.result) - .appendTo(that.options.filesContainer); - that._forceReflow(template); - that._transition(template).done( - function () { - data.context = $(this); - that._trigger('completed', e, data); - } - ); - } - }, - // Callback for failed (abort or error) uploads: - fail: function (e, data) { - var that = $(this).data('fileupload'), - template; - if (data.maxNumberOfFilesAdjusted) { - that._adjustMaxNumberOfFiles(data.files.length); - } - if (data.context) { - data.context.each(function (index) { - if (data.errorThrown !== 'abort') { - var file = data.files[index]; - file.error = file.error || data.errorThrown || - true; - that._transition($(this)).done( - function () { - var node = $(this); - template = that._renderDownload([file]) - .replaceAll(node); - that._forceReflow(template); - that._transition(template).done( - function () { - data.context = $(this); - that._trigger('failed', e, data); - } - ); - } - ); - } else { - that._transition($(this)).done( - function () { - $(this).remove(); - that._trigger('failed', e, data); - } - ); - } - }); - } else if (data.errorThrown !== 'abort') { - data.context = that._renderUpload(data.files) - .appendTo(that.options.filesContainer) - .data('data', data); - that._forceReflow(data.context); - that._transition(data.context).done( - function () { - data.context = $(this); - that._trigger('failed', e, data); - } - ); - } else { - that._trigger('failed', e, data); - } - }, - // Callback for upload progress events: - progress: function (e, data) { - if (data.context) { - var progress = parseInt(data.loaded / data.total * 100, 10); - data.context.find('.progress') - .attr('aria-valuenow', progress) - .find('.bar').css( - 'width', - progress + '%' - ); - } - }, - // Callback for global upload progress events: - progressall: function (e, data) { - var $this = $(this), - progress = parseInt(data.loaded / data.total * 100, 10), - globalProgressNode = $this.find('.fileupload-progress'), - extendedProgressNode = globalProgressNode - .find('.progress-extended'); - if (extendedProgressNode.length) { - extendedProgressNode.html( - $this.data('fileupload')._renderExtendedProgress(data) - ); - } - globalProgressNode - .find('.progress') - .attr('aria-valuenow', progress) - .find('.bar').css( - 'width', - progress + '%' - ); - }, - // Callback for uploads start, equivalent to the global ajaxStart event: - start: function (e) { - var that = $(this).data('fileupload'); - that._transition($(this).find('.fileupload-progress')).done( - function () { - that._trigger('started', e); - } - ); - }, - // Callback for uploads stop, equivalent to the global ajaxStop event: - stop: function (e) { - var that = $(this).data('fileupload'); - that._transition($(this).find('.fileupload-progress')).done( - function () { - $(this).find('.progress') - .attr('aria-valuenow', '0') - .find('.bar').css('width', '0%'); - $(this).find('.progress-extended').html(' '); - that._trigger('stopped', e); - } - ); - }, - // Callback for file deletion: - destroy: function (e, data) { - var that = $(this).data('fileupload'); - if (data.url) { - $.ajax(data); - that._adjustMaxNumberOfFiles(1); - } - that._transition(data.context).done( - function () { - $(this).remove(); - that._trigger('destroyed', e, data); - } - ); - } - }, - - // Link handler, that allows to download files - // by drag & drop of the links to the desktop: - _enableDragToDesktop: function () { - var link = $(this), - url = link.prop('href'), - name = link.prop('download'), - type = 'application/octet-stream'; - link.bind('dragstart', function (e) { - try { - e.originalEvent.dataTransfer.setData( - 'DownloadURL', - [type, name, url].join(':') - ); - } catch (err) {} - }); - }, - - _adjustMaxNumberOfFiles: function (operand) { - if (typeof this.options.maxNumberOfFiles === 'number') { - this.options.maxNumberOfFiles += operand; - if (this.options.maxNumberOfFiles < 1) { - this._disableFileInputButton(); - } else { - this._enableFileInputButton(); - } - } - }, - - _formatFileSize: function (bytes) { - if (typeof bytes !== 'number') { - return ''; - } - if (bytes >= 1000000000) { - return (bytes / 1000000000).toFixed(2) + ' GB'; - } - if (bytes >= 1000000) { - return (bytes / 1000000).toFixed(2) + ' MB'; - } - return (bytes / 1000).toFixed(2) + ' KB'; - }, - - _formatBitrate: function (bits) { - if (typeof bits !== 'number') { - return ''; - } - if (bits >= 1000000000) { - return (bits / 1000000000).toFixed(2) + ' Gbit/s'; - } - if (bits >= 1000000) { - return (bits / 1000000).toFixed(2) + ' Mbit/s'; - } - if (bits >= 1000) { - return (bits / 1000).toFixed(2) + ' kbit/s'; - } - return bits + ' bit/s'; - }, - - _formatTime: function (seconds) { - var date = new Date(seconds * 1000), - days = parseInt(seconds / 86400, 10); - days = days ? days + 'd ' : ''; - return days + - ('0' + date.getUTCHours()).slice(-2) + ':' + - ('0' + date.getUTCMinutes()).slice(-2) + ':' + - ('0' + date.getUTCSeconds()).slice(-2); - }, - - _formatPercentage: function (floatValue) { - return (floatValue * 100).toFixed(2) + ' %'; - }, - - _renderExtendedProgress: function (data) { - return this._formatBitrate(data.bitrate) + ' | ' + - this._formatTime( - (data.total - data.loaded) * 8 / data.bitrate - ) + ' | ' + - this._formatPercentage( - data.loaded / data.total - ) + ' | ' + - this._formatFileSize(data.loaded) + ' / ' + - this._formatFileSize(data.total); - }, - - _hasError: function (file) { - if (file.error) { - return file.error; - } - // The number of added files is subtracted from - // maxNumberOfFiles before validation, so we check if - // maxNumberOfFiles is below 0 (instead of below 1): - if (this.options.maxNumberOfFiles < 0) { - return 'maxNumberOfFiles'; - } - // Files are accepted if either the file type or the file name - // matches against the acceptFileTypes regular expression, as - // only browsers with support for the File API report the type: - if (!(this.options.acceptFileTypes.test(file.type) || - this.options.acceptFileTypes.test(file.name))) { - return 'acceptFileTypes'; - } - if (this.options.maxFileSize && - file.size > this.options.maxFileSize) { - return 'maxFileSize'; - } - if (typeof file.size === 'number' && - file.size < this.options.minFileSize) { - return 'minFileSize'; - } - return null; - }, - - _validate: function (files) { - var that = this, - valid = !!files.length; - $.each(files, function (index, file) { - file.error = that._hasError(file); - if (file.error) { - valid = false; - } - }); - return valid; - }, - - _renderTemplate: function (func, files) { - if (!func) { - return $(); - } - var result = func({ - files: files, - formatFileSize: this._formatFileSize, - options: this.options - }); - if (result instanceof $) { - return result; - } - return $(this.options.templatesContainer).html(result).children(); - }, - - _renderPreview: function (file, node) { - var that = this, - options = this.options, - dfd = $.Deferred(); - return ((loadImage && loadImage( - file, - function (img) { - node.append(img); - that._forceReflow(node); - that._transition(node).done(function () { - dfd.resolveWith(node); - }); - if (!$.contains(document.body, node[0])) { - // If the element is not part of the DOM, - // transition events are not triggered, - // so we have to resolve manually: - dfd.resolveWith(node); - } - }, - { - maxWidth: options.previewMaxWidth, - maxHeight: options.previewMaxHeight, - canvas: options.previewAsCanvas - } - )) || dfd.resolveWith(node)) && dfd; - }, - - _renderPreviews: function (files, nodes) { - var that = this, - options = this.options; - nodes.find('.preview span').each(function (index, element) { - var file = files[index]; - if (options.previewSourceFileTypes.test(file.type) && - ($.type(options.previewSourceMaxFileSize) !== 'number' || - file.size < options.previewSourceMaxFileSize)) { - that._processingQueue = that._processingQueue.pipe(function () { - var dfd = $.Deferred(); - that._renderPreview(file, $(element)).done( - function () { - dfd.resolveWith(that); - } - ); - return dfd.promise(); - }); - } - }); - return this._processingQueue; - }, - - _renderUpload: function (files) { - return this._renderTemplate( - this.options.uploadTemplate, - files - ); - }, - - _renderDownload: function (files) { - return this._renderTemplate( - this.options.downloadTemplate, - files - ).find('a[download]').each(this._enableDragToDesktop).end(); - }, - - _startHandler: function (e) { - e.preventDefault(); - var button = $(this), - template = button.closest('.template-upload'), - data = template.data('data'); - if (data && data.submit && !data.jqXHR && data.submit()) { - button.prop('disabled', true); - } - }, - - _cancelHandler: function (e) { - e.preventDefault(); - var template = $(this).closest('.template-upload'), - data = template.data('data') || {}; - if (!data.jqXHR) { - data.errorThrown = 'abort'; - e.data.fileupload._trigger('fail', e, data); - } else { - data.jqXHR.abort(); - } - }, - - _deleteHandler: function (e) { - e.preventDefault(); - var button = $(this); - e.data.fileupload._trigger('destroy', e, { - context: button.closest('.template-download'), - url: button.attr('data-url'), - type: button.attr('data-type') || 'DELETE', - dataType: e.data.fileupload.options.dataType - }); - }, - - _forceReflow: function (node) { - return $.support.transition && node.length && - node[0].offsetWidth; - }, - - _transition: function (node) { - var dfd = $.Deferred(); - if ($.support.transition && node.hasClass('fade')) { - node.bind( - $.support.transition.end, - function (e) { - // Make sure we don't respond to other transitions events - // in the container element, e.g. from button elements: - if (e.target === node[0]) { - node.unbind($.support.transition.end); - dfd.resolveWith(node); - } - } - ).toggleClass('in'); - } else { - node.toggleClass('in'); - dfd.resolveWith(node); - } - return dfd; - }, - - _initButtonBarEventHandlers: function () { - var fileUploadButtonBar = this.element.find('.fileupload-buttonbar'), - filesList = this.options.filesContainer, - ns = this.options.namespace; - fileUploadButtonBar.find('.start') - .bind('click.' + ns, function (e) { - e.preventDefault(); - filesList.find('.start button').click(); - }); - fileUploadButtonBar.find('.cancel') - .bind('click.' + ns, function (e) { - e.preventDefault(); - filesList.find('.cancel button').click(); - }); - fileUploadButtonBar.find('.delete') - .bind('click.' + ns, function (e) { - e.preventDefault(); - filesList.find('.delete input:checked') - .siblings('button').click(); - fileUploadButtonBar.find('.toggle') - .prop('checked', false); - }); - fileUploadButtonBar.find('.toggle') - .bind('change.' + ns, function (e) { - filesList.find('.delete input').prop( - 'checked', - $(this).is(':checked') - ); - }); - }, - - _destroyButtonBarEventHandlers: function () { - this.element.find('.fileupload-buttonbar button') - .unbind('click.' + this.options.namespace); - this.element.find('.fileupload-buttonbar .toggle') - .unbind('change.' + this.options.namespace); - }, - - _initEventHandlers: function () { - parentWidget.prototype._initEventHandlers.call(this); - var eventData = {fileupload: this}; - this.options.filesContainer - .delegate( - '.start button', - 'click.' + this.options.namespace, - eventData, - this._startHandler - ) - .delegate( - '.cancel button', - 'click.' + this.options.namespace, - eventData, - this._cancelHandler - ) - .delegate( - '.delete button', - 'click.' + this.options.namespace, - eventData, - this._deleteHandler - ); - this._initButtonBarEventHandlers(); - }, - - _destroyEventHandlers: function () { - var options = this.options; - this._destroyButtonBarEventHandlers(); - options.filesContainer - .undelegate('.start button', 'click.' + options.namespace) - .undelegate('.cancel button', 'click.' + options.namespace) - .undelegate('.delete button', 'click.' + options.namespace); - parentWidget.prototype._destroyEventHandlers.call(this); - }, - - _enableFileInputButton: function () { - this.element.find('.fileinput-button input') - .prop('disabled', false) - .parent().removeClass('disabled'); - }, - - _disableFileInputButton: function () { - this.element.find('.fileinput-button input') - .prop('disabled', true) - .parent().addClass('disabled'); - }, - - _initTemplates: function () { - var options = this.options; - options.templatesContainer = document.createElement( - options.filesContainer.prop('nodeName') - ); - if (tmpl) { - if (options.uploadTemplateId) { - options.uploadTemplate = tmpl(options.uploadTemplateId); - } - if (options.downloadTemplateId) { - options.downloadTemplate = tmpl(options.downloadTemplateId); - } - } - }, - - _initFilesContainer: function () { - var options = this.options; - if (options.filesContainer === undefined) { - options.filesContainer = this.element.find('.files'); - } else if (!(options.filesContainer instanceof $)) { - options.filesContainer = $(options.filesContainer); - } - }, - - _stringToRegExp: function (str) { - var parts = str.split('/'), - modifiers = parts.pop(); - parts.shift(); - return new RegExp(parts.join('/'), modifiers); - }, - - _initRegExpOptions: function () { - var options = this.options; - if ($.type(options.acceptFileTypes) === 'string') { - options.acceptFileTypes = this._stringToRegExp( - options.acceptFileTypes - ); - } - if ($.type(options.previewSourceFileTypes) === 'string') { - options.previewSourceFileTypes = this._stringToRegExp( - options.previewSourceFileTypes - ); - } - }, - - _initSpecialOptions: function () { - parentWidget.prototype._initSpecialOptions.call(this); - this._initFilesContainer(); - this._initTemplates(); - this._initRegExpOptions(); - }, - - _create: function () { - parentWidget.prototype._create.call(this); - this._refreshOptionsList.push( - 'filesContainer', - 'uploadTemplateId', - 'downloadTemplateId' - ); - if (!$.blueimpFP) { - this._processingQueue = $.Deferred().resolveWith(this).promise(); - this.process = function () { - return this._processingQueue; - }; - } - }, - - enable: function () { - parentWidget.prototype.enable.call(this); - this.element.find('input, button').prop('disabled', false); - this._enableFileInputButton(); - }, - - disable: function () { - this.element.find('input, button').prop('disabled', true); - this._disableFileInputButton(); - parentWidget.prototype.disable.call(this); - } - - }); - -})); diff --git a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/js/jquery.fileupload.js b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/js/jquery.fileupload.js deleted file mode 100644 index c9375294..00000000 --- a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/js/jquery.fileupload.js +++ /dev/null @@ -1,975 +0,0 @@ -/* - * jQuery File Upload Plugin 5.14 - * https://github.com/blueimp/jQuery-File-Upload - * - * Copyright 2010, Sebastian Tschan - * https://blueimp.net - * - * Licensed under the MIT license: - * http://www.opensource.org/licenses/MIT - */ - -/*jslint nomen: true, unparam: true, regexp: true */ -/*global define, window, document, Blob, FormData, location */ - -(function (factory) { - 'use strict'; - if (typeof define === 'function' && define.amd) { - // Register as an anonymous AMD module: - define([ - 'jquery', - 'jquery.ui.widget' - ], factory); - } else { - // Browser globals: - factory(window.jQuery); - } -}(function ($) { - 'use strict'; - - // The FileReader API is not actually used, but works as feature detection, - // as e.g. Safari supports XHR file uploads via the FormData API, - // but not non-multipart XHR file uploads: - $.support.xhrFileUpload = !!(window.XMLHttpRequestUpload && window.FileReader); - $.support.xhrFormDataFileUpload = !!window.FormData; - - // The fileupload widget listens for change events on file input fields defined - // via fileInput setting and paste or drop events of the given dropZone. - // In addition to the default jQuery Widget methods, the fileupload widget - // exposes the "add" and "send" methods, to add or directly send files using - // the fileupload API. - // By default, files added via file input selection, paste, drag & drop or - // "add" method are uploaded immediately, but it is possible to override - // the "add" callback option to queue file uploads. - $.widget('blueimp.fileupload', { - - options: { - // The namespace used for event handler binding on the dropZone and - // fileInput collections. - // If not set, the name of the widget ("fileupload") is used. - namespace: undefined, - // The drop target collection, by the default the complete document. - // Set to null or an empty collection to disable drag & drop support: - dropZone: $(document), - // The file input field collection, that is listened for change events. - // If undefined, it is set to the file input fields inside - // of the widget element on plugin initialization. - // Set to null or an empty collection to disable the change listener. - fileInput: undefined, - // By default, the file input field is replaced with a clone after - // each input field change event. This is required for iframe transport - // queues and allows change events to be fired for the same file - // selection, but can be disabled by setting the following option to false: - replaceFileInput: true, - // The parameter name for the file form data (the request argument name). - // If undefined or empty, the name property of the file input field is - // used, or "files[]" if the file input name property is also empty, - // can be a string or an array of strings: - paramName: undefined, - // By default, each file of a selection is uploaded using an individual - // request for XHR type uploads. Set to false to upload file - // selections in one request each: - singleFileUploads: true, - // To limit the number of files uploaded with one XHR request, - // set the following option to an integer greater than 0: - limitMultiFileUploads: undefined, - // Set the following option to true to issue all file upload requests - // in a sequential order: - sequentialUploads: false, - // To limit the number of concurrent uploads, - // set the following option to an integer greater than 0: - limitConcurrentUploads: undefined, - // Set the following option to true to force iframe transport uploads: - forceIframeTransport: false, - // Set the following option to the location of a redirect url on the - // origin server, for cross-domain iframe transport uploads: - redirect: undefined, - // The parameter name for the redirect url, sent as part of the form - // data and set to 'redirect' if this option is empty: - redirectParamName: undefined, - // Set the following option to the location of a postMessage window, - // to enable postMessage transport uploads: - postMessage: undefined, - // By default, XHR file uploads are sent as multipart/form-data. - // The iframe transport is always using multipart/form-data. - // Set to false to enable non-multipart XHR uploads: - multipart: true, - // To upload large files in smaller chunks, set the following option - // to a preferred maximum chunk size. If set to 0, null or undefined, - // or the browser does not support the required Blob API, files will - // be uploaded as a whole. - maxChunkSize: undefined, - // When a non-multipart upload or a chunked multipart upload has been - // aborted, this option can be used to resume the upload by setting - // it to the size of the already uploaded bytes. This option is most - // useful when modifying the options object inside of the "add" or - // "send" callbacks, as the options are cloned for each file upload. - uploadedBytes: undefined, - // By default, failed (abort or error) file uploads are removed from the - // global progress calculation. Set the following option to false to - // prevent recalculating the global progress data: - recalculateProgress: true, - // Interval in milliseconds to calculate and trigger progress events: - progressInterval: 100, - // Interval in milliseconds to calculate progress bitrate: - bitrateInterval: 500, - - // Additional form data to be sent along with the file uploads can be set - // using this option, which accepts an array of objects with name and - // value properties, a function returning such an array, a FormData - // object (for XHR file uploads), or a simple object. - // The form of the first fileInput is given as parameter to the function: - formData: function (form) { - return form.serializeArray(); - }, - - // The add callback is invoked as soon as files are added to the fileupload - // widget (via file input selection, drag & drop, paste or add API call). - // If the singleFileUploads option is enabled, this callback will be - // called once for each file in the selection for XHR file uplaods, else - // once for each file selection. - // The upload starts when the submit method is invoked on the data parameter. - // The data object contains a files property holding the added files - // and allows to override plugin options as well as define ajax settings. - // Listeners for this callback can also be bound the following way: - // .bind('fileuploadadd', func); - // data.submit() returns a Promise object and allows to attach additional - // handlers using jQuery's Deferred callbacks: - // data.submit().done(func).fail(func).always(func); - add: function (e, data) { - data.submit(); - }, - - // Other callbacks: - // Callback for the submit event of each file upload: - // submit: function (e, data) {}, // .bind('fileuploadsubmit', func); - // Callback for the start of each file upload request: - // send: function (e, data) {}, // .bind('fileuploadsend', func); - // Callback for successful uploads: - // done: function (e, data) {}, // .bind('fileuploaddone', func); - // Callback for failed (abort or error) uploads: - // fail: function (e, data) {}, // .bind('fileuploadfail', func); - // Callback for completed (success, abort or error) requests: - // always: function (e, data) {}, // .bind('fileuploadalways', func); - // Callback for upload progress events: - // progress: function (e, data) {}, // .bind('fileuploadprogress', func); - // Callback for global upload progress events: - // progressall: function (e, data) {}, // .bind('fileuploadprogressall', func); - // Callback for uploads start, equivalent to the global ajaxStart event: - // start: function (e) {}, // .bind('fileuploadstart', func); - // Callback for uploads stop, equivalent to the global ajaxStop event: - // stop: function (e) {}, // .bind('fileuploadstop', func); - // Callback for change events of the fileInput collection: - // change: function (e, data) {}, // .bind('fileuploadchange', func); - // Callback for paste events to the dropZone collection: - // paste: function (e, data) {}, // .bind('fileuploadpaste', func); - // Callback for drop events of the dropZone collection: - // drop: function (e, data) {}, // .bind('fileuploaddrop', func); - // Callback for dragover events of the dropZone collection: - // dragover: function (e) {}, // .bind('fileuploaddragover', func); - - // The plugin options are used as settings object for the ajax calls. - // The following are jQuery ajax settings required for the file uploads: - processData: false, - contentType: false, - cache: false - }, - - // A list of options that require a refresh after assigning a new value: - _refreshOptionsList: [ - 'namespace', - 'dropZone', - 'fileInput', - 'multipart', - 'forceIframeTransport' - ], - - _BitrateTimer: function () { - this.timestamp = +(new Date()); - this.loaded = 0; - this.bitrate = 0; - this.getBitrate = function (now, loaded, interval) { - var timeDiff = now - this.timestamp; - if (!this.bitrate || !interval || timeDiff > interval) { - this.bitrate = (loaded - this.loaded) * (1000 / timeDiff) * 8; - this.loaded = loaded; - this.timestamp = now; - } - return this.bitrate; - }; - }, - - _isXHRUpload: function (options) { - return !options.forceIframeTransport && - ((!options.multipart && $.support.xhrFileUpload) || - $.support.xhrFormDataFileUpload); - }, - - _getFormData: function (options) { - var formData; - if (typeof options.formData === 'function') { - return options.formData(options.form); - } - if ($.isArray(options.formData)) { - return options.formData; - } - if (options.formData) { - formData = []; - $.each(options.formData, function (name, value) { - formData.push({name: name, value: value}); - }); - return formData; - } - return []; - }, - - _getTotal: function (files) { - var total = 0; - $.each(files, function (index, file) { - total += file.size || 1; - }); - return total; - }, - - _onProgress: function (e, data) { - if (e.lengthComputable) { - var now = +(new Date()), - total, - loaded; - if (data._time && data.progressInterval && - (now - data._time < data.progressInterval) && - e.loaded !== e.total) { - return; - } - data._time = now; - total = data.total || this._getTotal(data.files); - loaded = parseInt( - e.loaded / e.total * (data.chunkSize || total), - 10 - ) + (data.uploadedBytes || 0); - this._loaded += loaded - (data.loaded || data.uploadedBytes || 0); - data.lengthComputable = true; - data.loaded = loaded; - data.total = total; - data.bitrate = data._bitrateTimer.getBitrate( - now, - loaded, - data.bitrateInterval - ); - // Trigger a custom progress event with a total data property set - // to the file size(s) of the current upload and a loaded data - // property calculated accordingly: - this._trigger('progress', e, data); - // Trigger a global progress event for all current file uploads, - // including ajax calls queued for sequential file uploads: - this._trigger('progressall', e, { - lengthComputable: true, - loaded: this._loaded, - total: this._total, - bitrate: this._bitrateTimer.getBitrate( - now, - this._loaded, - data.bitrateInterval - ) - }); - } - }, - - _initProgressListener: function (options) { - var that = this, - xhr = options.xhr ? options.xhr() : $.ajaxSettings.xhr(); - // Accesss to the native XHR object is required to add event listeners - // for the upload progress event: - if (xhr.upload) { - $(xhr.upload).bind('progress', function (e) { - var oe = e.originalEvent; - // Make sure the progress event properties get copied over: - e.lengthComputable = oe.lengthComputable; - e.loaded = oe.loaded; - e.total = oe.total; - that._onProgress(e, options); - }); - options.xhr = function () { - return xhr; - }; - } - }, - - _initXHRData: function (options) { - var formData, - file = options.files[0], - // Ignore non-multipart setting if not supported: - multipart = options.multipart || !$.support.xhrFileUpload, - paramName = options.paramName[0]; - if (!multipart || options.blob) { - // For non-multipart uploads and chunked uploads, - // file meta data is not part of the request body, - // so we transmit this data as part of the HTTP headers. - // For cross domain requests, these headers must be allowed - // via Access-Control-Allow-Headers or removed using - // the beforeSend callback: - options.headers = $.extend(options.headers, { - 'X-File-Name': file.name, - 'X-File-Type': file.type, - 'X-File-Size': file.size - }); - if (!options.blob) { - // Non-chunked non-multipart upload: - options.contentType = file.type; - options.data = file; - } else if (!multipart) { - // Chunked non-multipart upload: - options.contentType = 'application/octet-stream'; - options.data = options.blob; - } - } - if (multipart && $.support.xhrFormDataFileUpload) { - if (options.postMessage) { - // window.postMessage does not allow sending FormData - // objects, so we just add the File/Blob objects to - // the formData array and let the postMessage window - // create the FormData object out of this array: - formData = this._getFormData(options); - if (options.blob) { - formData.push({ - name: paramName, - value: options.blob - }); - } else { - $.each(options.files, function (index, file) { - formData.push({ - name: options.paramName[index] || paramName, - value: file - }); - }); - } - } else { - if (options.formData instanceof FormData) { - formData = options.formData; - } else { - formData = new FormData(); - $.each(this._getFormData(options), function (index, field) { - formData.append(field.name, field.value); - }); - } - if (options.blob) { - formData.append(paramName, options.blob, file.name); - } else { - $.each(options.files, function (index, file) { - // File objects are also Blob instances. - // This check allows the tests to run with - // dummy objects: - if (file instanceof Blob) { - formData.append( - options.paramName[index] || paramName, - file, - file.name - ); - } - }); - } - } - options.data = formData; - } - // Blob reference is not needed anymore, free memory: - options.blob = null; - }, - - _initIframeSettings: function (options) { - // Setting the dataType to iframe enables the iframe transport: - options.dataType = 'iframe ' + (options.dataType || ''); - // The iframe transport accepts a serialized array as form data: - options.formData = this._getFormData(options); - // Add redirect url to form data on cross-domain uploads: - if (options.redirect && $('').prop('href', options.url) - .prop('host') !== location.host) { - options.formData.push({ - name: options.redirectParamName || 'redirect', - value: options.redirect - }); - } - }, - - _initDataSettings: function (options) { - if (this._isXHRUpload(options)) { - if (!this._chunkedUpload(options, true)) { - if (!options.data) { - this._initXHRData(options); - } - this._initProgressListener(options); - } - if (options.postMessage) { - // Setting the dataType to postmessage enables the - // postMessage transport: - options.dataType = 'postmessage ' + (options.dataType || ''); - } - } else { - this._initIframeSettings(options, 'iframe'); - } - }, - - _getParamName: function (options) { - var fileInput = $(options.fileInput), - paramName = options.paramName; - if (!paramName) { - paramName = []; - fileInput.each(function () { - var input = $(this), - name = input.prop('name') || 'files[]', - i = (input.prop('files') || [1]).length; - while (i) { - paramName.push(name); - i -= 1; - } - }); - if (!paramName.length) { - paramName = [fileInput.prop('name') || 'files[]']; - } - } else if (!$.isArray(paramName)) { - paramName = [paramName]; - } - return paramName; - }, - - _initFormSettings: function (options) { - // Retrieve missing options from the input field and the - // associated form, if available: - if (!options.form || !options.form.length) { - options.form = $(options.fileInput.prop('form')); - } - options.paramName = this._getParamName(options); - if (!options.url) { - options.url = options.form.prop('action') || location.href; - } - // The HTTP request method must be "POST" or "PUT": - options.type = (options.type || options.form.prop('method') || '') - .toUpperCase(); - if (options.type !== 'POST' && options.type !== 'PUT') { - options.type = 'POST'; - } - if (!options.formAcceptCharset) { - options.formAcceptCharset = options.form.attr('accept-charset'); - } - }, - - _getAJAXSettings: function (data) { - var options = $.extend({}, this.options, data); - this._initFormSettings(options); - this._initDataSettings(options); - return options; - }, - - // Maps jqXHR callbacks to the equivalent - // methods of the given Promise object: - _enhancePromise: function (promise) { - promise.success = promise.done; - promise.error = promise.fail; - promise.complete = promise.always; - return promise; - }, - - // Creates and returns a Promise object enhanced with - // the jqXHR methods abort, success, error and complete: - _getXHRPromise: function (resolveOrReject, context, args) { - var dfd = $.Deferred(), - promise = dfd.promise(); - context = context || this.options.context || promise; - if (resolveOrReject === true) { - dfd.resolveWith(context, args); - } else if (resolveOrReject === false) { - dfd.rejectWith(context, args); - } - promise.abort = dfd.promise; - return this._enhancePromise(promise); - }, - - // Uploads a file in multiple, sequential requests - // by splitting the file up in multiple blob chunks. - // If the second parameter is true, only tests if the file - // should be uploaded in chunks, but does not invoke any - // upload requests: - _chunkedUpload: function (options, testOnly) { - var that = this, - file = options.files[0], - fs = file.size, - ub = options.uploadedBytes = options.uploadedBytes || 0, - mcs = options.maxChunkSize || fs, - // Use the Blob methods with the slice implementation - // according to the W3C Blob API specification: - slice = file.webkitSlice || file.mozSlice || file.slice, - upload, - n, - jqXHR, - pipe; - if (!(this._isXHRUpload(options) && slice && (ub || mcs < fs)) || - options.data) { - return false; - } - if (testOnly) { - return true; - } - if (ub >= fs) { - file.error = 'uploadedBytes'; - return this._getXHRPromise( - false, - options.context, - [null, 'error', file.error] - ); - } - // n is the number of blobs to upload, - // calculated via filesize, uploaded bytes and max chunk size: - n = Math.ceil((fs - ub) / mcs); - // The chunk upload method accepting the chunk number as parameter: - upload = function (i) { - if (!i) { - return that._getXHRPromise(true, options.context); - } - // Upload the blobs in sequential order: - return upload(i -= 1).pipe(function () { - // Clone the options object for each chunk upload: - var o = $.extend({}, options); - o.blob = slice.call( - file, - ub + i * mcs, - ub + (i + 1) * mcs - ); - // Expose the chunk index: - o.chunkIndex = i; - // Expose the number of chunks: - o.chunksNumber = n; - // Store the current chunk size, as the blob itself - // will be dereferenced after data processing: - o.chunkSize = o.blob.size; - // Process the upload data (the blob and potential form data): - that._initXHRData(o); - // Add progress listeners for this chunk upload: - that._initProgressListener(o); - jqXHR = ($.ajax(o) || that._getXHRPromise(false, o.context)) - .done(function () { - // Create a progress event if upload is done and - // no progress event has been invoked for this chunk: - if (!o.loaded) { - that._onProgress($.Event('progress', { - lengthComputable: true, - loaded: o.chunkSize, - total: o.chunkSize - }), o); - } - options.uploadedBytes = o.uploadedBytes += - o.chunkSize; - }); - return jqXHR; - }); - }; - // Return the piped Promise object, enhanced with an abort method, - // which is delegated to the jqXHR object of the current upload, - // and jqXHR callbacks mapped to the equivalent Promise methods: - pipe = upload(n); - pipe.abort = function () { - return jqXHR.abort(); - }; - return this._enhancePromise(pipe); - }, - - _beforeSend: function (e, data) { - if (this._active === 0) { - // the start callback is triggered when an upload starts - // and no other uploads are currently running, - // equivalent to the global ajaxStart event: - this._trigger('start'); - // Set timer for global bitrate progress calculation: - this._bitrateTimer = new this._BitrateTimer(); - } - this._active += 1; - // Initialize the global progress values: - this._loaded += data.uploadedBytes || 0; - this._total += this._getTotal(data.files); - }, - - _onDone: function (result, textStatus, jqXHR, options) { - if (!this._isXHRUpload(options)) { - // Create a progress event for each iframe load: - this._onProgress($.Event('progress', { - lengthComputable: true, - loaded: 1, - total: 1 - }), options); - } - options.result = result; - options.textStatus = textStatus; - options.jqXHR = jqXHR; - this._trigger('done', null, options); - }, - - _onFail: function (jqXHR, textStatus, errorThrown, options) { - options.jqXHR = jqXHR; - options.textStatus = textStatus; - options.errorThrown = errorThrown; - this._trigger('fail', null, options); - if (options.recalculateProgress) { - // Remove the failed (error or abort) file upload from - // the global progress calculation: - this._loaded -= options.loaded || options.uploadedBytes || 0; - this._total -= options.total || this._getTotal(options.files); - } - }, - - _onAlways: function (jqXHRorResult, textStatus, jqXHRorError, options) { - this._active -= 1; - options.textStatus = textStatus; - if (jqXHRorError && jqXHRorError.always) { - options.jqXHR = jqXHRorError; - options.result = jqXHRorResult; - } else { - options.jqXHR = jqXHRorResult; - options.errorThrown = jqXHRorError; - } - this._trigger('always', null, options); - if (this._active === 0) { - // The stop callback is triggered when all uploads have - // been completed, equivalent to the global ajaxStop event: - this._trigger('stop'); - // Reset the global progress values: - this._loaded = this._total = 0; - this._bitrateTimer = null; - } - }, - - _onSend: function (e, data) { - var that = this, - jqXHR, - slot, - pipe, - options = that._getAJAXSettings(data), - send = function (resolve, args) { - that._sending += 1; - // Set timer for bitrate progress calculation: - options._bitrateTimer = new that._BitrateTimer(); - jqXHR = jqXHR || ( - (resolve !== false && - that._trigger('send', e, options) !== false && - (that._chunkedUpload(options) || $.ajax(options))) || - that._getXHRPromise(false, options.context, args) - ).done(function (result, textStatus, jqXHR) { - that._onDone(result, textStatus, jqXHR, options); - }).fail(function (jqXHR, textStatus, errorThrown) { - that._onFail(jqXHR, textStatus, errorThrown, options); - }).always(function (jqXHRorResult, textStatus, jqXHRorError) { - that._sending -= 1; - that._onAlways( - jqXHRorResult, - textStatus, - jqXHRorError, - options - ); - if (options.limitConcurrentUploads && - options.limitConcurrentUploads > that._sending) { - // Start the next queued upload, - // that has not been aborted: - var nextSlot = that._slots.shift(); - while (nextSlot) { - if (!nextSlot.isRejected()) { - nextSlot.resolve(); - break; - } - nextSlot = that._slots.shift(); - } - } - }); - return jqXHR; - }; - this._beforeSend(e, options); - if (this.options.sequentialUploads || - (this.options.limitConcurrentUploads && - this.options.limitConcurrentUploads <= this._sending)) { - if (this.options.limitConcurrentUploads > 1) { - slot = $.Deferred(); - this._slots.push(slot); - pipe = slot.pipe(send); - } else { - pipe = (this._sequence = this._sequence.pipe(send, send)); - } - // Return the piped Promise object, enhanced with an abort method, - // which is delegated to the jqXHR object of the current upload, - // and jqXHR callbacks mapped to the equivalent Promise methods: - pipe.abort = function () { - var args = [undefined, 'abort', 'abort']; - if (!jqXHR) { - if (slot) { - slot.rejectWith(args); - } - return send(false, args); - } - return jqXHR.abort(); - }; - return this._enhancePromise(pipe); - } - return send(); - }, - - _onAdd: function (e, data) { - var that = this, - result = true, - options = $.extend({}, this.options, data), - limit = options.limitMultiFileUploads, - paramName = this._getParamName(options), - paramNameSet, - paramNameSlice, - fileSet, - i; - if (!(options.singleFileUploads || limit) || - !this._isXHRUpload(options)) { - fileSet = [data.files]; - paramNameSet = [paramName]; - } else if (!options.singleFileUploads && limit) { - fileSet = []; - paramNameSet = []; - for (i = 0; i < data.files.length; i += limit) { - fileSet.push(data.files.slice(i, i + limit)); - paramNameSlice = paramName.slice(i, i + limit); - if (!paramNameSlice.length) { - paramNameSlice = paramName; - } - paramNameSet.push(paramNameSlice); - } - } else { - paramNameSet = paramName; - } - data.originalFiles = data.files; - $.each(fileSet || data.files, function (index, element) { - var newData = $.extend({}, data); - newData.files = fileSet ? element : [element]; - newData.paramName = paramNameSet[index]; - newData.submit = function () { - newData.jqXHR = this.jqXHR = - (that._trigger('submit', e, this) !== false) && - that._onSend(e, this); - return this.jqXHR; - }; - return (result = that._trigger('add', e, newData)); - }); - return result; - }, - - // File Normalization for Gecko 1.9.1 (Firefox 3.5) support: - _normalizeFile: function (index, file) { - if (file.name === undefined && file.size === undefined) { - file.name = file.fileName; - file.size = file.fileSize; - } - }, - - _replaceFileInput: function (input) { - var inputClone = input.clone(true); - $('').append(inputClone)[0].reset(); - // Detaching allows to insert the fileInput on another form - // without loosing the file input value: - input.after(inputClone).detach(); - // Avoid memory leaks with the detached file input: - $.cleanData(input.unbind('remove')); - // Replace the original file input element in the fileInput - // collection with the clone, which has been copied including - // event handlers: - this.options.fileInput = this.options.fileInput.map(function (i, el) { - if (el === input[0]) { - return inputClone[0]; - } - return el; - }); - // If the widget has been initialized on the file input itself, - // override this.element with the file input clone: - if (input[0] === this.element[0]) { - this.element = inputClone; - } - }, - - _getFileInputFiles: function (fileInput) { - fileInput = $(fileInput); - var files = $.each($.makeArray(fileInput.prop('files')), this._normalizeFile), - value; - if (!files.length) { - value = fileInput.prop('value'); - if (!value) { - return []; - } - // If the files property is not available, the browser does not - // support the File API and we add a pseudo File object with - // the input value as name with path information removed: - files = [{name: value.replace(/^.*\\/, '')}]; - } - return files; - }, - - _onChange: function (e) { - var that = e.data.fileupload, - data = { - fileInput: $(e.target), - form: $(e.target.form) - }; - data.files = that._getFileInputFiles(data.fileInput); - if (that.options.replaceFileInput) { - that._replaceFileInput(data.fileInput); - } - if (that._trigger('change', e, data) === false || - that._onAdd(e, data) === false) { - return false; - } - }, - - _onPaste: function (e) { - var that = e.data.fileupload, - cbd = e.originalEvent.clipboardData, - items = (cbd && cbd.items) || [], - data = {files: []}; - $.each(items, function (index, item) { - var file = item.getAsFile && item.getAsFile(); - if (file) { - data.files.push(file); - } - }); - if (that._trigger('paste', e, data) === false || - that._onAdd(e, data) === false) { - return false; - } - }, - - _onDrop: function (e) { - var that = e.data.fileupload, - dataTransfer = e.dataTransfer = e.originalEvent.dataTransfer, - data = { - files: $.each( - $.makeArray(dataTransfer && dataTransfer.files), - that._normalizeFile - ) - }; - if (that._trigger('drop', e, data) === false || - that._onAdd(e, data) === false) { - return false; - } - e.preventDefault(); - }, - - _onDragOver: function (e) { - var that = e.data.fileupload, - dataTransfer = e.dataTransfer = e.originalEvent.dataTransfer; - if (that._trigger('dragover', e) === false) { - return false; - } - if (dataTransfer) { - dataTransfer.dropEffect = 'copy'; - } - e.preventDefault(); - }, - - _initEventHandlers: function () { - var ns = this.options.namespace; - if (this._isXHRUpload(this.options)) { - this.options.dropZone - .bind('dragover.' + ns, {fileupload: this}, this._onDragOver) - .bind('drop.' + ns, {fileupload: this}, this._onDrop) - .bind('paste.' + ns, {fileupload: this}, this._onPaste); - } - this.options.fileInput - .bind('change.' + ns, {fileupload: this}, this._onChange); - }, - - _destroyEventHandlers: function () { - var ns = this.options.namespace; - this.options.dropZone - .unbind('dragover.' + ns, this._onDragOver) - .unbind('drop.' + ns, this._onDrop) - .unbind('paste.' + ns, this._onPaste); - this.options.fileInput - .unbind('change.' + ns, this._onChange); - }, - - _setOption: function (key, value) { - var refresh = $.inArray(key, this._refreshOptionsList) !== -1; - if (refresh) { - this._destroyEventHandlers(); - } - $.Widget.prototype._setOption.call(this, key, value); - if (refresh) { - this._initSpecialOptions(); - this._initEventHandlers(); - } - }, - - _initSpecialOptions: function () { - var options = this.options; - if (options.fileInput === undefined) { - options.fileInput = this.element.is('input:file') ? - this.element : this.element.find('input:file'); - } else if (!(options.fileInput instanceof $)) { - options.fileInput = $(options.fileInput); - } - if (!(options.dropZone instanceof $)) { - options.dropZone = $(options.dropZone); - } - }, - - _create: function () { - var options = this.options; - // Initialize options set via HTML5 data-attributes: - $.extend(options, $(this.element[0].cloneNode(false)).data()); - options.namespace = options.namespace || this.widgetName; - this._initSpecialOptions(); - this._slots = []; - this._sequence = this._getXHRPromise(true); - this._sending = this._active = this._loaded = this._total = 0; - this._initEventHandlers(); - }, - - destroy: function () { - this._destroyEventHandlers(); - $.Widget.prototype.destroy.call(this); - }, - - enable: function () { - $.Widget.prototype.enable.call(this); - this._initEventHandlers(); - }, - - disable: function () { - this._destroyEventHandlers(); - $.Widget.prototype.disable.call(this); - }, - - // This method is exposed to the widget API and allows adding files - // using the fileupload API. The data parameter accepts an object which - // must have a files property and can contain additional options: - // .fileupload('add', {files: filesList}); - add: function (data) { - if (!data || this.options.disabled) { - return; - } - if (data.fileInput && !data.files) { - data.files = this._getFileInputFiles(data.fileInput); - } else { - data.files = $.each($.makeArray(data.files), this._normalizeFile); - } - this._onAdd(null, data); - }, - - // This method is exposed to the widget API and allows sending files - // using the fileupload API. The data parameter accepts an object which - // must have a files property and can contain additional options: - // .fileupload('send', {files: filesList}); - // The method returns a Promise object for the file upload call. - send: function (data) { - if (data && !this.options.disabled) { - if (data.fileInput && !data.files) { - data.files = this._getFileInputFiles(data.fileInput); - } else { - data.files = $.each($.makeArray(data.files), this._normalizeFile); - } - if (data.files.length) { - return this._onSend(null, data); - } - } - return this._getXHRPromise(false, data && data.context); - } - - }); - -})); diff --git a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/js/jquery.iframe-transport.js b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/js/jquery.iframe-transport.js deleted file mode 100644 index 4749f469..00000000 --- a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/js/jquery.iframe-transport.js +++ /dev/null @@ -1,172 +0,0 @@ -/* - * jQuery Iframe Transport Plugin 1.5 - * https://github.com/blueimp/jQuery-File-Upload - * - * Copyright 2011, Sebastian Tschan - * https://blueimp.net - * - * Licensed under the MIT license: - * http://www.opensource.org/licenses/MIT - */ - -/*jslint unparam: true, nomen: true */ -/*global define, window, document */ - -(function (factory) { - 'use strict'; - if (typeof define === 'function' && define.amd) { - // Register as an anonymous AMD module: - define(['jquery'], factory); - } else { - // Browser globals: - factory(window.jQuery); - } -}(function ($) { - 'use strict'; - - // Helper variable to create unique names for the transport iframes: - var counter = 0; - - // The iframe transport accepts three additional options: - // options.fileInput: a jQuery collection of file input fields - // options.paramName: the parameter name for the file form data, - // overrides the name property of the file input field(s), - // can be a string or an array of strings. - // options.formData: an array of objects with name and value properties, - // equivalent to the return data of .serializeArray(), e.g.: - // [{name: 'a', value: 1}, {name: 'b', value: 2}] - $.ajaxTransport('iframe', function (options) { - if (options.async && (options.type === 'POST' || options.type === 'GET')) { - var form, - iframe; - return { - send: function (_, completeCallback) { - form = $(''); - form.attr('accept-charset', options.formAcceptCharset); - // javascript:false as initial iframe src - // prevents warning popups on HTTPS in IE6. - // IE versions below IE8 cannot set the name property of - // elements that have already been added to the DOM, - // so we set the name along with the iframe HTML markup: - iframe = $( - '' - ).bind('load', function () { - var fileInputClones, - paramNames = $.isArray(options.paramName) ? - options.paramName : [options.paramName]; - iframe - .unbind('load') - .bind('load', function () { - var response; - // Wrap in a try/catch block to catch exceptions thrown - // when trying to access cross-domain iframe contents: - try { - response = iframe.contents(); - // Google Chrome and Firefox do not throw an - // exception when calling iframe.contents() on - // cross-domain requests, so we unify the response: - if (!response.length || !response[0].firstChild) { - throw new Error(); - } - } catch (e) { - response = undefined; - } - // The complete callback returns the - // iframe content document as response object: - completeCallback( - 200, - 'success', - {'iframe': response} - ); - // Fix for IE endless progress bar activity bug - // (happens on form submits to iframe targets): - $('') - .appendTo(form); - form.remove(); - }); - form - .prop('target', iframe.prop('name')) - .prop('action', options.url) - .prop('method', options.type); - if (options.formData) { - $.each(options.formData, function (index, field) { - $('') - .prop('name', field.name) - .val(field.value) - .appendTo(form); - }); - } - if (options.fileInput && options.fileInput.length && - options.type === 'POST') { - fileInputClones = options.fileInput.clone(); - // Insert a clone for each file input field: - options.fileInput.after(function (index) { - return fileInputClones[index]; - }); - if (options.paramName) { - options.fileInput.each(function (index) { - $(this).prop( - 'name', - paramNames[index] || options.paramName - ); - }); - } - // Appending the file input fields to the hidden form - // removes them from their original location: - form - .append(options.fileInput) - .prop('enctype', 'multipart/form-data') - // enctype must be set as encoding for IE: - .prop('encoding', 'multipart/form-data'); - } - form.submit(); - // Insert the file input fields at their original location - // by replacing the clones with the originals: - if (fileInputClones && fileInputClones.length) { - options.fileInput.each(function (index, input) { - var clone = $(fileInputClones[index]); - $(input).prop('name', clone.prop('name')); - clone.replaceWith(input); - }); - } - }); - form.append(iframe).appendTo(document.body); - }, - abort: function () { - if (iframe) { - // javascript:false as iframe src aborts the request - // and prevents warning popups on HTTPS in IE6. - // concat is used to avoid the "Script URL" JSLint error: - iframe - .unbind('load') - .prop('src', 'javascript'.concat(':false;')); - } - if (form) { - form.remove(); - } - } - }; - } - }); - - // The iframe transport returns the iframe content document as response. - // The following adds converters from iframe to text, json, html, and script: - $.ajaxSetup({ - converters: { - 'iframe text': function (iframe) { - return $(iframe[0].body).text(); - }, - 'iframe json': function (iframe) { - return $.parseJSON($(iframe[0].body).text()); - }, - 'iframe html': function (iframe) { - return $(iframe[0].body).html(); - }, - 'iframe script': function (iframe) { - return $.globalEval($(iframe[0].body).text()); - } - } - }); - -})); diff --git a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/js/locale.js b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/js/locale.js deleted file mode 100644 index ea64b0a8..00000000 --- a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/js/locale.js +++ /dev/null @@ -1,29 +0,0 @@ -/* - * jQuery File Upload Plugin Localization Example 6.5.1 - * https://github.com/blueimp/jQuery-File-Upload - * - * Copyright 2012, Sebastian Tschan - * https://blueimp.net - * - * Licensed under the MIT license: - * http://www.opensource.org/licenses/MIT - */ - -/*global window */ - -window.locale = { - "fileupload": { - "errors": { - "maxFileSize": "File is too big", - "minFileSize": "File is too small", - "acceptFileTypes": "Filetype not allowed", - "maxNumberOfFiles": "Max number of files exceeded", - "uploadedBytes": "Uploaded bytes exceed file size", - "emptyResult": "Empty file upload result" - }, - "error": "Error", - "start": "Start", - "cancel": "Cancel", - "destroy": "Delete" - } -}; diff --git a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/js/main.js b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/js/main.js deleted file mode 100644 index 01c86feb..00000000 --- a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/js/main.js +++ /dev/null @@ -1,78 +0,0 @@ -/* - * jQuery File Upload Plugin JS Example 6.7 - * https://github.com/blueimp/jQuery-File-Upload - * - * Copyright 2010, Sebastian Tschan - * https://blueimp.net - * - * Licensed under the MIT license: - * http://www.opensource.org/licenses/MIT - */ - -/*jslint nomen: true, unparam: true, regexp: true */ -/*global $, window, document */ - -$(function () { - 'use strict'; - - // Initialize the jQuery File Upload widget: - $('#fileupload').fileupload(); - - // Enable iframe cross-domain access via redirect option: - $('#fileupload').fileupload( - 'option', - 'redirect', - window.location.href.replace( - /\/[^\/]*$/, - '/cors/result.html?%s' - ) - ); - - if (window.location.hostname === 'blueimp.github.com') { - // Demo settings: - $('#fileupload').fileupload('option', { - url: '//jquery-file-upload.appspot.com/', - maxFileSize: 5000000, - acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i, - process: [ - { - action: 'load', - fileTypes: /^image\/(gif|jpeg|png)$/, - maxFileSize: 20000000 // 20MB - }, - { - action: 'resize', - maxWidth: 1440, - maxHeight: 900 - }, - { - action: 'save' - } - ] - }); - // Upload server status check for browsers with CORS support: - if ($.support.cors) { - $.ajax({ - url: '//jquery-file-upload.appspot.com/', - type: 'HEAD' - }).fail(function () { - $('') - .text('Upload server currently unavailable - ' + - new Date()) - .appendTo('#fileupload'); - }); - } - } else { - // Load existing files: - $('#fileupload').each(function () { - var that = this; - $.getJSON(this.action, function (result) { - if (result && result.length) { - $(that).fileupload('option', 'done') - .call(that, null, {result: result}); - } - }); - }); - } - -}); diff --git a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/show.html.erb b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/show.html.erb index f02d9156..db321af9 100644 --- a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/show.html.erb +++ b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/show.html.erb @@ -9,7 +9,7 @@
    • <%= t('announcement.category') %> - <%= @bulletin.bulletin_category.i18n_variable[I18n.locale] %> + <%= @bulletin.bulletin_category.title %>
    • <%= t('announcement.postdate') %> diff --git a/vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/index.html.erb b/vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/index.html.erb index ba70d365..cfcf47f9 100644 --- a/vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/index.html.erb +++ b/vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/index.html.erb @@ -10,11 +10,11 @@
        <% @archive_file_categorys.each do |afcpost| %> -
      • <%= link_to afcpost.i18n_variable[I18n.locale], panel_archive_front_end_archive_files_path(:category_id => afcpost.id) %>
        • +
      • <%= link_to afcpost.title, panel_archive_front_end_archive_files_path(:category_id => afcpost.id) %>
        • <% end %>
      -

      <%= @archive_files.first.archive_file_category.i18n_variable[I18n.locale] rescue nil %>

      +

      <%= @archive_files.first.archive_file_category.title rescue nil %>

      <% @archive_files.each do |post| %> diff --git a/vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/show.html.erb b/vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/show.html.erb index 08028554..6051eb4c 100644 --- a/vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/show.html.erb +++ b/vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/show.html.erb @@ -4,7 +4,7 @@

      <%= @title %>

      <% end %> -

      <%= @archive_file.archive_file_category.i18n_variable[I18n.locale] rescue nil %>

      +

      <%= @archive_file.archive_file_category.title rescue nil %>

      <%= @archive_file.title %> From da5e7f670e871df2485627941ac3fc66ee3207e7 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Mon, 5 Nov 2012 23:04:54 +0800 Subject: [PATCH 30/30] Desktop Widgtes updates.. --- app/assets/javascripts/orbitdesktop.js | 11 +- app/controllers/desktop_controller.rb | 36 +++++- .../desktop_publications_controller.rb | 1 + app/controllers/desktop_widgets_controller.rb | 3 +- app/models/design/css_default.rb | 6 +- app/models/design/design.rb | 6 +- app/models/design/image.rb | 6 +- app/models/design/javascript.rb | 6 +- app/models/design/stylesheet.rb | 107 +++++++----------- app/models/desktop/desktop.rb | 3 +- app/models/desktop/desktop_widget.rb | 12 +- app/models/desktop/group.rb | 13 +-- app/models/desktop/tile.rb | 1 + app/models/desktop/widget_layout.rb | 2 +- app/models/user/user.rb | 2 +- app/views/desktop/journal_pages/list.html.erb | 29 ++++- config/routes.rb | 4 + lib/parsers/parser_layout_widget.rb | 13 ++- .../{index.html.erb => index.html} | 0 public/desktop_widgets/browser/default.css | 1 + .../javascripts/browser.js} | 0 public/desktop_widgets/browser/settings.json | 6 + .../index.html.erb => browser/widget.html} | 0 public/desktop_widgets/clock/default.css | 59 +++++----- .../default.css} | 16 +-- .../img => googlesearch/images}/google_64.png | Bin .../javascripts/google.js} | 0 .../googlesearch/settings.json | 7 ++ .../desktop_widgets/googlesearch/widget.html | 13 +++ .../4fa78161c88514014d7c59c0.js | 0 .../index.html.erb | 0 .../4fa78197c88514014d7c59c4.js | 0 .../index.html.erb => youtube/index.html} | 0 33 files changed, 217 insertions(+), 146 deletions(-) rename public/desktop_widgets/509091e6bd98eb0352000009/{index.html.erb => index.html} (100%) create mode 100755 public/desktop_widgets/browser/default.css rename public/desktop_widgets/{4fba4bf36f4fea8095e389eb/4fba4bf36f4fea8095e389eb.js => browser/javascripts/browser.js} (100%) create mode 100644 public/desktop_widgets/browser/settings.json rename public/desktop_widgets/{4fba4bf36f4fea8095e389eb/index.html.erb => browser/widget.html} (100%) rename public/desktop_widgets/{4fa78140c88514014d7c59be/index.html.erb => googlesearch/default.css} (59%) mode change 100644 => 100755 rename public/desktop_widgets/{4fa78140c88514014d7c59be/img => googlesearch/images}/google_64.png (100%) rename public/desktop_widgets/{4fa78140c88514014d7c59be/4fa78140c88514014d7c59be.js => googlesearch/javascripts/google.js} (100%) create mode 100644 public/desktop_widgets/googlesearch/settings.json create mode 100644 public/desktop_widgets/googlesearch/widget.html rename public/desktop_widgets/{4fa78161c88514014d7c59c0 => timetable}/4fa78161c88514014d7c59c0.js (100%) rename public/desktop_widgets/{4fa78161c88514014d7c59c0 => timetable}/index.html.erb (100%) rename public/desktop_widgets/{4fa78197c88514014d7c59c4 => youtube}/4fa78197c88514014d7c59c4.js (100%) rename public/desktop_widgets/{4fa78197c88514014d7c59c4/index.html.erb => youtube/index.html} (100%) diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js index 230d6c07..2b4eb629 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -332,9 +332,9 @@ var orbitDesktop = function(dom){ if(j==0)$group.attr("id",tile.group_id); if(tile.data_category == "app") - $li = $('

    • '+tile.title+'

      • '); + $li = $('

    • '+tile.title+'

      • '); else - $li = $('

    • '+tile.title+'

      Loading...
      • '); + $li = $('

    • '+tile.title+'

      Loading...
      • '); $group.find('.col'+colindex).append($li); } @@ -1557,10 +1557,10 @@ var orbitDesktop = function(dom){ var widget = $(this); if(widget.attr("data-category")=="widget"){ var widgename = widget.attr("data-content"); - $.getScript("/desktop_widgets/"+widgename+"/"+widgename+".js",function(){ - widget.find("div.appholder").load("/desktop_widgets/"+widgename+"/index.html.erb"); + $.getScript(widget.attr("js-link"),function(){ + widget.find("div.appholder").load(widget.attr("data-content")); }); - // $(this).find("div.appholder").append( $('').attr('href', "/desktop_widgets/"+widgename+"/css/"+widgename+".css")); + $(this).find("div.appholder").append( '') } }) @@ -1697,3 +1697,4 @@ orbitDesktop.prototype.currentUsername = "Harry"; var uselessfunction = function(){ $.post("/desktop/temp_func",{sectionid:"4f83e7bbbd98eb041600001d"}); } + diff --git a/app/controllers/desktop_controller.rb b/app/controllers/desktop_controller.rb index 286ec1c4..ff657441 100644 --- a/app/controllers/desktop_controller.rb +++ b/app/controllers/desktop_controller.rb @@ -103,11 +103,41 @@ class DesktopController< ApplicationController def getgroups @section = Section.find(params["sectionid"]) @groups = @section.groups - a = Array.new + + gr = Array.new @groups.each do |group| - a << group.tiles + a = Array.new + t = group.tiles + t.each do |tile| + data_content = "" + jsfile = [] + cssfile = "" + shape = "w1 h1" + if tile.data_category == "widget" + widge = DesktopWidget.find(tile.desktop_widget_id.to_s) + # data_content = widge.widget_layout.file + data_content = "desktop/widget_layout?id="+tile.desktop_widget_id.to_s + jsfile = widge.javascripts.collect{|js| js.file} + cssfile = widge.css_default.file + shape = widge.shape + title = widge.name + else + data_content = tile.data_content + title = tile.title + end + a << {"id"=>tile.id,"data_category"=>tile.data_category,"data_content"=>data_content,"js"=>jsfile,"css"=>cssfile,"shape"=>shape,"position"=>tile.position,"title"=>title} + end + gr << a end - render :json =>a.to_json + render :json =>gr.to_json + end + + def widget_layout + widget = DesktopWidget.find(params[:id]) + link = '' + content = widget.widget_layout.body + dhtml = link + content + render :text => dhtml.html_safe end def getsectionlist diff --git a/app/controllers/desktop_publications_controller.rb b/app/controllers/desktop_publications_controller.rb index 14307022..fc3f36ab 100644 --- a/app/controllers/desktop_publications_controller.rb +++ b/app/controllers/desktop_publications_controller.rb @@ -8,6 +8,7 @@ class DesktopPublicationsController< ApplicationController end def journal_p_add + debugger render "desktop/journal_pages/add", :layout => false end diff --git a/app/controllers/desktop_widgets_controller.rb b/app/controllers/desktop_widgets_controller.rb index 6807082c..2605f367 100644 --- a/app/controllers/desktop_widgets_controller.rb +++ b/app/controllers/desktop_widgets_controller.rb @@ -31,7 +31,8 @@ class DesktopWidgetsController < OrbitBackendController zip_file.entries.each do |entry| case (path = entry.to_s) - when /\A(#{zip_name})\/(default\.css)\z/ #for default css + when /\A(#{zip_name})\/(default\.css)\z/ + #for default css dw.build_css_default(:file => get_temp_file(zip_file, dir, entry)) when /\A(#{zip_name})\/(widget\.html)\z/ #for layout html dw.build_widget_layout(:file => get_temp_file(zip_file, dir, entry)) diff --git a/app/models/design/css_default.rb b/app/models/design/css_default.rb index 9b2b17fc..bd4baa8c 100644 --- a/app/models/design/css_default.rb +++ b/app/models/design/css_default.rb @@ -1,6 +1,8 @@ class CssDefault < Stylesheet - belongs_to :design - belongs_to :desktop_widget + # belongs_to :design + # belongs_to :desktop_widget + + belongs_to :css, polymorphic: true end diff --git a/app/models/design/design.rb b/app/models/design/design.rb index c9d87982..54870a89 100644 --- a/app/models/design/design.rb +++ b/app/models/design/design.rb @@ -8,11 +8,11 @@ class Design field :title, :type => String field :version, :type => String - has_one :css_default, :autosave => true, :dependent => :destroy + has_one :css_default, as: :css, :autosave => true, :dependent => :destroy has_one :layout, :autosave => true, :dependent => :destroy has_one :css_reset, :autosave => true, :dependent => :destroy - has_many :images, :autosave => true, :dependent => :destroy - has_many :javascripts, :autosave => true, :dependent => :destroy + has_many :images,as: :imgs, :autosave => true, :dependent => :destroy + has_many :javascripts, as: :js, :autosave => true, :dependent => :destroy has_many :pages has_many :themes, :autosave => true, :dependent => :destroy diff --git a/app/models/design/image.rb b/app/models/design/image.rb index 355f66f7..d1a57d7f 100644 --- a/app/models/design/image.rb +++ b/app/models/design/image.rb @@ -10,8 +10,10 @@ class Image mount_uploader :file, ImageUploader - belongs_to :design - belongs_to :desktop_widget + # belongs_to :design + # belongs_to :desktop_widget + + belongs_to :imgs, polymorphic: true before_save :set_name diff --git a/app/models/design/javascript.rb b/app/models/design/javascript.rb index 4d13d0a3..808679d7 100644 --- a/app/models/design/javascript.rb +++ b/app/models/design/javascript.rb @@ -1,4 +1,6 @@ class Javascript < DesignFile - belongs_to :design - belongs_to :desktop_widget + # belongs_to :design + # belongs_to :desktop_widget + + belongs_to :js, polymorphic: true end diff --git a/app/models/design/stylesheet.rb b/app/models/design/stylesheet.rb index 47c13585..5e9a5775 100644 --- a/app/models/design/stylesheet.rb +++ b/app/models/design/stylesheet.rb @@ -1,67 +1,40 @@ -class Stylesheet < DesignFile - belongs_to :design - belongs_to :desktop_widget - mount_uploader :file_orig, AssetUploader - - def parse_urls - orig_content = content = self.file.read.force_encoding("UTF-8") - # self.remove_file! - # self.remove_file_orig! - names = [] - images = self.design.images - content.scan(/(?<=url)(.*?)(?=\))/){ - css_name = $1.gsub(' ','').gsub('(','') - name = File.basename(css_name).gsub(/[\\\"]/, '') - image = images.detect{ |i| i.file_identifier.eql?(name) } rescue nil - image.update_attribute(:in_css, true) if image - file_name = image.file_url rescue nil - names << [css_name, file_name] - } - names.each do |name| - content.gsub!(name[0], name[1]) if name[1] - end - Dir.mktmpdir('f_path') { |dir| - orig_file_name = self.file_identifier - - temp_file = File.new(dir + '/' + orig_file_name, 'w+') - temp_file.write orig_content.force_encoding("UTF-8") - self.file_orig = temp_file - - temp_file = File.new(dir + '/' + orig_file_name, 'w+') - temp_file.write content.force_encoding("UTF-8") - self.file = temp_file - self.save - } - end - def parse_widgets_urls - orig_content = content = self.file.read.force_encoding("UTF-8") - # self.remove_file! - # self.remove_file_orig! - names = [] - images = self.desktop_widget.images - content.scan(/(?<=url)(.*?)(?=\))/){ - css_name = $1.gsub(' ','').gsub('(','') - name = File.basename(css_name).gsub(/[\\\"]/, '') - image = images.detect{ |i| i.file_identifier.eql?(name) } rescue nil - image.update_attribute(:in_css, true) if image - file_name = image.file_url rescue nil - names << [css_name, file_name] - } - names.each do |name| - content.gsub!(name[0], name[1]) if name[1] - end - Dir.mktmpdir('f_path') { |dir| - orig_file_name = self.file_identifier - - temp_file = File.new(dir + '/' + orig_file_name, 'w+') - temp_file.write orig_content.force_encoding("UTF-8") - self.file_orig = temp_file - - temp_file = File.new(dir + '/' + orig_file_name, 'w+') - temp_file.write content.force_encoding("UTF-8") - self.file = temp_file - self.save - } - end - -end +class Stylesheet < DesignFile + # belongs_to :design + mount_uploader :file_orig, AssetUploader + + def parse_urls + orig_content = content = self.file.read.force_encoding("UTF-8") + # self.remove_file! + # self.remove_file_orig! + names = {} + images = self.css.images + content.scan(/(?<=url)(.*?)(?=\))/){ + css_name = $1.gsub(' ','').gsub('(','') + unless names.has_key?(css_name) + name = File.basename(css_name).gsub(/[\\\"]/, '') + image = images.detect{ |i| i.file_identifier.eql?(name) } rescue nil + if image + image.update_attribute(:in_css, true) + file_name = image.file_url + names.merge!({css_name => file_name}) + end + end + } + names.each_pair do |key, value| + content.gsub!(key, value) + end + Dir.mktmpdir('f_path') { |dir| + orig_file_name = self.file_identifier + + temp_file = File.new(dir + '/' + orig_file_name, 'w+') + temp_file.write orig_content.force_encoding("UTF-8") + self.file_orig = temp_file + + temp_file = File.new(dir + '/' + orig_file_name, 'w+') + temp_file.write content.force_encoding("UTF-8") + self.file = temp_file + self.save + } + end + +end diff --git a/app/models/desktop/desktop.rb b/app/models/desktop/desktop.rb index 20a6e577..6633005f 100644 --- a/app/models/desktop/desktop.rb +++ b/app/models/desktop/desktop.rb @@ -2,11 +2,12 @@ class Desktop include Mongoid::Document include Mongoid::Timestamps - field :theme, default: "4f8d3f493b67fcd05f086359" + field :theme, default: "4f8d3f533b67fcd05f08635a" field :customtheme field :wallpaper belongs_to :user + has_and_belongs_to_many :desktop_widgets, :autosave => true has_many :sections, :autosave => true, :dependent => :destroy # has_many :desktop_widgets, :autosave => true, :dependent => :destroy diff --git a/app/models/desktop/desktop_widget.rb b/app/models/desktop/desktop_widget.rb index 20eda85a..feb40aa7 100644 --- a/app/models/desktop/desktop_widget.rb +++ b/app/models/desktop/desktop_widget.rb @@ -8,13 +8,15 @@ class DesktopWidget field :shape field :version, :type => String - has_one :css_default, :autosave => true, :dependent => :destroy + has_one :css_default, as: :css, :autosave => true, :dependent => :destroy has_one :widget_layout, :autosave => true, :dependent => :destroy - has_many :images, :autosave => true, :dependent => :destroy - has_many :javascripts, :autosave => true, :dependent => :destroy + has_many :images, as: :imgs, :autosave => true, :dependent => :destroy + has_many :javascripts, as: :js, :autosave => true, :dependent => :destroy + has_and_belongs_to_many :desktops, :autosave => true + belongs_to :tiles, :autosave => true accepts_nested_attributes_for :images, :allow_destroy => true - accepts_nested_attributes_for :javascripts, :allow_destroy => true + accepts_nested_attributes_for :javascripts, :allow_destroy => true after_save :parse_css_for_images @@ -24,7 +26,7 @@ class DesktopWidget protected def parse_css_for_images - self.css_default.parse_widgets_urls + self.css_default.parse_urls parse_widget_for_images(self) end diff --git a/app/models/desktop/group.rb b/app/models/desktop/group.rb index 7346ad1e..2c1992f0 100644 --- a/app/models/desktop/group.rb +++ b/app/models/desktop/group.rb @@ -7,13 +7,12 @@ class Group before_create :initialize_tile def initialize_tile - self.tiles.build(data_category: "widget", data_content: "timetable", position: 1, shape: "w2 h2", title: "Tiime Table") - self.tiles.build(data_category: "app", data_content: "quotes", position: 2, shape: "w1 h1", title: "Quotes") - self.tiles.build(data_category: "widget", data_content: "weather", position: 3, shape: "w2 h2", title: "Weather") - self.tiles.build(data_category: "widget", data_content: "clock", position: 4, shape: "w2 h1", title: "Clock") - self.tiles.build(data_category: "app", data_content: "dailyenglish", position: 5, shape: "w1 h1", title: "Daily English Word") - self.tiles.build(data_category: "widget", data_content: "school_events", position: 6, shape: "w2 h1", title: "School Events") + self.tiles.build(data_category: "app", data_content: "quotes", position: 5, shape: "w1 h1", title: "Quotes") + self.tiles.build(data_category: "app", data_content: "dailyenglish", position: 6, shape: "w1 h1", title: "Daily English Word") + widgets = self.section.desktop.desktop_widgets.collect{|widget| widget.id} + for i in 0..3 + self.tiles.build(data_category: "widget", position: i+1,desktop_widget_id: widgets[i]) + end end - end \ No newline at end of file diff --git a/app/models/desktop/tile.rb b/app/models/desktop/tile.rb index 306338a1..91840d8a 100644 --- a/app/models/desktop/tile.rb +++ b/app/models/desktop/tile.rb @@ -9,5 +9,6 @@ class Tile field :title belongs_to :group + has_one :desktop_widget end diff --git a/app/models/desktop/widget_layout.rb b/app/models/desktop/widget_layout.rb index 25389682..5bf24805 100644 --- a/app/models/desktop/widget_layout.rb +++ b/app/models/desktop/widget_layout.rb @@ -5,7 +5,7 @@ class WidgetLayout < DesignFile field :body belongs_to :desktop_widget - + def content self.file.read.force_encoding("UTF-8") rescue '' diff --git a/app/models/user/user.rb b/app/models/user/user.rb index dbd91cf9..e0f0a836 100644 --- a/app/models/user/user.rb +++ b/app/models/user/user.rb @@ -180,7 +180,7 @@ class User end def initialize_desktop - self.build_desktop + self.build_desktop(desktop_widget_ids: DesktopWidget.all.collect{|widget| widget.id}) end protected diff --git a/app/views/desktop/journal_pages/list.html.erb b/app/views/desktop/journal_pages/list.html.erb index e32e4d6c..3d396711 100644 --- a/app/views/desktop/journal_pages/list.html.erb +++ b/app/views/desktop/journal_pages/list.html.erb @@ -61,6 +61,18 @@
    +
    +
    New Share
    +
    + +
    +
    @@ -72,4 +84,19 @@ - \ No newline at end of file + +Panel::PersonalJournal::Plugin::WritingJournals + diff --git a/config/routes.rb b/config/routes.rb index 17e96a60..383a69ae 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -201,6 +201,7 @@ namespace :desktop do match '/getapplist/'=>'desktop#getapplist' match '/newpositions/'=>'desktop#newpositions' match '/settingconnection/'=>'desktop#settingconnection' + match '/widget_layout' => 'desktop#widget_layout' match '/journal_p/'=>'desktop_publications#journal_p' @@ -221,6 +222,9 @@ namespace :desktop do match '/research_p' => 'desktop_research#research_p' match '/research_p_list/' => 'desktop_research#research_p_list' match '/research_p_add' => 'desktop_research#research_p_add' + + + match '/temp_func/'=>'desktop#temp_func' end diff --git a/lib/parsers/parser_layout_widget.rb b/lib/parsers/parser_layout_widget.rb index 6749dae3..382657d8 100644 --- a/lib/parsers/parser_layout_widget.rb +++ b/lib/parsers/parser_layout_widget.rb @@ -2,13 +2,20 @@ module ParserLayoutWidget require 'nokogiri' def parse_widget_for_images(widget) - widge = Nokogiri::HTML(widget.widget_layout.body) - + content = widget.widget_layout.file.read.force_encoding("UTF-8") + widge = Nokogiri::HTML(content) + a = [] + b = [] widge.css('.widget_image').each do |page_image| image = widget.images.where( file: File.basename(page_image['src']))[0] + a << page_image['src'] + b << image.file image.update_attributes(:html_id => page_image['id'], :html_class => page_image['class'], :in_html => true) if image end - + a.each_with_index do |img,i| + content = content.gsub(img,b[i].to_s) + end + widget.widget_layout.update_attributes(:body => content) end diff --git a/public/desktop_widgets/509091e6bd98eb0352000009/index.html.erb b/public/desktop_widgets/509091e6bd98eb0352000009/index.html similarity index 100% rename from public/desktop_widgets/509091e6bd98eb0352000009/index.html.erb rename to public/desktop_widgets/509091e6bd98eb0352000009/index.html diff --git a/public/desktop_widgets/browser/default.css b/public/desktop_widgets/browser/default.css new file mode 100755 index 00000000..fe1e395e --- /dev/null +++ b/public/desktop_widgets/browser/default.css @@ -0,0 +1 @@ +/* No Css */ \ No newline at end of file diff --git a/public/desktop_widgets/4fba4bf36f4fea8095e389eb/4fba4bf36f4fea8095e389eb.js b/public/desktop_widgets/browser/javascripts/browser.js similarity index 100% rename from public/desktop_widgets/4fba4bf36f4fea8095e389eb/4fba4bf36f4fea8095e389eb.js rename to public/desktop_widgets/browser/javascripts/browser.js diff --git a/public/desktop_widgets/browser/settings.json b/public/desktop_widgets/browser/settings.json new file mode 100644 index 00000000..3ce3df02 --- /dev/null +++ b/public/desktop_widgets/browser/settings.json @@ -0,0 +1,6 @@ +{ + "author" : "Harry", + "name" : "Browser", + "shape" : "w2 h1", + "version" : "1.0" +} diff --git a/public/desktop_widgets/4fba4bf36f4fea8095e389eb/index.html.erb b/public/desktop_widgets/browser/widget.html similarity index 100% rename from public/desktop_widgets/4fba4bf36f4fea8095e389eb/index.html.erb rename to public/desktop_widgets/browser/widget.html diff --git a/public/desktop_widgets/clock/default.css b/public/desktop_widgets/clock/default.css index 8790b137..24125313 100755 --- a/public/desktop_widgets/clock/default.css +++ b/public/desktop_widgets/clock/default.css @@ -1,8 +1,8 @@ .clock{ /* The .clock div. Created dynamically by jQuery */ - /*background-color:#252525;*/ - height:200px; - width:200px; + background-color:#111; + height:75px; + width:75px; position:relative; overflow:hidden; float:left; @@ -11,21 +11,21 @@ .clock .rotate{ /* There are two .rotate divs - one for each half of the background */ position:absolute; - width:200px; - height:200px; + width:75px; + height:75px; top:0; left:0; } .rotate.right{ display:none; - z-index:11; + z-index:9; } .clock .bg, .clock .front{ - width:100px; - height:200px; - /*background-color:#252525;*/ + width:37.5px; + height:75px; + background-color:#111; position:absolute; top:0; } @@ -33,37 +33,42 @@ .clock .display{ /* Holds the number of seconds, minutes or hours respectfully */ position:absolute; - width:200px; - font-family:"Lucida Sans Unicode", "Lucida Grande", sans-serif; - z-index:20; + width:75px; + font-family: Orbitron, sans-serif; + z-index:17; color:#F5F5F5; - font-size:60px; + font-size:21px; text-align:center; - top:65px; - left:0; - - /* CSS3 text shadow: */ - text-shadow:4px 4px 5px #333333; + top:27.5px; + left:0px; + } /* The left part of the background: */ -.clock .bg.left{ left:0; } +.clock .bg.left{ left:0px; } /* Individual styles for each color: */ -.orange .bg.left{ background:url(bg_orange.png) no-repeat left top; } -.green .bg.left{ background:url(bg_green.png) no-repeat left top; } -.blue .bg.left{ background:url(bg_blue.png) no-repeat left top; } +.orange .bg.left{ background:url(desktop_widgets/4fa7810ac88514014d7c59bc/img/bg_orange.png) no-repeat left top; } +.green .bg.left{ background:url(desktop_widgets/4fa7810ac88514014d7c59bc/img/bg_green.png) no-repeat left top; } +.blue .bg.left{ background:url(desktop_widgets/4fa7810ac88514014d7c59bc/img/bg_blue.png) no-repeat left top; } /* The right part of the background: */ -.clock .bg.right{ left:100px; } +.clock .bg.right{ left:37.5px; } -.orange .bg.right{ background:url(bg_orange.png) no-repeat right top; } -.green .bg.right{ background:url(bg_green.png) no-repeat right top; } -.blue .bg.right{ background:url(bg_blue.png) no-repeat right top; } +.orange .bg.right{ background:url(desktop_widgets/4fa7810ac88514014d7c59bc/img/bg_orange.png) no-repeat right top; } +.green .bg.right{ background:url(desktop_widgets/4fa7810ac88514014d7c59bc/img/bg_green.png) no-repeat right top; } +.blue .bg.right{ background:url(desktop_widgets/4fa7810ac88514014d7c59bc/img/bg_blue.png) no-repeat right top; } .clock .front.left{ left:0; - z-index:10; + z-index:15; } +#fancyClock { + position: absolute; + overflow: hidden; + top: 50%; + left: 50%; + margin: -36px 0 0 -114px; +} \ No newline at end of file diff --git a/public/desktop_widgets/4fa78140c88514014d7c59be/index.html.erb b/public/desktop_widgets/googlesearch/default.css old mode 100644 new mode 100755 similarity index 59% rename from public/desktop_widgets/4fa78140c88514014d7c59be/index.html.erb rename to public/desktop_widgets/googlesearch/default.css index 341b8d81..1aede945 --- a/public/desktop_widgets/4fa78140c88514014d7c59be/index.html.erb +++ b/public/desktop_widgets/googlesearch/default.css @@ -1,4 +1,3 @@ - -
    - -
    - - -
    -Powered by Eric - -
    - \ No newline at end of file +} \ No newline at end of file diff --git a/public/desktop_widgets/4fa78140c88514014d7c59be/img/google_64.png b/public/desktop_widgets/googlesearch/images/google_64.png similarity index 100% rename from public/desktop_widgets/4fa78140c88514014d7c59be/img/google_64.png rename to public/desktop_widgets/googlesearch/images/google_64.png diff --git a/public/desktop_widgets/4fa78140c88514014d7c59be/4fa78140c88514014d7c59be.js b/public/desktop_widgets/googlesearch/javascripts/google.js similarity index 100% rename from public/desktop_widgets/4fa78140c88514014d7c59be/4fa78140c88514014d7c59be.js rename to public/desktop_widgets/googlesearch/javascripts/google.js diff --git a/public/desktop_widgets/googlesearch/settings.json b/public/desktop_widgets/googlesearch/settings.json new file mode 100644 index 00000000..ddb52727 --- /dev/null +++ b/public/desktop_widgets/googlesearch/settings.json @@ -0,0 +1,7 @@ +{ + "author" : "Eric", + "name" : "Google Search", + "shape" : "w2 h1", + "version" : "1.0" + +} diff --git a/public/desktop_widgets/googlesearch/widget.html b/public/desktop_widgets/googlesearch/widget.html new file mode 100644 index 00000000..df5c715b --- /dev/null +++ b/public/desktop_widgets/googlesearch/widget.html @@ -0,0 +1,13 @@ + +
    + +
    + + +
    +Powered by Eric + +
    + \ No newline at end of file diff --git a/public/desktop_widgets/4fa78161c88514014d7c59c0/4fa78161c88514014d7c59c0.js b/public/desktop_widgets/timetable/4fa78161c88514014d7c59c0.js similarity index 100% rename from public/desktop_widgets/4fa78161c88514014d7c59c0/4fa78161c88514014d7c59c0.js rename to public/desktop_widgets/timetable/4fa78161c88514014d7c59c0.js diff --git a/public/desktop_widgets/4fa78161c88514014d7c59c0/index.html.erb b/public/desktop_widgets/timetable/index.html.erb similarity index 100% rename from public/desktop_widgets/4fa78161c88514014d7c59c0/index.html.erb rename to public/desktop_widgets/timetable/index.html.erb diff --git a/public/desktop_widgets/4fa78197c88514014d7c59c4/4fa78197c88514014d7c59c4.js b/public/desktop_widgets/youtube/4fa78197c88514014d7c59c4.js similarity index 100% rename from public/desktop_widgets/4fa78197c88514014d7c59c4/4fa78197c88514014d7c59c4.js rename to public/desktop_widgets/youtube/4fa78197c88514014d7c59c4.js diff --git a/public/desktop_widgets/4fa78197c88514014d7c59c4/index.html.erb b/public/desktop_widgets/youtube/index.html similarity index 100% rename from public/desktop_widgets/4fa78197c88514014d7c59c4/index.html.erb rename to public/desktop_widgets/youtube/index.html