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

Merge branches 'nccu_0509' and 'design_team' into ldap

Browse Source
This commit is contained in:
Christophe Vilayphiou committed 2012-05-09 14:21:24 +08:00
2 parents d88d4e58dc ec8afc1341
commit 9d01f624da
2 files changed
+3 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/views/admin/ad_banners/index.html.erb
+2 -2
View File
@@ -12,13 +12,13 @@
<% @ad_banners.each do |ab| %>
<%= content_tag :li,link_to(ab.title,"##{ab.title.dehumanize}",:data=>{:toggle=>"tab"}),:class => (ab == @active ? 'active' : nil ) %>
<% 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 ) %>
<%#= 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 ) %>
</ul>
<div class="tab-content">
<%= render :partial => 'ad_banner_tab',:collection => @ad_banners %>
</div>
<%= render :partial => "modal_ad_banner_form"%>
<%#= render :partial => "modal_ad_banner_form"%>
</div>