diff --git a/src/Mod/Start/StartPage/StartPage.css b/src/Mod/Start/StartPage/StartPage.css index 3faaac9ebb2f..2bd75be5d1dc 100644 --- a/src/Mod/Start/StartPage/StartPage.css +++ b/src/Mod/Start/StartPage/StartPage.css @@ -67,7 +67,6 @@ ul { padding: 8px; margin-bottom: 10px; color: #windowtextcolor; - width: 47% !important; } .options { diff --git a/src/Mod/Start/StartPage/StartPage.html b/src/Mod/Start/StartPage/StartPage.html index 0a5f9bbd0d0c..36f20a7ad2ab 100644 --- a/src/Mod/Start/StartPage/StartPage.html +++ b/src/Mod/Start/StartPage/StartPage.html @@ -4,7 +4,7 @@ - +

 text01
 

  diff --git a/src/Mod/Start/StartPage/StartPage.js b/src/Mod/Start/StartPage/StartPage.js index 1d547c2fac8f..7516df160b53 100644 --- a/src/Mod/Start/StartPage/StartPage.js +++ b/src/Mod/Start/StartPage/StartPage.js @@ -67,7 +67,6 @@ function load() { var script = document.createElement('script'); script.src = 'http://www.freecadweb.org/version.php?callback=checkVersion'; document.body.appendChild(script); - } function stripTags(text) { @@ -88,7 +87,7 @@ function showTweets(data) { ddiv = document.getElementById('news'); ddiv.innerHTML = "Received"; var html = [''); html.push('text63'); ddiv.innerHTML = html.join(''); - var commits = document.getElementById("commits"); - var examples = document.getElementById("examples"); - var files = document.getElementById("files"); - var description = document.getElementById("description"); - - var commitsHeight = commits.offsetHeight; - var examplesHeight = examples.offsetHeight; - var filesHeight = files.offsetHeight; - - var biggerHeight = commitsHeight > examplesHeight ? commitsHeight : examplesHeight; - - var totalHeight = biggerHeight + filesHeight + 145 + 36; - commits.style.height = biggerHeight + 'px'; - examples.style.height = biggerHeight + 'px'; - description.style.height = totalHeight + 'px'; + resize(); } function showDescr(d) { @@ -136,4 +121,37 @@ function scroller() { } } +function resize() { + var halfblocks = document.getElementsByClassName('half-block'); + var commits = document.getElementById("commits"); + var examples = document.getElementById("examples"); + var files = document.getElementById("files"); + var newproj = document.getElementById('newproject'); + var ontheweb = document.getElementById('ontheweb'); + var description = document.getElementById("description"); + + var w = files.offsetWidth; + var filesHeight = files.offsetHeight; + var h1 = newproj.getElementsByTagName('ul')[0].offsetHeight; + var h2 = ontheweb.getElementsByTagName('ul')[0].offsetHeight; + var h3 = examples.getElementsByTagName('ul')[0].offsetHeight; + var h4 = commits.getElementsByTagName('ul')[0].offsetHeight; + + var rowTwoHeight = h1 > h2 ? h1 : h2; + var rowThreeHeight = h3 > h4 ? h3 : h4; + rowTwoHeight = rowTwoHeight + 40; + rowThreeHeight = rowThreeHeight + 80; + var totalHeight = rowTwoHeight + rowThreeHeight + filesHeight + 36; + + w = w - 52; + for (var i = 0; i < halfblocks.length; i++) { + halfblocks[i].style.width = w/2 + 'px'; + } + newproj.style.height = rowTwoHeight + 'px'; + ontheweb.style.height = rowTwoHeight + 'px'; + examples.style.height = rowThreeHeight + 'px'; + commits.style.height = rowThreeHeight + 'px'; + description.style.height = totalHeight + 'px'; +} + document.onmousemove=scroller; diff --git a/src/Mod/Start/StartPage/TranslationTexts.py b/src/Mod/Start/StartPage/TranslationTexts.py index 0391b848a7b3..cdb5272c7ca1 100644 --- a/src/Mod/Start/StartPage/TranslationTexts.py +++ b/src/Mod/Start/StartPage/TranslationTexts.py @@ -78,7 +78,7 @@ def translate(context,text): text21 = translate("StartPage", "Example workflow") text22 = translate("StartPage", "Part Design") text23 = translate("StartPage", "Designing architectural elements") -text24 = translate("StartPage", "The Architectural Design workbench is specially designed for working with architectural elements such as walls or windows. Start by drawing 2D shapes, and use them as guides to build architecutral objects.") +text24 = translate("StartPage", "The Architectural Design workbench is specially designed for working with architectural elements such as walls or windows. Start by drawing 2D shapes, and use them as guides to build architectural objects.") text25 = translate("StartPage", "Architectural Design") text26 = translate("StartPage", "Working with Meshes") text27 = translate("StartPage", "The Mesh Workbench is used to work with Mesh objects. Meshes are simpler 3D objects than Part objects, but they are often easier to import and export to/from other applications.")