Merge remote branch 'friendica/master' into blog-like

[friendica.git] / view / theme / frost-mobile / head.tpl

diff --git a/view/theme/frost-mobile/head.tpl b/view/theme/frost-mobile/head.tpl
index 8496667e135a2a834c0ac18a57766ba42619f3c7..111f5f6173fd07f427dc538a242adb402ef9c084 100644 (file)
--- a/view/theme/frost-mobile/head.tpl
+++ b/view/theme/frost-mobile/head.tpl
@@ -1,7 +1,10 @@
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<meta content='width=device-width, minimum-scale=1 maximum-scale=1' name='viewport'>
+<!--<meta content='width=device-width, minimum-scale=1 maximum-scale=1' name='viewport'>
 <meta content='True' name='HandheldFriendly'>
-<meta content='320' name='MobileOptimized'>
+<meta content='320' name='MobileOptimized'>-->
+<meta name="viewport" content="width=device-width; initial-scale = 1.0; maximum-scale=1.0; user-scalable=no" />
+<!--<meta name="viewport" content="width=100%;  initial-scale=1; maximum-scale=1; minimum-scale=1; user-scalable=no;" />-->
+
 <base href="$baseurl/" />
 <meta name="generator" content="$generator" />
 <!--<link rel="stylesheet" href="$baseurl/library/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
@@ -24,4 +27,7 @@
        var updateInterval = $update_interval;
        var localUser = {{ if $local_user }}$local_user{{ else }}false{{ endif }};
 </script>
+<script type="text/javascript" src="$baseurl/js/jquery.js" ></script>
+<script type="text/javascript">var $j = jQuery.noConflict();</script>
+<script type="text/javascript" src="$baseurl/view/theme/frost-mobile/js/main.min.js" ></script>