Update favicons

midasplatform · Oct 12, 2015 · ee06ca4 · ee06ca4
1 parent a58b1f6
commit ee06ca4
Show file tree

Hide file tree

Showing 9 changed files with 99 additions and 83 deletions.
diff --git a/app.yaml b/app.yaml
@@ -26,9 +26,14 @@ api_version: 1
 threadsafe: yes
 
 handlers:
-- url: /favicon\.ico
+- url: /(apple-touch-icon-.*\.png)$
+  static_files: \1
+  upload: apple-touch-icon-.*\.png$
+  secure: always
+
+- url: /favicon\.ico$
   static_files: favicon.ico
-  upload: favicon\.ico
+  upload: favicon\.ico$
   secure: always
 
 - url: /(.*/(public|SwaggerUI)/.*\.(css|gif|ico|jpeg|jpg|js|map|png))$

diff --git a/apple-touch-icon-120x120.png b/apple-touch-icon-120x120.png
diff --git a/apple-touch-icon-152x152.png b/apple-touch-icon-152x152.png
diff --git a/core/layouts/empty.phtml b/core/layouts/empty.phtml
@@ -38,6 +38,8 @@ echo $this->doctype().PHP_EOL;
     $this->headLink()->appendStylesheet($this->baseUrl('core/public/css/layout/loginForm.css'));
     $this->headLink()->appendStylesheet($this->baseUrl('core/public/css/layout/jquery.treeTable.css'));
     $this->headLink()->appendStylesheet($this->baseUrl('core/public/css/layout/jquery.qtip.min.css'));
+    $this->headLink()->headLink(array('rel' => 'apple-touch-icon', 'href' => $this->baseUrl('apple-touch-icon-120x120.png'), 'sizes' => '60x60 120x120', 'APPEND'));
+    $this->headLink()->headLink(array('rel' => 'apple-touch-icon', 'href' => $this->baseUrl('apple-touch-icon-152x152.png'), 'sizes' => '76x76 152x152', 'APPEND'));
     $this->headLink()->headLink(array('rel' => 'icon', 'href' => $this->baseUrl('favicon.ico'), 'APPEND'));
     echo $this->headLink().PHP_EOL;
 

diff --git a/core/layouts/layout.phtml b/core/layouts/layout.phtml
@@ -38,6 +38,8 @@ echo $this->doctype().PHP_EOL;
     $this->headLink()->appendStylesheet($this->baseUrl('core/public/css/layout/loginForm.css'));
     $this->headLink()->appendStylesheet($this->baseUrl('core/public/css/layout/jquery.treeTable.css'));
     $this->headLink()->appendStylesheet($this->baseUrl('core/public/css/layout/jquery.qtip.min.css'));
+    $this->headLink()->headLink(array('rel' => 'apple-touch-icon', 'href' => $this->baseUrl('apple-touch-icon-120x120.png'), 'sizes' => '60x60 120x120', 'APPEND'));
+    $this->headLink()->headLink(array('rel' => 'apple-touch-icon', 'href' => $this->baseUrl('apple-touch-icon-152x152.png'), 'sizes' => '76x76 152x152', 'APPEND'));
     $this->headLink()->headLink(array('rel' => 'icon', 'href' => $this->baseUrl('favicon.ico'), 'APPEND'));
     echo $this->headLink().PHP_EOL;
 

diff --git a/favicon.ico b/favicon.ico
diff --git a/modules/oauth/views/authorize/index.phtml b/modules/oauth/views/authorize/index.phtml
@@ -17,25 +17,34 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 =========================================================================*/
+
+echo $this->doctype().PHP_EOL;
 ?>
-<html>
+<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
 <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="">
-    <meta name="author" content="">
-    <title>Midas Login</title>
-    <link rel="shortcut icon" href="<?php echo $this->coreWebroot ?>/public/images/icons/favicon.ico"/>
+    <?php
+    $this->headMeta()->appendHttpEquiv('Content-Type', 'text/html; charset=UTF-8');
+    echo $this->headMeta().PHP_EOL;
+
+    $this->headTitle('Login');
+    $this->headTitle()->setSeparator(' - ');
+    echo $this->headTitle().PHP_EOL;
 
-    <link type="text/css" rel="stylesheet"
-          href="<?php echo $this->moduleWebroot ?>/public/css/authorize/authorize.index.css"/>
-    <link type="text/css" rel="stylesheet"
-          href="<?php echo $this->moduleWebroot ?>/public/css/bootstrap/bootstrap.min.css"/>
+    $this->headLink()->appendStylesheet($this->baseUrl('core/public/css/layout/jquery-ui.min.css'));
+    $this->headLink()->appendStylesheet($this->baseUrl('modules/oauth/public/css/authorize/authorize.index.css'));
+    $this->headLink()->appendStylesheet($this->baseUrl('modules/oauth/public/css/bootstrap/bootstrap.min.css'));
+    $this->headLink()->headLink(array('rel' => 'apple-touch-icon', 'href' => $this->baseUrl('apple-touch-icon-120x120.png'), 'sizes' => '60x60 120x120', 'APPEND'));
+    $this->headLink()->headLink(array('rel' => 'apple-touch-icon', 'href' => $this->baseUrl('apple-touch-icon-152x152.png'), 'sizes' => '76x76 152x152', 'APPEND'));
+    $this->headLink()->headLink(array('rel' => 'icon', 'href' => $this->baseUrl('favicon.ico'), 'APPEND'));
+    echo $this->headLink().PHP_EOL;
 
-    <script type="text/javascript" src="<?php echo $this->coreWebroot ?>/public/js/layout/jquery.js"></script>
-    <script type="text/javascript" src="<?php echo $this->coreWebroot ?>/public/js/jquery/jquery.form.js"></script>
-    <script type="text/javascript"
-            src="<?php echo $this->moduleWebroot ?>/public/js/authorize/authorize.index.js"></script>
+    $this->headScript()->prependFile($this->baseUrl('modules/oauth/public/js/authorize//authorize.index.js'));
+    $this->headScript()->prependFile($this->baseUrl('core/public/js/jquery/jquery.form.js'));
+    $this->headScript()->prependFile($this->baseUrl('core/public/js/layout/jquery.js'));
+    echo $this->headScript().PHP_EOL;
+
+    echo $this->headStyle().PHP_EOL;
+    ?>
 </head>
 <body>
 <div class="loginFormContainer">
@@ -60,7 +69,6 @@
         </div>
         <input type="text" class="input-block-level" name="login" placeholder="Login"/>
         <input type="password" class="input-block-level" name="password" placeholder="Password"/>
-
         <div class="buttonBar">
             <input class="btn btn-primary loginSubmit" type="submit" name="allowOrDeny" value="Allow"/>
             <input class="btn loginDeny" type="submit" name="allowOrDeny" value="Deny"/>

diff --git a/modules/visualize/processData/index.jsp b/modules/visualize/processData/index.jsp
@@ -1,36 +1,31 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-pageEncoding="UTF-8"%>
-
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@ page import="java.io.*"%>
 <%@ page import="java.util.*"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
 <%
-Runtime r=Runtime.getRuntime();
-Process p =null;
-String cmd=request.getParameter("pvbatch")+" --use-offscreen-rendering "+request.getRealPath("/")+"processData.py "+request.getParameter("file")+" "+request.getRealPath("/");
-try{
-p=r.exec(cmd);
-InputStreamReader isr=new InputStreamReader(p.getInputStream());
-BufferedReader br=new BufferedReader(isr);
-String line=null;
-while((line=br.readLine())!=null){
-out.println(line);
+Runtime r = Runtime.getRuntime();
+Process p = null;
+String cmd = request.getParameter("pvbatch") + " --use-offscreen-rendering " + request.getRealPath("/") + "processData.py " + request.getParameter("file") + " " + request.getRealPath("/");
+try {
+    p = r.exec(cmd);
+    InputStreamReader isr = new InputStreamReader(p.getInputStream());
+    BufferedReader br = new BufferedReader(isr);
+    String line = null;
+    while ((line = br.readLine()) != null) {
+        out.println(line);
+    }
+    p.waitFor();
 }
-p.waitFor();
+catch (Exception e) {
+    out.println("PROBLEM");
+    out.println(e);
 }
-catch(Exception e){
-	out.println("PROBLEME !!!");
-	out.println(e);
-	}
-
 %>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta http-equiv="Content-Script-Type" content="text/ecmascript" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>Midas Platform - Digital Archiving System</title>
 </head>
 <body>
-
 </body>
-</html>
+</html>
diff --git a/modules/visualize/views/webgl/index.phtml b/modules/visualize/views/webgl/index.phtml
@@ -17,50 +17,54 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 =========================================================================*/
-?>
-<html>
-<title>Midas Platform Visualization</title>
-
-<script type="text/javascript" src="<?php echo $this->moduleWebroot ?>/public/js/webgl/Three.js"></script>
-<script type="text/javascript" src="<?php echo $this->moduleWebroot ?>/public/js/webgl/Detector.js"></script>
-<script type="text/javascript"
-        src="<?php echo $this->moduleWebroot ?>/public/js/webgl/RequestAnimationFrame.js"></script>
-<script type="text/javascript" src="<?php echo $this->moduleWebroot ?>/public/js/webgl/utils.js"></script>
-<script type="text/javascript"
-        src="<?php echo $this->moduleWebroot ?>/public/js/webgl/TrackballControlsMidas.js"></script>
 
-<?php
-echo '<script type="text/javascript" src="'.$this->coreWebroot.'/public/js/layout/jquery.js"></script>';
-echo '<script type="text/javascript" src="'.$this->coreWebroot.'/public/js/layout/jquery-ui.js"></script>';
+echo $this->doctype().PHP_EOL;
 ?>
-<script type="text/javascript" src="<?php echo $this->moduleWebroot ?>/public/js/webgl/webgl.index.js"></script>
-<link type="text/css" href="<?php echo $this->coreWebroot ?>/public/css/layout/jquery-ui.min.css" rel="stylesheet"/>
-<link type="text/css" href="<?php echo $this->moduleWebroot ?>/public/css/webgl/webgl.index.css" rel="stylesheet"/>
-</head>
+<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <?php
+    $this->headMeta()->appendHttpEquiv('Content-Type', 'text/html; charset=UTF-8');
+    echo $this->headMeta().PHP_EOL;
 
-<body>
+    $this->headTitle('Visualization');
+    $this->headTitle()->setSeparator(' - ');
+    echo $this->headTitle().PHP_EOL;
 
-<button onclick="cameraUp();" id="buttonUp" class="buttonNav"></button>
-<button onclick="cameraDown();" id="buttonDown" class="buttonNav"></button>
-<button onclick="cameraLeft();" id="buttonLeft" class="buttonNav"></button>
-<button onclick="cameraRight();" id="buttonRight" class="buttonNav"></button>
-<button onclick="resetCameraPosition(objects3D);" id="buttonReset" class="buttonNav"></button>
-<button onclick="zoomIn();" id="buttonPlus" class="buttonNav"></button>
-<button onclick="zoomOut();" id="buttonMinus" class="buttonNav"></button>
-<div id="info">
-    <b>MOVE</b> mouse & press <b>LEFT button:</b> rotate,
-    <b>MIDDLE button:</b> pan , <b>RIGHT button:</b> zoom
-</div>
+    $this->headLink()->appendStylesheet($this->baseUrl('core/public/css/layout/jquery-ui.min.css'));
+    $this->headLink()->appendStylesheet($this->baseUrl('modules/visualize/public/css/webgl/webgl.index.css'));
+    $this->headLink()->headLink(array('rel' => 'apple-touch-icon', 'href' => $this->baseUrl('apple-touch-icon-120x120.png'), 'sizes' => '60x60 120x120', 'APPEND'));
+    $this->headLink()->headLink(array('rel' => 'apple-touch-icon', 'href' => $this->baseUrl('apple-touch-icon-152x152.png'), 'sizes' => '76x76 152x152', 'APPEND'));
+    $this->headLink()->headLink(array('rel' => 'icon', 'href' => $this->baseUrl('favicon.ico'), 'APPEND'));
+    echo $this->headLink().PHP_EOL;
 
-<div id="onliver" style="display:none">
-    Over tooltip
-</div>
+    $this->headScript()->prependFile($this->baseUrl('modules/visualize/public/js/webgl/webgl.index.js'));
+    $this->headScript()->prependFile($this->baseUrl('modules/visualize/public/js/webgl/TrackballControlsMidas.js'));
+    $this->headScript()->prependFile($this->baseUrl('modules/visualize/public/js/webgl/utils.js'));
+    $this->headScript()->prependFile($this->baseUrl('modules/visualize/public/js/webgl/RequestAnimationFrame.js'));
+    $this->headScript()->prependFile($this->baseUrl('modules/visualize/public/js/webgl/Detector.js'));
+    $this->headScript()->prependFile($this->baseUrl('modules/visualize/public/js/webgl/Three.js'));
+    $this->headScript()->prependFile($this->baseUrl('core/public/js/layout/jquery-ui.js'));
+    $this->headScript()->prependFile($this->baseUrl('core/public/js/layout/jquery.js'));
+    echo $this->headScript().PHP_EOL;
 
-<div id="axesContainer">
-</div>
-
-<div id="container"></div>
-
-<div id="datacontent" style="display:none"><?php echo $this->data ?></div>
+    echo $this->headStyle().PHP_EOL;
+    ?>
+</head>
+<body>
+    <button onclick="cameraUp();" id="buttonUp" class="buttonNav"></button>
+    <button onclick="cameraDown();" id="buttonDown" class="buttonNav"></button>
+    <button onclick="cameraLeft();" id="buttonLeft" class="buttonNav"></button>
+    <button onclick="cameraRight();" id="buttonRight" class="buttonNav"></button>
+    <button onclick="resetCameraPosition(objects3D);" id="buttonReset" class="buttonNav"></button>
+    <button onclick="zoomIn();" id="buttonPlus" class="buttonNav"></button>
+    <button onclick="zoomOut();" id="buttonMinus" class="buttonNav"></button>
+    <div id="info">
+        <b>MOVE</b> mouse and press <b>LEFT button:</b> rotate,
+        <b>MIDDLE button:</b> pan, <b>RIGHT button:</b> zoom.
+    </div>
+    <div id="onliver" style="display:none">Over tooltip</div>
+    <div id="axesContainer"></div>
+    <div id="container"></div>
+    <div id="datacontent" style="display:none"><?php echo $this->data ?></div>
 </body>
 </html>