developers/Orbit
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed the frontend loading to more rails specific. and also fixed the filter reload in thumbnali and summary view of members

Browse Source 
Conflicts:
	vendor/built_in_modules/gallery/app/assets/javascripts/galleryAPI_frontend.js.erb
	vendor/built_in_modules/gallery/app/controllers/panel/gallery/front_end/albums_controller.rb
	vendor/built_in_modules/gallery/app/views/panel/gallery/front_end/albums/index.html.erb
	vendor/built_in_modules/gallery/app/views/panel/gallery/front_end/albums/show.html.erb
This commit is contained in:
harrybomrah authored and Manson Wang committed 2013-11-14 10:20:02 +08:00
1 parent 3f2c729528
commit 9ea8b536b5
8 files changed
+33 -184
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/views/admin/users_new_interface/index_summary.html.erb
+2 -2
View File
@@ -25,12 +25,12 @@
<ul class="nav nav-pills filter-nav pull-right">
<li class="accordion-group">
<div class="accordion-heading">
<a href="#collapse-status" data-toggle="collapse" data-parent="#filter" class="accordion-toggle">Roles</a>
<a href="#collapse-role" data-toggle="collapse" data-parent="#filter" class="accordion-toggle">Roles</a>
</div>
</li>
</ul>
<div class="filter-group accordion-group">
<div class="accordion-body collapse" id="collapse-status">
<div class="accordion-body collapse" id="collapse-role">
<%= render :partial => "filter"%>
app/views/admin/users_new_interface/index_thumbnail.html.erb
+2 -2
View File
@@ -25,12 +25,12 @@
<ul class="nav nav-pills filter-nav pull-right">
<li class="accordion-group">
<div class="accordion-heading">
<a href="#collapse-status" data-toggle="collapse" data-parent="#filter" class="accordion-toggle">Roles</a>
<a href="#collapse-role" data-toggle="collapse" data-parent="#filter" class="accordion-toggle">Roles</a>
</div>
</li>
</ul>
<div class="filter-group accordion-group">
<div class="accordion-body collapse" id="collapse-status">
<div class="accordion-body collapse" id="collapse-role">
<%= render :partial => "filter"%>