You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2015/12/10 09:40:38 UTC
svn commit: r1719029 - in /incubator/taverna/site/trunk: content/index.md
templates/default_footer.html templates/skeleton.html
Author: stain
Date: Thu Dec 10 08:40:37 2015
New Revision: 1719029
URL: http://svn.apache.org/viewvc?rev=1719029&view=rev
Log:
incubator logo only on front page
.. changing footer would require various CSS tweaks
Modified:
incubator/taverna/site/trunk/content/index.md
incubator/taverna/site/trunk/templates/default_footer.html
incubator/taverna/site/trunk/templates/skeleton.html
Modified: incubator/taverna/site/trunk/content/index.md
URL: http://svn.apache.org/viewvc/incubator/taverna/site/trunk/content/index.md?rev=1719029&r1=1719028&r2=1719029&view=diff
==============================================================================
--- incubator/taverna/site/trunk/content/index.md (original)
+++ incubator/taverna/site/trunk/content/index.md Thu Dec 10 08:40:37 2015
@@ -27,7 +27,7 @@ jsonld: {
"name" : "Apache Taverna",
"logo" : "http://taverna.incubator.apache.org/img/taverna-logo-145x134.png"
},
- "publisher" : { "@type" : "Organization",
+ "publisher" : { "@type" : "Organization",
"url" : "http://www.apache.org/",
"name" : "The Apache Software Foundation (ASF)" },
"downloadUrl" : "http://taverna.incubator.apache.org/download"
@@ -39,7 +39,7 @@ Taverna has recently transitioned
to the Apache Incubator. This website is for the Apache Taverna project and is <strong>under development</strong>.
</p>
<p>
-You might want to visit the earlier <a class="alert-link" href="http://www.taverna.org.uk/">taverna.org.uk</a>
+You might want to visit the earlier <a class="alert-link" href="http://www.taverna.org.uk/">taverna.org.uk</a>
website which is not affiliated with Apache.
</div>
@@ -61,9 +61,9 @@ designing and executing workflows. Acces
<div class="row marketing">
<div class="col-lg-6">
<h4>Build scientific workflows</h4>
- <p><strong>Taverna</strong> is an open source and domain-independent
+ <p><strong>Taverna</strong> is an open source and domain-independent
Workflow Management System
- – a suite of tools used to design and execute <em>scientific workflows</em> and aid
+ – a suite of tools used to design and execute <em>scientific workflows</em> and aid
<em>in silico</em> experimentation.
</p>
</div>
@@ -77,13 +77,13 @@ In short, this means:</p>
<li><a href="https://www.apache.org/foundation/how-it-works.html#management">Open Development</a> process - anyone can contribute</li>
<li>Development infrastructure hosted by <a href="http://www.apache.org/">apache.org</a></li>
<li><a href="/community">Taverna mailing lists</a> have moved to @taverna.incubator.apache.org</li>
-<li><a href="/download/code">Source code</a> will move to
+<li><a href="/download/code">Source code</a> will move to
<a href="http://git.apache.org/">http://git.apache.org/</a>, with GitHub mirror</li>
</ul>
-<p>For further details, see the presentation
-<a href="http://dev.mygrid.org.uk/wiki/display/developer/Taverna+as+an+Apache+Incubator+project">Taverna
-as an Apache Incubator project</a> and sign up to
-the <a href="http://mail-archives.apache.org/mod_mbox/incubator-taverna-dev/">dev@taverna.incubator.apache.org</a>
+<p>For further details, see the presentation
+<a href="http://dev.mygrid.org.uk/wiki/display/developer/Taverna+as+an+Apache+Incubator+project">Taverna
+as an Apache Incubator project</a> and sign up to
+the <a href="http://mail-archives.apache.org/mod_mbox/incubator-taverna-dev/">dev@taverna.incubator.apache.org</a>
mailing list.</p>
@@ -100,4 +100,6 @@ indicates that the infrastructure, commu
have stabilized in a manner consistent with other successful ASF projects.
While incubation status is not necessarily a reflection of the completeness or
stability of the code, it does indicate that the project has yet to be fully
-endorsed by the ASF.
\ No newline at end of file
+endorsed by the ASF.
+
+<a href="http://incubator.apache.org/"><img src="/img/apache-incubator-logo.png" width="229" height="57"/></a>
Modified: incubator/taverna/site/trunk/templates/default_footer.html
URL: http://svn.apache.org/viewvc/incubator/taverna/site/trunk/templates/default_footer.html?rev=1719029&r1=1719028&r2=1719029&view=diff
==============================================================================
--- incubator/taverna/site/trunk/templates/default_footer.html (original)
+++ incubator/taverna/site/trunk/templates/default_footer.html Thu Dec 10 08:40:37 2015
@@ -1,11 +1,10 @@
<footer class="footer">
<div class="container">
- <a href="http://incubator.apache.org/"><img src="/img/apache-incubator-logo.png" width="229" height="57"/></a>
+
<p id="copyright" class="text-muted">
- Copyright © 2014-2015 The Apache Software Foundation, Licensed under the
+ Copyright © 2014-2015 The Apache Software Foundation, Licensed under the
<a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
</p>
</div>
</footer>
-
Modified: incubator/taverna/site/trunk/templates/skeleton.html
URL: http://svn.apache.org/viewvc/incubator/taverna/site/trunk/templates/skeleton.html?rev=1719029&r1=1719028&r2=1719029&view=diff
==============================================================================
--- incubator/taverna/site/trunk/templates/skeleton.html (original)
+++ incubator/taverna/site/trunk/templates/skeleton.html Thu Dec 10 08:40:37 2015
@@ -1,14 +1,14 @@
-<!--
+<!--
Note as of 29 Jan 2015 no page uses this template.
Instead the seperate header, navbar and footer are used.
- Check ../lib/path.pm to see which pages are using which templates.
+ Check ../lib/path.pm to see which pages are using which templates.
-->
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
- <meta name="viewport" content="width=device-width, initial-scale=1">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
<title>Apache Taverna - {% block title %}{{ headers.title }}{% endblock %}</title>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
@@ -35,38 +35,38 @@
<!-- JSON-LD markup for Google Structured Data -->
{% if headers.jsonld %}
<!-- custom JSON-LD for this page -->
- <script type="application/ld+json">
+ <script type="application/ld+json">
{{ headers.jsonld|safe}}
</script>
{% endif %}
<!-- generic JSON-LD for this page -->
- <script type="application/ld+json">
+ <script type="application/ld+json">
{
"@context" : "http://schema.org",
"@type" : ["CreativeWork"],
"@id": "",
"name" : "{{ headers.title|safe }}",
"publisher" : {
- "@type" : "Organization",
+ "@type" : "Organization",
"url" : "http://www.apache.org/",
- "name" : "The Apache Software Foundation (ASF)"
+ "name" : "The Apache Software Foundation (ASF)"
},
- "license": {
+ "license": {
"@type": "CreativeWork",
"@id": "http://www.apache.org/licenses/LICENSE-2.0",
"url": "http://www.apache.org/licenses/LICENSE-2.0",
"name": "Apache License, Version 2.0"
}
- }
+ }
</script>
-
+
</head>
<body>
-
-
-
-
+
+
+
+
<!-- Static navbar -->
<nav class="navbar navbar-default" role="navigation">
<div class="container">
@@ -78,10 +78,10 @@
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="/"><img src="/img/taverna-logo-145x134.png" alt="">Apache Taverna</a>
-
+
</div>
<div id="navbar" class="navbar-collapse collapse">
- <ul class="nav navbar-nav">
+ <ul class="nav navbar-nav">
<li><a href="/about/">About</a></li>
<li class="dropdown">
<a href="/download/" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Download<span class="caret"></span></a>
@@ -91,16 +91,16 @@
</ul>
</li>
<li><a href="/doc/">Documentation</a></li>
- <li><a href="/code/">Code</a></li>
+ <li><a href="/code/">Code</a></li>
<li><a href="/contact/">Contact</a></li>
</ul>
-
+
<form >
-
-
+
+
<!--<input type="submit" id="submit" value="Search">-->
</form>
-
+
<form class="navbar-form navbar-right" role="search"
name="search" id="search" action="http://www.google.com/search" method="get">
<input value="taverna.incubator.apache.org" name="sitesearch" type="hidden"/>
@@ -109,10 +109,10 @@
<span class="input-group-btn">
<button type="submit" class="btn btn-default">Search</button>
</span>
- </div>
+ </div>
</form>
- <ul class="nav navbar-nav navbar-right">
+ <ul class="nav navbar-nav navbar-right">
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">ASF<span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
@@ -127,38 +127,37 @@
</div><!--/.nav-collapse -->
</div><!--/.container-fluid -->
</nav>
-
-
-
-
+
+
+
+
<div id="page" class="container">
<h1>{% block tagline %}{{ headers.title }}{% endblock %}</h1>
- <div id="nav">
+ <div id="nav">
<!-- Is this needed?
<p>{{ breadcrumbs|safe }}</p>
-->
</div>
-
+
{% block content %}<div id="content">{{ content|markdown }}</div>{% endblock %}
-
+
</div>
-
+
<footer class="footer">
<div class="container">
- <a href="http://incubator.apache.org/"><img src="/img/apache-incubator-logo.png" width="229" height="57"/></a>
<p id="copyright" class="text-muted">
- Copyright © 2014-2015 The Apache Software Foundation, Licensed under the
+ Copyright © 2014-2015 The Apache Software Foundation, Licensed under the
<a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
</p>
</div>
</footer>
-
+
<script src="/lib/jquery/jquery-1.11.1.min.js"></script>
<script src="/lib/bootstrap/js/bootstrap.min.js"></script>
-
+
</body>
</html>