Skip to content

Commit

Permalink
Merge pull request #1717 from mdamour1976/BACKLOG-4374
Browse files Browse the repository at this point in the history 
[BACKLOG-4374] Updates on doc links
  • Loading branch information
@e-cuellar
e-cuellar committed Sep 3, 2015
2 parents 336fb55 + b26e9af commit bcba55a
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 33 deletions.
58 changes: 34 additions & 24 deletions assembly/package-res/docs/English/InformationMap.html
View file
Expand Up @@ -10,10 +10,22 @@

var docBase = "https://help.pentaho.com/Documentation/6.0/";

window.loadDocURL = function(docId) {
window.location = docBase + docId;
return false;
}
$('#getting_started_pdi').attr("href", docBase + '0J0/0C0');
$('#components').attr("href", docBase + '0D0/050');
$('#workflows').attr("href", docBase + '0D0/1A0');
$('#matrix').attr("href", docBase + '0D0/160');
$('#di_install_options').attr("href", docBase + '0F0/0N0');
$('#di_components').attr("href", docBase + '0F0/0H0');
$('#di_archive').attr("href", docBase + '0F0/0O0');
$('#di_tools').attr("href", docBase + '0H0/070/020');
$('#di_config').attr("href", docBase + '0H0/070');
$('#wt_getting_started_pdi').attr("href", docBase + '0J0/0C0');
$('#di_solutions').attr("href", docBase + '0L0/0Y0');
$('#big_data').attr("href", docBase + '0L0/040');
$('#di_admin').attr("href", docBase + '0P0/0U0');
$('#di_troubleshoot').attr("href", docBase + '0P0/180');
$('#di_security').attr("href", docBase + '0P0/0W0');
$('#di_embed').attr("href", docBase + '0R0/0V0');

// Toggle display panel w/ animation
$('.title_bar').click(function(){
Expand Down Expand Up @@ -274,7 +286,7 @@
<!--Header-->
<div id="header">
<div id="title">Documentation</div>
<div id="logo"><a href="http://www.pentaho.com" target="_blank"><img src="logo.png"
<div id="logo"><a href="http://www.pentaho.com"><img src="logo.png"
alt="Pentaho Logo" border="0" /></a></div>
</div>
<!--Featured Content-->
Expand All @@ -284,14 +296,13 @@
<tr>
<td rowspan="2" class="bannerimage"><img src="doc_icon.png" width="56" height="74"
/></td>
<td><a href="#" onclick="return loadDocURL('0J0/0C0');" target="_blank">Getting Started with PDI</a><br />
<td><a id="getting_started_pdi">Getting Started with PDI</a><br />
<span class="style2">Tutorial showcasing the high-value features of Pentaho Data
Integration.</span></td>
</tr>
<tr>
<td valign="top" class="bannercontent"><a
href="http://help.pentaho.com" target="_blank">Pentaho
Help</a><br />
href="http://help.pentaho.com">Pentaho Help</a><br />
<span class="style2">Continuously updated, searchable information for all Pentaho
products. </span></td>
</tr>
Expand All @@ -311,20 +322,19 @@
<ul>
<li>
<a href="" class="article"></a>
<a href="#" onclick="return loadDocURL('0D0/050');" target="_blank">Get Acquainted with Pentaho Components</a><br />
<a id="components">Get Acquainted with Pentaho Components</a><br />
<div id="Components" class="disc">Introduction to the components that comprise
Pentaho. </div>
</li>
<li>
<a href="" class="article"></a>
<a href="#" onclick="return loadDocURL('0D0/1A0');" target="_blank">Choose Your Workflows</a><br />
<a id="workflows">Choose Your Workflows</a><br />
<div id="PentahoUserConsoleGuideU" class="disc">Overview of the different ways to
work with Pentaho.</div>
</li>
<li>
<a href="" class="article"></a>
<a href="#" onclick="return loadDocURL('0D0/160');" target="_blank">Review Supported
Technnologies</a><br />
<a id="matrix">Review Supported Technnologies</a><br />
<div id="SupportMatrix" class="disc">Listing of technologies that Pentaho supports
for use with our products. </div>
</li>
Expand All @@ -336,28 +346,28 @@
<ul>
<li>
<a href="" class="article"></a>
<a href="#" onclick="return loadDocURL('0F0/0N0');" target="_blank">Select Data Integration (DI)
<a id="di_install_options">Select Data Integration (DI)
Installation Options </a><br />
<div id="DIInstallationOptions" class="disc">Discussion of the options for
installing Pentaho Data Integration and why you would use each. </div>
</li>
<li>
<a href="" class="article"></a>
<a href="#" onclick="return loadDocURL('0F0/0H0');" target="_blank">Install All DI Components </a><br />
<a id="di_components">Install All DI Components </a><br />
<div id="PDIInstallation" class="disc">Complete instructions for using the guided
wizard to install Pentaho Data Integration on Windows, Linux, and OS X. Use the
installation wizard if you are evaluating Pentaho. </div>
</li>
<li>
<a href="" class="article"></a>
<a href="#" onclick="return loadDocURL('0F0/0O0');" target="_blank">Install with Your Own DI Repository </a><br />
<a id="di_archive">Install with Your Own DI Repository </a><br />
<div id="DIArchiveInstallation" class="disc">Instructions for using archive packages
in .zip format to install Data Integration components. Individual packages are
available for each component. </div>
</li>
<li>
<a href="" class="article"></a>
<a href="#" onclick="return loadDocURL('0H0/070/020');" target="_blank">Install Only DI Tools </a><br />
<a id="di_tools">Install Only DI Tools </a><br />
<div id="DITools" class="disc">Instructions for installing each of the Data
Integration tools. </div>
</li>
Expand All @@ -369,7 +379,7 @@
<ul>
<li>
<a href="" class="article"></a>
<a href="#" onclick="return loadDocURL('0H0/070');" target="_blank">Set Up DI Server and Tools</a><br />
<a id="di_config">Set Up DI Server and Tools</a><br />
<div id="ConfigDI" class="disc">Complete instructions for configuring Pentaho Data
Integration on Windows, Linux, and OS X. </div>
</li>
Expand All @@ -381,7 +391,7 @@
<ul>
<li>
<a href="" class="article"></a>
<a href="#" onclick="return loadDocURL('0J0/0C0');" target="_blank">Getting Started with PDI</a><br />
<a id="wt_getting_started_pdi">Getting Started with PDI</a><br />
<div id="GettingStartedwithPDI" class="disc">Tutorial showcasing the high-value
features of Pentaho Data Integration. </div>
</li>
Expand All @@ -393,13 +403,13 @@
<ul>
<li>
<a href="" class="article"></a>
<a href="#" onclick="return loadDocURL('0L0/0Y0');" target="_blank">Create DI Solutions</a><br />
<a id="di_solutions">Create DI Solutions</a><br />
<div id="PDIUser" class="disc">Task-based documentation covering Pentaho Data
Integration features. </div>
</li>
<li>
<a href="" class="article"></a>
<a href="#" onclick="return loadDocURL('0L0/040');" target="_blank">Work with Big Data</a><br />
<a id="big_data">Work with Big Data</a><br />
<div id="Bigdata" class="disc">How to configure Pentaho Data Integration for various
Hadoop distributions, along with procedural documentation about how to use the Big
Data steps and entries. </div>
Expand All @@ -411,17 +421,17 @@
<div id="admin" class="panel">
<ul>
<li><a href="" class="article"></a>
<a href="#" onclick="return loadDocURL('0P0/0U0');" target="_blank">Administer DI Server</a><br />
<a id="di_admin">Administer DI Server</a><br />
<div id="PDIAdministratorsGuide" class="disc">Explains system administration tasks
for the Data Integration Server. </div>
</li>
<li><a href="" class="article"></a>
<a href="#" onclick="return loadDocURL('0P0/180');" target="_blank">Troubleshoot DI Server</a><br />
<a id="di_troubleshoot">Troubleshoot DI Server</a><br />
<div id="PDITroubleShootingGuide" class="disc">A collection of troubleshooting topics
for the DI Server. </div>
</li>
<li><a href="" class="article"></a>
<a href="#" onclick="return loadDocURL('0P0/0W0');" target="_blank">Define DI Server Advanced Security</a><br />
<a id="di_security">Define DI Server Advanced Security</a><br />
<div id="PDISecurityGuide" class="disc">Instructions and guidance for implementing advanced security.
Covers Active Directory, LDAP, JDBC, Kerberos, and AES. </div>
</li>
Expand All @@ -432,7 +442,7 @@
<div id="dev" class="panel">
<ul>
<li><a href="" class="article"></a>
<a href="#" onclick="return loadDocURL('0R0/0V0');" target="_blank">Embed and Extend DI</a><br />
<a id="di_embed">Embed and Extend DI</a><br />
<div id="ExtendingAndEmbeddingPDI" class="disc"> Instructions, Java classes and
methods, as well as Eclipse-based sample plugin projects that show you how to
programmatically extend Data Integration functionality or embed the Data
Expand Down
13 changes: 6 additions & 7 deletions assembly/package-res/docs/English/welcome/index.html
View file
Expand Up @@ -107,13 +107,13 @@ <h1 class="large lineheight45">There's No Better Time</h1>
<h2 id='getting_started'>Getting Started</h2>
<p>New user? Want to know how to get started? Check out our documentation. These documents are also available in the <em>Pentaho Data Integration</em> installation directory, under <em>docs/</em>.</p>
<ul>
<li><a href="#" onclick="return loadDocURL('0J0/0C0');">Get Started With PDI</a></li>
<li><a id="getting_started_pdi">Get Started With PDI</a></li>
<li><a href='../InformationMap.html'>DI Documentation</a></li>
</ul>
<h2 id='documentation'>Documentation</h2>
<p>Both the <a href='http://help.pentaho.com'>Pentaho Help</a> and the <a href='http://wiki.pentaho.com/display/EAI/Latest+Pentaho+Data+Integration+%28aka+Kettle%29+Documentation'>Kettle Wiki</a> are extensive repositories of information. To learn more spend time navigating content through these important links.</p>
<ul>
<li><a href="#" onclick="return loadDocURL('0L0/0Y0');">Pentaho Help, Create DI Solutions</a></li>
<li><a id="di_solutions">Pentaho Help, Create DI Solutions</a></li>
<li><a href='http://wiki.pentaho.com/display/EAI/Pentaho+Data+Integration+Steps'>Transformation Steps Documentation</a></li>
<li><a href='http://wiki.pentaho.com/display/EAI/Pentaho+Data+Integration+Job+Entries'>Job Steps Documentation</a></li>
<li><a href='http://wiki.pentaho.com/display/EAI/Marketplace'>Marketplace</a></li>
Expand Down Expand Up @@ -152,7 +152,7 @@ <h2 id='build_your_own_plugin'>Build Your Own Plugin</h2>
<h3 id='embed_pdi' style="height: 25px;">Embed PDI</h3>
<p>To embed the PDI engine into your own Java applications, check out our PDI SDK.</p>
<ul>
<li><a href='href="#" onclick="return loadDocURL('0R0/0V0');">Embed and Extend DI</a></li>
<li><a id="di_embed">Embed and Extend DI</a></li>
</ul>
<h2 id='blogs'>Blogs</h2>
<p>Follow some of our most active bloggers.</p>
Expand Down Expand Up @@ -415,10 +415,9 @@ <h6 id='endbuttonize_upgradetoee'>ENDBUTTONIZE upgradeToEE</h6>
<script src="js/main.js"></script>
<script type="text/javascript">
var docBase = "https://help.pentaho.com/Documentation/6.0/";
window.loadDocURL = function(docId) {
window.location = docBase + docId;
return false;
}
$('#getting_started_pdi').attr("href", docBase + '0J0/0C0');
$('#di_solutions').attr("href", docBase + '0L0/0Y0');
$('#di_embed').attr("href", docBase + '0R0/0V0');
</script>
</body>
</html>
14 changes: 12 additions & 2 deletions ui/src/org/pentaho/di/ui/spoon/Spoon.java
View file
Expand Up @@ -23,11 +23,13 @@

package org.pentaho.di.ui.spoon;

import java.awt.Desktop;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.io.DataOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.lang.reflect.Method;
import java.net.MalformedURLException;
import java.net.URL;
Expand Down Expand Up @@ -1730,8 +1732,16 @@ public void changed( LocationEvent event ) {
// see if we can find the welcome file on the file system
File file = new File( FILE_DOCUMENT_MAP );
if ( file.exists() ) {
// ./docs/English/tips/index.htm
addSpoonBrowser( STRING_DOCUMENT_TAB_NAME, file.toURI().toURL().toString(), listener );
if ( Desktop.isDesktopSupported() ) {
// ./docs/English/tips/index.htm
try {
Desktop.getDesktop().open( file );
} catch ( IOException e ) {
log.logError( Const.getStackTracker( e ) );
}
} else {
addSpoonBrowser( STRING_DOCUMENT_TAB_NAME, file.toURI().toURL().toString(), listener );
}
}
}
} catch ( MalformedURLException e1 ) {
Expand Down

0 comments on commit bcba55a

Please sign in to comment.