From f0c11cac4a2eb4b7c7ca929b860c067c7fd3839d Mon Sep 17 00:00:00 2001 From: Max Weller Date: Wed, 2 May 2012 16:59:58 +0200 Subject: Moved Meta Viewport from global head.tpl to diabook's header I mistakenly added this tag to the global header, but it causes problems for other themes, as they have other optimal widths. I also added a style to diabook which makes the jGrowl messages appear below the header bar, so you can still click the menu items without having to close messages first. --- view/theme/diabook/style.css | 1 + view/theme/diabook/theme.php | 8 ++++++++ 2 files changed, 9 insertions(+) (limited to 'view/theme') 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'] .= ''; +} else { + $a->page['htmlhead'] .= ''; +} + + $color = false; $site_color = get_config("diabook", "color" ); if (local_user()) {$color = get_pconfig(local_user(), "diabook", "color");} -- cgit v1.2.3 From 3521e22333d9050d3feb35b4f9b147d444505904 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Thu, 3 May 2012 06:05:55 +0200 Subject: diabook-theme: made boxes at right_aside sortable --- view/theme/diabook/bottom.tpl | 26 +++++++++++---- view/theme/diabook/communityhome.tpl | 8 ++++- .../diabook/diabook-aerith/style-network-wide.css | 4 +-- .../theme/diabook/diabook-aerith/style-network.css | 4 +-- .../diabook/diabook-aerith/style-profile-wide.css | 4 +-- .../theme/diabook/diabook-aerith/style-profile.css | 4 +-- .../diabook/diabook-blue/style-network-wide.css | 4 +-- view/theme/diabook/diabook-blue/style-network.css | 4 +-- .../diabook/diabook-blue/style-profile-wide.css | 4 +-- view/theme/diabook/diabook-blue/style-profile.css | 4 +-- .../diabook/diabook-green/style-network-wide.css | 4 +-- view/theme/diabook/diabook-green/style-network.css | 4 +-- .../diabook/diabook-green/style-profile-wide.css | 4 +-- view/theme/diabook/diabook-green/style-profile.css | 4 +-- .../diabook/diabook-pink/style-network-wide.css | 4 +-- view/theme/diabook/diabook-pink/style-network.css | 4 +-- .../diabook/diabook-pink/style-profile-wide.css | 4 +-- view/theme/diabook/diabook-pink/style-profile.css | 4 +-- .../diabook/diabook-red/style-network-wide.css | 4 +-- view/theme/diabook/diabook-red/style-network.css | 4 +-- .../diabook/diabook-red/style-profile-wide.css | 4 +-- view/theme/diabook/diabook-red/style-profile.css | 4 +-- .../diabook/js/jquery-ui-1.8.20.custom.min.js | 37 ++++++++++++++++++++++ view/theme/diabook/style-network-wide.css | 4 +-- view/theme/diabook/style-network.css | 4 +-- view/theme/diabook/style-profile-wide.css | 4 +-- view/theme/diabook/style-profile.css | 4 +-- view/theme/diabook/style-wide.css | 1 + view/theme/diabook/theme.php | 11 +++++-- 29 files changed, 122 insertions(+), 57 deletions(-) create mode 100644 view/theme/diabook/js/jquery-ui-1.8.20.custom.min.js (limited to 'view/theme') diff --git a/view/theme/diabook/bottom.tpl b/view/theme/diabook/bottom.tpl index 8eb71b7dd..2bb651796 100644 --- a/view/theme/diabook/bottom.tpl +++ b/view/theme/diabook/bottom.tpl @@ -1,11 +1,6 @@ ', $imageresizeJS); + //load jquery.ui.js + $jqueryuiJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery-ui-1.8.20.custom.min.js"; + $a->page['htmlhead'] .= sprintf('', $jqueryuiJS); + //load jquery.twitter.search.js if($_COOKIE['close_twitter'] != "1") { $twitterJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.twitter.search.js"; @@ -133,6 +137,9 @@ if ($color=="dark") $color_path = "/diabook-dark/"; var footer_top = $(document).height() - 30; $("div#footerbox").attr("style", "border-top: 1px solid #D2D2D2; width: 70%;right: 15%;position: absolute;top:"+footer_top+"px;"); }); + + + '; //check if twitterbox is active and print @@ -467,7 +474,7 @@ if ($color=="dark") $color_path = "/diabook-dark/"; //Community_Pages at right_aside if($_COOKIE['close_pages'] != "1") { if(local_user()) { - $page = '
+ $page = '

'.t("Community Pages").'

    '; @@ -493,7 +500,7 @@ if ($color=="dark") $color_path = "/diabook-dark/"; $page .= '
  • ' . $contact['url'] . ' '. $contact["name"]."
    • "; } - $page .= '
'; + $page .= ''; //if (sizeof($contacts) > 0) $aside['$page'] = $page; }} -- cgit v1.2.3 From ff2ddc319d4307e56a1bf48f51f8f948fe0736ca Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Thu, 3 May 2012 06:25:23 +0200 Subject: diabook-theme: small fix --- view/theme/diabook/theme.php | 1 + 1 file changed, 1 insertion(+) (limited to 'view/theme') diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index 1d4fd5e28..eaf17bea1 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -193,6 +193,7 @@ if ($color=="dark") $color_path = "/diabook-dark/"; $.cookie("close_lastusers","2", { expires: 365, path: "/" }); $.cookie("close_lastphotos","2", { expires: 365, path: "/" }); $.cookie("close_lastlikes","2", { expires: 365, path: "/" }); + $.cookie("Boxorder",null, { expires: 365, path: "/" }); alert("Right-hand column was restored. Please refresh your browser"); } ';} -- cgit v1.2.3