diff --git a/app/views/layouts/_foot.html.erb b/app/views/layouts/_foot.html.erb index f76170d7..fd35e765 100644 --- a/app/views/layouts/_foot.html.erb +++ b/app/views/layouts/_foot.html.erb @@ -1,3 +1,18 @@ +
+ <%= render :partial => 'layouts/lightboxes' %> <%= render :partial => 'layouts/templates' %> <%= render :partial => 'shared/metacodeBgColors' %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 13fde7ba..4a4fc673 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -21,19 +21,4 @@ <%= render :partial => 'shared/metacodeoptions' %> <% end %> -
- <%= render :partial => 'layouts/foot' %> diff --git a/app/views/layouts/doorkeeper.html.erb b/app/views/layouts/doorkeeper.html.erb index f4696a37..b9ff5bef 100644 --- a/app/views/layouts/doorkeeper.html.erb +++ b/app/views/layouts/doorkeeper.html.erb @@ -6,55 +6,26 @@ #%> <%= render :partial => 'layouts/head' %> - - - - - <%= content_tag :div, class: "main" do %> - - <% if params[:controller] == 'doorkeeper/applications' || params[:controller] == 'doorkeeper/authorized_applications' - classes = 'appsPage' - else - classes = '' - end - %> - -
- - <%= render :partial => 'layouts/upperelements', :locals => {:noHardHomeLink => true } %> - - <%= yield %> - -
-
-
-
- <% if current_user && current_user.admin %> - -
Registered Apps - - <% end %> - -
Authorized Apps - - -
Maps - -
-
-
-
-

- <% if devise_error_messages? %> - <%= devise_error_messages! %> - <% elsif notice %> - <%= notice %> - <% end %> -

-
-
- - <% end %> - +
+ <%= yield %> +
+
+
+
+ <% if current_user && current_user.admin %> + +
Registered Apps + + <% end %> + +
Authorized Apps + + +
Maps + +
+
+
+
<%= render :partial => 'layouts/foot' %> diff --git a/frontend/src/Metamaps/GlobalUI/ReactApp.js b/frontend/src/Metamaps/GlobalUI/ReactApp.js index 0cd9e4ba..f007bf47 100644 --- a/frontend/src/Metamaps/GlobalUI/ReactApp.js +++ b/frontend/src/Metamaps/GlobalUI/ReactApp.js @@ -122,7 +122,7 @@ const ReactApp = { toggleMapInfoBox: InfoBox.toggleBox, infoBoxHtml: InfoBox.html, toggleFilterBox: Filter.toggleBox, - filterBoxHtml: $('.filterBox')[0].outerHTML, + filterBoxHtml: $('.filterBox')[0] && $('.filterBox')[0].outerHTML, openImportLightbox: () => ImportDialog.show(), forkMap: Map.fork, openHelpLightbox: () => self.openLightbox('cheatsheet'), diff --git a/frontend/src/components/makeRoutes.js b/frontend/src/components/makeRoutes.js index 5447e79e..45f8b746 100644 --- a/frontend/src/components/makeRoutes.js +++ b/frontend/src/components/makeRoutes.js @@ -34,7 +34,11 @@ export default function makeRoutes (currentUser) { - + + + + + @@ -45,5 +49,22 @@ export default function makeRoutes (currentUser) { + + + + + + + + + + + + + + + + + }