developers
/
orbit-basic
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner

This commit is contained in:
Christophe Vilayphiou 2012-04-13 15:27:10 +08:00
parent 5f16059301 d646a9dff1
commit d1feb102d0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/admin/ad_images/_form.html.erb
View File

@ -32,10 +32,10 @@
today = today.format('isoDate'); today = today.format('isoDate');
var state = false; var state = false;
var arr = state ? "▼" : "▲" var arr = state ? "▼" : "▲"
var start_date = <%= "'#{@ad_image.post_date.strftime('%Y / %m / %d')}'"%> || today var start_date = <%= @ad_image.post_date.nil?? 'today' : "'#{@ad_image.post_date.strftime('%Y / %m / %d')}'" %>;
var end_date = <%= "'#{@ad_image.unpost_date.strftime('%Y / %m / %d')}'"%> || today var end_date = <%= @ad_image.unpost_date.nil?? 'today' : "'#{@ad_image.unpost_date.strftime('%Y / %m / %d')}'" %>;
//calendarRange //calendarRange
$('#calendarRange .showDate').html(start_date+" - "+end_date) $('#calendarRange .showDate').html(start_date+" - "+end_date);
$('#calendarRange .calendarInput').val(start_date+" - "+end_date); $('#calendarRange .calendarInput').val(start_date+" - "+end_date);
$('#calendarRange #widgetCalendar').DatePicker({ $('#calendarRange #widgetCalendar').DatePicker({
flat: true, flat: true,