Attachment #368714 for bug #457830




text35 = translate("StartPage","last modified:")
text36 = translate("StartPage","location:")
text37 = translate("StartPage","User manual")
text38 = translate("StartPage","http://www.freecadweb.org/wiki/index.php?title=Online_Help_Toc")
text39 = translate("StartPage","Tutorials")
text40 = translate("StartPage","Python resources")
text41 = translate("StartPage","File not found")

text48 = translate("StartPage","A blog dedicated to teaching FreeCAD, maintained by members of the FreeCAD community")
text49 = translate("StartPage","Getting started")
text50 = translate("StartPage","The FreeCAD interface is divided in workbenches, which are sets of tools suited for a specific task. You can start with one of the workbenches in this list, or with the complete workbench, which presents you with some of the most used tools gathered from other workbenches. Click to read more about workbenches on the FreeCAD website.")
text51 = translate("StartPage","http://www.freecadweb.org/wiki/index.php?title=Workbench_Concept")
text52 = translate("StartPage","Ship Design")
text53 = translate("StartPage","Designing and calculating ships")
text54 = translate("StartPage","The <b>Ship Design</b> module offers several tools to help ship designers to view, model and calculate profiles and other specific properties of ship hulls.")

            ddiv.innerHTML = "Done fetching";
            ddiv = document.getElementById("news");
            ddiv.innerHTML = "Fetching data from the web...";
            var tobj=new JSONscriptRequest('http://pipes.yahoo.com/pipes/pipe.run?_id=da8b612e97a6bb4588b1ce27db30efd9&_render=json&_callback=showTweets');
            tobj.buildScriptTag(); // Build the script tag
            tobj.addScriptTag(); // Execute (add) the script tag
            ddiv.innerHTML = "Done fetching";

            ddiv = document.getElementById('news');
            ddiv.innerHTML = "Received";
            var html = ['<ul>'];
            for (var i = 0; i < 8; i++) {
                html.push('<li><a href="', data.value.items[i].link, '">', data.value.items[i].title, '</a></li>');
                html.push('<li>',tf,'</li>');
            }
            html.push('</ul>');
            ddiv.innerHTML = html.join('');
        }

        function placeLinks(text) {
            result=text.replace(/(https?:\/\/([-\w\.]+)+(:\d+)?(\/([\w\/_\.]*(\?\S+)?)?)?)/g,'<a href="$1">$1</a>');
            return result;
        }

    </script>

    <style type="text/css">

      </div>

      <div class="block">
        <h2>""" + text04 + """</h2>
        <div id="youtube">youtube videos</div>
      </div>

      <div class="block">
        <h2>""" + text05 + """</h2>
        <div id="news">news feed</div>
      </div>


        <li><img src="web.png">&nbsp;
            <a onMouseover="show('<p>""" + text07 + """</p>')" 
                onMouseout="show('')"
                href="http://www.freecadweb.org/">""" + text08 + """</a></li>
        <li><img src="web.png">&nbsp;
            <a onMouseover="show('<p>""" + text45 + """</p>')" 
                onMouseout="show('')"

        <li><img src="web.png">&nbsp;
            <a onMouseover="show('<p>""" + text46 + """</p>')" 
                onMouseout="show('')"
                href="http://www.freecadweb.org/wiki/index.php?title=Tutorials">""" + text39 + """</a></li>
        <li><img src="web.png">&nbsp;
            <a onMouseover="show('<p>""" + text47 + """</p>')" 
                onMouseout="show('')"
                href="http://www.freecadweb.org/wiki/index.php?title=Power_users_hub">""" + text40 + """</a></li>
        <li><img src="web.png">&nbsp;
            <a onMouseover="show('<p>""" + text48 + """</p>')" 
                onMouseout="show('')"

Return to bug 457830

Lines 84-90 text34 = translate("StartPage","creation time:") Link Here

(-)a/src/Mod/Start/StartPage/StartPage.py (-16 / +10 lines)
84	text35 = translate("StartPage","last modified:")	84	text35 = translate("StartPage","last modified:")
85	text36 = translate("StartPage","location:")	85	text36 = translate("StartPage","location:")
86	text37 = translate("StartPage","User manual")	86	text37 = translate("StartPage","User manual")
87	text38 = translate("StartPage","http://sourceforge.net/apps/mediawiki/free-cad/index.php?title=Online_Help_Toc")	87	text38 = translate("StartPage","http://www.freecadweb.org/wiki/index.php?title=Online_Help_Toc")
88	text39 = translate("StartPage","Tutorials")	88	text39 = translate("StartPage","Tutorials")
89	text40 = translate("StartPage","Python resources")	89	text40 = translate("StartPage","Python resources")
90	text41 = translate("StartPage","File not found")	90	text41 = translate("StartPage","File not found")
Lines 97-103 text47 = translate("StartPage","The section of the FreeCAd website dedicate dto Link Here
97	text48 = translate("StartPage","A blog dedicated to teaching FreeCAD, maintained by members of the FreeCAD community")	97	text48 = translate("StartPage","A blog dedicated to teaching FreeCAD, maintained by members of the FreeCAD community")
98	text49 = translate("StartPage","Getting started")	98	text49 = translate("StartPage","Getting started")
99	text50 = translate("StartPage","The FreeCAD interface is divided in workbenches, which are sets of tools suited for a specific task. You can start with one of the workbenches in this list, or with the complete workbench, which presents you with some of the most used tools gathered from other workbenches. Click to read more about workbenches on the FreeCAD website.")	99	text50 = translate("StartPage","The FreeCAD interface is divided in workbenches, which are sets of tools suited for a specific task. You can start with one of the workbenches in this list, or with the complete workbench, which presents you with some of the most used tools gathered from other workbenches. Click to read more about workbenches on the FreeCAD website.")
100	text51 = translate("StartPage","http://sourceforge.net/apps/mediawiki/free-cad/index.php?title=Workbench_Concept")	100	text51 = translate("StartPage","http://www.freecadweb.org/wiki/index.php?title=Workbench_Concept")
101	text52 = translate("StartPage","Ship Design")	101	text52 = translate("StartPage","Ship Design")
102	text53 = translate("StartPage","Designing and calculating ships")	102	text53 = translate("StartPage","Designing and calculating ships")
103	text54 = translate("StartPage","The <b>Ship Design</b> module offers several tools to help ship designers to view, model and calculate profiles and other specific properties of ship hulls.")	103	text54 = translate("StartPage","The <b>Ship Design</b> module offers several tools to help ship designers to view, model and calculate profiles and other specific properties of ship hulls.")
Lines 159-165 page = """ Link Here
159	ddiv.innerHTML = "Done fetching";	159	ddiv.innerHTML = "Done fetching";
160	ddiv = document.getElementById("news");	160	ddiv = document.getElementById("news");
161	ddiv.innerHTML = "Fetching data from the web...";	161	ddiv.innerHTML = "Fetching data from the web...";
162	var tobj=new JSONscriptRequest('http://twitter.com/status/user_timeline/FreeCADNews.json?count=10&callback=showTweets');	162	var tobj=new JSONscriptRequest('http://pipes.yahoo.com/pipes/pipe.run?_id=da8b612e97a6bb4588b1ce27db30efd9&_render=json&_callback=showTweets');
163	tobj.buildScriptTag(); // Build the script tag	163	tobj.buildScriptTag(); // Build the script tag
164	tobj.addScriptTag(); // Execute (add) the script tag	164	tobj.addScriptTag(); // Execute (add) the script tag
165	ddiv.innerHTML = "Done fetching";	165	ddiv.innerHTML = "Done fetching";
Lines 182-200 page = """ Link Here
182	ddiv = document.getElementById('news');	182	ddiv = document.getElementById('news');
183	ddiv.innerHTML = "Received";	183	ddiv.innerHTML = "Received";
184	var html = ['<ul>'];	184	var html = ['<ul>'];
185	for (var i = 0; i < Math.min(5,data.length); i++) {	185	for (var i = 0; i < 8; i++) {
186	tf = placeLinks(data[i].text);	186	html.push('<li><a href="', data.value.items[i].link, '">', data.value.items[i].title, '</a></li>');
187	html.push('<li>',tf,'</li>');
188	}	187	}
189	html.push('</ul>');	188	html.push('</ul>');
190	ddiv.innerHTML = html.join('');	189	ddiv.innerHTML = html.join('');
191	}	190	}
192		191
193	function placeLinks(text) {
194	result=text.replace(/(https?:\/\/([-\w\.]+)+(:\d+)?(\/([\w\/_\.]*(\?\S+)?)?)?)/g,'<a href="$1">$1</a>');
195	return result;
196	}
197
198	</script>	192	</script>
199		193
200	<style type="text/css">	194	<style type="text/css">
Lines 286-297 page = """ Link Here
286	</div>	280	</div>
287		281
288	<div class="block">	282	<div class="block">
289	<h2>""" + text04 + """ <span class="from">""" + text44 + """</span></h2>	283	<h2>""" + text04 + """</h2>
290	<div id="youtube">youtube videos</div>	284	<div id="youtube">youtube videos</div>
291	</div>	285	</div>
292		286
293	<div class="block">	287	<div class="block">
294	<h2>""" + text05 + """ <span class="from">""" + text42 + """</span></h2>	288	<h2>""" + text05 + """</h2>
295	<div id="news">news feed</div>	289	<div id="news">news feed</div>
296	</div>	290	</div>
297		291
Lines 354-360 def getLinks(): Link Here
354	<li><img src="web.png">	348	<li><img src="web.png">
355	<a onMouseover="show('<p>""" + text07 + """</p>')"	349	<a onMouseover="show('<p>""" + text07 + """</p>')"
356	onMouseout="show('')"	350	onMouseout="show('')"
357	href="http://free-cad.sf.net/">""" + text08 + """</a></li>	351	href="http://www.freecadweb.org/">""" + text08 + """</a></li>
358	<li><img src="web.png">	352	<li><img src="web.png">
359	<a onMouseover="show('<p>""" + text45 + """</p>')"	353	<a onMouseover="show('<p>""" + text45 + """</p>')"
360	onMouseout="show('')"	354	onMouseout="show('')"
Lines 362-372 def getLinks(): Link Here
362	<li><img src="web.png">	356	<li><img src="web.png">
363	<a onMouseover="show('<p>""" + text46 + """</p>')"	357	<a onMouseover="show('<p>""" + text46 + """</p>')"
364	onMouseout="show('')"	358	onMouseout="show('')"
365	href="http://sourceforge.net/apps/mediawiki/free-cad/index.php?title=Tutorials">""" + text39 + """</a></li>	359	href="http://www.freecadweb.org/wiki/index.php?title=Tutorials">""" + text39 + """</a></li>
366	<li><img src="web.png">	360	<li><img src="web.png">
367	<a onMouseover="show('<p>""" + text47 + """</p>')"	361	<a onMouseover="show('<p>""" + text47 + """</p>')"
368	onMouseout="show('')"	362	onMouseout="show('')"
369	href="http://sourceforge.net/apps/mediawiki/free-cad/index.php?title=Power_users_hub">""" + text40 + """</a></li>	363	href="http://www.freecadweb.org/wiki/index.php?title=Power_users_hub">""" + text40 + """</a></li>
370	<li><img src="web.png">	364	<li><img src="web.png">
371	<a onMouseover="show('<p>""" + text48 + """</p>')"	365	<a onMouseover="show('<p>""" + text48 + """</p>')"
372	onMouseout="show('')"	366	onMouseout="show('')"