From 9faa940f044dd47687a008272c727f8f8dac9fec Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Mon, 2 Apr 2012 15:06:55 +0200 Subject: diabook-themes: bugfixes / css-fixes --- view/theme/diabook-aerith/profile_vcard.tpl | 4 ++-- view/theme/diabook-aerith/style-network.css | 2 +- view/theme/diabook-aerith/style-profile.css | 3 ++- view/theme/diabook-aerith/style.css | 1 + view/theme/diabook-blue/profile_vcard.tpl | 4 ++-- view/theme/diabook-blue/style-network.css | 2 +- view/theme/diabook-blue/style-profile.css | 3 ++- view/theme/diabook-blue/style.css | 1 + view/theme/diabook-red/profile_vcard.tpl | 4 ++-- view/theme/diabook-red/style-network.css | 2 +- view/theme/diabook-red/style-profile.css | 3 ++- view/theme/diabook-red/style.css | 1 + view/theme/diabook/profile_vcard.tpl | 4 ++-- view/theme/diabook/style-network.css | 2 +- view/theme/diabook/style-profile.css | 5 ++++- view/theme/diabook/style.css | 3 +++ view/theme/diabook/theme.php | 3 ++- 17 files changed, 30 insertions(+), 17 deletions(-) (limited to 'view') diff --git a/view/theme/diabook-aerith/profile_vcard.tpl b/view/theme/diabook-aerith/profile_vcard.tpl index 918cfc97c..e28ec2909 100644 --- a/view/theme/diabook-aerith/profile_vcard.tpl +++ b/view/theme/diabook-aerith/profile_vcard.tpl @@ -21,9 +21,9 @@ - {{ if $pdesc }}
$profile.pdesc
{{ endif }} -
$profile.name
+
$profile.name
+ {{ if $pdesc }}
$profile.pdesc
{{ endif }} {{ if $location }} diff --git a/view/theme/diabook-aerith/style-network.css b/view/theme/diabook-aerith/style-network.css index f6c7bc69a..79ab1d04f 100644 --- a/view/theme/diabook-aerith/style-network.css +++ b/view/theme/diabook-aerith/style-network.css @@ -1256,7 +1256,7 @@ right_aside { /* background: #F1F1F1; */ } right_aside a{color: #3465A4;} -right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; +right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px; margin-top:30px;} right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; } right_aside .directory-photo { margin: 0px; } diff --git a/view/theme/diabook-aerith/style-profile.css b/view/theme/diabook-aerith/style-profile.css index c4f89359a..74f2a48d1 100644 --- a/view/theme/diabook-aerith/style-profile.css +++ b/view/theme/diabook-aerith/style-profile.css @@ -1251,7 +1251,7 @@ right_aside { /* background: #F1F1F1; */ } right_aside a{color: #3465A4;} -right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; +right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px; margin-top:30px;} right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; } right_aside .directory-photo { margin: 0px; } @@ -2076,6 +2076,7 @@ box-shadow: 2px 2px 5px 0px #000000; margin: 2px 5px 2px 5px; max-height: 85%; max-width: 85%; +border-radius: 10px; } .lframe { float: left; diff --git a/view/theme/diabook-aerith/style.css b/view/theme/diabook-aerith/style.css index 796af62ed..189d6252b 100644 --- a/view/theme/diabook-aerith/style.css +++ b/view/theme/diabook-aerith/style.css @@ -2096,6 +2096,7 @@ box-shadow: 2px 2px 5px 0px #000000; margin: 2px 5px 2px 5px; max-height: 85%; max-width: 85%; +border-radius: 10px; } .lframe { float: left; diff --git a/view/theme/diabook-blue/profile_vcard.tpl b/view/theme/diabook-blue/profile_vcard.tpl index 918cfc97c..e28ec2909 100644 --- a/view/theme/diabook-blue/profile_vcard.tpl +++ b/view/theme/diabook-blue/profile_vcard.tpl @@ -21,9 +21,9 @@ - {{ if $pdesc }}
$profile.pdesc
{{ endif }} -
$profile.name
+
$profile.name
+ {{ if $pdesc }}
$profile.pdesc
{{ endif }} {{ if $location }} diff --git a/view/theme/diabook-blue/style-network.css b/view/theme/diabook-blue/style-network.css index 5d16cde9e..224e6a931 100644 --- a/view/theme/diabook-blue/style-network.css +++ b/view/theme/diabook-blue/style-network.css @@ -1215,7 +1215,7 @@ right_aside { /* background: #F1F1F1; */ } right_aside a{color: #1872A2;} -right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; +right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px; margin-top:30px;} right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; } right_aside .directory-photo { margin: 0px; } diff --git a/view/theme/diabook-blue/style-profile.css b/view/theme/diabook-blue/style-profile.css index 528327ac3..a84b2df34 100644 --- a/view/theme/diabook-blue/style-profile.css +++ b/view/theme/diabook-blue/style-profile.css @@ -1214,7 +1214,7 @@ right_aside { /* background: #F1F1F1; */ } right_aside a{color: #1872A2;} -right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; +right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px; margin-top:30px;} right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; } right_aside .directory-photo { margin: 0px; } @@ -2035,6 +2035,7 @@ box-shadow: 2px 2px 5px 0px #000000; margin: 2px 5px 2px 5px; max-height: 85%; max-width: 85%; +border-radius: 10px; } .lframe { float: left; diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css index b4289dc0f..867d5b88f 100644 --- a/view/theme/diabook-blue/style.css +++ b/view/theme/diabook-blue/style.css @@ -2044,6 +2044,7 @@ box-shadow: 2px 2px 5px 0px #000000; margin: 2px 5px 2px 5px; max-height: 85%; max-width: 85%; +border-radius: 10px; } .lframe { float: left; diff --git a/view/theme/diabook-red/profile_vcard.tpl b/view/theme/diabook-red/profile_vcard.tpl index 918cfc97c..e28ec2909 100644 --- a/view/theme/diabook-red/profile_vcard.tpl +++ b/view/theme/diabook-red/profile_vcard.tpl @@ -21,9 +21,9 @@ - {{ if $pdesc }}
$profile.pdesc
{{ endif }} -
$profile.name
+
$profile.name
+ {{ if $pdesc }}
$profile.pdesc
{{ endif }} {{ if $location }} diff --git a/view/theme/diabook-red/style-network.css b/view/theme/diabook-red/style-network.css index c7063860f..145852d96 100644 --- a/view/theme/diabook-red/style-network.css +++ b/view/theme/diabook-red/style-network.css @@ -1253,7 +1253,7 @@ right_aside { /* background: #F1F1F1; */ } right_aside a{color: red;} -right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; +right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px; margin-top:30px;} right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; } right_aside .directory-photo { margin: 0px; } diff --git a/view/theme/diabook-red/style-profile.css b/view/theme/diabook-red/style-profile.css index 5124ed8c0..37790584d 100644 --- a/view/theme/diabook-red/style-profile.css +++ b/view/theme/diabook-red/style-profile.css @@ -1231,7 +1231,7 @@ right_aside { /* background: #F1F1F1; */ } right_aside a{color: red;} -right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; +right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px; margin-top:30px;} right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; } right_aside .directory-photo { margin: 0px; } @@ -2057,6 +2057,7 @@ box-shadow: 2px 2px 5px 0px #000000; margin: 2px 5px 2px 5px; max-height: 85%; max-width: 85%; +border-radius: 10px; } .lframe { float: left; diff --git a/view/theme/diabook-red/style.css b/view/theme/diabook-red/style.css index 578a5473a..92ede79be 100644 --- a/view/theme/diabook-red/style.css +++ b/view/theme/diabook-red/style.css @@ -2081,6 +2081,7 @@ box-shadow: 2px 2px 5px 0px #000000; margin: 2px 5px 2px 5px; max-height: 85%; max-width: 85%; +border-radius: 10px; } .lframe { float: left; diff --git a/view/theme/diabook/profile_vcard.tpl b/view/theme/diabook/profile_vcard.tpl index 918cfc97c..e28ec2909 100644 --- a/view/theme/diabook/profile_vcard.tpl +++ b/view/theme/diabook/profile_vcard.tpl @@ -21,9 +21,9 @@ - {{ if $pdesc }}
$profile.pdesc
{{ endif }} -
$profile.name
+
$profile.name
+ {{ if $pdesc }}
$profile.pdesc
{{ endif }} {{ if $location }} diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css index 518e7b88d..641d35b39 100644 --- a/view/theme/diabook/style-network.css +++ b/view/theme/diabook/style-network.css @@ -1196,7 +1196,7 @@ right_aside { /* background: #F1F1F1; */ } -right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; +right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px; margin-top:30px;} right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; } right_aside .directory-photo { margin: 0px; } diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css index 0077510a1..54b282310 100644 --- a/view/theme/diabook/style-profile.css +++ b/view/theme/diabook/style-profile.css @@ -1191,7 +1191,7 @@ right_aside { /* background: #F1F1F1; */ } -right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; +right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px; margin-top:30px;} right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; } right_aside .directory-photo { margin: 0px; } @@ -2003,6 +2003,9 @@ ul.tabs li .active { float: left; } /* photo */ +.photo { +border-radius: 10px; + } .lframe { float: left; } diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index 97a26a41d..99bf1b335 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -2014,6 +2014,9 @@ ul.tabs li .active { float: left; } /* photo */ +.photo { +border-radius: 10px; + } .lframe { float: left; } diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index d6ee57316..a535ed07e 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -169,7 +169,8 @@ function diabook_community_info(){ $pagelist = array(); $contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact` - WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d", + WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d + ORDER BY `name` ASC", intval($a->user['uid']) ); -- cgit v1.2.3 From b5d57d5313b61842a72f0e2ad002cf633aa72dd7 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Mon, 2 Apr 2012 17:17:14 +0200 Subject: diabook-themes: fixed pageheader --- view/theme/diabook-aerith/style-network.css | 6 ++- view/theme/diabook-aerith/style-profile.css | 7 +-- view/theme/diabook-aerith/style-settings.css | 6 ++- view/theme/diabook-aerith/style.css | 6 ++- view/theme/diabook-blue/style-network.css | 6 ++- view/theme/diabook-blue/style-profile.css | 6 ++- view/theme/diabook-blue/style-settings.css | 6 ++- view/theme/diabook-blue/style.css | 6 ++- view/theme/diabook-red/style-network.css | 6 ++- view/theme/diabook-red/style-profile.css | 6 ++- view/theme/diabook-red/style-settings.css | 6 ++- view/theme/diabook-red/style.css | 6 ++- view/theme/diabook/style-network.css | 6 ++- view/theme/diabook/style-profile.css | 6 ++- view/theme/diabook/style-settings.css | 7 ++- view/theme/diabook/style.css | 6 ++- view/theme/diabook/theme.php | 68 ++++++++++++++-------------- 17 files changed, 98 insertions(+), 68 deletions(-) (limited to 'view') diff --git a/view/theme/diabook-aerith/style-network.css b/view/theme/diabook-aerith/style-network.css index 79ab1d04f..3e6e44f28 100644 --- a/view/theme/diabook-aerith/style-network.css +++ b/view/theme/diabook-aerith/style-network.css @@ -1198,8 +1198,10 @@ section { body .pageheader{ text-align: center; - margin-top: 25px; - font-size: 0px; + font-size: 20px; + margin-bottom: 20px; + margin-top: 0px; + max-width: 575px; } #id_username { diff --git a/view/theme/diabook-aerith/style-profile.css b/view/theme/diabook-aerith/style-profile.css index 74f2a48d1..ef09829d4 100644 --- a/view/theme/diabook-aerith/style-profile.css +++ b/view/theme/diabook-aerith/style-profile.css @@ -1193,10 +1193,11 @@ section { body .pageheader{ text-align: center; - margin-top: 25px; - font-size: 0px; + font-size: 20px; + margin-bottom: 20px; + margin-top: 0px; + max-width: 575px; } - #id_username { width: 173px; } diff --git a/view/theme/diabook-aerith/style-settings.css b/view/theme/diabook-aerith/style-settings.css index 0326dbcfc..8963065ca 100644 --- a/view/theme/diabook-aerith/style-settings.css +++ b/view/theme/diabook-aerith/style-settings.css @@ -1191,8 +1191,10 @@ section { body .pageheader{ text-align: center; - margin-top: 25px; - font-size: 0px; + font-size: 20px; + margin-bottom: 20px; + margin-top: 0px; + max-width: 575px; } #id_username { diff --git a/view/theme/diabook-aerith/style.css b/view/theme/diabook-aerith/style.css index 189d6252b..3f11e71ef 100644 --- a/view/theme/diabook-aerith/style.css +++ b/view/theme/diabook-aerith/style.css @@ -1254,8 +1254,10 @@ section { } body .pageheader{ text-align: center; - margin-top: 25px; - font-size: 0px; + font-size: 20px; + margin-bottom: 20px; + margin-top: 0px; + max-width: 575px; } #id_username { diff --git a/view/theme/diabook-blue/style-network.css b/view/theme/diabook-blue/style-network.css index 224e6a931..08dc87076 100644 --- a/view/theme/diabook-blue/style-network.css +++ b/view/theme/diabook-blue/style-network.css @@ -1160,8 +1160,10 @@ section { body .pageheader{ text-align: center; - margin-top: 25px; - font-size: 0px; + font-size: 20px; + margin-bottom: 20px; + margin-top: 0px; + max-width: 575px; } #id_username { diff --git a/view/theme/diabook-blue/style-profile.css b/view/theme/diabook-blue/style-profile.css index a84b2df34..81bbe03c6 100644 --- a/view/theme/diabook-blue/style-profile.css +++ b/view/theme/diabook-blue/style-profile.css @@ -1159,8 +1159,10 @@ section { body .pageheader{ text-align: center; - margin-top: 25px; - font-size: 0px; + font-size: 20px; + margin-bottom: 20px; + margin-top: 0px; + max-width: 575px; } #id_username { diff --git a/view/theme/diabook-blue/style-settings.css b/view/theme/diabook-blue/style-settings.css index 197b53d30..2e7db1e1f 100644 --- a/view/theme/diabook-blue/style-settings.css +++ b/view/theme/diabook-blue/style-settings.css @@ -1156,8 +1156,10 @@ section { body .pageheader{ text-align: center; - margin-top: 25px; - font-size: 0px; + font-size: 20px; + margin-bottom: 20px; + margin-top: 0px; + max-width: 575px; } #id_username { diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css index 867d5b88f..809ae8f61 100644 --- a/view/theme/diabook-blue/style.css +++ b/view/theme/diabook-blue/style.css @@ -1210,8 +1210,10 @@ section { } body .pageheader{ text-align: center; - margin-top: 25px; - font-size: 0px; + font-size: 20px; + margin-bottom: 20px; + margin-top: 0px; + max-width: 575px; } #id_username { diff --git a/view/theme/diabook-red/style-network.css b/view/theme/diabook-red/style-network.css index 145852d96..7301ace3f 100644 --- a/view/theme/diabook-red/style-network.css +++ b/view/theme/diabook-red/style-network.css @@ -1198,8 +1198,10 @@ section { body .pageheader{ text-align: center; - margin-top: 25px; - font-size: 0px; + font-size: 20px; + margin-bottom: 20px; + margin-top: 0px; + max-width: 575px; } #id_username { diff --git a/view/theme/diabook-red/style-profile.css b/view/theme/diabook-red/style-profile.css index 37790584d..59e57fdd6 100644 --- a/view/theme/diabook-red/style-profile.css +++ b/view/theme/diabook-red/style-profile.css @@ -1176,8 +1176,10 @@ section { body .pageheader{ text-align: center; - margin-top: 25px; - font-size: 0px; + font-size: 20px; + margin-bottom: 20px; + margin-top: 0px; + max-width: 575px; } #id_username { diff --git a/view/theme/diabook-red/style-settings.css b/view/theme/diabook-red/style-settings.css index 9407c68f9..43bb3d037 100644 --- a/view/theme/diabook-red/style-settings.css +++ b/view/theme/diabook-red/style-settings.css @@ -1173,8 +1173,10 @@ section { body .pageheader{ text-align: center; - margin-top: 25px; - font-size: 0px; + font-size: 20px; + margin-bottom: 20px; + margin-top: 0px; + max-width: 575px; } #id_username { diff --git a/view/theme/diabook-red/style.css b/view/theme/diabook-red/style.css index 92ede79be..ef498e639 100644 --- a/view/theme/diabook-red/style.css +++ b/view/theme/diabook-red/style.css @@ -1243,8 +1243,10 @@ section { } body .pageheader{ text-align: center; - margin-top: 25px; - font-size: 0px; + font-size: 20px; + margin-bottom: 20px; + margin-top: 0px; + max-width: 575px; } #id_username { diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css index 641d35b39..2044e1126 100644 --- a/view/theme/diabook/style-network.css +++ b/view/theme/diabook/style-network.css @@ -1144,8 +1144,10 @@ section { body .pageheader{ text-align: center; - margin-top: 25px; - font-size: 0px; + font-size: 20px; + margin-bottom: 20px; + margin-top: 0px; + max-width: 575px; } #id_username { diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css index 54b282310..2664adfc5 100644 --- a/view/theme/diabook/style-profile.css +++ b/view/theme/diabook/style-profile.css @@ -1138,8 +1138,10 @@ section { body .pageheader{ text-align: center; - margin-top: 25px; - font-size: 0px; + font-size: 20px; + margin-bottom: 20px; + margin-top: 0px; + max-width: 575px; } #id_username { diff --git a/view/theme/diabook/style-settings.css b/view/theme/diabook/style-settings.css index 46f7e957e..b23c2bb1b 100644 --- a/view/theme/diabook/style-settings.css +++ b/view/theme/diabook/style-settings.css @@ -1135,8 +1135,11 @@ section { body .pageheader{ text-align: center; - margin-top: 25px; - font-size: 0px; + font-size: 20px; + max-width: 575px; + margin-bottom: 20px; + margin-top: 0px; + max-width: 575px; } #id_username { diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index 99bf1b335..4ce3068f0 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -1190,8 +1190,10 @@ section { body .pageheader{ text-align: center; - margin-top: 25px; - font-size: 0px; + font-size: 20px; + margin-bottom: 20px; + margin-top: 0px; + max-width: 575px; } #id_username { diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index a535ed07e..34e5535de 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -265,7 +265,7 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){ } } -//tabs at right_aside on settings page +//tabs at aside on settings page if ($a->argv[0] === "settings"){ $tabs = array( @@ -324,55 +324,58 @@ $a->page['htmlhead'] .= sprintf(' + '; + +if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){ +$a->page['htmlhead'] .= ' - - -EOT; +';} \ No newline at end of file -- cgit v1.2.3 From 076b1b374b864a4d45add31c72e447495dbe0339 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Mon, 2 Apr 2012 18:16:58 +0200 Subject: diabook-themes: fixes in js --- view/theme/diabook-aerith/theme.php | 75 +++++++++++++++++++------------------ view/theme/diabook-blue/theme.php | 75 +++++++++++++++++++------------------ view/theme/diabook-red/theme.php | 75 +++++++++++++++++++------------------ view/theme/diabook/theme.php | 2 +- 4 files changed, 115 insertions(+), 112 deletions(-) (limited to 'view') diff --git a/view/theme/diabook-aerith/theme.php b/view/theme/diabook-aerith/theme.php index 490010750..f9be1b232 100755 --- a/view/theme/diabook-aerith/theme.php +++ b/view/theme/diabook-aerith/theme.php @@ -3,7 +3,7 @@ /* * Name: Diabook-aerith * Description: Diabook-aerith : report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu - * Version: + * Version: (Version: 0.010) * Author: */ @@ -164,7 +164,8 @@ function diabook_aerith_community_info(){ $pagelist = array(); $contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact` - WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d", + WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d + ORDER BY `name` ASC", intval($a->user['uid']) ); @@ -316,56 +317,58 @@ $a->page['htmlhead'] .= sprintf(''; - +if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){ +$a->page['htmlhead'] .= ' - -EOT; + +function restore_boxes(){ + $.cookie("close_pages","2", { expires: 365, path: "/" }); + $.cookie("close_helpers","2", { expires: 365, path: "/" }); + $.cookie("close_services","2", { expires: 365, path: "/" }); + $.cookie("close_friends","2", { expires: 365, path: "/" }); + $.cookie("close_postit","2", { expires: 365, path: "/" }); + $.cookie("close_lastusers","2", { expires: 365, path: "/" }); + $.cookie("close_lastphotos","2", { expires: 365, path: "/" }); + $.cookie("close_lastlikes","2", { expires: 365, path: "/" }); + alert("Right-hand column was restored. Please refresh your browser"); + }; +';} \ No newline at end of file diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php index 891c13cbf..3a1312fef 100755 --- a/view/theme/diabook-blue/theme.php +++ b/view/theme/diabook-blue/theme.php @@ -3,7 +3,7 @@ /* * Name: Diabook-blue * Description: Diabook-blue: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu - * Version: + * Version: (Version: 0.010) * Author: */ @@ -164,7 +164,8 @@ function diabook_blue_community_info(){ $pagelist = array(); $contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact` - WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d", + WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d + ORDER BY `name` ASC", intval($a->user['uid']) ); @@ -316,56 +317,58 @@ $a->page['htmlhead'] .= sprintf(''; - +if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){ +$a->page['htmlhead'] .= ' - -EOT; + +function restore_boxes(){ + $.cookie("close_pages","2", { expires: 365, path: "/" }); + $.cookie("close_helpers","2", { expires: 365, path: "/" }); + $.cookie("close_services","2", { expires: 365, path: "/" }); + $.cookie("close_friends","2", { expires: 365, path: "/" }); + $.cookie("close_postit","2", { expires: 365, path: "/" }); + $.cookie("close_lastusers","2", { expires: 365, path: "/" }); + $.cookie("close_lastphotos","2", { expires: 365, path: "/" }); + $.cookie("close_lastlikes","2", { expires: 365, path: "/" }); + alert("Right-hand column was restored. Please refresh your browser"); + }; +';} diff --git a/view/theme/diabook-red/theme.php b/view/theme/diabook-red/theme.php index 44a76a5e4..79045c979 100755 --- a/view/theme/diabook-red/theme.php +++ b/view/theme/diabook-red/theme.php @@ -3,7 +3,7 @@ /* * Name: Diabook-red * Description: Diabook-red: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu - * Version: + * Version: (Version: 0.010) * Author: */ @@ -164,7 +164,8 @@ function diabook_red_community_info(){ $pagelist = array(); $contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact` - WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d", + WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d + ORDER BY `name` ASC", intval($a->user['uid']) ); @@ -317,56 +318,58 @@ $a->page['htmlhead'] .= sprintf(''; - +if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){ +$a->page['htmlhead'] .= ' - -EOT; + +function restore_boxes(){ + $.cookie("close_pages","2", { expires: 365, path: "/" }); + $.cookie("close_helpers","2", { expires: 365, path: "/" }); + $.cookie("close_services","2", { expires: 365, path: "/" }); + $.cookie("close_friends","2", { expires: 365, path: "/" }); + $.cookie("close_postit","2", { expires: 365, path: "/" }); + $.cookie("close_lastusers","2", { expires: 365, path: "/" }); + $.cookie("close_lastphotos","2", { expires: 365, path: "/" }); + $.cookie("close_lastlikes","2", { expires: 365, path: "/" }); + alert("Right-hand column was restored. Please refresh your browser"); + }; +';} diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index 34e5535de..d8f96e9f7 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: (Version: 0.010) * Author: */ -- cgit v1.2.3 From 6dfd55668f39d2cfb27d468cc982471abaad5165 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Mon, 2 Apr 2012 20:30:27 +0200 Subject: diabook-themes: css-fixes --- view/theme/diabook-aerith/jot.tpl | 2 +- view/theme/diabook-aerith/style-network.css | 9 ++++++++- view/theme/diabook-aerith/style-profile.css | 8 ++++++++ view/theme/diabook-aerith/style.css | 12 ++++++++++-- view/theme/diabook-aerith/theme.php | 2 +- view/theme/diabook-aerith/wallwall_item.tpl | 4 ++++ view/theme/diabook-blue/jot.tpl | 2 +- view/theme/diabook-blue/style-network.css | 9 ++++++++- view/theme/diabook-blue/style-profile.css | 9 ++++++++- view/theme/diabook-blue/style.css | 10 +++++++++- view/theme/diabook-blue/theme.php | 2 +- view/theme/diabook-blue/wallwall_item.tpl | 4 ++++ view/theme/diabook-red/jot.tpl | 2 +- view/theme/diabook-red/style-network.css | 9 ++++++++- view/theme/diabook-red/style-profile.css | 9 ++++++++- view/theme/diabook-red/style.css | 10 +++++++++- view/theme/diabook-red/theme.php | 2 +- view/theme/diabook-red/wallwall_item.tpl | 4 ++++ view/theme/diabook/jot.tpl | 2 +- view/theme/diabook/style-network.css | 8 ++++++++ view/theme/diabook/style-profile.css | 9 ++++++++- view/theme/diabook/style.css | 11 +++++++++-- view/theme/diabook/theme.php | 2 +- view/theme/diabook/wallwall_item.tpl | 4 ++++ 24 files changed, 125 insertions(+), 20 deletions(-) (limited to 'view') diff --git a/view/theme/diabook-aerith/jot.tpl b/view/theme/diabook-aerith/jot.tpl index 59066a19c..ee30da7bf 100755 --- a/view/theme/diabook-aerith/jot.tpl +++ b/view/theme/diabook-aerith/jot.tpl @@ -2,7 +2,6 @@
 
-
@@ -15,6 +14,7 @@ +
diff --git a/view/theme/diabook-aerith/style-network.css b/view/theme/diabook-aerith/style-network.css index 3e6e44f28..7e2c8f02b 100644 --- a/view/theme/diabook-aerith/style-network.css +++ b/view/theme/diabook-aerith/style-network.css @@ -1203,7 +1203,9 @@ body .pageheader{ margin-top: 0px; max-width: 575px; } - +.qcomment{ + max-width: 122px; + } #id_username { width: 173px; } @@ -1615,6 +1617,11 @@ transition: all 0.2s ease-in-out; padding: 0.3em; margin-bottom: 10px; } +.grey +{ + display: inline; + float: right; + } #jot #jot-tools { margin: 0px; padding: 0px; diff --git a/view/theme/diabook-aerith/style-profile.css b/view/theme/diabook-aerith/style-profile.css index ef09829d4..29982c8c5 100644 --- a/view/theme/diabook-aerith/style-profile.css +++ b/view/theme/diabook-aerith/style-profile.css @@ -1198,6 +1198,9 @@ body .pageheader{ margin-top: 0px; max-width: 575px; } +.qcomment{ + max-width: 122px; + } #id_username { width: 173px; } @@ -1604,6 +1607,11 @@ transition: all 0.2s ease-in-out; padding: 0.3em; margin-bottom: 10px; } +.grey +{ + display: inline; + float: right; + } #jot #jot-tools { margin: 0px; padding: 0px; diff --git a/view/theme/diabook-aerith/style.css b/view/theme/diabook-aerith/style.css index 3f11e71ef..14bbb6cda 100644 --- a/view/theme/diabook-aerith/style.css +++ b/view/theme/diabook-aerith/style.css @@ -1,4 +1,4 @@ -/opt/lampp/htdocs/friendica/view/theme/diabook/search_item.tpl/** +/** * Fabio Comuni * Additional Changes: Michael Vogel **/ @@ -1062,6 +1062,7 @@ aside { float: left; /* background: #F1F1F1; */ } +aside #page-sidebar{display: none;} aside .vcard .fn { font-size: 18px; font-weight: bold; @@ -1259,7 +1260,9 @@ body .pageheader{ margin-top: 0px; max-width: 575px; } - +.qcomment{ + max-width: 122px; + } #id_username { width: 173px; } @@ -1624,6 +1627,11 @@ body .pageheader{ padding: 0.3em; margin-bottom: 10px; } +.grey +{ + display: inline; + float: right; + } #jot #jot-tools { margin: 0px; padding: 0px; diff --git a/view/theme/diabook-aerith/theme.php b/view/theme/diabook-aerith/theme.php index f9be1b232..008e80c14 100755 --- a/view/theme/diabook-aerith/theme.php +++ b/view/theme/diabook-aerith/theme.php @@ -3,7 +3,7 @@ /* * Name: Diabook-aerith * Description: Diabook-aerith : report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu - * Version: (Version: 0.010) + * Version: (Version: 1.011) * Author: */ diff --git a/view/theme/diabook-aerith/wallwall_item.tpl b/view/theme/diabook-aerith/wallwall_item.tpl index c5b6b36b5..6a0c93f88 100644 --- a/view/theme/diabook-aerith/wallwall_item.tpl +++ b/view/theme/diabook-aerith/wallwall_item.tpl @@ -71,6 +71,10 @@ {{ endif }} + {{ if $item.filer }} + + {{ endif }} + {{ if $item.plink }}$item.plink.title{{ endif }} diff --git a/view/theme/diabook-blue/jot.tpl b/view/theme/diabook-blue/jot.tpl index 9aef99787..bd43994b5 100755 --- a/view/theme/diabook-blue/jot.tpl +++ b/view/theme/diabook-blue/jot.tpl @@ -2,7 +2,6 @@
 
-
@@ -15,6 +14,7 @@ +
diff --git a/view/theme/diabook-blue/style-network.css b/view/theme/diabook-blue/style-network.css index 08dc87076..3542dc00c 100644 --- a/view/theme/diabook-blue/style-network.css +++ b/view/theme/diabook-blue/style-network.css @@ -1165,7 +1165,9 @@ body .pageheader{ margin-top: 0px; max-width: 575px; } - +.qcomment{ + max-width: 122px; + } #id_username { width: 173px; } @@ -1573,6 +1575,11 @@ transition: all 0.2s ease-in-out; padding: 0.3em; margin-bottom: 10px; } +.grey +{ + display: inline; + float: right; + } #jot #jot-tools { margin: 0px; padding: 0px; diff --git a/view/theme/diabook-blue/style-profile.css b/view/theme/diabook-blue/style-profile.css index 81bbe03c6..0b27e4a77 100644 --- a/view/theme/diabook-blue/style-profile.css +++ b/view/theme/diabook-blue/style-profile.css @@ -1164,7 +1164,9 @@ body .pageheader{ margin-top: 0px; max-width: 575px; } - +.qcomment{ + max-width: 122px; + } #id_username { width: 173px; } @@ -1568,6 +1570,11 @@ transition: all 0.2s ease-in-out; padding: 0.3em; margin-bottom: 10px; } +.grey +{ + display: inline; + float: right; + } #jot #jot-tools { margin: 0px; padding: 0px; diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css index 809ae8f61..8d3d854ba 100644 --- a/view/theme/diabook-blue/style.css +++ b/view/theme/diabook-blue/style.css @@ -1030,6 +1030,7 @@ aside { float: left; /* background: #F1F1F1; */ } +aside #page-sidebar{display: none;} aside .vcard .fn { font-size: 18px; font-weight: bold; @@ -1215,7 +1216,9 @@ body .pageheader{ margin-top: 0px; max-width: 575px; } - +.qcomment{ + max-width: 122px; + } #id_username { width: 173px; } @@ -1577,6 +1580,11 @@ body .pageheader{ padding: 0.3em; margin-bottom: 10px; } +.grey +{ + display: inline; + float: right; + } #jot #jot-tools { margin: 0px; padding: 0px; diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php index 3a1312fef..19468779e 100755 --- a/view/theme/diabook-blue/theme.php +++ b/view/theme/diabook-blue/theme.php @@ -3,7 +3,7 @@ /* * Name: Diabook-blue * Description: Diabook-blue: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu - * Version: (Version: 0.010) + * Version: (Version: 1.011) * Author: */ diff --git a/view/theme/diabook-blue/wallwall_item.tpl b/view/theme/diabook-blue/wallwall_item.tpl index c5b6b36b5..bee75ad99 100644 --- a/view/theme/diabook-blue/wallwall_item.tpl +++ b/view/theme/diabook-blue/wallwall_item.tpl @@ -71,6 +71,10 @@ {{ endif }} + {{ if $item.filer }} + + {{ endif }} + {{ if $item.plink }}$item.plink.title{{ endif }} diff --git a/view/theme/diabook-red/jot.tpl b/view/theme/diabook-red/jot.tpl index 9aef99787..bd43994b5 100755 --- a/view/theme/diabook-red/jot.tpl +++ b/view/theme/diabook-red/jot.tpl @@ -2,7 +2,6 @@
 
-
@@ -15,6 +14,7 @@ +
diff --git a/view/theme/diabook-red/style-network.css b/view/theme/diabook-red/style-network.css index 7301ace3f..bbd4ceeee 100644 --- a/view/theme/diabook-red/style-network.css +++ b/view/theme/diabook-red/style-network.css @@ -1203,7 +1203,9 @@ body .pageheader{ margin-top: 0px; max-width: 575px; } - +.qcomment{ + max-width: 122px; + } #id_username { width: 173px; } @@ -1611,6 +1613,11 @@ transition: all 0.2s ease-in-out; padding: 0.3em; margin-bottom: 10px; } +.grey +{ + display: inline; + float: right; + } #jot #jot-tools { margin: 0px; padding: 0px; diff --git a/view/theme/diabook-red/style-profile.css b/view/theme/diabook-red/style-profile.css index 59e57fdd6..74217acf3 100644 --- a/view/theme/diabook-red/style-profile.css +++ b/view/theme/diabook-red/style-profile.css @@ -1181,7 +1181,9 @@ body .pageheader{ margin-top: 0px; max-width: 575px; } - +.qcomment{ + max-width: 122px; + } #id_username { width: 173px; } @@ -1585,6 +1587,11 @@ transition: all 0.2s ease-in-out; padding: 0.3em; margin-bottom: 10px; } +.grey +{ + display: inline; + float: right; + } #jot #jot-tools { margin: 0px; padding: 0px; diff --git a/view/theme/diabook-red/style.css b/view/theme/diabook-red/style.css index ef498e639..16c8fe6c5 100644 --- a/view/theme/diabook-red/style.css +++ b/view/theme/diabook-red/style.css @@ -1061,6 +1061,7 @@ aside { float: left; /* background: #F1F1F1; */ } +aside #page-sidebar{display: none;} aside .vcard .fn { font-size: 18px; font-weight: bold; @@ -1248,7 +1249,9 @@ body .pageheader{ margin-top: 0px; max-width: 575px; } - +.qcomment{ + max-width: 122px; + } #id_username { width: 173px; } @@ -1610,6 +1613,11 @@ body .pageheader{ padding: 0.3em; margin-bottom: 10px; } +.grey +{ + display: inline; + float: right; + } #jot #jot-tools { margin: 0px; padding: 0px; diff --git a/view/theme/diabook-red/theme.php b/view/theme/diabook-red/theme.php index 79045c979..a6b2ea823 100755 --- a/view/theme/diabook-red/theme.php +++ b/view/theme/diabook-red/theme.php @@ -3,7 +3,7 @@ /* * Name: Diabook-red * Description: Diabook-red: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu - * Version: (Version: 0.010) + * Version: (Version: 1.011) * Author: */ diff --git a/view/theme/diabook-red/wallwall_item.tpl b/view/theme/diabook-red/wallwall_item.tpl index c5b6b36b5..bee75ad99 100644 --- a/view/theme/diabook-red/wallwall_item.tpl +++ b/view/theme/diabook-red/wallwall_item.tpl @@ -71,6 +71,10 @@ {{ endif }} + {{ if $item.filer }} + + {{ endif }} + {{ if $item.plink }}$item.plink.title{{ endif }} diff --git a/view/theme/diabook/jot.tpl b/view/theme/diabook/jot.tpl index 9aef99787..bd43994b5 100755 --- a/view/theme/diabook/jot.tpl +++ b/view/theme/diabook/jot.tpl @@ -2,7 +2,6 @@
 
-
@@ -15,6 +14,7 @@ +
diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css index 2044e1126..d226c70fd 100644 --- a/view/theme/diabook/style-network.css +++ b/view/theme/diabook/style-network.css @@ -1149,6 +1149,9 @@ body .pageheader{ margin-top: 0px; max-width: 575px; } +.qcomment{ + max-width: 122px; + } #id_username { width: 173px; @@ -1546,6 +1549,11 @@ transition: all 0.2s ease-in-out; padding: 0.3em; margin-bottom: 10px; } +.grey +{ + display: inline; + float: right; + } #jot #jot-tools { margin: 0px; padding: 0px; diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css index 2664adfc5..f1672f4b4 100644 --- a/view/theme/diabook/style-profile.css +++ b/view/theme/diabook/style-profile.css @@ -1143,7 +1143,9 @@ body .pageheader{ margin-top: 0px; max-width: 575px; } - +.qcomment{ + max-width: 122px; + } #id_username { width: 173px; } @@ -1541,6 +1543,11 @@ transition: all 0.2s ease-in-out; padding: 0.3em; margin-bottom: 10px; } +.grey +{ + display: inline; + float: right; + } #jot #jot-tools { margin: 0px; padding: 0px; diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index 4ce3068f0..c8efeab33 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -1022,7 +1022,7 @@ aside { float: left; /* background: #F1F1F1; */ } - +aside #page-sidebar{display: none;} aside .vcard .fn { font-size: 18px; font-weight: bold; @@ -1195,7 +1195,9 @@ body .pageheader{ margin-top: 0px; max-width: 575px; } - +.qcomment{ + max-width: 122px; + } #id_username { width: 173px; } @@ -1552,6 +1554,11 @@ body .pageheader{ padding: 0.3em; margin-bottom: 10px; } +.grey +{ + display: inline; + float: right; + } #jot #jot-tools { margin: 0px; padding: 0px; diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index d8f96e9f7..2fe985060 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: 0.010) + * Version: (Version: 1.011) * Author: */ diff --git a/view/theme/diabook/wallwall_item.tpl b/view/theme/diabook/wallwall_item.tpl index c5b6b36b5..bee75ad99 100644 --- a/view/theme/diabook/wallwall_item.tpl +++ b/view/theme/diabook/wallwall_item.tpl @@ -71,6 +71,10 @@ {{ endif }} + {{ if $item.filer }} + + {{ endif }} + {{ if $item.plink }}$item.plink.title{{ endif }} -- cgit v1.2.3