Revision: 17331
          http://sourceforge.net/p/gate/code/17331
Author:   ian_roberts
Date:     2014-02-18 12:57:23 +0000 (Tue, 18 Feb 2014)
Log Message:
-----------
Re-synced with mimir-web layout.

Modified Paths:
--------------
    mimir/trunk/mimir-cloud/grails-app/views/layouts/mimir.gsp

Modified: mimir/trunk/mimir-cloud/grails-app/views/layouts/mimir.gsp
===================================================================
--- mimir/trunk/mimir-cloud/grails-app/views/layouts/mimir.gsp  2014-02-18 
11:53:52 UTC (rev 17330)
+++ mimir/trunk/mimir-cloud/grails-app/views/layouts/mimir.gsp  2014-02-18 
12:57:23 UTC (rev 17331)
@@ -1,51 +1,48 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" 
"http://www.w3.org/TR/html4/strict.dtd";>
 <html>
-<head>
-<title><g:layoutTitle default="Mimir" /></title>
-<link rel="stylesheet"
-       href="${resource(dir:'css',file:'mimir.css', plugin:'mimir-web')}" />
-<link rel="shortcut icon"
-       href="${resource(dir:'images',file:'favicon.ico', plugin:'mimir-web')}"
-       type="image/x-icon" />
-<link rel="stylesheet"
-       href="${resource(dir:'css',file:'mimir-cloud.css')}" /> 
-<g:layoutHead />
-<g:javascript library="application" />
-<r:layoutResources />
-</head>
-<body>
-       <div id="spinner" class="spinner" style="display: none;">
-               <img src="${resource(dir:'images',file:'spinner.gif')}" 
alt="Spinner" />
-       </div>
-       <div id="paneHeader" class="paneHeader">
-               <table>
-                       <tbody>
-                               <tr>
-                                       <td valign="top" colSpan="3">
-                                               <div align="left">
-                                                       <img alt="Mimir" 
align="top"
-                                                               
src="${resource(dir:'images', file:'logo.png', plugin:'mimir-web')}" />
-                                               </div></td>
-                                       <td valign="top" width="20%">
-                                               <div align="right">
-                                                       <img alt="Powered by 
M&iacute;mir"
-                                                               
src="${resource(dir:'images', file:'logo-poweredby.png', plugin:'mimir-web')}"
-                                                               border="0" />
-                                                       <sec:ifLoggedIn>
-                                                               <br />You are 
logged in as <strong><sec:username /></strong>. (<g:link
-                                                                       
controller="logout">Log out</g:link>)</sec:ifLoggedIn>
-                                               </div></td>
-                               </tr>
-                       </tbody>
-               </table>
-       </div>
-       <div id="content">
-               <g:layoutBody />
-               <div align="center">
-                       <p>M&iacute;mir <mimir:version />, &copy; <a 
href="http://gate.ac.uk";>GATE</a> 2013.
-                       </p>
-               </div>
-       </div>
-       <r:layoutResources />   
-</body>
+    <head>
+        <title><g:layoutTitle default="Mimir" /></title>
+        <link rel="stylesheet" href="${resource(dir:'css',file:'mimir.css')}" 
/>
+        <%-- The query string is ignored but causes the browsers to refresh 
the 
+             cached version. The query value should be changed whenever the 
+             favicon changes. --%>
+        <link rel="shortcut icon" 
href="${resource(dir:'images',file:'mimir-favicon.ico')}?v=1" 
type="image/x-icon" />
+                               <link rel="apple-touch-icon" 
href="${resource(dir: 'images', file: 'mimir-apple-touch-icon.png')}?v=1">
+                               <link rel="apple-touch-icon" sizes="114x114" 
href="${resource(dir: 'images', file: 
'mimir-apple-touch-icon-retina.png')}?v=1">        
+        <g:layoutHead />
+        <g:javascript src="application.js" />
+        <r:layoutResources/>
+        <%-- Add any custom CSS content provided by the page. --%>
+        <style type="text/css">
+        <g:pageProperty name="page.customCss" default="" />
+        </style>
+    </head>
+    <body>
+        <div id="spinner" class="spinner" style="display:none;">
+            <img src="${resource(dir:'images',file:'spinner.gif')}" 
alt="Spinner" />
+        </div> 
+        <div id="paneHeader" class="paneHeader">
+          <table>
+            <tbody>
+            <tr>
+              <td  valign="top" colSpan="3">
+                <div align="left"><img alt="Mimir" align="top" 
+                src="${resource(dir:'images', file:'logo.png')}" /></div></td>
+              <td valign="top" width="20%">
+                <div align="right"><img alt="Powered by M&iacute;mir"
+                src="${resource(dir:'images', file:'logo-poweredby.png')}"
+                border="0"/>
+                <sec:ifLoggedIn>
+                <br />You are logged in as <strong><sec:username /></strong>.
+                (<g:link controller="logout">Log out</g:link>)</sec:ifLoggedIn>
+          </div></td></tr></tbody></table>
+        </div>
+        <div id="content">
+          <g:layoutBody />
+                                 <div align="center">
+                                   <p>M&iacute;mir <mimir:version />,  &copy; 
<a href="http://gate.ac.uk";>GATE</a> 2013.</p>
+                                 </div>
+        </div>
+        <r:layoutResources/>
+    </body>
 </html>

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
Managing the Performance of Cloud-Based Applications
Take advantage of what the Cloud has to offer - Avoid Common Pitfalls.
Read the Whitepaper.
http://pubads.g.doubleclick.net/gampad/clk?id=121054471&iu=/4140/ostg.clktrk
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs

Reply via email to