Module: website Branch: master Commit: ec2957aefab5d3e5e63409b07be0abfbbff6de06 URL: https://source.winehq.org/git/website.git/?a=commit;h=ec2957aefab5d3e5e63409...
Author: Jeremy Newman jnewman@codeweavers.com Date: Wed May 2 15:49:39 2018 -0500
clean up news and rss links
sync the languages, and use font awesome
---
css/styles.css | 16 ---------------- templates/de/news.template | 16 ---------------- templates/en/news.template | 11 +++++------ templates/fr/news.template | 12 ++++++++---- templates/ko/news.template | 12 ++++++------ templates/pl/news.template | 11 +++++------ templates/tr/news.template | 13 ++++++------- templates/uk/news.template | 13 ++++++------- templates/zh-cn/news.template | 13 ++++++------- 9 files changed, 42 insertions(+), 75 deletions(-)
diff --git a/css/styles.css b/css/styles.css index 4c046d9..5564088 100644 --- a/css/styles.css +++ b/css/styles.css @@ -536,22 +536,6 @@ div.rbox div.content { margin: 0; background-color: #FFFFFF; } .wwnQuote { color: #A8003C; } p.indent { padding-left: 1em; padding-right: 1em;}
-/* RSS Feed Links */ -ul.rss { - list-style: none; - padding: 0 0 0 2px; - margin: 0; -} -ul.rss li { - background: url("./images/feed.gif") no-repeat 0 1px; - padding: 0px 0 0px 0px; - height: 18px; -} -ul.rss li a { - font-size: 8pt; - padding: 0 0 0 18px; -} - /* template navigation links */ .link-container { position: relative; height: 1.2em; } .link-container p { position: absolute; width: 50%; margin: 0; } diff --git a/templates/de/news.template b/templates/de/news.template deleted file mode 100644 index 0fe155a..0000000 --- a/templates/de/news.template +++ /dev/null @@ -1,16 +0,0 @@ -<!--TITLE:[News]--> -<!--BLURB:[Die neuesten Nachrichten der Wine Community.]--> - -<h1 class="title">News</h1> - -<!--EXEC:[news]--> - -<hr /> - -<div class="link-container"> - <p><a href="{$root}/wwn/">World Wine News Archiv</a></p> -</div> -<ul class="rss"> - <li><a href="{$root}/news/rss/">WineHQ News RSS Feed</a></li> -</ul> - diff --git a/templates/en/news.template b/templates/en/news.template index 0443453..719e072 100644 --- a/templates/en/news.template +++ b/templates/en/news.template @@ -1,5 +1,4 @@ <!--TITLE:[News]--> -<!--BLURB:[All the latest news from the Wine community.]-->
<h1 class="title">News</h1>
@@ -8,9 +7,9 @@ <hr>
<div class="link-container"> - <p><a href="{$root}/wwn/">World Wine News Archive</a></p> + <p> + <a href="{$root}/wwn"><i class="fas fa-newspaper"></i> World Wine News Archive</a> + <i class="fas fa-ellipsis-v"></i> + <a href="{$root}/news/rss"><i class="fas fa-rss-square"></i> WineHQ News RSS Feed</a> + </p> </div> -<ul class="rss"> - <li><a href="{$root}/news/rss/">WineHQ News RSS Feed</a></li> -</ul> - diff --git a/templates/fr/news.template b/templates/fr/news.template index 68585e5..e62421c 100644 --- a/templates/fr/news.template +++ b/templates/fr/news.template @@ -1,11 +1,15 @@ <!--TITLE:[Nouvelles]--> -<!--BLURB:[Toutes les dernières nouvelles de la communauté de Wine.]-->
<h1 class="title">Nouvelles</h1>
<!--EXEC:[news]-->
-<ul class="rss"> - <li><a href="{$root}/news/rss/">Flux RSS des nouvelles de WineHQ</a></li> -</ul> +<hr>
+<div class="link-container"> + <p> + <a href="{$root}/wwn"><i class="fas fa-newspaper"></i> World Wine News Archive</a> + <i class="fas fa-ellipsis-v"></i> + <a href="{$root}/news/rss"><i class="fas fa-rss-square"></i> Flux RSS des nouvelles de WineHQ</a> + </p> +</div> diff --git a/templates/ko/news.template b/templates/ko/news.template index 59878d5..69cb5da 100644 --- a/templates/ko/news.template +++ b/templates/ko/news.template @@ -1,5 +1,4 @@ -<!--TITLE:[News]--> -<!--BLURB:[All the latest news from the Wine community.]--> +<!--TITLE:[소식]-->
<h1 class="title">소식</h1>
@@ -8,9 +7,10 @@ <hr>
<div class="link-container"> - <p><a href="{$root}/wwn/">보존된 세계 와인 소식</a></p> + <p> + <a href="{$root}/wwn"><i class="fas fa-newspaper"></i> 보존된 세계 와인 소식</a> + <i class="fas fa-ellipsis-v"></i> + <a href="{$root}/news/rss"><i class="fas fa-rss-square"></i> 와인HQ 소식 RSS 피드</a> + </p> </div> -<ul class="rss"> - <li><a href="{$root}/news/rss/">와인HQ 소식 RSS 피드</a></li> -</ul>
diff --git a/templates/pl/news.template b/templates/pl/news.template index 5bad815..77f9f22 100644 --- a/templates/pl/news.template +++ b/templates/pl/news.template @@ -1,5 +1,4 @@ <!--TITLE:[Wieści]--> -<!--BLURB:[Najświeższe wieści dotyczące społeczności Wine.]-->
<h1 class="title">Wieści</h1>
@@ -8,9 +7,9 @@ <hr>
<div class="link-container"> - <p><a href="{$root}/wwn/">Archiwum Wieści ze Świata Wine</a></p> + <p> + <a href="{$root}/wwn"><i class="fas fa-newspaper"></i> Archiwum Wieści ze Świata Wine</a> + <i class="fas fa-ellipsis-v"></i> + <a href="{$root}/news/rss"><i class="fas fa-rss-square"></i> Kanał RSS Wieści WineHQ</a> + </p> </div> -<ul class="rss"> - <li><a href="{$root}/news/rss/">Kanał RSS Wieści WineHQ</a></li> -</ul> - diff --git a/templates/tr/news.template b/templates/tr/news.template index c529df2..ebea1c1 100644 --- a/templates/tr/news.template +++ b/templates/tr/news.template @@ -1,16 +1,15 @@ <!--TITLE:[Haberler]--> -<!--BLURB:[Wine topluluğundan tüm yeni haberler.]-->
<h1 class="title">Haberler</h1>
<!--EXEC:[news]-->
-<hr /> +<hr>
<div class="link-container"> - <p><a href="{$root}/wwn/">Dünya Wine Haber Arşivi</a></p> + <p> + <a href="{$root}/wwn"><i class="fas fa-newspaper"></i> Dünya Wine Haber Arşivi</a> + <i class="fas fa-ellipsis-v"></i> + <a href="{$root}/news/rss"><i class="fas fa-rss-square"></i> WineHQ Haber RSS Beslemesi</a> + </p> </div> -<ul class="rss"> - <li><a href="{$root}/news/rss/">WineHQ Haber RSS Beslemesi</a></li> -</ul> - diff --git a/templates/uk/news.template b/templates/uk/news.template index 52ba070..164507c 100644 --- a/templates/uk/news.template +++ b/templates/uk/news.template @@ -1,16 +1,15 @@ <!--TITLE:[Новини]--> -<!--BLURB:[Всі останні новини співтовариства Wine.]-->
<h1 class="title">Новини</h1>
<!--EXEC:[news]-->
-<hr /> +<hr>
<div class="link-container"> - <p><a href="{$root}/wwn/">Світовий новинний архів Wine</a></p> + <p> + <a href="{$root}/wwn"><i class="fas fa-newspaper"></i> Світовий новинний архів Wine</a> + <i class="fas fa-ellipsis-v"></i> + <a href="{$root}/news/rss"><i class="fas fa-rss-square"></i> WineHQ Новинна стрічка RSS Feed</a> + </p> </div> -<ul class="rss"> - <li><a href="{$root}/news/rss/">WineHQ Новинна стрічка RSS Feed</a></li> -</ul> - diff --git a/templates/zh-cn/news.template b/templates/zh-cn/news.template index ea32da2..b23f88b 100644 --- a/templates/zh-cn/news.template +++ b/templates/zh-cn/news.template @@ -1,16 +1,15 @@ <!--TITLE:[新闻]--> -<!--BLURB:[来自 Wine 社区的最新消息。]-->
<h1 class="title">新闻</h1>
<!--EXEC:[news]-->
-<hr /> +<hr>
<div class="link-container"> - <p><a href="{$root}/wwn/">全部 Wine 新闻归档</a></p> + <p> + <a href="{$root}/wwn"><i class="fas fa-newspaper"></i> 全部 Wine 新闻归档</a> + <i class="fas fa-ellipsis-v"></i> + <a href="{$root}/news/rss"><i class="fas fa-rss-square"></i> WineHQ 新闻 RSS 订阅</a> + </p> </div> -<ul class="rss"> - <li><a href="{$root}/news/rss/">WineHQ 新闻 RSS 订阅</a></li> -</ul> -