[myexperiment-hackers] [2160] branches/apace/app/views/layouts: De-myExperiment-ification and APACE-ification.

[noreply]

Revision

2160

Author

dtm

Date

2009-04-07 06:39:00 -0400 (Tue, 07 Apr 2009)

Log Message

De-myExperiment-ification and APACE-ification.

Modified Paths

• branches/apace/app/views/layouts/_footer.rhtml
• branches/apace/app/views/layouts/application.rhtml

Diff

Modified: branches/apace/app/views/layouts/_footer.rhtml (2159 => 2160)

--- branches/apace/app/views/layouts/_footer.rhtml	2009-04-07 10:19:24 UTC (rev 2159)
+++ branches/apace/app/views/layouts/_footer.rhtml	2009-04-07 10:39:00 UTC (rev 2160)
@@ -1,8 +1,6 @@
 <p class="copyright">
-	Copyright (c) 2007 - 2009 
-	<%= link_to "The University of Manchester", "http://www.manchester.ac.uk/", :target => '_blank' %>
-	and
-	<%= link_to "University of Southampton", "http://www.soton.ac.uk/", :target => '_blank' %>
+	Copyright (c) 2009 
+	<%= link_to "University of Oxford", "http://www.oxford.ac.uk/", :target => '_blank' %>
 </p>
 
 <div>
@@ -11,23 +9,15 @@
 			<td class="left">
 				<p><%= link_to "Front Page", "/" %></p>
 				<p><%= link_to "Home", "/home" %></p>
-				<p><%= link_to "About Us", "http://wiki.myexperiment.org/", :target => '_blank' %></p>
-				<p><%= link_to "Mailing List", "http://lists.nongnu.org/mailman/listinfo/myexperiment-discuss", :target => '_blank' %></p>
+				<p><%= link_to "About HPC/NA", "http://www.oerc.ac.uk/research/hpc-na", :target => '_blank' %></p>
 				<p><%= link_to "Contact Us", "/feedback", :target => '_blank' %></p>
-				<p><%= link_to "API", "/mashup/api" %></p>
-				<p><%= link_to "Publications", "http://www.semanticgrid.org/myexperiment/", :target => '_blank' %></p>
 			</td>
 			<td class="middle">
-				<p><%= link_to "Taverna Workflow Workbench", "http://www.taverna.org.uk/", :target => '_blank' %></p>
-				<p><%= link_to "Google Coop Search", "/google", :target => '_blank' %></p>
 				<br/>
 				<p><%= link_to "Invite people to #{Conf.sitename}", invite_users_path %></p>
 			</td>
 			<td class="middle">
-				<p><%= link_to "myGrid", "http://www.mygrid.org.uk", :target => '_blank' %></p>
-				<p><%= link_to "BioCatalogue", "http://www.biocatalogue.org", :target => '_blank' %></p>
-				<p><%= link_to "JISC", "http://jisc.ac.uk/", :target => '_blank' %></p>
-				<p><%= link_to "Microsoft", "http://www.microsoft.com", :target => '_blank' %></p>
+				<p><%= link_to "EPSRC", "http://www.epsrc.ac.uk", :target => '_blank' %></p>
 			</td>
 			<td class="right">
 				<p>Powered by:</p>

Modified: branches/apace/app/views/layouts/application.rhtml (2159 => 2160)

--- branches/apace/app/views/layouts/application.rhtml	2009-04-07 10:19:24 UTC (rev 2159)
+++ branches/apace/app/views/layouts/application.rhtml	2009-04-07 10:39:00 UTC (rev 2160)
@@ -31,11 +31,11 @@
 					</div>
 					<div class="links">
 						<div style="text-align: left; float: left; width: 34%; padding-top: 6px;">
+<!--
 							<span><b><%= link_to "About", "http://wiki.myexperiment.org/", :target => '_blank' %></b></span>
 							<span>&nbsp;|&nbsp;</span>
 							<span><b><%= link_to "Mailing List", "http://lists.nongnu.org/mailman/listinfo/myexperiment-discuss", :target => '_blank' %></b></span>
-							<span>&nbsp;|&nbsp;</span>
-							<span><b><%= link_to "Publications", "http://www.semanticgrid.org/myexperiment/", :target => '_blank' %></b></span>
+-->
 						</div>
 						<div style="text-align: right; float: right; width: 64%;">
 							<% if logged_in? -%>