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

Merge branch 'master' into desktop_harry

Browse Source
This commit is contained in:
Christophe Vilayphiou committed 2012-04-13 16:03:43 +08:00
2 parents 8167172ca9 ca0fc4c767
commit 957d4eaebb
3 files changed
+25 -25
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/views/admin/ad_banners/_ad_image_update.html.erb
+1 -1
View File
@@ -1,5 +1,5 @@
<li class="span3" id = 'asd'>
<%= image_tag ad_image.file %>
<%= image_tag ad_image.file rescue nil %>
<p>
<%= ad_image.display? ? '[Showing]' : '[NotShawing]' %>
<%= "#{ad_image.post_date ||'NeedReset' }~#{ad_image.unpost_date || 'NeedReset'}" %>
app/views/admin/ad_images/_form.html.erb
+3 -3
View File
@@ -32,10 +32,10 @@
today = today.format('isoDate');
var state = false;
var arr = state ? "▼" : "▲"
var start_date = <%= "'#{@ad_image.post_date.strftime('%Y / %m / %d')}'"%> || today
var end_date = <%= "'#{@ad_image.unpost_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.nil?? 'today' : "'#{@ad_image.unpost_date.strftime('%Y / %m / %d')}'" %>;
//calendarRange
$('#calendarRange .showDate').html(start_date+" - "+end_date)
$('#calendarRange .showDate').html(start_date+" - "+end_date);
$('#calendarRange .calendarInput').val(start_date+" - "+end_date);
$('#calendarRange #widgetCalendar').DatePicker({
flat: true,