diff --git a/Gemfile.lock b/Gemfile.lock
index cd9920498..beb6db383 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -58,7 +58,7 @@ GEM
ruby2ruby (~> 1.2)
ruport (~> 1.6)
sass (~> 3.0)
- bson (1.6.1)
+ bson (1.6.4)
bson_ext (1.6.1)
bson (~> 1.6.1)
builder (3.0.0)
@@ -130,18 +130,18 @@ GEM
mime-types (1.17.2)
mini_magick (3.4)
subexec (~> 0.2.1)
- mongo (1.6.1)
- bson (~> 1.6.1)
+ mongo (1.6.2)
+ bson (~> 1.6.2)
mongo_session_store-rails3 (3.0.5)
actionpack (>= 3.0)
mongo
- mongoid (2.4.6)
+ mongoid (2.4.12)
activemodel (~> 3.1)
- mongo (~> 1.3)
+ mongo (<= 1.6.2)
tzinfo (~> 0.3.22)
mongoid-tree (0.7.0)
mongoid (~> 2.0)
- multi_json (1.1.0)
+ multi_json (1.3.6)
mysql2 (0.3.11)
mysql2 (0.3.11-x86-mingw32)
net-ldap (0.3.1)
@@ -301,7 +301,7 @@ GEM
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.32)
+ tzinfo (0.3.33)
uglifier (1.2.3)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
diff --git a/app/assets/javascripts/ajax_form.js.erb b/app/assets/javascripts/ajax_form.js.erb
index 917c352df..d56024b3d 100644
--- a/app/assets/javascripts/ajax_form.js.erb
+++ b/app/assets/javascripts/ajax_form.js.erb
@@ -1,5 +1,5 @@
<%#= encoding: utf-8 %>
-$(document).on('click', '#ajax_form_submit', function(){
+// $(document).on('click', '#ajax_form_submit', function(){
// $('#ajaxForm').ajaxSubmit({
// beforeSubmit: function(a,f,o) {
// o.dataType = 'script';
@@ -20,92 +20,102 @@ $(document).on('click', '#ajax_form_submit', function(){
// });
- var o = {
- // dataType: 'script',
- dataType: 'html',
- url:$("#ajaxForm").attr("action"),
- beforeSubmit: function(){
- var sub = true;
- $("span.error").remove();
- $("#dyn_error").empty();
- $("#ajaxForm input").each(function(){
- if($(this).val() == ""){
- $(" *").insertAfter($(this));
- sub = false;
- }
- })
- if(!sub){
- $("#dyn_error").text("Cannot be empty.");
- $("#dyn_error").text("<%= I18n.t('cant_empty_star') %>");
- return false;
- }
- },
- success: function(response,status,xhr){
- if(typeof tinyMCEPopup != "undefined"){
- var x = response.split("#");
- var returnurl = x[0],
- returntitle = x[1],
- returndescription = x[2];
- var win = tinyMCEPopup.getWindowArg("window");
- win.document.getElementById(tinyMCEPopup.getWindowArg("input")).value = returnurl;
- win.document.getElementById(tinyMCEPopup.getWindowArg("alt")).value = returndescription;
- win.document.getElementById(tinyMCEPopup.getWindowArg("title")).value = returntitle;
- if (typeof(win.ImageDialog) != "undefined") {
- // we are, so update image dimensions...
- if (win.ImageDialog.getImageData)
- win.ImageDialog.getImageData();
+// var o = {
+// // dataType: 'script',
+// dataType: 'html',
+// url:$("#ajaxForm").attr("action"),
+// beforeSubmit: function(){
+// var sub = true;
+// $("span.error").remove();
+// $("#dyn_error").empty();
+// $("#ajaxForm input").each(function(){
+// if($(this).val() == ""){
+// $(" *").insertAfter($(this));
+// sub = false;
+// }
+// })
+// if(!sub){
+// $("#dyn_error").text("Cannot be empty.");
+// $("#dyn_error").text("<%= I18n.t('cant_empty_star') %>");
+// return false;
+// }
+// },
+// success: function(response,status,xhr){
+// if(typeof tinyMCEPopup != "undefined"){
+// var x = response.split("#");
+// var returnurl = x[0],
+// returntitle = x[1],
+// returndescription = x[2];
+// var win = tinyMCEPopup.getWindowArg("window");
+// win.document.getElementById(tinyMCEPopup.getWindowArg("input")).value = returnurl;
+// win.document.getElementById(tinyMCEPopup.getWindowArg("alt")).value = returndescription;
+// win.document.getElementById(tinyMCEPopup.getWindowArg("title")).value = returntitle;
+// if (typeof(win.ImageDialog) != "undefined") {
+// // we are, so update image dimensions...
+// if (win.ImageDialog.getImageData)
+// win.ImageDialog.getImageData();
- // ... and preview if necessary
- if (win.ImageDialog.showPreviewImage)
- win.ImageDialog.showPreviewImage(returnurl);
- }
- tinyMCEPopup.close();
- }else{
- //incase if we want to do something for quick edit file upload
- // var modalvalues = "";
- // var r = "";
- // if(rcom.getInternetExplorerVersion() > -1){
- // r = "| " + response + " |
";
- // r = r.replace("**","");
- // r = r.replace("**"," | ");
- // r = $(r);
- // modalvalues = r.find("span").attr("data-content").split("#");
- // r.attr("id",r.find("span").attr("for"));
- // var table=document.getElementById(modalvalues[0]);
- // //var tbody = table.getElementsByTagName("tbody");
- // var row = table.insertRow(table.rows.length-1);
- // var c1 = row.insertCell(0),
- // c2 = row.insertCell(1),
- // c3 = row.insertCell(2);
- // c1.innerHTML = r.find("td").eq(0).html();
- // c2.innerHTML = r.find("td").eq(1).html();
- // c3.innerHTML = r.find("td").eq(2).html();
- // var trow = $("#bulletin_files tfoot").find("tr").eq(0);
- // $("#bulletin_files tbody").append(trow);
- // }else{
+// // ... and preview if necessary
+// if (win.ImageDialog.showPreviewImage)
+// win.ImageDialog.showPreviewImage(returnurl);
+// }
+// tinyMCEPopup.close();
+// }else{
+// //incase if we want to do something for quick edit file upload
+// // var modalvalues = "";
+// // var r = "";
+// // if(rcom.getInternetExplorerVersion() > -1){
+// // r = " | | " + response + " |
";
+// // r = r.replace("**","");
+// // r = r.replace("**"," | ");
+// // r = $(r);
+// // modalvalues = r.find("span").attr("data-content").split("#");
+// // r.attr("id",r.find("span").attr("for"));
+// // var table=document.getElementById(modalvalues[0]);
+// // //var tbody = table.getElementsByTagName("tbody");
+// // var row = table.insertRow(table.rows.length-1);
+// // var c1 = row.insertCell(0),
+// // c2 = row.insertCell(1),
+// // c3 = row.insertCell(2);
+// // c1.innerHTML = r.find("td").eq(0).html();
+// // c2.innerHTML = r.find("td").eq(1).html();
+// // c3.innerHTML = r.find("td").eq(2).html();
+// // var trow = $("#bulletin_files tfoot").find("tr").eq(0);
+// // $("#bulletin_files tbody").append(trow);
+// // }else{
- // response = response.replace("**","");
- // response = response.replace("**","");
- // r = $(response);
- // modalvalues = r.find("span").attr("data-content").split("#");
- // $('#' + modalvalues[0]+ ' tbody').append(r);
- // }
- // console.log(modalvalues[1]);
- // $("#"+modalvalues[1]).modal('hide');
- //$('#bulletin_files tbody').append(r);
- //$(response).fadeIn();
- }
- },
- error:function(){
- alert("error");
- }
- }
+// // response = response.replace("**","");
+// // response = response.replace("**","");
+// // r = $(response);
+// // modalvalues = r.find("span").attr("data-content").split("#");
+// // $('#' + modalvalues[0]+ ' tbody').append(r);
+// // }
+// // console.log(modalvalues[1]);
+// // $("#"+modalvalues[1]).modal('hide');
+// //$('#bulletin_files tbody').append(r);
+// //$(response).fadeIn();
+// }
+// },
+// error:function(){
+// alert("error");
+// }
+// }
- if (o.dataType == 'script') {
- o.url = o.url.split('?'); // split on GET params
- if (o.url[0].substr(-3) != '.js') o.url[0] += '.js'; // force rails to respond to respond to the request with :format = js
- o.url = o.url.join('?'); // join on GET params
- }
- $('#ajaxForm').ajaxSubmit(o);
+// if (o.dataType == 'script') {
+// o.url = o.url.split('?'); // split on GET params
+// if (o.url[0].substr(-3) != '.js') o.url[0] += '.js'; // force rails to respond to respond to the request with :format = js
+// o.url = o.url.join('?'); // join on GET params
+// }
+// $('#ajaxForm').ajaxSubmit(o);
-});
\ No newline at end of file
+// });
+
+$('#ajaxForm').ajaxForm({
+ beforeSubmit: function(a,f,o) {
+ o.dataType = 'script';
+
+ },
+ success: function(data) {
+
+ }
+ });
\ No newline at end of file
diff --git a/app/assets/javascripts/bulletin_form.js.erb b/app/assets/javascripts/bulletin_form.js.erb
index 18e8e375b..902f815d6 100644
--- a/app/assets/javascripts/bulletin_form.js.erb
+++ b/app/assets/javascripts/bulletin_form.js.erb
@@ -10,7 +10,7 @@ $('.bulletin_files_block a.delete').live('click', function(){
});
$(document).on('click', '.action a.remove_existing_record', function(){
- if(confirm("<%= I18n.t('announcement.sure?')%>")){
+ if(confirm("<%= I18n.t(:sure?)%>")){
$(this).next('.should_destroy').attr('value', 1);
$("tr#" + $(this).prev().attr('value')).hide();
}
diff --git a/app/assets/javascripts/inc/ajax_setting.js b/app/assets/javascripts/inc/ajax_setting.js
index c23a73bfd..d2f183f06 100644
--- a/app/assets/javascripts/inc/ajax_setting.js
+++ b/app/assets/javascripts/inc/ajax_setting.js
@@ -1,7 +1,7 @@
-jQuery(document).ajaxStart(function(){
- $(' "
ret << (link_to node.title, dest, :class => 'js_history')
ret << " "
- ret << (link_to t('admin.edit'), eval("edit_admin_#{node.class.to_s.downcase}_path(node)"), :class => 'js_history') if node.class.to_s.eql?('Page')
- ret << (link_to t('admin.new_page'), new_admin_page_path(:parent_id => node.id), :class => 'new_page js_history') if node.class.to_s.eql?('Page')
- ret << (link_to t('admin.new_link'), new_admin_link_path(:parent_id => node.id), :class => 'new_link js_history') if node.class.to_s.eql?('Page')
+ ret << (link_to t(:edit), eval("edit_admin_#{node.class.to_s.downcase}_path(node)"), :class => 'js_history') if node.class.to_s.eql?('Page')
+ ret << (link_to t('new.page'), new_admin_page_path(:parent_id => node.id), :class => 'new_page js_history') if node.class.to_s.eql?('Page')
+ ret << (link_to t('new.link'), new_admin_link_path(:parent_id => node.id), :class => 'new_link js_history') if node.class.to_s.eql?('Page')
ret << (link_to t(:delete), eval("delete_admin_#{node.class.to_s.downcase}_path(node, :authenticity_token => form_authenticity_token)"), :confirm => t('sure?'), :class => 'delete js_history')
ret << " "
ret << "
-
- <%= f.label :ad_fx, t('admin.ad.ab_fx') %>
+
+ <%= f.label :ad_fx, t('ad.ab_fx') %>
<%= f.select :ad_fx ,AdBanner::FX_TYPES %>
- <%= f.label :transition_sec, t('admin.ad.transition_sec') %>
- <%= f.text_field :transition_sec,:placeholder=>t('admin.ad.sec_place_holder'),:class=> "span3" %> <%= t("admin.ad.trans_unit_sec") %>
+ <%= f.label :transition_sec, t('ad.transition_sec') %>
+ <%= f.text_field :transition_sec,:placeholder=>t('ad.sec_place_holder'),:class=> "span3" %> <%= t("ad.trans_unit_sec") %>
<%if at_least_module_manager%>
- <%= f.label :best_size, t('admin.ad.best_size') %>
+ <%= f.label :best_size, t('ad.best_size') %>
<%= f.text_field :best_size %> Ex: 500px x 300px
<% end -%>
- <%= f.submit t("admin.ad.update_banner"), :class => 'btn' %>
+ <%= f.submit t("ad.update_banner"), :class => 'btn' %>
<%= f.submit t("cancel"),:type=>'reset', :class => 'btn' %>
<% end -%>
<% end -%>
- <%= t("admin.ad.picture_list")%>
+ <%= t("ad.picture_list")%>
<%if (at_least_module_manager || ad_banner_tab.cur_user_is_sub_manager_of(:edit) )%>
<%= content_tag :div ,:class=>'adbanner-action' do%>
- <%= link_to t("admin.ad.new_image"),new_admin_ad_banner_ad_image_path(ad_banner_tab) ,:class => "btn btn-primary"%>
+ <%= link_to t("ad.new_image"),new_admin_ad_banner_ad_image_path(ad_banner_tab) ,:class => "btn btn-primary"%>
<%= link_to t("modal.preview"), admin_realtime_preview_ad_banner_path(ad_banner_tab.id) , :class=>'preview_trigger btn btn-success'%>
<% end -%>
<% end -%>
@@ -30,7 +30,7 @@
<% if at_least_module_manager %>
<%= show_ad_banner_permission_link ad_banner_tab%>
- <%= link_to t('admin.ad.delete_banner'),admin_ad_banner_path(ad_banner_tab),:class => 'btn',:method => :delete,:confirm => t('sure?') %>
+ <%= link_to t(:delete),admin_ad_banner_path(ad_banner_tab),:class => 'btn',:method => :delete,:confirm => t('sure?') %>
<% end -%>
<%#= render :partial => 'new_add_banner_file', :object => ad_banner_tab.ad_images.build, :locals => { :field_name => "new_ad_images[]", :f => f, :classes => "r_destroy" } %>
diff --git a/app/views/admin/ad_banners/_ad_image_update.html.erb b/app/views/admin/ad_banners/_ad_image_update.html.erb
index 0b4277a05..15bb75d01 100644
--- a/app/views/admin/ad_banners/_ad_image_update.html.erb
+++ b/app/views/admin/ad_banners/_ad_image_update.html.erb
@@ -1,7 +1,7 @@
<%= image_tag ad_image.file rescue nil%>
- <%= ad_image.display? ? "[#{t('admin.ad.showing')}]" : "[#{t('admin.ad.not_showing')}]" %>
+ <%= ad_image.display? ? "[#{t('ad.showing')}]" : "[#{t('ad.not_showing')}]" %>
<%= "#{ad_image.post_date ||'NeedReset' }~#{ad_image.unpost_date || 'NeedReset'}" %>
<%if at_least_module_manager || sub_manager?(ad_image.ad_banner) %>
diff --git a/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb b/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb
index 68e0a9c60..dc77bc5f4 100644
--- a/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb
+++ b/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb
@@ -4,33 +4,33 @@
- <%= f.label :title,t('admin.ad.title'),:class => "control-label" %>
+ <%= f.label :title, t(:title),:class => "control-label" %>
<%= f.text_field :title %>
- <%= f.label :transition_sec, t('admin.ad.transition_sec'),:class => "control-label" %>
+ <%= f.label :transition_sec, t('ad.transition_sec'),:class => "control-label" %>
- <%= f.text_field :transition_sec %> <%= t("admin.ad.trans_unit_sec") %>
+ <%= f.text_field :transition_sec %> <%= t("ad.trans_unit_sec") %>
- <%= f.label :best_size, t('admin.ad.best_size'),:class => "control-label" %>
+ <%= f.label :best_size, t('ad.best_size'),:class => "control-label" %>
<%= f.text_field :best_size %> Ex: 500px x 300px
- <%= f.label :ad_fx, t('admin.ad.ab_fx') %>
+ <%= f.label :ad_fx, t('ad.ab_fx') %>
<%= f.select :ad_fx ,AdBanner::FX_TYPES %>
diff --git a/app/views/admin/ad_banners/index.html.erb b/app/views/admin/ad_banners/index.html.erb
index 92c78f5bd..9b2550d55 100644
--- a/app/views/admin/ad_banners/index.html.erb
+++ b/app/views/admin/ad_banners/index.html.erb
@@ -22,7 +22,7 @@
<% end -%>
<% end -%>
- <%= content_tag :li,link_to(t("admin.ad.new_banner"),"#new-a-banner",:data=>{:toggle=>"modal"}),:id=>'new_ad_banner_tab_but',:class => (@active.nil? ? 'active' : nil ) if at_least_module_manager%>
+ <%= content_tag :li,link_to(t('new.banner'),"#new-a-banner",:data=>{:toggle=>"modal"}),:id=>'new_ad_banner_tab_but',:class => (@active.nil? ? 'active' : nil ) if at_least_module_manager%>
diff --git a/app/views/admin/ad_images/_form.html.erb b/app/views/admin/ad_images/_form.html.erb
index 49cf1ae76..008421bc9 100644
--- a/app/views/admin/ad_images/_form.html.erb
+++ b/app/views/admin/ad_images/_form.html.erb
@@ -19,7 +19,7 @@
-
+
|