January 2016 - Wine-Commits

Jeremy Newman : add fr and de translations of global strings
by Jeremy Newman Jan. 19, 2016

Jan. 19, 2016

Module: website Branch: master Commit: 1833a7cd04450e82fe0cf7dc1e39d4012d9d634b URL: http://source.winehq.org/git/website.git/?a=commit;h=1833a7cd04450e82fe0cf7… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jan 19 11:55:32 2016 -0600 add fr and de translations of global strings --- templates/de/global/xml/trans/global.xml | 15 +++++++++++++++ templates/fr/global/xml/trans/global.xml | 15 +++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/templates/de/global/xml/trans/global.xml b/templates/de/global/xml/trans/global.xml new file mode 100644 index 0000000..3008dac --- /dev/null +++ b/templates/de/global/xml/trans/global.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" ?> +<trans lang="de" table="global"> + +  + <str name="tab_winehq">WineHQ</str> + <str name="tab_wiki">Wiki</str> + <str name="tab_appdb">AppDB</str> + <str name="tab_bugs">Bugzilla</str> + <str name="tab_forums">Forums</str> + +  + <str name="hosted_by">Hosted By</str> + <str name="hosted_by_alt">CodeWeavers - Führt Windows-Anwendungen und -Spiele unter Linux und Mac aus</str> + +</trans> diff --git a/templates/fr/global/xml/trans/global.xml b/templates/fr/global/xml/trans/global.xml new file mode 100644 index 0000000..e3c51a9 --- /dev/null +++ b/templates/fr/global/xml/trans/global.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" ?> +<trans lang="fr" table="global"> + +  + <str name="tab_winehq">WineHQ</str> + <str name="tab_wiki">Wiki</str> + <str name="tab_appdb">AppDB</str> + <str name="tab_bugs">Bugzilla</str> + <str name="tab_forums">Forums</str> + +  + <str name="hosted_by">Hébergé par</str> + <str name="hosted_by_alt">CodeWeavers - Exécuter des applications et jeux Windows sur Mac et Linux</str> + +</trans>

1 0

Jeremy Newman : clean up
by Jeremy Newman Jan. 19, 2016

Jan. 19, 2016

Module: website Branch: master Commit: c9f01901cc38d371c6d1fd681034db0208523e38 URL: http://source.winehq.org/git/website.git/?a=commit;h=c9f01901cc38d371c6d1fd… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jan 19 12:43:19 2016 -0600 clean up --- templates/en/search.template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/templates/en/search.template b/templates/en/search.template index a142ead..003d434 100644 --- a/templates/en/search.template +++ b/templates/en/search.template @@ -1,7 +1,6 @@  - -<h1 class="title" style="margin-bottom: 10px;">Search Results</h1> +<h1 class="title margin-bottom-md">Search Results</h1> <script> (function() {

1 0

Jeremy Newman : clean up irc page
by Jeremy Newman Jan. 19, 2016

Jan. 19, 2016

Module: website Branch: master Commit: 5a0649317a24823912dc474caf8912548975d099 URL: http://source.winehq.org/git/website.git/?a=commit;h=5a0649317a24823912dc47… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jan 19 12:36:19 2016 -0600 clean up irc page --- templates/en/irc.template | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/templates/en/irc.template b/templates/en/irc.template index 1d96c47..401c6ab 100644 --- a/templates/en/irc.template +++ b/templates/en/irc.template @@ -35,7 +35,7 @@ a chat by clicking on:</p> to research your question some before asking about it on the IRC. The <a href="http://wiki.winehq.org/FAQ">Wine FAQ</a>, <a href="//appdb.winehq.org">AppDB</a>, and -<a href="//www.winehq.org/site/download">download page</a> are all good +<a href="//www.winehq.org/download">download page</a> are all good resources to check first.</p> <h2>IRC Rules and Penalties</h2> @@ -54,33 +54,36 @@ want to contest a ban, go to <b>#winehq-social</b> (or the been banned from <b>#winehq-social</b>), and explain why you believe you were banned in the first place and why the ban should be lifted.</p> -<table border="0" cellpadding="5" cellspacing="1" bgcolor="#EFEFEF"> - <tr align="center" bgcolor="black"> - <th><b><font color="white" class="small">Rule</font></b></th> - <th><b><font color="white" class="small">Clarification</font></b></th> - <th><b><font color="white" class="small">Warnings</font></b></th> - <th><b><font color="white" class="small">Kicks</font></b></th> +<table class="table"> +<thead> + <tr class="black inverse small"> + <th>Rule</th> + <th>Clarification</th> + <th>Warnings</th> + <th>Kicks</th> </tr> - <tr bgcolor="#ffffff"> +</thead> +<tbody> + <tr> <td>Do not spam.</td> <td></td> <td>1</td> <td>2</td> </tr> - <tr bgcolor="#ffffff"> + <tr> <td>Use a pastebin for pasting more than 1 or 2 lines.</td> <td><a href="http://winehq.pastebin.com">winehq.pastebin.com</a> and <a href="http://pastebin.ca">pastebin.ca</a> both work well.</td> <td>0</td> <td>5</td> </tr> - <tr bgcolor="#ffffff"> + <tr> <td>Talk in the appropriate channel.</td> <td>If unsure, ask in <b>#winehq</b> which channel to join.</td> <td>2</td> <td>3</td> </tr> - <tr bgcolor="#ffffff"> + <tr> <td>Only Wine and Crossover are supported in their respective channels.</td> <td>Sidenet, WineDoors, Cedega, IEs4Linux, etc. are <b>not</b> @@ -88,7 +91,7 @@ banned in the first place and why the ban should be lifted.</p> <td>2</td> <td>1</td> </tr> - <tr bgcolor="#ffffff"> + <tr> <td>Before asking for help in <b>#winehq</b>, be sure you're running the latest version of Wine.</td> <td>If unsure, run <tt>wine --version</tt> in the command line to @@ -96,16 +99,17 @@ banned in the first place and why the ban should be lifted.</p> <td>3</td> <td>1</td> </tr> - <tr bgcolor="#ffffff"> + <tr> <td>Please wait your turn for help.</td> <td></td> <td>3</td> <td>1</td> </tr> - <tr bgcolor="#ffffff"> + <tr> <td>Do <b>not</b> discuss pirated software.</td> <td></td> <td>1</td> <td>1</td> </tr> +</tbody> </table>

1 0

Jeremy Newman : add some info icons
by Jeremy Newman Jan. 19, 2016

Jan. 19, 2016

Module: website Branch: master Commit: 363484eaaf15a625d063df557a6627e22c0db89a URL: http://source.winehq.org/git/website.git/?a=commit;h=363484eaaf15a625d063df… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jan 19 12:41:14 2016 -0600 add some info icons --- templates/en/download.template | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/en/download.template b/templates/en/download.template index 2ba2acb..6dd5cc2 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -50,6 +50,7 @@ <div class="col-md-1"></div> <div class="col-md-7"> <div class="whq-info-box center"> + <span class="glyphicon glyphicon-info-sign big pull-left text-muted"></span> <b>See the <a href="http://wiki.winehq.org/HowTo">installation and configuration how-to</a> for post-installation instructions.</b> </div> </div> @@ -153,5 +154,6 @@ </p> <div class="whq-info-box"> + <span class="glyphicon glyphicon-info-sign text-muted"></span> <b>Note:</b> See the <a href="http://wiki.winehq.org/Recommended_Packages">recommended packages</a> for help on configuring and building Wine. </div>

1 0

Jeremy Newman : remove unused banner ad code
by Jeremy Newman Jan. 19, 2016

Jan. 19, 2016

Module: website Branch: master Commit: da36925eebb42af7eb8dbc79e6e609efa1815edf URL: http://source.winehq.org/git/website.git/?a=commit;h=da36925eebb42af7eb8dbc… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jan 19 12:31:44 2016 -0600 remove unused banner ad code --- bin/.htaccess | 7 ---- bin/ad | 61 -------------------------------- images/bannerads/WineReleaseParty01.png | Bin 16509 -> 0 bytes images/bannerads/WineReleaseParty02.png | Bin 15764 -> 0 bytes images/bannerads/WineReleaseParty03.png | Bin 15057 -> 0 bytes 5 files changed, 68 deletions(-) diff --git a/bin/.htaccess b/bin/.htaccess deleted file mode 100644 index 48eff56..0000000 --- a/bin/.htaccess +++ /dev/null @@ -1,7 +0,0 @@ -deny from all - -<Files ad> - allow from all - ForceType application/x-httpd-php -</Files> - diff --git a/bin/ad b/bin/ad deleted file mode 100644 index e7c20da..0000000 --- a/bin/ad +++ /dev/null @@ -1,61 +0,0 @@ -<?php - -/* Banner Ad Code */ -/* For WineHQ */ - -// path for banner ad -$bannerads_path = '../images/bannerads/'; - -// max count until we stop displaying ads for user -$max_ads = 10; - -// check cookie for ad counter -$whqac = 0; -if (isset($_COOKIE['whqac'])) - $whqac = $_COOKIE['whqac']; -unset($_COOKIE["whqac"]); -$whqac++; - -// randomly select a banner and display it -if ($whqac >= $max_ads) -{ - // display fixed ad - $whqac = $max_ads; - $img = "../images/blank.gif"; -} -else -{ - // get random ad - $ads = array(); - $d = opendir($bannerads_path); - while($entry = readdir($d)) - { - if(!ereg("(.+)\\.png$", $entry, $arr)) - continue; - array_push($ads, $arr[1]); - } - closedir($d); - sort($ads); - $img = $bannerads_path.$ads[(rand(1,count($ads))-1)]; -} - -// da banner -setcookie("whqac", $whqac, time()+60*60*24*365); -header("Expires: Mon, 1 Jan 2006 05:00:00 GMT"); -header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); - -?> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> - <title>WineHQ Banner Ad</title> -</head> -<body bgcolor="#E2E2E2" text="#000000" marginwidth="0" marginheight="0" style="margin:0px;"> -<a href="http://www.codeweavers.com/products/support_wine/" target="_top"><img -src="<?=$img?>" width="468" height="60" border="0" alt="Support the Wine Project" -title="Support the Wine Project" /></a> -</body> -</html> diff --git a/images/bannerads/WineReleaseParty01.png b/images/bannerads/WineReleaseParty01.png deleted file mode 100644 index e49eb76..0000000 Binary files a/images/bannerads/WineReleaseParty01.png and /dev/null differ diff --git a/images/bannerads/WineReleaseParty02.png b/images/bannerads/WineReleaseParty02.png deleted file mode 100644 index bec58ce..0000000 Binary files a/images/bannerads/WineReleaseParty02.png and /dev/null differ diff --git a/images/bannerads/WineReleaseParty03.png b/images/bannerads/WineReleaseParty03.png deleted file mode 100644 index 52a7be7..0000000 Binary files a/images/bannerads/WineReleaseParty03.png and /dev/null differ

1 0

Jeremy Newman : remove requirement for base_path config var
by Jeremy Newman Jan. 19, 2016

Jan. 19, 2016

Module: website Branch: master Commit: 1fb8c25327696aa95a66618852768725534205ff URL: http://source.winehq.org/git/website.git/?a=commit;h=1fb8c25327696aa95a6661… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jan 19 11:49:42 2016 -0600 remove requirement for base_path config var --- include/utils.php | 4 ++-- include/winehq.conf.sample | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/include/utils.php b/include/utils.php index f9cc2c6..21d5253 100644 --- a/include/utils.php +++ b/include/utils.php @@ -63,7 +63,7 @@ function include_plugin ($__module, $_PLUGIN = array()) $__module = preg_replace('%(^\/|^\\\|^\.|\.\.*)%', '', $__module); // load module if file exists - if ($__module and file_exists("{$GLOBALS['config']->base_path}include/plugins/{$__module}.php")) + if ($__module and file_exists("{$GLOBALS['file_root']}/include/plugins/{$__module}.php")) { debug("plugin", "loading plugin: [{$__module}]"); $out = ""; @@ -74,7 +74,7 @@ function include_plugin ($__module, $_PLUGIN = array()) extract($GLOBALS, EXTR_REFS); // execute the plugin - include("{$config->base_path}include/plugins/{$__module}.php"); + include("{$GLOBALS['file_root']}/include/plugins/{$__module}.php"); $out = ob_get_contents(); } catch (_pluginError $e) diff --git a/include/winehq.conf.sample b/include/winehq.conf.sample index 8967c53..82db033 100644 --- a/include/winehq.conf.sample +++ b/include/winehq.conf.sample @@ -29,14 +29,11 @@ lang: en base_root: base_url: https://www.winehq.org{$base_root}/ -# base path on filesystem to website -base_path: /home/wineowner/opt/www/ - # Path to WWN XML files -news_xml_path: {$base_path}news +news_xml_path: ./news # Path to WWN XML files -wwn_xml_path: {$base_path}wwn +wwn_xml_path: ./wwn # URL for bugs bug_system: http://bugs.winehq.org/show_bug.cgi?id=

1 0

Jeremy Newman : status link should be in the wine wiki
by Jeremy Newman Jan. 19, 2016

Jan. 19, 2016

Module: website Branch: master Commit: 7202cfa52aa42c91d556133e0eee71ac0eb4d648 URL: http://source.winehq.org/git/website.git/?a=commit;h=7202cfa52aa42c91d55613… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jan 19 10:31:48 2016 -0600 status link should be in the wine wiki also fix the codeweavers internship link --- templates/de/devel.template | 4 +- templates/en/devel.template | 3 +- templates/en/status.template | 133 ------------------------------------------- templates/pl/devel.template | 4 +- templates/tr/devel.template | 4 +- templates/tr/status.template | 129 ----------------------------------------- 6 files changed, 7 insertions(+), 270 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=7202cfa52aa42c91d5…

1 0

Jeremy Newman : Merge branch 'master' of winehq.org:/home/winehq/opt/ source/git/website
by Jeremy Newman Jan. 19, 2016

Jan. 19, 2016

Module: website Branch: master Commit: bbe34b348dfec3a60da3f5a8d1242e6d1da28ebf URL: http://source.winehq.org/git/website.git/?a=commit;h=bbe34b348dfec3a60da3f5… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jan 19 10:15:24 2016 -0600 Merge branch 'master' of winehq.org:/home/winehq/opt/source/git/website ---

1 0

Jeremy Newman : update english files for new layout
by Jeremy Newman Jan. 19, 2016

Jan. 19, 2016

Module: website Branch: master Commit: 8dd8c5f063c1cabafb2523881ead20332cc6ee18 URL: http://source.winehq.org/git/website.git/?a=commit;h=8dd8c5f063c1cabafb2523… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jan 19 09:54:57 2016 -0600 update english files for new layout --- templates/en/about.template | 1 - templates/en/devel.template | 195 ++++++++++++----------- templates/en/donate.template | 51 +++--- templates/en/download.template | 296 +++++++++++++++++------------------ templates/en/forums.template | 1 - templates/en/help.template | 119 +++++++------- templates/en/home.template | 140 +++++++++-------- templates/en/irc.template | 1 - templates/en/license.template | 1 - templates/en/wineconf/media.template | 2 +- 10 files changed, 392 insertions(+), 415 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=8dd8c5f063c1cabafb…

1 0

Jeremy Newman : remove template, merge into plugin
by Jeremy Newman Jan. 19, 2016

Jan. 19, 2016

Module: website Branch: master Commit: 120f2717b5973a7affe892cb985c89be4ae630fc URL: http://source.winehq.org/git/website.git/?a=commit;h=120f2717b5973a7affe892… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jan 19 09:52:39 2016 -0600 remove template, merge into plugin --- include/plugins/language.php | 9 +++------ templates/en/global/lang_row.template | 3 --- templates/tr/global/lang_row.template | 3 --- templates/uk/global/lang_row.template | 3 --- 4 files changed, 3 insertions(+), 15 deletions(-) diff --git a/include/plugins/language.php b/include/plugins/language.php index dc8da6f..8ea917e 100644 --- a/include/plugins/language.php +++ b/include/plugins/language.php @@ -12,12 +12,9 @@ switch ($_PLUGIN['cmd']) case "list": foreach ($config->languages as $lang) { - $row = array( - 'lang' => $lang, - 'langFull' => $data->languages[$lang]['name'], - 'langHelp' => $data->languages[$lang]['change'] - ); - echo $html->template('local', 'global/lang_row', $row, 1); + echo "<li style=\"background-image: url('{$html->base_url()}/images/lang/{$lang}.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;\">\n". + " <a href=\"{$html->base_url()}/lang/{$lang}\">{$whq_data->languages[$lang]['name']}</a> · {$whq_data->languages[$lang]['change']}\n". + "</li>\n"; } break; diff --git a/templates/en/global/lang_row.template b/templates/en/global/lang_row.template deleted file mode 100644 index cb6c776..0000000 --- a/templates/en/global/lang_row.template +++ /dev/null @@ -1,3 +0,0 @@ - <li style="background-image: url('{$root}/images/lang/{$lang}.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> - <a href="{$root}/lang/{$lang}">{$langFull}</a> · {$langHelp} - </li> diff --git a/templates/tr/global/lang_row.template b/templates/tr/global/lang_row.template deleted file mode 100644 index cb6c776..0000000 --- a/templates/tr/global/lang_row.template +++ /dev/null @@ -1,3 +0,0 @@ - <li style="background-image: url('{$root}/images/lang/{$lang}.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> - <a href="{$root}/lang/{$lang}">{$langFull}</a> · {$langHelp} - </li> diff --git a/templates/uk/global/lang_row.template b/templates/uk/global/lang_row.template deleted file mode 100644 index cb6c776..0000000 --- a/templates/uk/global/lang_row.template +++ /dev/null @@ -1,3 +0,0 @@ - <li style="background-image: url('{$root}/images/lang/{$lang}.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> - <a href="{$root}/lang/{$lang}">{$langFull}</a> · {$langHelp} - </li>

1 0