diff options
author | Marko Pušnik <marko.pusnik@guru.si> | 2015-10-20 17:39:04 +0200 |
---|---|---|
committer | Marko Pušnik <marko.pusnik@guru.si> | 2015-10-20 17:39:04 +0200 |
commit | 08e955335ecb65c308dbc68bf0610dce39ce3623 (patch) | |
tree | 8b9326f9e6a9c7d4cf5189efca83f56cf3961bd7 /index.html | |
parent | cdfff9e0ab7fc26682218c5c694da4e9d0f4eea5 (diff) |
- icons
- any state marker from the URL before everything else loads removed
- settings dropdown separator visibility in case of saml login fixed
- profile screen:
- go back button refactored
- name, email field
- phone, browser and platform type detection (misc.js) added
- mobile apps:
- meta viewport and add HandheldFriendly changed
- style @-ms-viewport defined
- ajaxPrefix and eioHost temporary changed to dev server
- android: phonegap whitelistening in config.xml fixed
- ios: add hide status bar to config.xml
TODO:
- WP8 mobile app: test
- iOS mobile app: saml login solution (iframe cross domain url not allowed)
- "No Content-Security-Policy meta tag found. Please add one when using the cordova-plugin-whitelist plugin."
Diffstat (limited to 'index.html')
-rw-r--r-- | index.html | 47 |
1 files changed, 41 insertions, 6 deletions
@@ -1,10 +1,33 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <meta name="viewport" content="width=device-width, target-densitydpi=device-dpi"> + <!--meta name="viewport" content="width=device-width, target-densitydpi=device-dpi"--> + <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no"> + <meta name='HandheldFriendly' content='True'> <meta name="apple-mobile-web-app-capable" content="yes"> <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"> <meta name="format-detection" content="telephone=no"> + <!-- TODO: required by phonegap whitelistening + meta http-equiv="Content-Security-Policy" content="frame-src *"--> + <link rel="shortcut icon" type="image/x-icon" href="favicon.ico" /> + <link rel="icon" sizes="32x32" type="image/png" href="res/icon/icon-32.png" /> + <link rel="icon" sizes="48x48" type="image/png" href="res/icon/icon-48.png" /> + <link rel="icon" sizes="64x64" type="image/png" href="res/icon/icon-64.png" /> + <link rel="icon" sizes="96x96" type="image/png" href="res/icon/icon-96.png" /> + <link rel="icon" sizes="128x128" type="image/png" href="res/icon/icon-128.png" /> + <link rel="icon" sizes="256x256" type="image/png" href="res/icon/icon-256.png" /> + <link rel="apple-touch-icon" href="res/icon/icon-60.png" /> + <link rel="apple-touch-icon" sizes="76x76" href="res/icon/icon-76.png" /> + <link rel="apple-touch-icon" sizes="120x120" href="res/icon/icon-120.png" /> + <link rel="apple-touch-icon" sizes="152x152" href="res/icon/icon-152.png" /> + <link rel="apple-touch-icon" sizes="180x180" href="res/icon/icon-180.png" /> + <style> + @-ms-viewport { + width: device-width; + height: device-height; + } + /* placeholder for run-time generated styles */ + </style> <!-- CodeMirror --> <link rel="stylesheet" href="css/codemirror/codemirror.css" type="text/css"> <link rel="stylesheet" href="css/codemirror/show-hint.css" type="text/css"> @@ -16,6 +39,16 @@ <link rel="stylesheet" href="css/codeq/console.css" type="text/css"> <link rel="stylesheet" href="css/codeq/hint.css" type="text/css"> <title>CodeQ</title> + <script> + // remove any state marker from the URL before everything else loads + (function(){ + var r = location.href.split('?'), + replaceHref = r.length > 1; + r = r[0].split('#'); + replaceHref = replaceHref || (r.length > 1); + if (replaceHref) location.href = r[0]; + })(); + </script> </head> <body> <!-- the status bar at the top of each page --> @@ -42,7 +75,7 @@ <li style="display: none;" id="navigation-prolog"><a href="" data-tkey="prolog">Prolog</a></li> <li style="display: none;" id="navigation-robot"><a href="" data-tkey="robot">Robot</a></li> </ul> - <ul class="nav navbar-nav navbar-right" style="display: none;"> + <ul class="nav navbar-nav navbar-right" style="display:none;"> <p class="navbar-text"><span data-tkey="signed_in_as">Signed in as </span><span id="signed-in-title">Janez</span></p> <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="true"> @@ -51,7 +84,7 @@ <ul class="dropdown-menu"> <li id="navigation-logout"><a href="#" data-tkey="logout">Logout</a></li> <li id="navigation-profile"><a href="#" data-tkey="profile">Profile</a></li> - <li role="separator" class="divider"></li> + <li class="saml-login-hide divider" role="separator"></li> <li class="saml-login-hide"><a href="#" data-toggle="modal" data-target="#modalChangePassword" data-tkey="change_pass" id="change-password">Change password</a></li> </ul> </li> @@ -191,7 +224,7 @@ </form> </div> <div class="panel-footer text-center"> - <button class="btn btn-default" data-dismiss="modal" aria-hidden="true" data-tkey="cancel" id="cancel_change_pass_button">Cancel</button> + <button class="btn btn-default" data-tkey="cancel" id="cancel_change_pass_button">Cancel</button> <input form="formChangePassword" class="btn btn-primary" id="btnPasswdChange" type="submit" data-tkey-value="change_password_button" value="Change password"></button> </div> </div> @@ -345,8 +378,8 @@ <h2> <span data-tkey="profile">Profile</span> <div class="btn-group pull-right"> - <a href="" data-toggle="modal" data-target="#modalChangePassword" class="btn btn-default saml-login-hide" data-tkey="change_pass" id="change_pass_profile">Change Password</a> - <a href="#" class="btn btn-default" id="btnProfileGoBack" onclick="history.back()" data-tkey="go_back">Go back</a> + <button type="button" class="btn btn-default saml-login-hide" data-tkey="change_pass" id="change_pass_profile">Change Password</button> + <button type="button" class="btn btn-default" id="btnProfileGoBack" data-tkey="go_back">Go back</button> </div> </h2> <hr> @@ -359,6 +392,7 @@ <ul class="list-group small"> <li class="list-group-item text-right"><span class="pull-left"><strong data-tkey="username">Username</strong></span><span id="profileUsername">janezk</span></li> <li class="list-group-item text-right"><span class="pull-left"><strong data-tkey="name">Display name</strong></span><span id="profileName">Janez Kranjski</span></li> + <li class="list-group-item text-right"><span class="pull-left"><strong data-tkey="email">E-email</strong></span><span id="profileEmail">janez.kranjski@dezela_kranjska.si</span></li> <li class="list-group-item text-right"><span class="pull-left"><strong data-tkey="joined">Joined</strong></span><span id="profileJoined">Sep 29, 2015</span></li> <li class="list-group-item text-right"><span class="pull-left"><strong data-tkey="last_login">Last seen</strong></span><span id="profileLastLogin">1 hour ago</span></li> </ul> @@ -439,6 +473,7 @@ <script type="text/javascript" src="cordova.js"></script> <!-- codeq app cont. --> <script src="js/codeq/init.js"></script> + <script src="js/codeq/misc.js"></script> <script src="js/codeq/translation.js"></script> <script src="js/codeq/navigation.js"></script> <script src="js/codeq/comms.js"></script> |