summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2022-09-08 14:45:18 +0200
committerVolker Hilsheimer <volker.hilsheimer@qt.io>2022-09-14 05:44:46 +0000
commitb26d6903ca7ed07fdb951d35ec87c270fcb47fda (patch)
tree017ae8bfbfd352bc8fce4d13faf2b47ff81b4a38 /scripts
parenta8437491c7801f268b0dd52bd2a69a0926e11b40 (diff)
Update Planet Qt submodule to latest version
As at planetqt commit 3e350aefca147b9c06361a25947fe5cd931da0c9 (last template.qt update 2019) and update scripts/template.diff to match. Change-Id: I6c03176e31e175d627d7446cafda53013858a9ac Reviewed-by: Olli Puurunen <olli.puurunen@qt.io> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/template.diff29
1 files changed, 14 insertions, 15 deletions
diff --git a/scripts/template.diff b/scripts/template.diff
index 0902e11..c1e49fc 100644
--- a/scripts/template.diff
+++ b/scripts/template.diff
@@ -1,5 +1,5 @@
---- planetqt/template.qt 2017-04-21 16:11:06.542439585 +0200
-+++ scripts/template.html 2017-04-25 17:50:11.806838515 +0200
+--- planetqt/template.qt 2022-09-08 14:35:37.086932542 +0200
++++ scripts/template.html 2022-09-08 14:42:36.624911663 +0200
@@ -9,8 +9,8 @@
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
@@ -11,7 +11,7 @@
<link rel="shortcut icon" href="favicon.ico" />
<link href='http://fonts.googleapis.com/css?family=Open+Sans:700,300,400' rel='stylesheet' type='text/css'>
<link rel="stylesheet" type="text/css" href="online.css" />
-@@ -82,33 +82,14 @@
+@@ -82,32 +82,14 @@
</div>
<div class="content">
<div class="wrapper">
@@ -34,26 +34,25 @@
- <h3>Join us</h3>
- <ul class="icon-links">
- <li class="qtproject-twitter"><a href="http://twitter.com/qtproject">@qtproject</a></li>
-- <li class="qtproject-gplus"><a href="https://plus.google.com/104580575722059274792">Qt Project</a></li>
- <li class="qt-meetup"><a href="http://www.meetup.com/QtEverywhere/">Qt Meetups</a></li>
- </ul>
- <h3>Contributing</h3>
-- <p>All who blog in English about Qt can either add their complete RSS feed or a feed based on a specific category or tag for those blogging about multiple topics. All you need to do is clone the <a href="https://codereview.qt-project.org/#admin,project,www/planetqt,info">Planet Qt repository</a>, add your feed's address, and put your change up for <a href="http://wiki.qt.io/Code_Reviews">review</a>.</p>
+- <p>All who blog in English about Qt can either add their complete RSS feed or a feed based on a specific category or tag for those blogging about multiple topics. All you need to do is clone the <a href="https://code.qt.io/cgit/www/planetqt.git/">Planet Qt repository</a>, add your feed's address, and put your change up for <a href="http://wiki.qt.io/Code_Reviews">review</a>.</p>
- <h3>Subscriptions</h3>
- __feedlist__
- </aside>
-+ <h1>%(title)s</h1>
-+ <ul>
-+ <li><a href="./">QUIP Index</a></li>
-+ <li><a href="quip-%(quipnum)s.html">QUIP %(quip)s</a></li>
-+ </ul>
-+<div class="context document">
++ <h1>%(title)s</h1>
++ <ul>
++ <li><a href="./">QUIP Index</a></li>
++ <li><a href="quip-%(quipnum)s.html">QUIP %(quip)s</a></li>
++ </ul>
++ <div class="context document">
+%(body)s
-+</div>
++ </div>
</div>
</div>
<div id="footer">
-@@ -174,7 +155,7 @@
+@@ -173,7 +155,7 @@
<a href="http://www.qt.io/about-us/" target="_blank" class="theqtcompany"></a>
<div class="footer-social clearfix">
<div class="facebook">
@@ -62,12 +61,12 @@
</div>
<div class="twitter">
<iframe id="twitter-widget-0" scrolling="no" frameborder="0" allowtransparency="true" src="//platform.twitter.com/widgets/follow_button.33b190ea0cba008796487b65df7f6d8e.en.html#_=1414403615717&amp;id=twitter-widget-0&amp;lang=en&amp;screen_name=qtproject&amp;show_count=true&amp;show_screen_name=false&amp;size=m" class="twitter-follow-button twitter-follow-button" title="Twitter Follow Button" data-twttr-rendered="true" style="width: 160px; height: 20px;"></iframe>
-@@ -186,7 +167,7 @@
+@@ -185,7 +167,7 @@
<div class="container clearfix no_discs">
<ul id="menu-footer-submenu" class="right clearfix"><li class="menu-item"><a href="http://www.qtworldsummit.com">Qt World Summit</a></li>
<li class="menu-item"><a title="Sign into your account." href="https://account.qt.io/login">Sign In</a></li>
- <li class="menu-item"><a href="mailto:feedback@theqtcompany.com?Subject=Feedback%20about%20www.qt.io%20site">Feedback</a></li>
+ <li class="menu-item"><a href="mailto:feedback@theqtcompany.com?Subject=Feedback%%20about%%20www.qt.io%%20site">Feedback</a></li>
- <li class="menu-item"><a href="http://www.qt.io/about-us">© 2015 The Qt Company</a></li>
+ <li class="menu-item"><a href="http://www.qt.io/about-us">© 2019 The Qt Company</a></li>
</ul>
</div>