diff --git a/view/theme/diabook/admin_site.tpl b/view/theme/diabook/admin_site.tpl index dd89b81a9b..346934b70c 100644 --- a/view/theme/diabook/admin_site.tpl +++ b/view/theme/diabook/admin_site.tpl @@ -49,6 +49,9 @@ {{ inc field_input.tpl with $field=$proxy }}{{ endinc }} {{ inc field_input.tpl with $field=$proxyuser }}{{ endinc }} {{ inc field_input.tpl with $field=$timeout }}{{ endinc }} + {{ inc field_input.tpl with $field=$delivery_interval }}{{ endinc }} + {{ inc field_input.tpl with $field=$poll_interval }}{{ endinc }} + {{ inc field_input.tpl with $field=$maxloadavg }}{{ endinc }} {{ inc field_input.tpl with $field=$abandon_days }}{{ endinc }}
diff --git a/view/theme/diabook/bottom.tpl b/view/theme/diabook/bottom.tpl index 02ad1dcd23..0811993605 100644 --- a/view/theme/diabook/bottom.tpl +++ b/view/theme/diabook/bottom.tpl @@ -67,12 +67,14 @@ $(document).ready(function() { $("a#top").attr("id","down"); $("a#down").attr("onclick","scrolldown()"); $("img#scroll_top_bottom").attr("src","view/theme/diabook/icons/scroll_bottom.png"); + $("img#scroll_top_bottom").attr("title","Scroll to bottom"); } if (scrollInfo > "900"){ $("a#down").attr("id","top"); $("a#top").attr("onclick","scrolltop()"); $("img#scroll_top_bottom").attr("src","view/theme/diabook/icons/scroll_top.png"); + $("img#scroll_top_bottom").attr("title","Back to top"); } }); diff --git a/view/theme/diabook/diabook-aerith/style-wide.css b/view/theme/diabook/diabook-aerith/style-wide.css index 5c263154f1..43c0974b14 100644 --- a/view/theme/diabook/diabook-aerith/style-wide.css +++ b/view/theme/diabook/diabook-aerith/style-wide.css @@ -555,6 +555,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; @@ -621,9 +622,7 @@ header #banner #logo-img { margin-top: 3px; } header #banner #logo-text { - font-size: 20px; - position: absolute; - top: 10%; + font-size: 20px!important;position: relative!important;top: -4px!important; } /* messages */ #message-new { diff --git a/view/theme/diabook/diabook-aerith/style.css b/view/theme/diabook/diabook-aerith/style.css index e0f38aff6a..b512c8bfe2 100644 --- a/view/theme/diabook/diabook-aerith/style.css +++ b/view/theme/diabook/diabook-aerith/style.css @@ -555,6 +555,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; @@ -621,9 +622,7 @@ header #banner #logo-img { margin-top: 3px; } header #banner #logo-text { - font-size: 20px; - position: absolute; - top: 10%; + font-size: 20px!important;position: relative!important;top: -4px!important; } /* messages */ #message-new { diff --git a/view/theme/diabook/diabook-blue/style-wide.css b/view/theme/diabook/diabook-blue/style-wide.css index 189f4d5599..103047f32a 100644 --- a/view/theme/diabook/diabook-blue/style-wide.css +++ b/view/theme/diabook/diabook-blue/style-wide.css @@ -554,6 +554,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; @@ -607,9 +608,7 @@ header #banner #logo-img { margin-top: 3px; } header #banner #logo-text { - font-size: 20px; - position: absolute; - top: 10%; + font-size: 20px!important;position: relative!important;top: -4px!important; } /* messages */ #message-new { diff --git a/view/theme/diabook/diabook-blue/style.css b/view/theme/diabook/diabook-blue/style.css index 2b68afc6f5..e7f3fd0bc8 100644 --- a/view/theme/diabook/diabook-blue/style.css +++ b/view/theme/diabook/diabook-blue/style.css @@ -554,6 +554,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; @@ -607,9 +608,7 @@ header #banner #logo-img { margin-top: 3px; } header #banner #logo-text { - font-size: 20px; - position: absolute; - top: 10%; + font-size: 20px!important;position: relative!important;top: -4px!important; } /* messages */ #message-new { diff --git a/view/theme/diabook/diabook-dark/style-wide.css b/view/theme/diabook/diabook-dark/style-wide.css index 73d0e4c0f3..3475408b28 100644 --- a/view/theme/diabook/diabook-dark/style-wide.css +++ b/view/theme/diabook/diabook-dark/style-wide.css @@ -553,6 +553,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; @@ -606,9 +607,7 @@ header #banner #logo-img { margin-top: 3px; } header #banner #logo-text { - font-size: 20px; - position: absolute; - top: 10%; + font-size: 20px!important;position: relative!important;top: -4px!important; } /* messages */ #message-new { diff --git a/view/theme/diabook/diabook-dark/style.css b/view/theme/diabook/diabook-dark/style.css index fdc4e64812..24d319f8a2 100644 --- a/view/theme/diabook/diabook-dark/style.css +++ b/view/theme/diabook/diabook-dark/style.css @@ -565,6 +565,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: #2e2f2e; @@ -615,9 +616,7 @@ header #banner #logo-img { margin-top: 3px; } header #banner #logo-text { - font-size: 20px; - position: absolute; - top: 10%; + font-size: 20px!important;position: relative!important;top: -4px!important; } /* messages */ #message-new { diff --git a/view/theme/diabook/diabook-green/style-wide.css b/view/theme/diabook/diabook-green/style-wide.css index d98a6c3256..0a9c5e35cb 100644 --- a/view/theme/diabook/diabook-green/style-wide.css +++ b/view/theme/diabook/diabook-green/style-wide.css @@ -555,6 +555,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; @@ -609,9 +610,7 @@ header #banner #logo-img { margin-top: 3px; } header #banner #logo-text { - font-size: 20px; - position: absolute; - top: 10%; + font-size: 20px!important;position: relative!important;top: -4px!important; } /* messages */ #message-new { diff --git a/view/theme/diabook/diabook-green/style.css b/view/theme/diabook/diabook-green/style.css index 6a9d8f7d0c..762310e4db 100644 --- a/view/theme/diabook/diabook-green/style.css +++ b/view/theme/diabook/diabook-green/style.css @@ -557,6 +557,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; @@ -611,9 +612,7 @@ header #banner #logo-img { margin-top: 3px; } header #banner #logo-text { - font-size: 20px; - position: absolute; - top: 10%; + font-size: 20px!important;position: relative!important;top: -4px!important; } /*color*/ /* messages */ diff --git a/view/theme/diabook/diabook-pink/style-wide.css b/view/theme/diabook/diabook-pink/style-wide.css index 849566aa01..e85c58850a 100644 --- a/view/theme/diabook/diabook-pink/style-wide.css +++ b/view/theme/diabook/diabook-pink/style-wide.css @@ -555,6 +555,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; @@ -609,9 +610,7 @@ header #banner #logo-img { margin-top: 3px; } header #banner #logo-text { - font-size: 20px; - position: absolute; - top: 10%; + font-size: 20px!important;position: relative!important;top: -4px!important; } /* messages */ #message-new { diff --git a/view/theme/diabook/diabook-pink/style.css b/view/theme/diabook/diabook-pink/style.css index 798d739794..248e3ead07 100644 --- a/view/theme/diabook/diabook-pink/style.css +++ b/view/theme/diabook/diabook-pink/style.css @@ -557,6 +557,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; @@ -611,9 +612,7 @@ header #banner #logo-img { margin-top: 3px; } header #banner #logo-text { - font-size: 20px; - position: absolute; - top: 10%; + font-size: 20px!important;position: relative!important;top: -4px!important; } /* messages */ /*color*/ diff --git a/view/theme/diabook/diabook-red/style-wide.css b/view/theme/diabook/diabook-red/style-wide.css index b9ea238e2e..b068a2f5d2 100644 --- a/view/theme/diabook/diabook-red/style-wide.css +++ b/view/theme/diabook/diabook-red/style-wide.css @@ -554,6 +554,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; @@ -619,10 +620,7 @@ header #banner #logo-img { margin-top: 3px; } header #banner #logo-text { - font-size: 20px; - position: absolute; - top: 10%; - margin-left: 3px; + font-size: 20px!important;position: relative!important;top: -4px!important; } /* messages */ #message-new { diff --git a/view/theme/diabook/diabook-red/style.css b/view/theme/diabook/diabook-red/style.css index 05c802102c..37e26b8b93 100644 --- a/view/theme/diabook/diabook-red/style.css +++ b/view/theme/diabook/diabook-red/style.css @@ -554,6 +554,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; @@ -619,10 +620,7 @@ header #banner #logo-img { margin-top: 3px; } header #banner #logo-text { - font-size: 20px; - position: absolute; - top: 10%; - margin-left: 3px; + font-size: 20px!important;position: relative!important;top: -4px!important; } /* messages */ #message-new { diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl index f611de0043..4165656bd4 100644 --- a/view/theme/diabook/nav.tpl +++ b/view/theme/diabook/nav.tpl @@ -136,7 +136,7 @@ - +
$langselector
diff --git a/view/theme/diabook/style-wide.css b/view/theme/diabook/style-wide.css index cf54e5b580..64393bdffb 100644 --- a/view/theme/diabook/style-wide.css +++ b/view/theme/diabook/style-wide.css @@ -610,9 +610,7 @@ header #banner #logo-img { margin-top: 3px; } header #banner #logo-text { - font-size: 20px; - position: absolute; - top: 10%; + font-size: 20px!important;position: relative!important;top: -4px!important; } /* messages */ #message-new { diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index 2834e76f27..736817c7bf 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -611,9 +611,7 @@ header #banner #logo-img { margin-top: 3px; } header #banner #logo-text { - font-size: 20px; - position: absolute; - top: 10%; + font-size: 20px!important;position: relative!important;top: -4px!important; } /* messages */ #message-new { diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index 607414f17a..15c0794fa0 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -3,7 +3,7 @@ /* * Name: Diabook * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu - * Version: (Version: 1.026) + * Version: (Version: 1.027) * Author: */ @@ -13,7 +13,7 @@ $a = get_app(); function diabook_init(&$a) { //print diabook-version for debugging -$diabook_version = "Diabook (Version: 1.026)"; +$diabook_version = "Diabook (Version: 1.027)"; $a->page['htmlhead'] .= sprintf('', $diabook_version); //change css on network and profilepages @@ -401,7 +401,7 @@ if ($color=="dark") $color_path = "/diabook-dark/"; // custom css if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('', $cssFile); - + //footer $tpl = get_markup_template('footer.tpl'); $a->page['footer'] .= replace_macros($tpl, array()); @@ -568,7 +568,7 @@ if ($color=="dark") $color_path = "/diabook-dark/"; if($close_pages != "1") { if(local_user()) { $page = ' -

'.t("Community Pages").'

+

'.t("Community Pages").'