aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authortommy tomson <thomas.bierey@gmx.de>2012-05-10 09:54:16 +0200
committertommy tomson <thomas.bierey@gmx.de>2012-05-10 09:54:16 +0200
commit69b43582d07d90536030c780b8c85db2ef789ee4 (patch)
tree101fc7028a16d0b45456742d4faffe299793c8bd /view
parent4a42414135538fedad53ba6a2bc46ae18d652609 (diff)
downloadvolse-hubzilla-69b43582d07d90536030c780b8c85db2ef789ee4.tar.gz
volse-hubzilla-69b43582d07d90536030c780b8c85db2ef789ee4.tar.bz2
volse-hubzilla-69b43582d07d90536030c780b8c85db2ef789ee4.zip
diabook-theme: some css/bug-fixes
Diffstat (limited to 'view')
-rw-r--r--view/theme/diabook/admin_site.tpl3
-rw-r--r--view/theme/diabook/bottom.tpl2
-rw-r--r--view/theme/diabook/diabook-aerith/style-wide.css5
-rw-r--r--view/theme/diabook/diabook-aerith/style.css5
-rw-r--r--view/theme/diabook/diabook-blue/style-wide.css5
-rw-r--r--view/theme/diabook/diabook-blue/style.css5
-rw-r--r--view/theme/diabook/diabook-dark/style-wide.css5
-rw-r--r--view/theme/diabook/diabook-dark/style.css5
-rw-r--r--view/theme/diabook/diabook-green/style-wide.css5
-rw-r--r--view/theme/diabook/diabook-green/style.css5
-rw-r--r--view/theme/diabook/diabook-pink/style-wide.css5
-rw-r--r--view/theme/diabook/diabook-pink/style.css5
-rw-r--r--view/theme/diabook/diabook-red/style-wide.css6
-rw-r--r--view/theme/diabook/diabook-red/style.css6
-rw-r--r--view/theme/diabook/nav.tpl2
-rw-r--r--view/theme/diabook/style-wide.css4
-rw-r--r--view/theme/diabook/style.css4
-rwxr-xr-xview/theme/diabook/theme.php8
18 files changed, 36 insertions, 49 deletions
diff --git a/view/theme/diabook/admin_site.tpl b/view/theme/diabook/admin_site.tpl
index dd89b81a9..346934b70 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 }}
<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
diff --git a/view/theme/diabook/bottom.tpl b/view/theme/diabook/bottom.tpl
index 02ad1dcd2..081199360 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 5c263154f..43c0974b1 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 e0f38aff6..b512c8bfe 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 189f4d559..103047f32 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 2b68afc6f..e7f3fd0bc 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 73d0e4c0f..3475408b2 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 fdc4e6481..24d319f8a 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 d98a6c325..0a9c5e35c 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 6a9d8f7d0..762310e4d 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 849566aa0..e85c58850 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 798d73979..248e3ead0 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 b9ea238e2..b068a2f5d 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 05c802102..37e26b8b9 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 f611de004..4165656bd 100644
--- a/view/theme/diabook/nav.tpl
+++ b/view/theme/diabook/nav.tpl
@@ -136,7 +136,7 @@
</nav>
-<div id="scrollup" style="position: fixed; bottom: 5px; right: 10px;z-index: 97;"><a id="down" onclick="scrolldown()" ><img id="scroll_top_bottom" src="view/theme/diabook/icons/scroll_bottom.png" style="display:cursor !important;" alt="back to top" title="Back to top"></a></div>
+<div id="scrollup" style="position: fixed; bottom: 5px; right: 10px;z-index: 97;"><a id="down" onclick="scrolldown()" ><img id="scroll_top_bottom" src="view/theme/diabook/icons/scroll_bottom.png" style="display:cursor !important;" alt="back to top" title="Scroll to bottom"></a></div>
<div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div>
<div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>
diff --git a/view/theme/diabook/style-wide.css b/view/theme/diabook/style-wide.css
index cf54e5b58..64393bdff 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 2834e76f2..736817c7b 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 607414f17..15c0794fa 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('<META NAME="theme" CONTENT="%s"/>', $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('<link rel="stylesheet" type="text/css" href="%s" />', $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 = '
- <h3 style="margin-top:0px;">'.t("Community Pages").'<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="close"></a></h3>
+ <h3 style="margin-top:0px;">'.t("Community Pages").'<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="'.t("Settings").'"></a></h3>
<div id=""><ul style="margin-left: 7px;margin-top: 0px;padding-left: 0px;padding-top: 0px;">';
$pagelist = array();