Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-22 01:11:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

MjpegServer: style fixes for root page (#72)

Browse Source 
- Moves stream to the right of any settings
- When the page is too small, then the stream will move to the top of the settings
This commit is contained in:
Dustin Spicuzza
2017-04-30 11:49:21 -04:00
committed by Peter Johnson
parent 59133a7d93
commit c34cf11769
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/MjpegServerImpl.cpp
View File

@@ -60,11 +60,16 @@ static const char* startRootPage = "<html><head>\n"
" border: 1px solid black;\n"
" border-collapse: collapse;\n"
"}\n"
".settings { float: left; }\n"
".stream { display: inline-block; margin-left: 10px; }\n"
"</style>\n"
"<title>CameraServer</title></head><body>\n"
"<div class=\"stream\">\n"
"<img src=\"/stream.mjpg\" /><p />\n"
"<a href=\"/settings.json\">Settings JSON</a>\n";
static const char* endRootPage ="</body></html>";
"<a href=\"/settings.json\">Settings JSON</a>\n"
"</div>\n"
"<div class=\"settings\">\n";
static const char* endRootPage ="</div></body></html>";
class MjpegServerImpl::ConnThread : public wpi::SafeThread {
public: