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

Merge branch 'design_team' into ldap

Browse Source 
Conflicts:
	config/environments/development.rb
This commit is contained in:
Christophe Vilayphiou committed 2012-05-09 13:51:00 +08:00
2 parents 083963af65 f9f7ddc8ee
commit d88d4e58dc
48 files changed
+916 -246
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb
Vendored
+4 -4
View File
@@ -16,9 +16,9 @@
</table>
<% end %>
<div id="web_link_pagination" class="paginationFixed">
<%= paginate @web_links, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
</div>
<div class="form-actions form-fixed pagination-right">
<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_web_resource_back_end_web_link_path, :class => 'btn btn-primary' %>
<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_web_resource_back_end_web_link_path, :class => 'btn btn-primary pull-right' %>
<div id="web_link_pagination" class="paginationFixed">
<%= paginate @web_links, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
</div>
</div>