From f4b483976ca44ed8a5e46ec3e2324591d6e8c08a Mon Sep 17 00:00:00 2001 From: Xavier J Date: Mon, 28 Nov 2016 10:15:11 +0100 Subject: [PATCH] Add default navbar and left panel --- app/views/layouts/_navbar.html.haml | 5 ++++- app/views/layouts/application.html.haml | 5 ++++- app/views/layouts/left_panels/_left_panel_default.html.haml | 2 ++ ...left_panel_gestionnaires_sessionscontroller_new.html.haml | 0 app/views/layouts/navbars/_navbar_default.html.haml | 2 ++ .../_navbar_gestionnaires_sessionscontroller_new.html.haml | 0 6 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 app/views/layouts/left_panels/_left_panel_default.html.haml delete mode 100644 app/views/layouts/left_panels/_left_panel_gestionnaires_sessionscontroller_new.html.haml create mode 100644 app/views/layouts/navbars/_navbar_default.html.haml delete mode 100644 app/views/layouts/navbars/_navbar_gestionnaires_sessionscontroller_new.html.haml diff --git a/app/views/layouts/_navbar.html.haml b/app/views/layouts/_navbar.html.haml index 77d23d19a..3c631cdb7 100644 --- a/app/views/layouts/_navbar.html.haml +++ b/app/views/layouts/_navbar.html.haml @@ -15,7 +15,10 @@ %div.col-lg-10.col-md-10.no-padding %div#navbar-body %div.row - = render partial: @navbar_url + -begin + = render partial: @navbar_url + -rescue + = render partial: 'layouts/navbars/navbar_default' %div.col-lg-1.col-md-1.log-options %span.fa.fa-sign-out diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index ce5bd021e..0c686ed23 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -26,7 +26,10 @@ = render partial: "layouts/navbar" %div.row.no-margin %div.col-lg-2.col-md-2#left-pannel - = render partial: @left_pannel_url + - begin + = render partial: @left_pannel_url + -rescue + = render partial: 'layouts/left_panels/left_panel_default' %div.col-lg-10.col-md-10#main-container %div.row = render partial: 'layouts/flash_messages' diff --git a/app/views/layouts/left_panels/_left_panel_default.html.haml b/app/views/layouts/left_panels/_left_panel_default.html.haml new file mode 100644 index 000000000..a8cd3d0b8 --- /dev/null +++ b/app/views/layouts/left_panels/_left_panel_default.html.haml @@ -0,0 +1,2 @@ +%div + Default Left Panel \ No newline at end of file diff --git a/app/views/layouts/left_panels/_left_panel_gestionnaires_sessionscontroller_new.html.haml b/app/views/layouts/left_panels/_left_panel_gestionnaires_sessionscontroller_new.html.haml deleted file mode 100644 index e69de29bb..000000000 diff --git a/app/views/layouts/navbars/_navbar_default.html.haml b/app/views/layouts/navbars/_navbar_default.html.haml new file mode 100644 index 000000000..fb6ec30cc --- /dev/null +++ b/app/views/layouts/navbars/_navbar_default.html.haml @@ -0,0 +1,2 @@ +.col-lg-10.col-md-10 + Default navbar \ No newline at end of file diff --git a/app/views/layouts/navbars/_navbar_gestionnaires_sessionscontroller_new.html.haml b/app/views/layouts/navbars/_navbar_gestionnaires_sessionscontroller_new.html.haml deleted file mode 100644 index e69de29bb..000000000