Merge with new_blog

This commit is contained in:
chris2tof committed 2011-10-18 11:36:01 +08:00
1 parent 2e86d8081f
commit 64c68fcdeb
80 files changed
+906 -79

No files matched your search

+2 -2
View File
@@ -3,9 +3,9 @@
<%= t('admin.registered') %>
</div>
<% else %>
<div class="buy_btn">
<div class="buy_btn">
<%= link_to 'register', "http://#{APP_CONFIG['store_ip']}/user/sites/register?" +
{:site => {:school => @site.school, :department => @site.department}}.to_query,
:target => '_blank' %>
</div>
<% end %>
<% end %>