diff --git a/Makefile.am b/Makefile.am
index e0209bca..32d9c93b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -66,7 +66,7 @@ lms_SOURCES = \
$(top_srcdir)/ui/video/VideoMediaPlayerWidget.cpp \
$(top_srcdir)/ui/video/VideoParametersDialog.cpp \
$(top_srcdir)/ui/settings/Settings.cpp \
- $(top_srcdir)/ui/settings/SettingsDatabase.cpp
+ $(top_srcdir)/ui/settings/SettingsDatabaseFormView.cpp
lms_CXXFLAGS=-std=c++11 -Wall -I$(top_srcdir)/boost/ -I$(top_srcdir)/ui -I$(top_srcdir)/remote
diff --git a/README b/README
index a7fa60ce..8351c50b 100644
--- a/README
+++ b/README
@@ -3,7 +3,7 @@ I) DEPENCIES
libboost-dev libextractor-dev libavcodec-dev libwt-dev
-Warning: your distrib may provide an outdated wt library. Latest Wt highly recommended (http://www.webtoolkit.eu/wt)
+Warning: your distrib may provide an outdated wt library. Using the latest Wt (>= 3.3.3) is highly recommended (http://www.webtoolkit.eu/wt)
II) BUILD
@@ -18,11 +18,9 @@ II) BUILD
# make -j 4
-III) RUNNING
+III) Setting up SSL (required by the Remote mobile service and the web server)
-# ./lms --docroot=../ --http-port=8080 --http-address=0.0.0.0
-
-IV) Setting up SSL (required by the Remote mobile service)
+Just an example, you could do whatever you want (ca, self signed cert, etc.)
Generate a dh file:
# openssl dhparam -out dh2048.pem 2048
@@ -30,3 +28,11 @@ Generate a dh file:
Generate a self signed certificate:
# openssl req -x509 -out cert.pem -keyout privkey.pem -newkey rsa:4096
+
+IV) RUNNING
+
+In the build directory:
+# ./lms --docroot=../ui --approot=../ui/approot --https-port=5081 --https-address=0.0.0.0 --ssl-certificate=./certUI.pem --ssl-private-key ./privkeyUI.pem --ssl-tmp-dh dh2048.pem
+
+Depending of your SSL parameters, you may be asked for the PEM passphrase to unlock the private key.
+
diff --git a/TODO b/TODO
index 0607a5de..7f82397c 100644
--- a/TODO
+++ b/TODO
@@ -9,15 +9,18 @@
- consider using external web server instead of builtin httpd (new FCGI service?)
[Settings]
-- [admin] Add/remove users
+- [admin/Users]
+ - Add/remove users
- max audio/video bitrates for user
- - capabilities
-- [admin] Add path to Audio/Video files
-- [admin] Manual/autorefresh settings
-- [admin] Display some stats about the database:
- - nb audio/video files
- - last scan/update
-- Prefered bitrate and codecs for audio/video
+ - capabilities (admin)
+- [admin/DB]
+ - Add path to Audio/Video files
+ - Do not make the update start time active when update perdiod is "Never"
+ - Do not restart the db update service if user applied no changes
+- [user/transcoding]
+ - Prefered bitrate and codecs for audio/video
+- [user/Personal]
+ - password, email
[Users]
- Handle login lifetime?
diff --git a/ui/LmsApplication.cpp b/ui/LmsApplication.cpp
index 97a415d4..fbcd1fd0 100644
--- a/ui/LmsApplication.cpp
+++ b/ui/LmsApplication.cpp
@@ -29,7 +29,13 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env, boost::filesystem::p
_home(nullptr)
{
- setTheme(new Wt::WBootstrapTheme());
+ Wt::WBootstrapTheme *bootstrapTheme = new Wt::WBootstrapTheme(this);
+ bootstrapTheme->setVersion(Wt::WBootstrapTheme::Version3);
+ bootstrapTheme->setResponsive(true);
+ setTheme(bootstrapTheme);
+
+ // Add a resource bundle
+ messageResourceBundle().use(appRoot() + "templates");
setTitle("LMS"); // application title
diff --git a/ui/approot/templates.xml b/ui/approot/templates.xml
new file mode 100644
index 00000000..9c972819
--- /dev/null
+++ b/ui/approot/templates.xml
@@ -0,0 +1,66 @@
+
+
+
+
+
+
+