Merge pull request #156 from LazeMSS/develop

Develop

Author: LazeMSS

.gitignore

@@ -8,4 +8,4 @@ dist
 .DS_Store
 *.zip
 __pycache__
-octoprint_uicustomizer/static/themes/css/active.css
+octoprint_uicustomizer/static/themes/*

octoprint_uicustomizer/__init__.py

@@ -11,6 +11,7 @@
 import requests
 
 from flask import send_file
+from flask import url_for
 
 class UICustomizerPlugin(octoprint.plugin.StartupPlugin,
                        octoprint.plugin.SettingsPlugin,
@@ -92,6 +93,10 @@ def getRemoteThemeVersion(self):
                 return jsonVersion['tag_name']
         return False
 
+    def loginui_theming(self):
+        return [url_for("plugin.uicustomizer.static", filename="themes/css/active.css")]
+
+
     # Check for new versions on login
     def on_event(self,event,payload):
         if event == "UserLoggedIn":
@@ -208,5 +213,6 @@ def __plugin_load__():
 
     global __plugin_hooks__
     __plugin_hooks__ = {
+        "octoprint.theming.login": __plugin_implementation__.loginui_theming,
         "octoprint.plugin.softwareupdate.check_config": __plugin_implementation__.get_update_information
     }

octoprint_uicustomizer/static/css/uicustomizer.css

@@ -162,6 +162,7 @@
     body.UICResponsiveMode #files .gcode_files .scroll-wrapper.UICFullHeight{
         height: 100%;
         max-height: 75vh;
+        resize: vertical;
     }
 }
 
@@ -352,6 +353,7 @@ html:not(.themeify) #tabs_content{
     height: 100%;
     max-height: 80vh;
     min-height: 70px;
+    resize: vertical;
 }
 
 /* search in settings fix*/
@@ -1130,11 +1132,6 @@ body.inlineFullscreen .UICWebCamClick{
     border-radius: 3px;
 }
 
-/*OctoPrint-CameraSettings fixes - not perfect but the flexbox stuff and old bootstrap does not mix*/
-body.UICResponsiveMode #settings_plugin_camerasettings div.camera-settings-outer > div:nth-child(4){
-    max-height: 45vh;
-}
-
 /* themify hacks :/*/
 .themeify.dyl #navbar{
     position: absolute !important;
@@ -1206,5 +1203,11 @@ html.themeify #UICsetMenuShow{
 }
 
 
+#term .terminal pre.UICResizeAble{
+    height: 600px;
+    resize: vertical;
+    max-height: inherit;
+}
+
 /* UICustomizer END */
 

octoprint_uicustomizer/static/js/uicustomizer.js

@@ -8,6 +8,7 @@ $('head').prepend('<meta id="UICViewport" name="viewport" content="width=device-
 
 // Set theme onload
 var UICPreLoadTheme  = "default";
+var UICThemeV = 0;
 if (Modernizr.localstorage){
     if (window.location.pathname != "/"){
         UICPreLoadTheme = localStorage['plugin.uicustomizer.'+window.location.pathname+'theme'];
@@ -17,9 +18,13 @@ if (Modernizr.localstorage){
     if (UICPreLoadTheme == undefined || UICPreLoadTheme == "" || UICPreLoadTheme == null){
         UICPreLoadTheme = "default";
     }
+    UICThemeV = localStorage['plugin.uicustomizer.themeversion'];
+    if (UICThemeV == undefined){
+        UICThemeV = 0;
+    }
 }
-$('body').append('<link class="UICThemeCSS" rel="stylesheet" href="./plugin/uicustomizer/static/themes/css/active.css?theme='+UICPreLoadTheme+'">');
-delete UICPreLoadTheme;
+$('body').append('<link class="UICThemeCSS" rel="stylesheet" href="./plugin/uicustomizer/static/themes/css/active.css?theme='+UICPreLoadTheme+'&v='+UICThemeV+'">');
+delete UICPreLoadTheme,UICThemeV;
 // we will remove it again if user has opted out - this will just make it more clean on showing the UI
 $('body').append('<link class="UICBSResp" rel="stylesheet" href="./plugin/uicustomizer/static/css/bootstrap-responsive.css">');
 
@@ -136,6 +141,14 @@ $(function() {
             // Load from storage
             self.curTheme = self.getStorage('theme');
 
+            // Set theme version
+            var curVersion = self.settings.settings.plugins.uicustomizer.themeVersion();
+            var curVersionStor = self.getStorage('themeversion');
+            if (curVersion != curVersionStor && curVersionStor != undefined){
+                new PNotify({title:"UICustomizer themes...", type: "info","text":"UI Customizer themes has been updated: <a href=\"https://github.com/LazeMSS/OctoPrint-UICustomizerThemes/releases/\">Read the release notes</a>","hide":false});
+                self.setStorage('themeversion',self.settings.settings.plugins.uicustomizer.themeVersion());
+            }
+
             // Store WebCam
             self.onWebCamOrg = OctoPrint.coreui.viewmodels.controlViewModel.onWebcamLoaded;
             self.onWebCamErrorOrg = OctoPrint.coreui.viewmodels.controlViewModel.onWebcamErrored;
@@ -173,14 +186,6 @@ $(function() {
                 $('div#tabs_content div.tab-pane:not("#tab_plugin_consolidate_temp_control") > div.span6').children().unwrap();
             }
 
-
-            // Spool manager until its patched: https://github.com/OllisGit/OctoPrint-SpoolManager/issues/142
-            if ('spoolManagerViewModel' in OctoPrint.coreui.viewmodels && $('body').hasClass('UICResponsiveMode')){
-                $('#spool-form input[type="hidden"]').prependTo($('#spool-form'));
-                $('#spool-form > div.row:first').addClass('row-fluid').removeClass('row');
-                $('#spool-note-editor').closest('div.span6').addClass('span12').removeClass('span6');
-            }
-
             // Rewrite the tab selector for settings - https://github.com/LazeMSS/OctoPrint-UICustomizer/issues/95
             var prevTab = OctoPrint.coreui.viewmodels.settingsViewModel.selectTab;
             OctoPrint.coreui.viewmodels.settingsViewModel.selectTab = function(tab){
@@ -425,12 +430,17 @@ $(function() {
                 // Remove the current css to trigger reload
                 $('link.UICThemeCSS').remove();
 
-                var themeURL = self.ThemesBaseURL+"css/"+themeName+'.css?theme='+themeName;
+                var themeversion = "0";
+                if('themeVersion' in self.settings.settings.plugins.uicustomizer){
+                    themeversion = self.settings.settings.plugins.uicustomizer.themeVersion();
+                }
+                var themeURL = self.ThemesBaseURL+"css/"+themeName+'.css?theme='+themeName+'&v='+themeversion;
 
                 // Preview or for real?
                 if (!preview){
                     // Store it for easier loading
                     self.setStorage('theme',themeName);
+                    self.setStorage('themeversion',themeversion);
                 }
 
                 // Load style sheet
@@ -781,9 +791,11 @@ $(function() {
 
         self.set_filesFullHeight = function(enable){
              if (enable){
+                $('#term .terminal pre').addClass('UICResizeAble')
                 $('#files .gcode_files .scroll-wrapper').addClass('UICFullHeight');
             }else{
                 $('#files .gcode_files .scroll-wrapper').removeClass('UICFullHeight');
+                $('#term .terminal pre').addClass('UICResizeAble')
             }
         }
 

octoprint_uicustomizer/templates/uicustomizer_settings.jinja2

@@ -42,7 +42,7 @@
                             <label class="checkbox" title="Maximize the main gcode viewer to take up as much space as possible"><input data-bind="checked: settings.plugins.uicustomizer.gcodeFullWidth" data-settingtype="gcodeFullWidth" data-previewtab="gcode_link" type="checkbox"> {{ _('Gcode full-size') }}</label>
                         </div>
                          <div class="controls">
-                            <label class="checkbox" title="Maximize the files selector to show as many files as possible"><input data-bind="checked: settings.plugins.uicustomizer.filesFullHeight" data-settingtype="filesFullHeight" data-previewtab="gcode_link" type="checkbox"> {{ _('Maximize Files height') }}</label>
+                            <label class="checkbox" title="Maximize the files selector to show as many files as possible"><input data-bind="checked: settings.plugins.uicustomizer.filesFullHeight" data-settingtype="filesFullHeight" data-previewtab="gcode_link" type="checkbox"> {{ _('Resizable Files+Terminal') }}</label>
                         </div>
                     </div>
                     <div class="span6">

setup.py

@@ -14,7 +14,7 @@
 plugin_name = "UI Customizer"
 
 # The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module
-plugin_version = "0.1.5.8"
+plugin_version = "0.1.5.9"
 
 # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
 # module