diff --git a/couchpotato/core/plugins/log/main.py b/couchpotato/core/plugins/log/main.py index 19edc19..4bf7cf3 100644 --- a/couchpotato/core/plugins/log/main.py +++ b/couchpotato/core/plugins/log/main.py @@ -137,7 +137,7 @@ class Logging(Plugin): re_split = r'\x1b' for log_line in logs_raw: split = re.split(re_split, log_line) - if split: + if split and len(split) == 3: try: date, time, log_type = splitString(split[0], ' ') timestamp = '%s %s' % (date, time) diff --git a/couchpotato/core/plugins/log/static/log.js b/couchpotato/core/plugins/log/static/log.js index ee471bc..0d47914 100644 --- a/couchpotato/core/plugins/log/static/log.js +++ b/couchpotato/core/plugins/log/static/log.js @@ -257,12 +257,7 @@ Page.Log = new Class({ }) ), textarea = new Element('textarea', { - 'text': body, - 'events': { - 'click': function(){ - this.select(); - } - } + 'text': body }), new Element('a.button', { 'target': '_blank', diff --git a/couchpotato/core/plugins/log/static/log.scss b/couchpotato/core/plugins/log/static/log.scss index 6226e02..4be815b 100644 --- a/couchpotato/core/plugins/log/static/log.scss +++ b/couchpotato/core/plugins/log/static/log.scss @@ -51,12 +51,12 @@ .time { clear: both; - font-size: 11px; + font-size: .75em; border-top: 1px solid rgba(255, 255, 255, 0.1); - position: relative; overflow: hidden; padding: 0 3px; font-family: Lucida Console, Monaco, Nimbus Mono L, monospace, serif; + display: flex; &.highlight { background: $theme_off; @@ -66,6 +66,7 @@ padding: 5px 0 3px; display: inline-block; vertical-align: middle; + width: 90px; } ::selection { @@ -74,14 +75,14 @@ } } - .type { + .type.type { margin-left: 10px; + width: 40px; } .message { - float: right; - width: 86%; white-space: pre-wrap; + flex: 1 auto; } @@ -117,10 +118,10 @@ pointer-events: auto; .button { - display: inline-block; margin: 10px 0; padding: 10px; color: $background_color; + background: $primary_color; } .bug { @@ -132,6 +133,10 @@ display: flex; flex-flow: column nowrap; + > span { + margin: $padding/2 0 $padding 0; + } + textarea { display: block; width: 100%; diff --git a/couchpotato/static/scripts/combined.plugins.min.js b/couchpotato/static/scripts/combined.plugins.min.js index 599976a..958189e 100644 --- a/couchpotato/static/scripts/combined.plugins.min.js +++ b/couchpotato/static/scripts/combined.plugins.min.js @@ -3131,12 +3131,7 @@ Page.Log = new Class({ }), new Element("span", { html: " before posting, then copy the text below and FILL IN the dots." })), textarea = new Element("textarea", { - text: body, - events: { - click: function() { - this.select(); - } - } + text: body }), new Element("a.button", { target: "_blank", text: "Create a new issue on GitHub with the text above", diff --git a/couchpotato/static/style/combined.min.css b/couchpotato/static/style/combined.min.css index 918fc52..0d24d71 100644 --- a/couchpotato/static/style/combined.min.css +++ b/couchpotato/static/style/combined.min.css @@ -410,20 +410,21 @@ .page.log .container{padding:20px;overflow:hidden;line-height:150%} .page.log .container.loading{text-align:center;font-size:20px;padding:100px 50px} .page.log .container select{vertical-align:top} -.page.log .container .time{clear:both;font-size:11px;border-top:1px solid rgba(255,255,255,.1);position:relative;overflow:hidden;padding:0 3px;font-family:Lucida Console,Monaco,Nimbus Mono L,monospace,serif} +.page.log .container .time{clear:both;font-size:.75em;border-top:1px solid rgba(255,255,255,.1);overflow:hidden;padding:0 3px;font-family:Lucida Console,Monaco,Nimbus Mono L,monospace,serif;display:-webkit-flex;display:-ms-flexbox;display:flex} .page.log .container .time.highlight{background:#eaeaea} -.page.log .container .time span{padding:5px 0 3px;display:inline-block;vertical-align:middle} +.page.log .container .time span{padding:5px 0 3px;display:inline-block;vertical-align:middle;width:90px} .page.log .container .time ::-moz-selection{background-color:#000;color:#FFF} .page.log .container .time ::selection{background-color:#000;color:#FFF} -.page.log .container .type{margin-left:10px} -.page.log .container .message{float:right;width:86%;white-space:pre-wrap} +.page.log .container .type.type{margin-left:10px;width:40px} +.page.log .container .message{white-space:pre-wrap;-webkit-flex:1 auto;-ms-flex:1 auto;flex:1 auto} .page.log .container .error{color:#FFA4A4} .page.log .container .debug span{opacity:.6} .page.log [data-filter=DEBUG] .error,.page.log [data-filter=DEBUG] .info,.page.log [data-filter=ERROR] .debug,.page.log [data-filter=ERROR] .info,.page.log [data-filter=INFO] .debug,.page.log [data-filter=INFO] .error{display:none} .report_popup.report_popup{position:fixed;left:0;right:0;bottom:0;top:0;z-index:99999;font-size:14px;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;opacity:1;color:#FFF;pointer-events:auto} .disable_hover .scroll_content>*,.mask,.ripple{pointer-events:none} -.report_popup.report_popup .button{display:inline-block;margin:10px 0;padding:10px;color:#FFF} +.report_popup.report_popup .button{margin:10px 0;padding:10px;color:#FFF;background:#ac0000} .report_popup.report_popup .bug{width:80%;height:80%;max-height:800px;max-width:800px;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-flow:column nowrap;-ms-flex-flow:column nowrap;flex-flow:column nowrap} +.report_popup.report_popup .bug>span{margin:10px 0 20px} .report_popup.report_popup .bug textarea{display:block;width:100%;background:#FFF;padding:20px;overflow:auto;color:#666;height:70%;font-size:12px} .do_report.do_report{z-index:10000;position:absolute;padding:10px;background:#ac0000;color:#FFF} .add_new_profile{padding:20px;display:block;text-align:center;font-size:20px;border-bottom:1px solid #eaeaea}