Implemented issue #149 and some other changes. See changelog

ukdtom · Apr 23, 2016 · 5e8aaee · 5e8aaee
1 parent dddb208
commit 5e8aaee
Show file tree

Hide file tree

Showing 7 changed files with 294 additions and 66 deletions.
diff --git a/http/changelog.txt b/http/changelog.txt
@@ -35,6 +35,9 @@ FRONTEND:
 		#### Subtitlemgmt: Now uses the new Language Module
 		#93  WT: Now has support for custom themes! First out is a draft of trumpy81 that needs to be finetuned by trumpy81
 		#160 WT: Implemented Factory Reset functionality. Available through the Options menu.
+		#149 Subtitlemgmt: Implemented letters instead of straight up numbers for paging.
+		#### WT: Removed LogFiles from top menu, redirecting users to LogViewer instead.
+		#### WT: Themes are now applied on loginscreen aswell.
 
 ####
 

diff --git a/http/css/default.css b/http/css/default.css
@@ -27,6 +27,7 @@
 th {background-color: #FE9B00; color: #242424;}
 
 .subtitle {padding: 0px;}
+/*.subtitletable {display: none;}*/
 
 .btn-default:hover {background-color: #FE9B00; color: #242424;}
 .btn-default:focus {background-color: #FE9B00; color: #242424;}
@@ -58,11 +59,21 @@ body {background-color: #242424; padding-top:70px;  padding-bottom:70px;}
 .navbar-thin {min-height: 40px; padding-top: 5px; border-top: 1px solid #242424;}
 .changeDisplay {display: table-cell;}
 
+
+  .page-selector-dropdown {display: inline;}
+  .page-selector-list {display: none;}
+
 @media screen and (max-width:678px) {
   .changeDisplay {display: block;}
   .div-medium {width: auto;}
+
 }
-
+/*
+@media screen and (max-width:1346px) {
+  .page-selector-dropdown {display: inline;}
+  .page-selector-list {display: none;}
+}
+*/
 select {
   background-color: #FFFFFF;
   color: #000000;

diff --git a/http/index.html b/http/index.html
@@ -45,11 +45,6 @@
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Options<span class="caret"></span></a>
                   <ul class="dropdown-menu" role="menu" id="OptionsMenu">
                   </ul>
-                </li>
-                <li class="dropdown">
-                  <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Logfiles<span class="caret"></span></a>
-                  <ul class="dropdown-menu" role="menu" id="LogfilesMenu">
-                  </ul>
                 </li>
                   <li><a href="/logout">Logout</a></li>
               </ul>

diff --git a/http/jscript/functions.js b/http/jscript/functions.js
@@ -9,6 +9,7 @@ var webtools = {
 		['subtitlemgmt', 'Subtitle Management'],
 		['logviewer', 'LogViewer/Downloader Tool'],
 		['install', 'Unsupported AppStore']
+		//['findunmatched','FindUnmatched']
 	],
 	stylesheets: [],
 	active_stylesheet: '',
@@ -150,7 +151,8 @@ webtools.list_modules.inline([
 			});
 		},
 		function(callback, activatemodulename) {
-			webtools.listlogfiles(callback, activatemodulename);
+			callback('LogfileNamesFetch:Ignored', activatemodulename);
+			//webtools.listlogfiles(callback, activatemodulename);
 		},
 		function(callback, activatemodulename) {
 			$.ajax({
@@ -292,7 +294,7 @@ webtools.save_options = function() {
 };
 
 webtools.listlogfiles = function(callback, activatemodulename) {
-
+ // Currently unused
 	webtools.loading();
 	//Name:LogfileNamesFetch
 	$("#LogfilesMenu").html('');

diff --git a/http/login.html b/http/login.html
@@ -48,6 +48,24 @@
 				$('#LoginMessage').hide();
 			}
 		});
+
+		$.ajax({
+			///webtools2?module=settings&function=getSettings
+			url: '/webtools2?module=settings&function=getSetting&name=wt_csstheme',
+			cache: false,
+			dataType: 'JSON',
+			success: function(data) {
+				webtools.active_stylesheet = data;
+				if (data !== 'default.css') {
+					webtools.log('Found custom CSSTheme file setting (custom_themes/' + data + '). Loading it.','Core');
+					$('head').append('<link id="custom_theme_stylesheet" rel="stylesheet" href="custom_themes/' + data + '" type="text/css" />');
+				}
+			},
+			error: function(data) {
+				webtools.active_stylesheet = 'default.css';
+				webtools.log('No custom CSSTheme setting found.','Core');
+			}
+		});
 	});
 
 	function login() {