From 71bc500aab4cf94b3e6a81899c4d4a8fcda9a56e Mon Sep 17 00:00:00 2001 From: Yorik van Havre Date: Sat, 8 Mar 2014 12:37:24 -0300 Subject: [PATCH] Start: more improvements to the start page --- src/Mod/Start/StartPage/StartPage.py | 30 ++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/src/Mod/Start/StartPage/StartPage.py b/src/Mod/Start/StartPage/StartPage.py index 0722e031e..31eea5060 100644 --- a/src/Mod/Start/StartPage/StartPage.py +++ b/src/Mod/Start/StartPage/StartPage.py @@ -163,14 +163,27 @@ page = """ ddiv.innerHTML = "Done fetching"; } + function stripTags(text) { + // from http://www.pagecolumn.com/tool/all_about_html_tags.htm /<\s*\/?\s*span\s*.*?>/g + stripped = text.replace("']; - for (var i = 0; i < 8; i++) { + for (var i = 0; i < 15; i++) { html.push('
  •  ', data.value.items[i].title, '
  • '); if ("description" in data.value.items[i]) { - linkDescriptions.push(data.value.items[i].description); + linkDescriptions.push(stripTags(data.value.items[i].description)); } else if ("content" in data.value.items[i]) { if ("content" in data.value.items[i].content) { linkDescriptions.push(data.value.items[i].content.content); @@ -246,6 +259,10 @@ page = """ margin: 0 350px 0 10px; } + #column img { + max-width: 14px; + } + .block { background: #windowcolor; border-radius: 5px; @@ -282,6 +299,10 @@ page = """ clear: both; } + pre { + width: 300px !important; + } + @@ -539,7 +560,8 @@ def setColors(html): except: pass else: - defaults["#basecolor"] = palette.base().color().name() + #defaults["#basecolor"] = palette.base().color().name() + defaults["#basecolor"] = "#171A2B url(Background.jpg)" #defaults["#linkcolor"] = palette.link().color().name() # UGLY!! defaults["#textcolor"] = palette.text().color().name() defaults["#windowcolor"] = palette.window().color().name() @@ -578,4 +600,4 @@ def handle(): def exportTestFile(): f = open(os.path.expanduser("~")+os.sep+"freecad-startpage.html","wb") f.write(handle()) - f.close() \ No newline at end of file + f.close()