- <%= f.label :login ,t("admin.user_new_interface.email")%>
- <%= f.text_field :login, :placeholder => t("admin.user_new_interface.email"), :style => "width: 330px;" %>
+ <%= f.label :email ,t("admin.user_new_interface.email")%>
+ <%= f.text_field :email, :placeholder => t("admin.user_new_interface.email"), :style => "width: 330px;" %>
Please correct the error
diff --git a/app/views/shared/_address_modal_dialog.html.erb b/app/views/shared/_address_modal_dialog.html.erb
new file mode 100644
index 000000000..6e241074f
--- /dev/null
+++ b/app/views/shared/_address_modal_dialog.html.erb
@@ -0,0 +1,13 @@
+
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 525d6808e..88a39f422 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -58,6 +58,8 @@ Orbit::Application.routes.draw do
end
member do
post 'edit_file' => 'designs#edit_file'
+ post 'update_file' => 'designs#update_file'
+ post 'upload_image' => 'designs#upload_image'
end
end
resources :infos do
diff --git a/lib/parsers/parser_layout.rb b/lib/parsers/parser_layout.rb
index 3379c4878..817bf3273 100644
--- a/lib/parsers/parser_layout.rb
+++ b/lib/parsers/parser_layout.rb
@@ -22,7 +22,7 @@ module ParserLayout
body.css('.page_image').each do |page_image|
image = design.images.where( file: File.basename(page_image['src']))[0]
- image.update_attributes(:name => File.basename(page_image['src']), :html_id => page_image['id'], :html_class => page_image['class']) if image
+ image.update_attributes(:html_id => page_image['id'], :html_class => page_image['class'], :in_html => true) if image
end
end
diff --git a/lib/tasks/dev.rake b/lib/tasks/dev.rake
index 70776ed96..60a7ec938 100644
--- a/lib/tasks/dev.rake
+++ b/lib/tasks/dev.rake
@@ -71,7 +71,7 @@ namespace :dev do
design = Design.new(:title => "Fraisier", :author => "Paul", :intro => "Strawberry cake")
- design.build_default_css(:file => File.open("#{Rails.root}/lib/fraisier/default.css"))
+ design.build_css_default(:file => File.open("#{Rails.root}/lib/fraisier/default.css"))
# image = design.images.build(:file => File.open("#{Rails.root}/lib/fraisier/img/buttons.gif"))
#
@@ -89,7 +89,7 @@ namespace :dev do
design_1 = Design.new(:title => "Bob", :author => "Me", :intro => "Moran")
- design_1.build_default_css(:file => File.open("#{Rails.root}/lib/fraisier/default.css"))
+ design_1.build_css_default(:file => File.open("#{Rails.root}/lib/fraisier/default.css"))
# image = design.images.build(:file => File.open("#{Rails.root}/lib/fraisier/img/buttons.gif"))
#
diff --git a/lib/tasks/pages.rake b/lib/tasks/pages.rake
index 8a43f420a..598d4b539 100644
--- a/lib/tasks/pages.rake
+++ b/lib/tasks/pages.rake
@@ -13,7 +13,7 @@ namespace :pages do
design = Design.new(:title => "Fraisier", :author => "Paul", :intro => "Strawberry cake")
- design.build_default_css(:file => File.open("#{Rails.root}/lib/fraisier/default.css"))
+ design.build_css_default(:file => File.open("#{Rails.root}/lib/fraisier/default.css"))
# image = design.images.build(:file => File.open("#{Rails.root}/lib/fraisier/img/buttons.gif"))
#
@@ -37,7 +37,7 @@ namespace :pages do
design_1 = Design.new(:title => "Bob", :author => "Me", :intro => "Moran")
- design_1.build_default_css(:file => File.open("#{Rails.root}/lib/fraisier/default.css"))
+ design_1.build_css_default(:file => File.open("#{Rails.root}/lib/fraisier/default.css"))
# image = design.images.build(:file => File.open("#{Rails.root}/lib/fraisier/img/buttons.gif"))
#
diff --git a/spec/models/attribute_field_spec.rb b/spec/models/attribute_field_spec.rb
new file mode 100644
index 000000000..6fb01ba8b
--- /dev/null
+++ b/spec/models/attribute_field_spec.rb
@@ -0,0 +1,12 @@
+require 'spec_helper'
+describe AttributeField do
+ describe "#list field" do
+ context "when field is in type text_field(without add more)" do
+ before(:each) do
+ @attribute_field = AttributeField.new(:key=>'test',:markup=>"text_field")
+
+
+ end
+ end
+ end
+end
\ No newline at end of file
diff --git a/spec/models/attribute_value_spec.rb b/spec/models/attribute_value_spec.rb
new file mode 100644
index 000000000..9488121ef
--- /dev/null
+++ b/spec/models/attribute_value_spec.rb
@@ -0,0 +1,63 @@
+#encoding: UTF-8
+require 'spec_helper'
+
+describe AttributeValue do
+ describe "#attribute_value" do
+ context "Data should be able to input and out put as aspect"
+
+ before(:each) do
+ @af = AttributeField.find '5052cf9f2b5c49a742000005'
+ @user = User.where(email:'chris@rulingcom.com').first
+ @av = AttributeValue.last
+ end #end before
+
+
+ [true,false].each do |locale_sat|
+ LIST[:markups].each do |markup|
+ @av = nil
+ it "[#{markup[0]}]Input: should save data at right way when local is set to #{locale_sat}" do
+ @af.markup = markup[0]
+ @av = nil
+ @input_value = assume_result = case markup[0]
+ when 'text_field','text_area'
+ (locale_sat ? {"en"=> "lalala","zh_tw"=>"拉拉拉"} : "hahaha")
+ when 'select','radio_button'
+ "1"
+ when 'date'
+ {"(1i)"=>Date.today.year.to_s,"(2i)"=>Date.today.month.to_s,"(3i)"=>Date.today.day.to_s}
+ when 'checkbox'
+ {"1"=>"true", "3"=>"true"}
+ end #end of case
+ assume_result = ["1","3"] if markup[0] == 'checkbox'
+ @af.locale = locale_sat
+ @af.save
+ @data_hash = {"attribute_field_id" => @af.id,"value" => @input_value}
+ @av = @user.attribute_values.build(@data_hash)
+ @av.save
+ @av.value.should == assume_result
+ # @av.destroy
+ end
+
+ it "[#{markup[0]}]Output(just for show): should output data at right way when local is set to #{locale_sat}" do
+ locale = I18n.locale
+ assume_result = case markup[0]
+ when 'text_area'
+ (locale_sat ? "拉拉拉" : "hahaha")
+ when 'text_field'
+ (locale_sat ? "拉拉拉" : "hahaha")
+ when 'select','radio_button'
+ (locale_sat ? "男性" : "男性")
+ when 'date'
+ Date.today
+ when 'checkbox'
+ (locale_sat ? "男性,不公開" : "男性,不公開")
+ end #end of case
+
+ @av.get_value_by_locale(locale).should == assume_result
+ end
+
+ end #end of LIST loop
+ end
+
+ end
+end
\ No newline at end of file
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 64eb8f8ae..d023a0fa7 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
@@ -27,6 +27,13 @@ Date.prototype.getWeek = function (dowOffset) {
return weeknum;
};
+Date.prototype.daysInMonth = function(){
+ var daysArray = [31,28,31,30,31,30,31,31,30,31,30,31];
+ if(this.getFullYear()%4 == 0)
+ daysArray[1] = 29;
+
+ return daysArray[this.getMonth()];
+}
var calendarAPI = function(){
c = this;
@@ -36,17 +43,20 @@ var calendarAPI = function(){
this.cur_month = c.today.getMonth()+1;
this.cur_year = c.today.getFullYear();
this.cur_week = c.today.getWeek();
+ this.cur_date = c.today.getDate();
this.view = null;
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);
bindHandlers();
})
var bindHandlers = function(){
- $(".event").live("click",function(){
- c.displayEvent($(this));
+ $(".event").live("click",function(e){
+ var pos = {"x":e.clientX,"y":e.clientY};
+ c.displayEvent($(this),pos);
})
$("#create_event_btn").click(function(){
@@ -73,7 +83,7 @@ var calendarAPI = function(){
c.loadWeekView(c.cur_week,c.cur_year);
break;
case 'day':
- c.loadDayView();
+ c.loadDayView(c.cur_date,c.cur_month,c.cur_year);
break;
case 'agenda':
c.loadAgendaView();
@@ -104,6 +114,22 @@ var calendarAPI = function(){
}
c.loadWeekView(w,y);
break;
+ case "day":
+ var d,w,y;
+ d = c.cur_date - 1;
+ m = c.cur_month;
+ y = c.cur_year;
+ if(d == 0){
+ var dx = new Date(c.cur_year,c.cur_month-2);
+ d = dx.daysInMonth();
+ m--;
+ }
+ if(m == 0){
+ m = 12;
+ y = y - 1;
+ }
+ c.loadDayView(d,m,y);
+ break;
}
})
@@ -132,10 +158,40 @@ var calendarAPI = function(){
}
c.loadWeekView(w,y);
break;
+ case "day":
+ var d,w,y;
+ var dx = new Date(c.cur_year,c.cur_month-1);
+ if(c.cur_date == dx.daysInMonth()){
+ d = 1;
+ m = c.cur_month + 1;
+ }else{
+ d = c.cur_date + 1;
+ m = c.cur_month;
+ }
+
+ if(m == 13){
+ m = 1;
+ y = c.cur_year + 1;
+ }else{
+ y = c.cur_year;
+ }
+
+ c.loadDayView(d,m,y);
+ break;
}
})
$("button#today_btn").click(function(){
- c.loadMonthView();
+ switch (c.view){
+ case "week":
+ c.loadWeekView();
+ break;
+ case "month":
+ c.loadMonthView();
+ break;
+ case "day":
+ c.loadDayView();
+ break;
+ }
})
}
}
@@ -156,7 +212,7 @@ var calendarAPI = function(){
if($('#calendar_month').length > 0){
var $c_table = $('#calendar_month');
var sum_h = 0;
- var context_h = $('#main-sidebar').outerHeight();
+ var context_h = $(window).height() - $('#orbit-bar').height();
$('#main-wrap > *').not('#orbit_calendar, .modal').each(function(){
sum_h += $(this).outerHeight();
});
@@ -215,6 +271,8 @@ var calendarAPI = function(){
var recordcurdate = true;
if(allow){
+ if(evnt.title=="Navratri")
+ console.log(pos);
if(pos == 1){
var colspan = 0;
if(evnt.total_days>7){
@@ -231,13 +289,13 @@ var calendarAPI = function(){
$eventrow.html('');
+ $eventrow.append(' ');
+ $eventrow.append(' ');
+ if(precountspan != 0){
+ tr.append('');
+ $("table.all_day_event_holder").append(tr);
+ }
+
+ })
+ if(tr.html()!=""){
+ if(rowcount != 7){
+ tr.append("
+
+
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 b7726e4c5..57bb1bf9d 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
@@ -45,4 +45,223 @@
-
\ No newline at end of file
+'+evnt.title+'
- '+evnt.title+'
- '+evnt.title+'
- '+displaystarttime+' - '+displayendtime+'
- '+evnt.title+'
'+evnt.title+'
')
+ }else{
+ var starttime,endtime,displaystarttime,displayendtime;
+ if(evnt.start_am_pm == "AM"){
+ starttime = evnt.start_time;
+ if(starttime == 12)
+ starttime = 0;
+ if(starttime == 12.5)
+ starttime = 0.5;
+ }else
+ starttime = evnt.start_time + 12;
+
+ if(evnt.end_am_pm == "AM"){
+ endtime = evnt.end_time;
+ if(endtime == 12)
+ endtime = 0;
+ if(endtime == 12.5)
+ endtime = 0.5;
+ }else
+ endtime = evnt.end_time + 12;
+
+ var temp = parseInt(evnt.start_time);
+
+ if (evnt.start_time > temp)
+ displaystarttime = temp + ":30 " + evnt.start_am_pm;
+ else
+ displaystarttime = temp + ":00 " + evnt.start_am_pm;
+
+ temp = parseInt(evnt.end_time);
+
+ if (evnt.end_time > temp)
+ displayendtime = temp + ":30 " + evnt.end_am_pm;
+ else
+ displayendtime = temp + ":00 " + evnt.end_am_pm;
+
+ var toppx = ((starttime * 2) * 20) + 1;
+ var h = endtime - starttime;
+ var halfhour = "";
+ if(h == 0.5)
+ halfhour = "half";
+ h = 17 + 20 + (((h-1) * 2) * 20) + 1;
+ var eventdom = $('- '+displaystarttime+' - '+displayendtime+'
- '+evnt.title+'