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 000000000..9d72513c3 Binary files /dev/null and b/apple-touch-icon-120x120.png differ diff --git a/apple-touch-icon-152x152.png b/apple-touch-icon-152x152.png new file mode 100644 index 000000000..916bd7b55 Binary files /dev/null and b/apple-touch-icon-152x152.png differ 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 8a5870efb..e63e5ca95 100644 Binary files a/favicon.ico and b/favicon.ico differ 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. +
+ +
+
+