Merge pull request #282 from max-weller/master

Moved <meta viewport> to theme; Diabook style

3 files changed, 9 insertions, 1 deletions

diff --git a/view/head.tpl b/view/head.tpl
index 7b1541242..7638e56ca 100644
--- a/view/head.tpl
+++ b/view/head.tpl
@@ -6,7 +6,6 @@
 <link rel="stylesheet" href="$baseurl/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />
 
 <link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
-<meta name="viewport" content="width=800, initial-scale=1, maximum-scale=3" />
 
 <link rel="shortcut icon" href="$baseurl/images/friendica-32.png" />
 <link rel="search"
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index e70c72cb2..2834e76f2 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -558,6 +558,7 @@ code {
   text-decoration: none;
 }
 /* popup notifications */
+div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ }
 div.jGrowl div.notice {
   background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
   color: #ffffff;
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index a169043b2..758fb5d91 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -26,6 +26,14 @@ $resolution=false;
 $resolution = get_pconfig(local_user(), "diabook", "resolution");
 if ($resolution===false) $resolution="normal";
 
+//Add META viewport tag respecting the resolution to header for tablets
+if ($resolution=="wide") {
+  $a->page['htmlhead'] .= '<meta name="viewport" content="width=1200" />';
+} else {
+  $a->page['htmlhead'] .= '<meta name="viewport" content="width=980" />';
+}
+
+
 $color = false;
 $site_color = get_config("diabook", "color" );
 if (local_user()) {$color = get_pconfig(local_user(), "diabook", "color");}