Skip to content

Commit

Permalink
Fix bugzilla and forum links in "setup" web documentation
Browse files Browse the repository at this point in the history 
#3
  • Loading branch information
@merks
merks committed Jun 19, 2023
1 parent ce5110b commit cc37b9f
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 57 deletions.
14 changes: 0 additions & 14 deletions releng/org.eclipse.oomph.releng/www/donate/index.php
View file
Expand Up @@ -143,8 +143,6 @@
$Nav->addNavSeparator("Invest Your Time", "");
$Nav->addCustomNav("Get an Account", "https://accounts.eclipse.org/user/register", "_blank", 1);
$Nav->addCustomNav("Sign the Contributor Agreement", "https://accounts.eclipse.org/user/eca", "_blank", 1);
$Nav->addCustomNav("Configure Your Gerrit Account", "https://wiki.eclipse.org/Gerrit#User_Account", "_blank", 1);
$Nav->addCustomNav("Learn Bugzilla", "https://wiki.eclipse.org/Bug_Reporting_FAQ", "_blank", 1);
$Nav->addCustomNav("Contribute to the Platform", "https://www.eclipse.org/setups/installer/?url=https://raw.githubusercontent.com/eclipse-platform/eclipse.platform.releng.aggregator/master/oomph/PlatformSDKConfiguration.setup&show=true", "_blank", 1);

$branding_image = "https://www.eclipse.org/downloads/images/committers.png";
Expand Down Expand Up @@ -285,18 +283,6 @@
If you haven't already signed your Eclipse Contributor Agreement, <a href="https://accounts.eclipse.org/user/eca" target="_blank">sign</a> now.
</li>
<li>
If you haven't already set up your Eclipse Gerrit Account, <a href="https://wiki.eclipse.org/Gerrit#User_Account" target="_blank">set it up</a> now.
</li>
<li>
If you're not familiar with Bugzilla,
learn <a href="https://wiki.eclipse.org/Bug_Reporting_FAQ" target="_blank">how to use Bugzilla</a>
and learn how Buzilla fits into the <a href="https://wiki.eclipse.org/Development_Resources/HOWTO/Bugzilla_Use" target="_blank">development process</a>.
</li>
<li>
If you don't have a particular problem or enhancment in mind,
look at the <a href="https://bugs.eclipse.org/bugs/buglist.cgi?bug_status=NEW&bug_status=REOPENED&keywords=helpwanted" target="_blank">Bugzilla reports for which help is wanted</a>.
</li>
<li>
You'll need to set up a development environment with the workspace provisioned to include the Git repositories of the projects to which you wish to contribute.
<ul>
<li>
Expand Down
12 changes: 2 additions & 10 deletions releng/org.eclipse.oomph.releng/www/installer/index.html
View file
Expand Up @@ -504,12 +504,8 @@
</li>
<li class="dropdown visible-xs"><a href="#" data-toggle="dropdown" class="dropdown-toggle">Participate <b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="https://bugs.eclipse.org/bugs/">Report a Bug</a></li>
<li><a href="https://www.eclipse.org/forums/">Forums</a></li>
<li><a href="https://www.eclipse.org/mail/">Mailing Lists</a></li>
<li><a href="https://wiki.eclipse.org/">Wiki</a></li>
<li><a href="https://wiki.eclipse.org/IRC">IRC</a></li>
<li><a href="https://www.eclipse.org/org/research/">Research</a></li>
</ul>
</li>
<li class="dropdown visible-xs"><a href="#" data-toggle="dropdown" class="dropdown-toggle">Eclipse IDE <b class="caret"></b></a>
Expand Down Expand Up @@ -547,12 +543,8 @@
<li>
<p><strong>Participate</strong></p>
</li>
<li><a href="https://bugs.eclipse.org/bugs/">Report a Bug</a></li>
<li><a href="https://www.eclipse.org/forums/">Forums</a></li>
<li><a href="https://www.eclipse.org/mail/">Mailing Lists</a></li>
<li><a href="https://wiki.eclipse.org/">Wiki</a></li>
<li><a href="https://wiki.eclipse.org/IRC">IRC</a></li>
<li><a href="https://www.eclipse.org/org/research/">Research</a></li>
</ul>
<ul class="col-sm-8 list-unstyled">
<li>
Expand Down Expand Up @@ -839,11 +831,11 @@ <h3 class="section-header">
<li class="separator">Community</li>
<li>
<i class="fa fa-caret-right fa-fw"></i>
<a href="https://www.eclipse.org/forums/index.php/f/287/" target="oomph_forum">Ask a Question</a>
<a href="https://github.com/eclipse-oomph/oomph/discussions" target="oomph_discussions">Ask a Question</a>
</li>
<li>
<i class="fa fa-caret-right fa-fw"></i>
<a href="https://bugs.eclipse.org/bugs/enter_bug.cgi?product=Oomph" target="oomph_bugzilla">Report a Problem</a>
<a href="https://github.com/eclipse-oomph/oomph/issues" target="oomph_issues">Report a Problem</a>
</li>
<li>
<i class="fa fa-caret-right fa-fw"></i>
Expand Down
12 changes: 0 additions & 12 deletions releng/org.eclipse.oomph.releng/www/installer/notification/index.php
View file
Expand Up @@ -161,18 +161,6 @@
If you haven't already signed your Eclipse Contributor Agreement, <a href="https://accounts.eclipse.org/user/eca" target="_blank">sign</a> now.
</li>
<li>
If you haven't already set up your Eclipse Gerrit Account, <a href="https://wiki.eclipse.org/Gerrit#User_Account" target="_blank">set it up</a> now.
</li>
<li>
If you're not familiar with Bugzilla,
learn <a href="http://wiki.eclipse.org/Bug_Reporting_FAQ" target="_blank">how to use Bugzilla</a>
and learn how Buzilla fits into the <a href="http://wiki.eclipse.org/Development_Resources/HOWTO/Bugzilla_Use" target="_blank">development process</a>.
</li>
<li>
If you don't have a particular problem or enhancment in mind,
look at the <a href="https://bugs.eclipse.org/bugs/buglist.cgi?bug_status=NEW&bug_status=REOPENED&keywords=helpwanted" target="_blank">Bugzilla reports for which help is wanted</a>.
</li>
<li>
You'll need to set up a development environment with the workspace provisioned to include the Git repositories of the projects to which you wish to contribute.
<ul>
<li>
Expand Down
21 changes: 10 additions & 11 deletions releng/org.eclipse.oomph.releng/www/installer/problem/index.php
View file
Expand Up @@ -29,8 +29,8 @@
$version = $_GET["version"];
$version_label = "";
$version_parameter = "";
$bugzilla_version = "";
$bugzilla_short_desc = "&short_desc=Installer";
$installer_version = "";
$installer_short_desc = "Problem with Installer+";
if (!$version)
{
$version = "Self Hosting";
Expand All @@ -41,16 +41,19 @@
$version_parameter = "?version=" . $version;
if (preg_match('/([0-9.]+)( Build ([0-9]+))?/', $version, $match))
{
$bugzilla_version = "&version=" . $match[1];
$installer_version = " Version+" . $match[1];
if (count($match) == 4)
{
$bugzilla_short_desc .= " Build " . $match[3];
$installer_short_desc .= "Build " . $match[3];
}
}
}

$bugzilla = htmlEntities("https://bugs.eclipse.org/bugs/enter_bug.cgi?product=Oomph&component=Setup" . $bugzilla_version . $bugzilla_short_desc);
$question = htmlEntities("../question/$version_parameter");
$body= "&body=" . htmlEntities(urlencode("I have first considered [asking a question](https://www.eclipse.org/setups/installer/question?version=" . urlencode($version). ").\n\n".
" I understand that without details about the problem and how to reproduce then problem, no one can fix a problem for me. Therefore I have attached log details and screen captures below:\n```\nLog Details...\n```\n"));

$issue = htmlEntities("https://github.com/eclipse-oomph/oomph/issues/new?title=" . $installer_short_desc . $installer_version . $body);

# Add page-specific Nav bars here
# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
Expand All @@ -64,7 +67,7 @@
$Nav->addNavSeparator("Community", "");
$Nav->addCustomNav("Get an Eclipse Account", "https://accounts.eclipse.org/user/register", "_blank", 1);
$Nav->addCustomNav("Ask a Question", $question, "_self", 1);
$Nav->addCustomNav("Report a Problem", $bugzilla, "_blank", 1);
$Nav->addCustomNav("Report a Problem", $issue, "_blank", 1);
$Nav->addCustomNav("<span class='fa fa-star'></span> Like", "../notification/$version_parameter", "_self", 1);
$Nav->addNavSeparator("Download", "");
$Nav->addCustomNav("Eclipse Installers", "https://wiki.eclipse.org/Eclipse_Installer", "_blank", 1);
Expand All @@ -82,18 +85,14 @@
<br/>
<p>
Before <a href="$bugzilla">reporting a problem</a>,
Before <a href="$issue">reporting a problem</a>,
please consider <a href="$question">asking a question</a> instead.
Of course it's a good idea to read the <a href="https://www.eclipse.org/downloads/packages/installer" target="oomph_instructions">general instructions</a> for how to use the $eclipse_installer before doing either.
</p>
<p>
Keep in mind that we cannot fix the network.
Networks and servers can and do fail and this is beyound our control.
</p>
<p>
You will need an <b><a href="https://accounts.eclipse.org/user/register" target="_blank">Eclipse Account</a></b> to report problems via <a href="$bugzilla" target="_blank">Bugzilla</a>.
</p>
<p>
Please provide as much detail as possible.
I.e., include screen captures and/or attach log details, as well as information about your operating system version.
Expand Down
4 changes: 2 additions & 2 deletions releng/org.eclipse.oomph.releng/www/installer/question/index.php
View file
Expand Up @@ -49,7 +49,7 @@
$Nav->addCustomNav("Eclipse Installer", "https://wiki.eclipse.org/Eclipse_Installer", "_blank", 1);
$Nav->addNavSeparator("Community", "");
$Nav->addCustomNav("Get an Eclipse Account", "https://accounts.eclipse.org/user/register", "_blank", 1);
$Nav->addCustomNav("Ask a Question", "https://www.eclipse.org/forums/index.php/f/287/", "_self", 1);
$Nav->addCustomNav("Ask a Question", "https://github.com/eclipse-oomph/oomph/discussions", "_self", 1);
$Nav->addCustomNav("Report a Problem", "../problem/$version_parameter", "_self", 1);
$Nav->addCustomNav("<span class='fa fa-star'></span> Like", "../notification/$version_parameter", "_self", 1);
$Nav->addNavSeparator("Download", "");
Expand All @@ -68,7 +68,7 @@
<br/>
<p>
Before asking a question on the <a href="https://www.eclipse.org/forums/index.php/f/287/">Oomph forum</a>,
Before asking a question on the <a href="https://github.com/eclipse-oomph/oomph/discussions/">Oomph Discussions</a>,
please read the <a href="https://www.eclipse.org/downloads/packages/installer">general instructions</a> for how to use the $eclipse_installer.
While it's true that there's <a href="https://en.wikipedia.org/wiki/No_such_thing_as_a_stupid_question">no such thing as a stupid question</a>,
good answers nevertheless depend on the <a href="https://stackoverflow.com/help/how-to-ask">quality of the question</a>.
Expand Down
10 changes: 2 additions & 8 deletions releng/org.eclipse.oomph.releng/www/marketplace/index.html
View file
Expand Up @@ -975,12 +975,9 @@
</li>
<li class="dropdown visible-xs"><a href="#" data-toggle="dropdown" class="dropdown-toggle">Participate <b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="https://bugs.eclipse.org/bugs/">Report a Bug</a></li>
<li><a href="https://www.eclipse.org/forums/">Forums</a></li>
<li><a href="https://www.eclipse.org/mail/">Mailing Lists</a></li>
<li><a href="https://wiki.eclipse.org/">Wiki</a></li>
<li><a href="https://wiki.eclipse.org/IRC">IRC</a></li>
<li><a href="https://www.eclipse.org/org/research/">Research</a></li>
</ul>
</li>
<li class="dropdown visible-xs"><a href="#" data-toggle="dropdown" class="dropdown-toggle">Eclipse IDE <b class="caret"></b></a>
Expand Down Expand Up @@ -1018,12 +1015,9 @@
<li>
<p><strong>Participate</strong></p>
</li>
<li><a href="https://bugs.eclipse.org/bugs/">Report a Bug</a></li>
<li><a href="https://www.eclipse.org/forums/">Forums</a></li>
<li><a href="https://www.eclipse.org/mail/">Mailing Lists</a></li>
<li><a href="https://wiki.eclipse.org/">Wiki</a></li>
<li><a href="https://wiki.eclipse.org/IRC">IRC</a></li>
<li><a href="https://www.eclipse.org/org/research/">Research</a></li>
</ul>
<ul class="col-sm-8 list-unstyled">
<li>
Expand Down Expand Up @@ -1278,11 +1272,11 @@ <h3 id="marketplace-title" class="section-header marketplace-title">
<li class="separator">Community</li>
<li>
<i class="fa fa-caret-right fa-fw"></i>
<a href="https://www.eclipse.org/forums/index.php/f/287/" target="oomph_forum">Ask a Question</a>
<a href="https://github.com/eclipse-oomph/oomph/discussions" target="oomph_discussions">Ask a Question</a>
</li>
<li>
<i class="fa fa-caret-right fa-fw"></i>
<a href="https://bugs.eclipse.org/bugs/enter_bug.cgi?product=Oomph&amp;component=Setup&amp;short_desc=Marketplace%20reports" target="oomph_bugzilla">Report a Problem</a>
<a href="https://github.com/eclipse-oomph/oomph/issues" target="oomph_issues">Report a Problem</a>
</li>
</ul>
</aside>
Expand Down

0 comments on commit cc37b9f

Please sign in to comment.