owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[UI/MOBILE] Removed the duplicated search bar

Browse Source
This commit is contained in:
emeric
2016-01-03 20:05:29 +01:00
parent feb52c3ed9
commit 89e58b5adf
6 changed files with 100 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ui/LmsApplication.cpp
+15 -20
View File
@@ -23,7 +23,6 @@
#include <Wt/WNavigationBar>
#include <Wt/WStackedWidget>
#include <Wt/WMenu>
#include <Wt/WNavigationBar>
#include <Wt/WPopupMenu>
#include <Wt/WVBoxLayout>
#include <Wt/Auth/Identity>
@@ -204,9 +203,15 @@ LmsApplication::handleAuthEvent(void)
contentsStack->setOverflow(Wt::WContainerWidget::OverflowAuto);
contentsStack->addStyleClass("contents");
// Setup a Left-aligned menu.
Wt::WMenu *leftMenu = new Wt::WMenu(contentsStack);
navigation->addMenu(leftMenu);
Wt::WMenu *menu = new Wt::WMenu(contentsStack);
navigation->addMenu(menu, Wt::AlignRight);
Wt::WLineEdit *searchEdit = new Wt::WLineEdit();
navigation->bindWidget("search", searchEdit);
searchEdit->setEmptyText("Search...");
searchEdit->addStyleClass("navbar-form navbar-nav");
searchEdit->setWidth(150);
// TODO add a span with a search icon
Audio *audio;
@@ -215,23 +220,18 @@ LmsApplication::handleAuthEvent(void)
else
audio = new Desktop::Audio();
leftMenu->addItem("Audio", audio);
menu->addItem("Audio", audio);
#if defined HAVE_VIDEO
leftMenu->addItem("Video", new VideoWidget());
menu->addItem("Video", new VideoWidget());
#endif
leftMenu->addItem("Settings", new Settings::Settings());
// Setup a Right-aligned menu.
Wt::WMenu *rightMenu = new Wt::WMenu();
navigation->addMenu(rightMenu, Wt::AlignRight);
menu->addItem("Settings", new Settings::Settings());
Wt::WPopupMenu *popup = new Wt::WPopupMenu();
popup->addItem("Logout");
Wt::WMenuItem *item = new Wt::WMenuItem( CurrentAuthUser().identity(Wt::Auth::Identity::LoginName) );
item->setMenu(popup);
rightMenu->addItem(item);
item->setMenu(popup);
menu->addItem(item);
popup->itemSelected().connect(std::bind([=] (Wt::WMenuItem* item)
{
@@ -239,17 +239,12 @@ LmsApplication::handleAuthEvent(void)
DbHandler().getLogin().logout();
}, std::placeholders::_1));
// Add a Search control.
LineEdit *searchEdit = new LineEdit(500);
searchEdit->setEmptyText("Search...");
searchEdit->timedChanged().connect(std::bind([=] ()
searchEdit->changed().connect(std::bind([=] ()
{
// TODO: check which view is activated and search into it
audio->search(searchEdit->text().toUTF8());
}));
navigation->addSearch(searchEdit, Wt::AlignLeft);
layout->addWidget(navigation);
layout->addWidget(contentsStack, 1);