Author: Christian Lopes
Date: 2010-01-19 15:46:55 -0800 (Tue, 19 Jan 2010)
New Revision: 18969
Added:
cytoscapeweb/trunk/website/src/img/layout/external_link.png
cytoscapeweb/trunk/website/src/js/util/
cytoscapeweb/trunk/website/src/js/util/ga.js
Modified:
cytoscapeweb/trunk/website/src/css/layout.css
cytoscapeweb/trunk/website/src/file/example_code/style.html
cytoscapeweb/trunk/website/src/js/layout/layout.js
cytoscapeweb/trunk/website/src/php/content/about/cytoweb.php
cytoscapeweb/trunk/website/src/php/content/contact.php
cytoscapeweb/trunk/website/src/php/content/documentation/api.php
cytoscapeweb/trunk/website/src/php/content/documentation/tutorial.php
cytoscapeweb/trunk/website/src/php/content/download.php
cytoscapeweb/trunk/website/src/php/content/news.php
cytoscapeweb/trunk/website/src/php/layout/declaration.php
Log:
- Added Google Analytics code.
- Added external links style/behavior.
Modified: cytoscapeweb/trunk/website/src/css/layout.css
===================================================================
--- cytoscapeweb/trunk/website/src/css/layout.css 2010-01-19 23:11:02 UTC
(rev 18968)
+++ cytoscapeweb/trunk/website/src/css/layout.css 2010-01-19 23:46:55 UTC
(rev 18969)
@@ -4,6 +4,7 @@
body, html { background-color: #ffffff; }
body { line-height: 1.5; color: #000000; font-family: Helvetica, Arial,
Verdana, sans-serif; font-size: 14px; width: 950px; margin: 0 auto 0 auto;
padding: 0 22px 0 22px; }
a, .like_link { color: #0b94b1; text-decoration: underline; cursor: pointer; }
+a[rel=external] { background:transparent url(../img/layout/external_link.png)
no-repeat scroll right center; padding-right:12px; }
.pre_plain_link { font-size: 0.85em; }
.slice { width: 100%; float: left; }
h1, h2, h3 { font-family: Gill Sans, Gill Sans MT, Futura, Sans Serif;
font-weight: normal; color: #0b94b1; clear: both; }
Modified: cytoscapeweb/trunk/website/src/file/example_code/style.html
===================================================================
--- cytoscapeweb/trunk/website/src/file/example_code/style.html 2010-01-19
23:11:02 UTC (rev 18968)
+++ cytoscapeweb/trunk/website/src/file/example_code/style.html 2010-01-19
23:46:55 UTC (rev 18969)
@@ -91,8 +91,7 @@
},
edges: {
width: 3,
- color: "#0B94B1",
- label: { passthroughMapper: { attrName: "label" } }
+ color: "#0B94B1"
}
};
Added: cytoscapeweb/trunk/website/src/img/layout/external_link.png
===================================================================
(Binary files differ)
Property changes on: cytoscapeweb/trunk/website/src/img/layout/external_link.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: cytoscapeweb/trunk/website/src/js/layout/layout.js
===================================================================
--- cytoscapeweb/trunk/website/src/js/layout/layout.js 2010-01-19 23:11:02 UTC
(rev 18968)
+++ cytoscapeweb/trunk/website/src/js/layout/layout.js 2010-01-19 23:46:55 UTC
(rev 18969)
@@ -2,8 +2,12 @@
$(function(){
-
+ // Make these links open in another page
+ $("a[rel=external]").click(function() {
+ this.target = "_blank";
+ });
+
var search_default_text = $("#search_input").find("input").val();
$("#search_input").find("input").blur(function(){
Added: cytoscapeweb/trunk/website/src/js/util/ga.js
===================================================================
--- cytoscapeweb/trunk/website/src/js/util/ga.js
(rev 0)
+++ cytoscapeweb/trunk/website/src/js/util/ga.js 2010-01-19 23:46:55 UTC
(rev 18969)
@@ -0,0 +1,13 @@
+/*
+ * Google Analytics - Asynchronous Tracking
+ * http://code.google.com/apis/analytics/docs/tracking/asyncTracking.html
+ */
+var _gaq = _gaq || [];
+_gaq.push(['_setAccount', 'UA-155159-9']);
+_gaq.push(['_trackPageview']);
+
+(function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript';
ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' :
'http://www') + '.google-analytics.com/ga.js';
+ (document.getElementsByTagName('head')[0] ||
document.getElementsByTagName('body')[0]).appendChild(ga);
+})();
\ No newline at end of file
Modified: cytoscapeweb/trunk/website/src/php/content/about/cytoweb.php
===================================================================
--- cytoscapeweb/trunk/website/src/php/content/about/cytoweb.php
2010-01-19 23:11:02 UTC (rev 18968)
+++ cytoscapeweb/trunk/website/src/php/content/about/cytoweb.php
2010-01-19 23:46:55 UTC (rev 18969)
@@ -3,15 +3,15 @@
<h1>Background</h1>
<p>Cytoscape Web is actively developed at the
-<a href="http://utoronto.ca";>University of Toronto</a>, in
-the <a href="http://tdccbr.med.utoronto.ca";>Donnelly Centre for Cellular and
Biomolecular Research</a>,
-in the labs of <a href="http://baderlab.org";>Gary Bader</a> and
-<a href="http://morrislab.med.utoronto.ca";>Quaid Morris</a>. Cytoscape Web
development is funded
-by <a href="http://genomecanada.ca";>Genome Canada</a>, through the
-<a href="http://ontariogenomics.ca/";>Ontario Genomics Institute</a>
(2007-OGI-TD-05).</p>
+<a href="http://utoronto.ca"; rel="external">University of Toronto</a>, in
+the <a href="http://tdccbr.med.utoronto.ca"; rel="external">Donnelly Centre for
Cellular and Biomolecular Research</a>,
+in the labs of <a href="http://baderlab.org"; rel="external">Gary Bader</a> and
+<a href="http://morrislab.med.utoronto.ca"; rel="external">Quaid Morris</a>.
Cytoscape Web development is funded
+by <a href="http://genomecanada.ca"; rel="external">Genome Canada</a>, through
the
+<a href="http://ontariogenomics.ca/"; rel="external">Ontario Genomics
Institute</a> (2007-OGI-TD-05).</p>
<p>Cytoscape Web was created as a result of the need for a visualisation
interface for the
-<a href="http://genemania.org";>GeneMANIA</a> project at the University of
Toronto. Cytoscape Web
+<a href="http://genemania.org"; rel="external">GeneMANIA</a> project at the
University of Toronto. Cytoscape Web
was developed as an independent component so that it could be reused by others
in the
<a href="/about/license">spirit of open source software</a>.</p>
@@ -20,13 +20,13 @@
<h1>Client applications</h1>
<p>Cytoscape Web is currently being used by a gene function prediction server,
-<a href="http://genemania.org";>GeneMANIA</a>.
+<a href="http://genemania.org"; rel="external">GeneMANIA</a>.
The data provided to Cytoscape Web in GeneMANIA is unique to every user query,
and easily
modified with each new query. The rendering speed of Cytoscape Web allows for
dynamic user
interaction.</p>
<!-- Do not ask about this yet! Why are you viewing the source? :)
-<p>The database of molecular interaction databases, <a
href="http://pathguide.org";>PathGuide</a>,
+<p>The database of molecular interaction databases, <a
href="http://pathguide.org"; rel="external">PathGuide</a>,
also uses Cytoscape Web to display a network illustrating the interactions
among different molecular
interaction and pathway databases. The data provided to this network is
static, and can only
currently be modified by Pathguide developers.
@@ -39,9 +39,9 @@
contributors of those projects for their contributions to open source
software. Cytoscape Web uses</p>
<ul>
- <li><a href="http://flare.prefuse.org/";>Flare</a>,</li>
- <li><a href="http://alivepdf.bytearray.org/";>AlivePDF</a>, and</li>
- <li><a href="http://puremvc.org/";>PureMVC</a>.</li>
+ <li><a href="http://flare.prefuse.org/"; rel="external">Flare</a>,</li>
+ <li><a href="http://alivepdf.bytearray.org/"; rel="external">AlivePDF</a>,
and</li>
+ <li><a href="http://puremvc.org/"; rel="external">PureMVC</a>.</li>
</ul>
<h1>Developers</h1>
Modified: cytoscapeweb/trunk/website/src/php/content/contact.php
===================================================================
--- cytoscapeweb/trunk/website/src/php/content/contact.php 2010-01-19
23:11:02 UTC (rev 18968)
+++ cytoscapeweb/trunk/website/src/php/content/contact.php 2010-01-19
23:46:55 UTC (rev 18969)
@@ -86,11 +86,11 @@
<h2>Discussion Group</h2>
- <p>The Cytoscape Web <a
href="http://groups.google.com/group/cytoscapeweb-discuss";>discussion group</a>
is the main forum for users to share questions, solutions and new ideas.</p>
+ <p>The Cytoscape Web <a
href="http://groups.google.com/group/cytoscapeweb-discuss";
rel="external">discussion group</a> is the main forum for users to share
questions, solutions and new ideas.</p>
<h2>Reporting software bugs</h2>
- <p>The best way to report a bug to us is to <a
href="http://cbio.mskcc.org/cytoscape/bugs";>use our bug tracker</a>. However,
if you find it difficult to use the bug tracker, feel free to use the contact
form on this page to contact us about the bug.</p>
+ <p>The best way to report a bug to us is to <a
href="http://cbio.mskcc.org/cytoscape/bugs"; rel="external">use our bug
tracker</a>. However, if you find it difficult to use the bug tracker, feel
free to use the contact form on this page to contact us about the bug.</p>
<p>Though we greatly appreciate it when you point out a bug, several
pieces of information are required to fix it, including</p>
Modified: cytoscapeweb/trunk/website/src/php/content/documentation/api.php
===================================================================
--- cytoscapeweb/trunk/website/src/php/content/documentation/api.php
2010-01-19 23:11:02 UTC (rev 18968)
+++ cytoscapeweb/trunk/website/src/php/content/documentation/api.php
2010-01-19 23:46:55 UTC (rev 18969)
@@ -33,7 +33,10 @@
$release_info_file = fopen("$dir/$version_dir/.release_info",
"r");
if( $release_info_file ){
- $release_info = fgets($release_info_file);
+ $release_info = "";
+ while ( ! feof($release_info_file) ) {
+ $release_info = $release_info . "\n" .
fgets($release_info_file);
+ }
fclose($release_info_file);
$api->release_info = $release_info;
}
Modified: cytoscapeweb/trunk/website/src/php/content/documentation/tutorial.php
===================================================================
--- cytoscapeweb/trunk/website/src/php/content/documentation/tutorial.php
2010-01-19 23:11:02 UTC (rev 18968)
+++ cytoscapeweb/trunk/website/src/php/content/documentation/tutorial.php
2010-01-19 23:46:55 UTC (rev 18969)
@@ -27,9 +27,9 @@
<p>It is important to note that Cytoscape Web does not load remote files
for you. So if you
have a graph file you want to load from a server, you must load the file
into a
<code>string</code>, either by hardcoding the graph into your code or
loading the graph file via
- AJAX first. We recommend you take a look at <a
href="http://jquery.com";>jQuery</a>.
+ AJAX first. We recommend you take a look at <a href="http://jquery.com";
rel="external">jQuery</a>.
It makes Javascript <em>really</em> easy, especially
- <a href="http://docs.jquery.com/Ajax";>AJAX</a>.</p>
+ <a href="http://docs.jquery.com/Ajax"; rel="external">AJAX</a>.</p>
<p>Now, take a look at this example. It has everything needed to get
Cytoscape Web up and
running.</p>
Modified: cytoscapeweb/trunk/website/src/php/content/download.php
===================================================================
--- cytoscapeweb/trunk/website/src/php/content/download.php 2010-01-19
23:11:02 UTC (rev 18968)
+++ cytoscapeweb/trunk/website/src/php/content/download.php 2010-01-19
23:46:55 UTC (rev 18969)
@@ -41,11 +41,11 @@
<h1>Source Code</h1>
<div class="description">
<p>
- You can browse the Cytoscape Web source code <a
href="http://chianti.ucsd.edu/svn/cytoscapeweb/";>here</a>.
+ You can browse the Cytoscape Web source code <a
href="http://chianti.ucsd.edu/svn/cytoscapeweb/"; rel="external">here</a>.
</p>
<p>
If you want to download the latest source from our
- <a href="http://subversion.tigris.org";>Subversion</a> server, use
one of the following commands.
+ <a href="http://subversion.tigris.org";
rel="external">Subversion</a> server, use one of the following commands.
</p>
<p>
Download only the Cytoscape Web project:
Modified: cytoscapeweb/trunk/website/src/php/content/news.php
===================================================================
--- cytoscapeweb/trunk/website/src/php/content/news.php 2010-01-19 23:11:02 UTC
(rev 18968)
+++ cytoscapeweb/trunk/website/src/php/content/news.php 2010-01-19 23:46:55 UTC
(rev 18969)
@@ -2,7 +2,7 @@
<h1>Subscription</h1>
- <p>The news feed contains updates related to Cytoscape Web as posted on <a
href="<?php echo $rss_home_link; ?>">the Cytoscape Web Google group</a>. The
latest entries are posted here.</p>
+ <p>The news feed contains updates related to Cytoscape Web as posted on <a
href="<?php echo $rss_home_link; ?>" rel="external">the Cytoscape Web Google
group</a>. The latest entries are posted here.</p>
<p>Subscribing to the news feed allows you to receive automatic email
updates whenever a new entry is posted.</p>
Modified: cytoscapeweb/trunk/website/src/php/layout/declaration.php
===================================================================
--- cytoscapeweb/trunk/website/src/php/layout/declaration.php 2010-01-19
23:11:02 UTC (rev 18968)
+++ cytoscapeweb/trunk/website/src/php/layout/declaration.php 2010-01-19
23:46:55 UTC (rev 18969)
@@ -80,6 +80,9 @@
include_js("/js/content/$navigation_link/$page_link.ie.js");
}
+ // Google Analytics
+ include_js("/js/util/ga.js");
+
// remove duplicates from css, js, rss includes
$js_includes = array_unique($js_includes);
$css_includes = array_unique($css_includes);
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
