Skip to content

Commit 3f04f73

Browse files
devos50devos50
authored
Merge pull request Tribler#31 from xoriole/updated_images
Updated Tribler 7 links and screenshot images
2 parents 5a2af23 + 1370ca4 commit 3f04f73

17 files changed

+247
-226
lines changed

‎about.html‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -21,30 +21,30 @@
2121
new WOW().init();
2222
</script>
2323

24-
<script type="text/javascript">
25-
var uservoiceOptions = {
26-
/* required */
27-
key: 'tribler',
28-
host: 'tribler.uservoice.com',
29-
forum: '90409',
30-
showTab: true,
31-
/* optional */
32-
alignment: 'right',
33-
background_color:'#f00',
34-
text_color: 'white',
35-
hover_color: '#009ec3',
36-
lang: 'en'
37-
};
24+
<!--<script type="text/javascript">-->
25+
<!--var uservoiceOptions = {-->
26+
<!--/* required */-->
27+
<!--key: 'tribler',-->
28+
<!--host: 'tribler.uservoice.com',-->
29+
<!--forum: '90409',-->
30+
<!--showTab: true,-->
31+
<!--/* optional */-->
32+
<!--alignment: 'right',-->
33+
<!--background_color:'#f00',-->
34+
<!--text_color: 'white',-->
35+
<!--hover_color: '#009ec3',-->
36+
<!--lang: 'en'-->
37+
<!--};-->
3838

39-
function _loadUserVoice() {
40-
var s = document.createElement('script');
41-
s.setAttribute('type', 'text/javascript');
42-
s.setAttribute('src', ("https:" == document.location.protocol ? "https://" : "http://") + "cdn.uservoice.com/javascripts/widgets/tab.js");
43-
document.getElementsByTagName('head')[0].appendChild(s);
44-
}
45-
_loadSuper = window.onload;
46-
window.onload = (typeof window.onload != 'function') ? _loadUserVoice : function() { _loadSuper(); _loadUserVoice(); };
47-
</script>
39+
<!--function _loadUserVoice() {-->
40+
<!--var s = document.createElement('script');-->
41+
<!--s.setAttribute('type', 'text/javascript');-->
42+
<!--s.setAttribute('src', ("https:" == document.location.protocol ? "https://" : "http://") + "cdn.uservoice.com/javascripts/widgets/tab.js");-->
43+
<!--document.getElementsByTagName('head')[0].appendChild(s);-->
44+
<!--}-->
45+
<!--_loadSuper = window.onload;-->
46+
<!--window.onload = (typeof window.onload != 'function') ? _loadUserVoice : function() { _loadSuper(); _loadUserVoice(); };-->
47+
<!--</script>-->
4848

4949
</head>
5050

@@ -70,7 +70,7 @@
7070
<li><a href="download.html">Download</a></li>
7171
<li><a href="support-index.html">Support</a>
7272
<ul>
73-
<li><a href="howto.html">Get Started</a></li>
73+
<li><a href="howto.html">How does it work</a></li>
7474
<li><a href="faq.html">FAQ</a></li>
7575
</ul>
7676
</li>

‎anonymity.html‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -21,30 +21,30 @@
2121
new WOW().init();
2222
</script>
2323

24-
<script type="text/javascript">
25-
var uservoiceOptions = {
26-
/* required */
27-
key: 'tribler',
28-
host: 'tribler.uservoice.com',
29-
forum: '90409',
30-
showTab: true,
31-
/* optional */
32-
alignment: 'right',
33-
background_color:'#f00',
34-
text_color: 'white',
35-
hover_color: '#009ec3',
36-
lang: 'en'
37-
};
24+
<!--<script type="text/javascript">-->
25+
<!--var uservoiceOptions = {-->
26+
<!--/* required */-->
27+
<!--key: 'tribler',-->
28+
<!--host: 'tribler.uservoice.com',-->
29+
<!--forum: '90409',-->
30+
<!--showTab: true,-->
31+
<!--/* optional */-->
32+
<!--alignment: 'right',-->
33+
<!--background_color:'#f00',-->
34+
<!--text_color: 'white',-->
35+
<!--hover_color: '#009ec3',-->
36+
<!--lang: 'en'-->
37+
<!--};-->
3838

39-
function _loadUserVoice() {
40-
var s = document.createElement('script');
41-
s.setAttribute('type', 'text/javascript');
42-
s.setAttribute('src', ("https:" == document.location.protocol ? "https://" : "http://") + "cdn.uservoice.com/javascripts/widgets/tab.js");
43-
document.getElementsByTagName('head')[0].appendChild(s);
44-
}
45-
_loadSuper = window.onload;
46-
window.onload = (typeof window.onload != 'function') ? _loadUserVoice : function() { _loadSuper(); _loadUserVoice(); };
47-
</script>
39+
<!--function _loadUserVoice() {-->
40+
<!--var s = document.createElement('script');-->
41+
<!--s.setAttribute('type', 'text/javascript');-->
42+
<!--s.setAttribute('src', ("https:" == document.location.protocol ? "https://" : "http://") + "cdn.uservoice.com/javascripts/widgets/tab.js");-->
43+
<!--document.getElementsByTagName('head')[0].appendChild(s);-->
44+
<!--}-->
45+
<!--_loadSuper = window.onload;-->
46+
<!--window.onload = (typeof window.onload != 'function') ? _loadUserVoice : function() { _loadSuper(); _loadUserVoice(); };-->
47+
<!--</script>-->
4848

4949
</head>
5050

@@ -70,7 +70,7 @@
7070
<li><a href="download.html">Download</a></li>
7171
<li><a href="support-index.html">Support</a>
7272
<ul>
73-
<li><a href="howto.html">Get Started</a></li>
73+
<li><a href="howto.html">How does it work</a></li>
7474
<li><a href="faq.html">FAQ</a></li>
7575
</ul>
7676
</li>

‎developer-index.html‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -21,30 +21,30 @@
2121
new WOW().init();
2222
</script>
2323

24-
<script type="text/javascript">
25-
var uservoiceOptions = {
26-
/* required */
27-
key: 'tribler',
28-
host: 'tribler.uservoice.com',
29-
forum: '90409',
30-
showTab: true,
31-
/* optional */
32-
alignment: 'right',
33-
background_color:'#f00',
34-
text_color: 'white',
35-
hover_color: '#009ec3',
36-
lang: 'en'
37-
};
24+
<!--<script type="text/javascript">-->
25+
<!--var uservoiceOptions = {-->
26+
<!--/* required */-->
27+
<!--key: 'tribler',-->
28+
<!--host: 'tribler.uservoice.com',-->
29+
<!--forum: '90409',-->
30+
<!--showTab: true,-->
31+
<!--/* optional */-->
32+
<!--alignment: 'right',-->
33+
<!--background_color:'#f00',-->
34+
<!--text_color: 'white',-->
35+
<!--hover_color: '#009ec3',-->
36+
<!--lang: 'en'-->
37+
<!--};-->
3838

39-
function _loadUserVoice() {
40-
var s = document.createElement('script');
41-
s.setAttribute('type', 'text/javascript');
42-
s.setAttribute('src', ("https:" == document.location.protocol ? "https://" : "http://") + "cdn.uservoice.com/javascripts/widgets/tab.js");
43-
document.getElementsByTagName('head')[0].appendChild(s);
44-
}
45-
_loadSuper = window.onload;
46-
window.onload = (typeof window.onload != 'function') ? _loadUserVoice : function() { _loadSuper(); _loadUserVoice(); };
47-
</script>
39+
<!--function _loadUserVoice() {-->
40+
<!--var s = document.createElement('script');-->
41+
<!--s.setAttribute('type', 'text/javascript');-->
42+
<!--s.setAttribute('src', ("https:" == document.location.protocol ? "https://" : "http://") + "cdn.uservoice.com/javascripts/widgets/tab.js");-->
43+
<!--document.getElementsByTagName('head')[0].appendChild(s);-->
44+
<!--}-->
45+
<!--_loadSuper = window.onload;-->
46+
<!--window.onload = (typeof window.onload != 'function') ? _loadUserVoice : function() { _loadSuper(); _loadUserVoice(); };-->
47+
<!--</script>-->
4848

4949
</head>
5050

@@ -70,7 +70,7 @@
7070
<li><a href="download.html">Download</a></li>
7171
<li><a href="support-index.html">Support</a>
7272
<ul>
73-
<li><a href="howto.html">Get Started</a></li>
73+
<li><a href="howto.html">How does it work</a></li>
7474
<li><a href="faq.html">FAQ</a></li>
7575
</ul>
7676
</li>

‎download.html‎

Lines changed: 41 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -21,30 +21,30 @@
2121
new WOW().init();
2222
</script>
2323

24-
<script type="text/javascript">
25-
var uservoiceOptions = {
26-
/* required */
27-
key: 'tribler',
28-
host: 'tribler.uservoice.com',
29-
forum: '90409',
30-
showTab: true,
31-
/* optional */
32-
alignment: 'right',
33-
background_color:'#f00',
34-
text_color: 'white',
35-
hover_color: '#009ec3',
36-
lang: 'en'
37-
};
38-
39-
function _loadUserVoice() {
40-
var s = document.createElement('script');
41-
s.setAttribute('type', 'text/javascript');
42-
s.setAttribute('src', ("https:" == document.location.protocol ? "https://" : "http://") + "cdn.uservoice.com/javascripts/widgets/tab.js");
43-
document.getElementsByTagName('head')[0].appendChild(s);
44-
}
45-
_loadSuper = window.onload;
46-
window.onload = (typeof window.onload != 'function') ? _loadUserVoice : function() { _loadSuper(); _loadUserVoice(); };
47-
</script>
24+
<!--<script type="text/javascript">-->
25+
<!--var uservoiceOptions = {-->
26+
<!--/* required */-->
27+
<!--key: 'tribler',-->
28+
<!--host: 'tribler.uservoice.com',-->
29+
<!--forum: '90409',-->
30+
<!--showTab: true,-->
31+
<!--/* optional */-->
32+
<!--alignment: 'right',-->
33+
<!--background_color:'#f00',-->
34+
<!--text_color: 'white',-->
35+
<!--hover_color: '#009ec3',-->
36+
<!--lang: 'en'-->
37+
<!--};-->
38+
39+
<!--function _loadUserVoice() {-->
40+
<!--var s = document.createElement('script');-->
41+
<!--s.setAttribute('type', 'text/javascript');-->
42+
<!--s.setAttribute('src', ("https:" == document.location.protocol ? "https://" : "http://") + "cdn.uservoice.com/javascripts/widgets/tab.js");-->
43+
<!--document.getElementsByTagName('head')[0].appendChild(s);-->
44+
<!--}-->
45+
<!--_loadSuper = window.onload;-->
46+
<!--window.onload = (typeof window.onload != 'function') ? _loadUserVoice : function() { _loadSuper(); _loadUserVoice(); };-->
47+
<!--</script>-->
4848

4949
</head>
5050

@@ -70,7 +70,7 @@
7070
<li><a href="download.html">Download</a></li>
7171
<li><a href="support-index.html">Support</a>
7272
<ul>
73-
<li><a href="howto.html">Get Started</a></li>
73+
<li><a href="howto.html">How does it work</a></li>
7474
<li><a href="faq.html">FAQ</a></li>
7575
</ul>
7676
</li>
@@ -95,8 +95,7 @@
9595
<p><img src="img/win.png" width=100px height=100px></p>
9696

9797
<p>
98-
<a href="https://github.com/Tribler/tribler/releases/download/v7.0.0-rc5/Tribler_7.0.0-rc5_x64.exe">Tribler 7.0.0-rc5 for Windows</a><br>
99-
<a href="https://github.com/Tribler/tribler/releases/download/v6.5.2/Tribler_6.5.2.exe">Tribler 6.5.2</a><br>
98+
<a href="https://github.com/Tribler/tribler/releases/download/v7.0.0/Tribler_7.0.0_x64.exe">Tribler 7.0.0 for Windows</a><br>
10099
Windows Vista, and Windows 7 / 8 / 10
101100
</p>
102101
</div>
@@ -107,8 +106,7 @@
107106
<p><img src="img/osx.png" width=100px height=100px></p>
108107

109108
<p>
110-
<a href="https://github.com/Tribler/tribler/releases/download/v7.0.0-rc5/Tribler-7.0.0-rc5.dmg">Tribler 7.0.0-rc5 for macOS</a></br>
111-
<a href="https://github.com/Tribler/tribler/releases/download/v6.5.2/Tribler-6.5.2.dmg">Tribler 6.5.2 </a></br>
109+
<a href="https://github.com/Tribler/tribler/releases/download/v7.0.0/Tribler-7.0.0.dmg">Tribler 7.0.0 for macOS</a></br>
112110
(Snow Leopard or newer)
113111
</p>
114112
</div>
@@ -118,23 +116,30 @@
118116

119117
<p><img src="img/linux.png" width=100px height=100px></p>
120118

121-
<p><a href="https://github.com/Tribler/tribler/releases/download/v7.0.0-rc5/tribler_7.0.0-rc5_all.deb">Tribler 7.0.0-rc5 for Ubuntu</a> </p>
122-
<p><a href="https://github.com/Tribler/tribler/releases/download/v6.5.2/tribler_6.5.2_all.deb">Tribler 6.5.2</a> </p>
119+
<p><a href="https://github.com/Tribler/tribler/releases/download/v7.0.0/tribler_7.0.0_all.deb">Tribler 7.0.0 for Ubuntu</a> </p>
123120

124-
<p><a href="https://github.com/Tribler/tribler/tree/v7.0.0-rc5">Browse source code </a> <br/>
125-
<a href="https://github.com/Tribler/tribler/archive/v7.0.0-rc5.tar.gz">Download source tar</a><br>
121+
<p><a href="https://github.com/Tribler/tribler/tree/v7.0.0">Browse source code </a> <br/>
122+
<a href="https://github.com/Tribler/tribler/archive/v7.0.0.tar.gz">Download source tar</a><br>
126123
</p>
127124

128125
</div>
129126

130127
<div class="changelog">
131-
<p>To see the short changelog <a href="https://github.com/Tribler/tribler/tree/v7.0.0-rc5">click here</a>.</p>
132-
<p>To see a complete list of the changes, please <a href="https://github.com/Tribler/tribler/compare/v7.0.0-rc5...v6.5.2">click here</a>.</p>
128+
<p>To see the short changelog <a href="https://github.com/Tribler/tribler/tree/v7.0.0">click here</a>.</p>
129+
<p>To see a complete list of the changes, please <a href="https://github.com/Tribler/tribler/compare/v6.5.2...v7.0.0">click here</a>.</p>
133130
<br/>
134131
</div>
135132

136133
</section>
137134
</div>
138-
135+
<!-- Global site tag (gtag.js) - Google Analytics -->
136+
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-111501715-1"></script>
137+
<script>
138+
window.dataLayer = window.dataLayer || [];
139+
function gtag(){dataLayer.push(arguments);}
140+
gtag('js', new Date());
141+
142+
gtag('config', 'UA-111501715-1');
143+
</script>
139144
</body>
140145
</html>

‎faq.html‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -21,30 +21,30 @@
2121
new WOW().init();
2222
</script>
2323

24-
<script type="text/javascript">
25-
var uservoiceOptions = {
26-
/* required */
27-
key: 'tribler',
28-
host: 'tribler.uservoice.com',
29-
forum: '90409',
30-
showTab: true,
31-
/* optional */
32-
alignment: 'right',
33-
background_color:'#f00',
34-
text_color: 'white',
35-
hover_color: '#009ec3',
36-
lang: 'en'
37-
};
24+
<!--<script type="text/javascript">-->
25+
<!--var uservoiceOptions = {-->
26+
<!--/* required */-->
27+
<!--key: 'tribler',-->
28+
<!--host: 'tribler.uservoice.com',-->
29+
<!--forum: '90409',-->
30+
<!--showTab: true,-->
31+
<!--/* optional */-->
32+
<!--alignment: 'right',-->
33+
<!--background_color:'#f00',-->
34+
<!--text_color: 'white',-->
35+
<!--hover_color: '#009ec3',-->
36+
<!--lang: 'en'-->
37+
<!--};-->
3838

39-
function _loadUserVoice() {
40-
var s = document.createElement('script');
41-
s.setAttribute('type', 'text/javascript');
42-
s.setAttribute('src', ("https:" == document.location.protocol ? "https://" : "http://") + "cdn.uservoice.com/javascripts/widgets/tab.js");
43-
document.getElementsByTagName('head')[0].appendChild(s);
44-
}
45-
_loadSuper = window.onload;
46-
window.onload = (typeof window.onload != 'function') ? _loadUserVoice : function() { _loadSuper(); _loadUserVoice(); };
47-
</script>
39+
<!--function _loadUserVoice() {-->
40+
<!--var s = document.createElement('script');-->
41+
<!--s.setAttribute('type', 'text/javascript');-->
42+
<!--s.setAttribute('src', ("https:" == document.location.protocol ? "https://" : "http://") + "cdn.uservoice.com/javascripts/widgets/tab.js");-->
43+
<!--document.getElementsByTagName('head')[0].appendChild(s);-->
44+
<!--}-->
45+
<!--_loadSuper = window.onload;-->
46+
<!--window.onload = (typeof window.onload != 'function') ? _loadUserVoice : function() { _loadSuper(); _loadUserVoice(); };-->
47+
<!--</script>-->
4848

4949
<script type="text/javascript" src="js/jquery-1.10.2.min.js"></script>
5050
<script type="text/javascript">
@@ -94,7 +94,7 @@
9494
<li><a href="download.html">Download</a></li>
9595
<li><a href="support-index.html">Support</a>
9696
<ul>
97-
<li><a href="howto.html">Get Started</a></li>
97+
<li><a href="howto.html">How does it work</a></li>
9898
<li><a href="faq.html">FAQ</a></li>
9999
</ul>
100100
</li>

0 commit comments

Comments
 (0)