Merge pull request #272 from jmmastey/idiomatic-use-of-layouts
change to idiomatic use of layouts versus regular views
This commit is contained in:
@@ -17,19 +17,18 @@ class AdminController < ApplicationController
|
||||
else
|
||||
@analytics = Analytics.all
|
||||
end
|
||||
render "layouts/admin/_analytics"
|
||||
end
|
||||
|
||||
def get_all_users
|
||||
@users = User.all
|
||||
render :partial => "layouts/admin/get_all_users"
|
||||
render layout: false
|
||||
end
|
||||
|
||||
def get_user
|
||||
@user = User.find_by_id(params[:admin_id].to_s)
|
||||
arr = ["true", "false"]
|
||||
@admin_select = @user.admin ? arr : arr.reverse
|
||||
render :partial => "layouts/admin/get_user"
|
||||
render layout: false
|
||||
end
|
||||
|
||||
def update_user
|
||||
|
||||
@@ -15,12 +15,12 @@ class DashboardController < ApplicationController
|
||||
end
|
||||
|
||||
def bar_graph
|
||||
render :partial => "layouts/dashboard/bar_graph"
|
||||
render :bar_graph, layout: false
|
||||
end
|
||||
|
||||
def pie_charts
|
||||
@user = current_user
|
||||
render :partial => "layouts/dashboard/dashboard_stats"
|
||||
render :dashboard_stats, layout: false
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
@@ -3,7 +3,7 @@ class TutorialsController < ApplicationController
|
||||
skip_before_action :authenticated
|
||||
|
||||
def credentials
|
||||
render :partial => "layouts/tutorial/credentials/creds"
|
||||
render layout: false
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
<!-- End Title Buttons-->
|
||||
</div>
|
||||
<div id="charts_body" class="widget-body">
|
||||
<%#= render :partial => "layouts/dashboard/dashboard_stats"%>
|
||||
<%#= render partial: "dashboard_stats" %>
|
||||
</div>
|
||||
<div class="clearfix">
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user