From ee06ca4d6476d4e0e77002216a370d235d12c2a5 Mon Sep 17 00:00:00 2001 From: Jamie Snape Date: Fri, 9 Oct 2015 18:22:49 -0400 Subject: [PATCH] Update favicons --- app.yaml | 9 ++- apple-touch-icon-120x120.png | Bin 0 -> 9148 bytes apple-touch-icon-152x152.png | Bin 0 -> 12992 bytes core/layouts/empty.phtml | 2 + core/layouts/layout.phtml | 2 + favicon.ico | Bin 1150 -> 482 bytes modules/oauth/views/authorize/index.phtml | 40 ++++++----- modules/visualize/processData/index.jsp | 47 ++++++------- modules/visualize/views/webgl/index.phtml | 82 ++++++++++++---------- 9 files changed, 99 insertions(+), 83 deletions(-) create mode 100644 apple-touch-icon-120x120.png create mode 100644 apple-touch-icon-152x152.png diff --git a/app.yaml b/app.yaml index ee65d6b2a..94f585ab4 100644 --- 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 new file mode 100644 index 0000000000000000000000000000000000000000..9d72513c3703aad30ba5d7dde090bcbc4428adf0 GIT binary patch literal 9148 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 NpeU;ftCKbh{eNNUY)b$D literal 0 HcmV?d00001 diff --git a/core/layouts/empty.phtml b/core/layouts/empty.phtml index 9461e2a6e..8849bbd94 100644 --- 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 index 7265c652f..5fe19cfe1 100644 --- 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 index 8a5870efb0b5d52ff0ac56548908a848876ea99a..e63e5ca9565ea93a88da0768ca9477705bd8940e 100644 GIT binary patch literal 482 zcmV<80UiE{P)2}*an4dX+f6+;53l$4d%vFd`SFhx8lDzPum?+`R>2aQ zu%KLAX>2gs--=V%k4*I3y~B&XH}?=;qKo)}kYQ-mD5;D0iE$E%=nm!tdB-L?bkB?; z#Z5vN-r|-*DPJQP?Qg>aT)|~jFj+@#L)GmgkNns$j58R)HT2?Kg0mRL0Ip&?ir7^* z*yP0hEqIR(ysndX65DgwDryqksF}nI((%e~vw;IzvL~{Z-a743;zL4Tf>+px<2e0? z7}7D)v5KsD9y`SNvDU*o?9Ab_;0>zMu@~$7cpH|5)h;i_YC?R9Wzp2S8x!?l2Hj$O zhAtt@CDQRl(X`;(n&Lufv!D-maZ(5qID~RiU#Dp-ts%~#gzLD3AzZ|Oa`990Yf#bS zhA)dFn8jW!pdC{fY@CH!4mxoVyYU5iWcW%fE1#cVy`F0TonRibq87mlwqfz_ApMv6 Y2_H#{$J`wuqW}N^07*qoM6N<$f;j=?i2wiq literal 1150 zcmbu7ZA?>V6vq$I&3)Mdi*Z}b5{Fr)+Y;wA$h1Obl={+f0`6!Woc41&O3*aO*s>)#<)A{=6Qxrba?DJR0q z3gpK~DAXDWJ-!(9&cot^$@RHWax3OHto0!X!0cKd%)%4D?`Y8DnhSd752J?z?zz&y z{H$VWZbr6<^D*-RlD(FFwvX5zV*i9BA~?eVz6nbK;z!U+w6BGA#{?xQ@j`jC$_F?I9j;dl=Bt@huDs`Cx7pz=*K!4XcR%w^hvFY!UHoR#EL|7GaGl7!C+r zOU^rg_(rKia|0l>*1|0#2Y7u zT(R%5S3c#pmkhh~Q|hVqL!!~!z&BlntNlzU*HWOcYae8_!)up+Nj>m;^@Z8KAIe_r z`@YPAB==T-)9rlp;Ov;!Y|=S@OH)nCCUCxhZ{qH+>}S4S-u>m9OjUAjp5pmj*|l7X zn)9_yQ$bJAR4_c~UFu6Tzuh;k9CqoL+CMwYa$9qHllgkVO#{2(O7B-USelG0`O0@W z?8cp&m8|UE&U4w+P8NlZmUNV5o=~zV_pF|w_P&Sr8kBZ%daJcYQfuP2T^l%ak==8= zq)_!yRZcskwXl+pNQ({+$cheaku%fG=zY?{lrcH;dX1f)P!42IWJW;<-{|8&fC62bUF!Q zd7O`VIp+Cr(^LVKDhAZj;x^S~KuY}=a8Pg*K5V2wN<$XxMeq6P*rw-N@)F_SJRWmA kuK>}5Xfa|#OaN>jz=3DvqJ;=08z2$iH?{#hJ+hwr2X~^HUjP6A diff --git a/modules/oauth/views/authorize/index.phtml b/modules/oauth/views/authorize/index.phtml index 301adf2d7..cdcf673e1 100644 --- 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; ?> - + - - - - - Midas Login - + 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; - - + $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; - - - + $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; + ?>
@@ -60,7 +69,6 @@
-
diff --git a/modules/visualize/processData/index.jsp b/modules/visualize/processData/index.jsp index 50655db89..ea8d0a333 100644 --- 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.*"%> - - + + <% -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); - } - %> - - - + + Midas Platform - Digital Archiving System - - \ No newline at end of file + diff --git a/modules/visualize/views/webgl/index.phtml b/modules/visualize/views/webgl/index.phtml index 6e840ca0b..40c4c9787 100644 --- 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. =========================================================================*/ -?> - -Midas Platform Visualization - - - - - - -coreWebroot.'/public/js/layout/jquery.js">'; -echo ''; +echo $this->doctype().PHP_EOL; ?> - - - - + + + headMeta()->appendHttpEquiv('Content-Type', 'text/html; charset=UTF-8'); + echo $this->headMeta().PHP_EOL; - + $this->headTitle('Visualization'); + $this->headTitle()->setSeparator(' - '); + echo $this->headTitle().PHP_EOL; - - - - - - - -
- MOVE mouse & press LEFT button: rotate, - MIDDLE button: pan , RIGHT button: zoom -
+ $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; - + $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; -
-
- -
- - + echo $this->headStyle().PHP_EOL; + ?> + + + + + + + + + +
+ MOVE mouse and press LEFT button: rotate, + MIDDLE button: pan, RIGHT button: zoom. +
+ +
+
+