From 5242be2014300bfa20a000048606729e148ebe61 Mon Sep 17 00:00:00 2001
From: emeric <emeric@nas>
Date: Tue, 19 Aug 2014 19:24:57 +0200
Subject: [PATCH] Minor style update

---
 ui/LmsHome.cpp           |  4 ++--
 ui/settings/Settings.cpp | 14 +++++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/ui/LmsHome.cpp b/ui/LmsHome.cpp
index 3af31c7e..2b59e10b 100644
--- a/ui/LmsHome.cpp
+++ b/ui/LmsHome.cpp
@@ -20,9 +20,9 @@ LmsHome::LmsHome(SessionData& sessionData)
 	Wt::WNavigationBar *navigation = new Wt::WNavigationBar(this);
 	navigation->setTitle("LMS");
 	navigation->setResponsive(true);
+	navigation->addStyleClass("main-nav");
 
 	Wt::WStackedWidget *contentsStack = new Wt::WStackedWidget(this);
-	contentsStack->addStyleClass("contents");
 
 	// Setup a Left-aligned menu.
 	Wt::WMenu *leftMenu = new Wt::WMenu(contentsStack, this);
@@ -53,7 +53,7 @@ LmsHome::LmsHome(SessionData& sessionData)
 	_searchEdit = new Wt::WLineEdit();
 	_searchEdit->setEmptyText("Search...");
 
-	_searchEdit->keyWentUp().connect(this, &LmsHome::handleSearch);
+	_searchEdit->enterPressed().connect(this, &LmsHome::handleSearch);
 
 	navigation->addSearch(_searchEdit, Wt::AlignLeft);
 
diff --git a/ui/settings/Settings.cpp b/ui/settings/Settings.cpp
index bf055666..2434643b 100644
--- a/ui/settings/Settings.cpp
+++ b/ui/settings/Settings.cpp
@@ -1,6 +1,7 @@
 #include <Wt/WMenu>
 #include <Wt/WStackedWidget>
 #include <Wt/WTextArea>
+#include <Wt/WHBoxLayout>
 
 #include "SettingsAudioFormView.hpp"
 #include "SettingsUserFormView.hpp"
@@ -21,13 +22,21 @@ Settings::Settings(SessionData& sessionData, Wt::WContainerWidget* parent)
 : Wt::WContainerWidget(parent),
 _sessionData(sessionData)
 {
+	Wt::WHBoxLayout* hLayout = new Wt::WHBoxLayout(this);
+
 	// Create a stack where the contents will be located.
 	Wt::WStackedWidget *contents = new Wt::WStackedWidget();
 
-	Wt::WMenu *menu = new Wt::WMenu(contents, Wt::Vertical, this);
-	menu->setStyleClass("nav nav-pills nav-stacked");
+	contents->setStyleClass("contents");
+	contents->setOverflow(WContainerWidget::OverflowHidden);
+
+	Wt::WMenu *menu = new Wt::WMenu(contents, Wt::Vertical);
+	menu->setStyleClass("nav nav-pills nav-stacked submenu");
 	menu->setWidth(150);
 
+	hLayout->addWidget(menu);
+	hLayout->addWidget(contents, 1);
+
 	Wt::Dbo::Transaction transaction( sessionData.getDatabaseHandler().getSession());
 
 	::Database::User::pointer user = sessionData.getDatabaseHandler().getCurrentUser();
@@ -53,7 +62,6 @@ _sessionData(sessionData)
 		menu->addItem("Account", new AccountFormView(sessionData, Database::User::getId(user)));
 	}
 
-	addWidget(contents);
 }
 
 void