saurabh/orbit-basic
4
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added multi-phone numbers in mobile setting page and fixed language setting

Browse Source
This commit is contained in:
Manson Wang committed 2013-12-12 16:07:27 +08:00
1 parent 4c85d62866
commit afb5afeceb
7 files changed
+69 -23
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/views/admin/sites/preference.html.erb
+21 -9
View File
@@ -239,7 +239,7 @@
</div>
<!-- Form Actions -->
<div class="form-actions">
<div class="form-actions" style="background: none;">
<%= f.submit t("submit"), :class => "btn btn-primary" %>
<%= f.submit t("cancel"), :class => "btn ", :type => 'reset' %>
</div>
@@ -254,20 +254,32 @@
$(".language-nav li a").click(function(){window.location.hash = $(this).attr("href")});
$(document).ready(function(){
// Disable default language if language detection enbaled
$("#site_enable_language_detection").change(function(){
var language_detection = $("#site_enable_language_detection");
var default_locale = $( "input[name='site[default_locale]']" );
$(language_detection).click(function(){
if ( !$(this).parent().hasClass("disable") ){
$.each($( "input[name='site[default_locale]']" ),function(){
if ( !$(this).parent().hasClass("disable") ) $(this).parent().toggleClass('disable');
$(this).toggleClass('disable');
// Disable default language if language detection enbaled
$.each($(default_locale),function(){
if ( !$(this).parent().hasClass("disable") ){
$(this).parent().toggleClass('disable');
$(this).toggleClass('disable');
}
$(language_detection).val(1);
});
}else{
// Enable a default language when language detection is disabled
$(default_locale).first().click();
}
});
// Disable language detection if default language enbaled
$.each($( "input[name='site[default_locale]']" ),function(){
$(this).click(function(){
$("#site_enable_language_detection").parent().addClass('disable');
$.each($(default_locale),function(){
$(this).change(function(){
if(!$(language_detection).parent().hasClass("disable")) {
$(language_detection).parent().toggleClass('disable');
$(language_detection).val(0);
}
});
});
});
app/views/admin/sites/responsive_setting.html.erb
+30 -6
View File
@@ -79,14 +79,21 @@
<div class="control-group">
<label class="control-label muted">Phone Number</label>
<div class="controls">
<div class="textarea">
<%= f.fields_for :phone_number do |p| %>
<%= p.text_field :title, :value => @site.phone_number["title"], :placeholder => "title" %>
<%= p.text_field :number, :value => @site.phone_number["number"], :placeholder => "number" %>
<div id="phone_number_wrap" style="line-height: 40px;">
<% @site.phone_number.each_with_index do |phone,i| %>
<span>
<input type="text" name="site[phone_number][<%= i %>][title]" value="<%= phone['title'] %>">
<input type="text" name="site[phone_number][<%= i %>][number]" value="<%= phone['number'] %>">
<a class="btn btn-small btn-danger delete_phone_number" href="#" onclick="$(this).parent().remove();"><i class="icon-trash"></i> <%= t(:delete) %></a>
</span>
<% end %>
</div>
<div class='btn btn-small btn-success' id='add_phone_number_btn'>
<i class="icon-plus"></i>
<%= t(:add) %>
</div>
</div>
</div>
</div>
<div class="control-group">
<label class="control-label muted">Address</label>
@@ -115,6 +122,14 @@
</fieldset>
<%end%>
<div id="phone_number_template" style="display:none">
<span style='line-height: 40px; display: block;'>
<input id="site_phone_number_title" name="site[phone_number][][title]" placeholder="<%= t(:name) %>" size="30" type="text" value="">
<input id="site_phone_number_number" name="site[phone_number][][number]" placeholder="<%= t(:phone_number) %>" size="30" type="text" value="">
<a class="btn btn-small btn-danger delete_phone_number" href="#" onclick="$(this).parent().remove();"><i class="icon-trash"></i> <%= t(:delete) %></a>
</span>
</script>
<% content_for :page_specific_javascript do %>
<script type="text/javascript">
@@ -151,8 +166,17 @@
colorboxes.removeAttr('disabled');
}
})
});
// Number of phones
var num = $("#phone_number_wrap input").length/2;
$('#add_phone_number_btn').click(function(){
var template = $("#phone_number_template").html();
template = template.replace(/\[]/g,"["+num+"]");
$("#phone_number_wrap").append(template);
num++;
});
});
</script>
<% end %>