From 6f636e0ae9c418288bbf9c51df9aa1c81eca2785 Mon Sep 17 00:00:00 2001 From: Yorik van Havre Date: Sun, 28 Feb 2016 22:03:03 -0300 Subject: [PATCH] Start: Updated startpage - fixed some links + restored commits feed --- src/Mod/Start/StartPage/FreeCAD.png | Bin 3810 -> 2803 bytes src/Mod/Start/StartPage/StartPage.py | 38 +++++++++++++++------------ 2 files changed, 21 insertions(+), 17 deletions(-) mode change 100755 => 100644 src/Mod/Start/StartPage/FreeCAD.png diff --git a/src/Mod/Start/StartPage/FreeCAD.png b/src/Mod/Start/StartPage/FreeCAD.png old mode 100755 new mode 100644 index a7a53c347b1dcc6fcb4ddb4c3efaa778491e5aca..13674de03e0a837756f5a397fb0d8e1d853c74f4 GIT binary patch delta 2780 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 i!x+XehB1uKI{pWP)YEZ4A5~2N0000$i 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 JPDHLkV1jS;VfX+5 diff --git a/src/Mod/Start/StartPage/StartPage.py b/src/Mod/Start/StartPage/StartPage.py index df4590def..6babc79e5 100644 --- a/src/Mod/Start/StartPage/StartPage.py +++ b/src/Mod/Start/StartPage/StartPage.py @@ -51,7 +51,7 @@ text01 = translate("StartPage","FreeCAD Start Center") text02 = translate("StartPage","Start a new project") text03 = translate("StartPage","Recent Files") text04 = translate("StartPage","Latest videos") -text05 = translate("StartPage","Latest news") +text05 = translate("StartPage","Latest commits") text06 = translate("StartPage","On the web") text07 = translate("StartPage","This is the FreeCAD Homepage. Here you will be able to find a lot of information about FreeCAD, including tutorials, examples and user documentation.") text08 = translate("StartPage","FreeCAD Homepage") @@ -107,6 +107,9 @@ text57 = translate("StartPage","http://www.freecadweb.org/wiki/index.php?title=P text58 = translate("StartPage","Your version of FreeCAD is up to date.") text59 = translate("StartPage","There is a new release of FreeCAD available.") text60 = translate("StartPage","Load an FEM example analysis") +text61 = translate("StartPage","Obtain a development version") +text62 = translate("StartPage","Development versions are made available by community members from time to time and usually contain the latest changes, but are more likely to contain bugs.") +text63 = translate("StartPage","See all commits") # get FreeCAD version @@ -173,9 +176,9 @@ page = """ var aminor = data[0]['minor']; var abuild = data[0]['build']; if (cmajor >= amajor && cminor >= aminor && cbuild >= abuild) { - vdiv.innerHTML=" """ + text58 + """ "; + vdiv.innerHTML=" """ + text58 + """: """ + vmajor + """.""" + vminor + """.""" + vbuild + """"; } else { - vdiv.innerHTML=" """ + text59 + """ "; + vdiv.innerHTML=" """ + text59 + """:"+amajor+"."+aminor+"."+abuild+""; } } @@ -183,7 +186,7 @@ page = """ // load latest news ddiv = document.getElementById("news"); ddiv.innerHTML = "Connecting..."; - var tobj=new JSONscriptRequest('http://pipes.yahoo.com/pipes/pipe.run?_id=da8b612e97a6bb4588b1ce27db30efd9&_render=json&_callback=showTweets'); + var tobj=new JSONscriptRequest('https://api.github.com/repos/FreeCAD/FreeCAD/commits?callback=showTweets'); tobj.buildScriptTag(); // Build the script tag tobj.addScriptTag(); // Execute (add) the script tag ddiv.innerHTML = "Downloading latest news..."; @@ -213,21 +216,16 @@ page = """ ddiv.innerHTML = "Received"; var html = ['
    ']; for (var i = 0; i < 15; i++) { - html.push('
  •  ', data.value.items[i].title, '
    • '); - if ("description" in data.value.items[i]) { - 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); - } else { - linkDescriptions.push(data.value.items[i].content); - } + html.push('
  •  ', data.data[i].commit.message, '
    • '); + if ("message" in data.data[i].commit) { + linkDescriptions.push(stripTags(data.data[i].commit.message)+'
    '+data.data[i].commit.author.name+'
    '+data.data[i].commit.author.date); } else { linkDescriptions.push(""); } } html.push('
'); + html.push('""" + text63 + """'); ddiv.innerHTML = html.join(''); } @@ -289,6 +287,7 @@ page = """ letter-spacing: 2px; padding: 20px 0 0 80px; align: bottom; + color: #ffffff; } h2 { @@ -444,23 +443,28 @@ def getLinks():
  •   ')" onMouseout="show('')" - href="http://www.freecadweb.org/">""" + text08 + """
    • + exthref="http://www.freecadweb.org/">""" + text08 + """
  •   ')" onMouseout="show('')" - href=""" + text38 + """>""" + text37 + """
    • + href=ext""" + text38 + """>""" + text37 + """
  •   ')" onMouseout="show('')" - href=""" + text56 + """>""" + text39 + """
    • + href=ext""" + text56 + """>""" + text39 + """
  •   ')" onMouseout="show('')" - href=""" + text57 + """>""" + text40 + """
    • + href=ext""" + text57 + """>""" + text40 + """
  •   ')" onMouseout="show('')" href="exthttp://freecad-tutorial.blogspot.com/">""" + text43 + """
    • +
  •   + ')" + onMouseOut="show('')">""" + text61 + """
    • + """ def getWorkbenches():