From 9b4bef8ac49131f8138d360805645e2da44913ae Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 1 Apr 2012 06:46:12 -0700 Subject: [PATCH 01/21] that didn't quite work out --- include/items.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/items.php b/include/items.php index e09b888ca..8f8b3ccd0 100755 --- a/include/items.php +++ b/include/items.php @@ -435,8 +435,8 @@ function get_atom_elements($feed,$item) { $res['body'] = @html2bbcode($res['body']); } - else - $res['body'] = escape_tags($res['body']); +// else +// $res['body'] = escape_tags($res['body']); $allow = $item->get_item_tags(NAMESPACE_DFRN,'comment-allow'); if($allow && $allow[0]['data'] == 1) From ff12637ceb0bb0ff3b769fdb12d7158e7f7a917d Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sun, 1 Apr 2012 16:34:31 +0200 Subject: [PATCH 02/21] fix the display of community-plugin in diabook-themes --- view/theme/diabook-aerith/search_item.tpl | 100 ++++++++++++++++++ view/theme/diabook-aerith/style-network.css | 6 +- view/theme/diabook-aerith/style-profile.css | 6 +- view/theme/diabook-aerith/style.css | 94 +---------------- view/theme/diabook-blue/search_item.tpl | 100 ++++++++++++++++++ view/theme/diabook-blue/style-network.css | 4 +- view/theme/diabook-blue/style-profile.css | 4 +- view/theme/diabook-blue/style.css | 4 +- view/theme/diabook-red/search_item.tpl | 100 ++++++++++++++++++ view/theme/diabook-red/style-network.css | 6 +- view/theme/diabook-red/style-profile.css | 6 +- view/theme/diabook-red/style.css | 109 +------------------- view/theme/diabook/search_item.tpl | 100 ++++++++++++++++++ view/theme/diabook/style-network.css | 6 +- view/theme/diabook/style-profile.css | 6 +- view/theme/diabook/style.css | 6 +- 16 files changed, 435 insertions(+), 222 deletions(-) create mode 100755 view/theme/diabook-aerith/search_item.tpl create mode 100755 view/theme/diabook-blue/search_item.tpl create mode 100755 view/theme/diabook-red/search_item.tpl create mode 100755 view/theme/diabook/search_item.tpl diff --git a/view/theme/diabook-aerith/search_item.tpl b/view/theme/diabook-aerith/search_item.tpl new file mode 100755 index 000000000..123834064 --- /dev/null +++ b/view/theme/diabook-aerith/search_item.tpl @@ -0,0 +1,100 @@ +{{ if $item.indent }}{{ else }} +
+ +
+{{ endif }} +
+
+
+
+ + $item.name + + menu + + +
+
+
+ $item.name + - + {{ if $item.plink }}$item.ago{{ else }} $item.ago {{ endif }} + {{ if $item.lock }} - $item.lock {{ endif }} + +
+
+ {{ if $item.title }}

$item.title

{{ endif }} + $item.body +
+
+
+
+
+
+ {{ for $item.tags as $tag }} + $tag + {{ endfor }} +
+
+
+
+ +
+
+ +
+ + + {{ if $item.vote }} + + + {{ endif }} + + {{ if $item.vote.share }} + + {{ endif }} + + + {{ if $item.star }} + + $item.star.do + + {{ endif }} + + {{ if $item.filer }} + + {{ endif }} + + {{ if $item.plink }}$item.plink.title{{ endif }} + + + +
+ +
+ + {{ if $item.drop.dropping }} + + $item.drop.delete + {{ endif }} + {{ if $item.edpost }} + + {{ endif }} +
+
$item.location 
+
+
+
+
+ +
$item.dislike
+
+
+ +
+ $item.comment +
diff --git a/view/theme/diabook-aerith/style-network.css b/view/theme/diabook-aerith/style-network.css index bcba4c3be..3735ed66b 100644 --- a/view/theme/diabook-aerith/style-network.css +++ b/view/theme/diabook-aerith/style-network.css @@ -2122,7 +2122,7 @@ max-width: 85%; padding: 0px; width: 16px; height: 16px; - top: -20px; left:0px; + top: -16px; left:0px; overflow: hidden; text-indent: 40px; display: none; @@ -2501,8 +2501,8 @@ float: left; display: none; /* position: absolute; */ /* position: absolute; */ - left: -2px; - top: -20px; + left: 0px; + top: -16px; } .contact-wrapper { float: left; diff --git a/view/theme/diabook-aerith/style-profile.css b/view/theme/diabook-aerith/style-profile.css index 9c9f8b4e6..c4f89359a 100644 --- a/view/theme/diabook-aerith/style-profile.css +++ b/view/theme/diabook-aerith/style-profile.css @@ -2110,7 +2110,7 @@ max-width: 85%; padding: 0px; width: 16px; height: 16px; - top: -20px; left:0px; + top: -16px; left:0px; overflow: hidden; text-indent: 40px; display: none; @@ -2489,8 +2489,8 @@ float: left; display: none; /* position: absolute; */ /* position: absolute; */ - left: -2px; - top: -20px; + left: 0px; + top: -16px; } .contact-wrapper { float: left; diff --git a/view/theme/diabook-aerith/style.css b/view/theme/diabook-aerith/style.css index 1802c914d..be33fd5f2 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 **/ @@ -1233,92 +1233,6 @@ body .pageheader{ .tread-wrapper a{ color: #3465A4; } -.wall-item-photo-menu-button { -display: block; -position: absolute; -background-image: url("../../../view/theme/diabook-aerith/icons/photo-menu.jpg"); -background-position: top left; -background-repeat: no-repeat; -margin: 0px; -padding: 0px; -width: 16px; -height: 16px; -top: 90px; -left: 17px; -overflow: hidden; -text-indent: 40px; -display: none; -} -.wall-item-content-wrapper { -margin-top: 10px; -border: 1px solid #CCC; --moz-border-radius: 3px; -border-radius: 3px; -display: table; -width: 775px; -} -.wall-item-info { -/*display: block; -float: left; -width: 110px; -margin-right: 10px;*/ - display: table-cell; - vertical-align: top; - text-align: left; - width: 80px; -} -.wall-item-content { - font-size: 12.5px; - max-width: 720px; - word-wrap: break-word; - line-height: 1.2; -} -.wrapper-end { - clear: both; -} -.wall-item-photo-wrapper { -margin-top: 10px; -margin-left: 10px; -margin-bottom: 10px; -width: 100px; -} -.wall-item-photo-menu ul { margin:0px; padding: 0px; list-style: none } -.wall-item-photo-menu li a { display: block; padding: 2px; } -.wall-item-photo-menu li a:hover { color: #FFFFFF; background: #3465A4; text-decoration: none; } -.wall-item-wrapper { -margin-left: 10px; -} -.wall-item-title-end { - clear: both; -} - -.wall-item-body { - float: left; - /*width: 450px;*/ - margin-top: 10px; -} - -.wall-item-tools { - clear: both; - background-image: url("head.jpg"); - background-position: 0 -20px; - background-repeat: repeat-x; - padding: 5px 10px 0px; -} -.wall-item-author { - margin-top: 10px; -} -.wall-item-photo-menu { -width: auto; -border: 2px solid #444; -background: white; -position: absolute; -left: 10px; -top: 90px; -display: none; -z-index: 10000; -} - .wall-item-decor { position: absolute; left: 790px; @@ -2136,7 +2050,7 @@ max-width: 85%; padding: 0px; width: 16px; height: 16px; - top: -20px; left:0px; + top: -16px; left:0px; overflow: hidden; text-indent: 40px; display: none; @@ -2506,8 +2420,8 @@ float: left; display: none; /* position: absolute; */ /* position: absolute; */ - left: -2px; - top: -20px; + left: 0px; + top: -16px; } .contact-wrapper { float: left; diff --git a/view/theme/diabook-blue/search_item.tpl b/view/theme/diabook-blue/search_item.tpl new file mode 100755 index 000000000..123834064 --- /dev/null +++ b/view/theme/diabook-blue/search_item.tpl @@ -0,0 +1,100 @@ +{{ if $item.indent }}{{ else }} +
+ +
+{{ endif }} +
+
+
+
+ + $item.name + + menu + + +
+
+
+ $item.name + - + {{ if $item.plink }}$item.ago{{ else }} $item.ago {{ endif }} + {{ if $item.lock }} - $item.lock {{ endif }} + +
+
+ {{ if $item.title }}

$item.title

{{ endif }} + $item.body +
+
+
+
+
+
+ {{ for $item.tags as $tag }} + $tag + {{ endfor }} +
+
+
+
+ +
+
+ +
+ + + {{ if $item.vote }} + + + {{ endif }} + + {{ if $item.vote.share }} + + {{ endif }} + + + {{ if $item.star }} + + $item.star.do + + {{ endif }} + + {{ if $item.filer }} + + {{ endif }} + + {{ if $item.plink }}$item.plink.title{{ endif }} + + + +
+ +
+ + {{ if $item.drop.dropping }} + + $item.drop.delete + {{ endif }} + {{ if $item.edpost }} + + {{ endif }} +
+
$item.location 
+
+
+
+
+ +
$item.dislike
+
+
+ +
+ $item.comment +
diff --git a/view/theme/diabook-blue/style-network.css b/view/theme/diabook-blue/style-network.css index 9737670ec..0e779a08b 100644 --- a/view/theme/diabook-blue/style-network.css +++ b/view/theme/diabook-blue/style-network.css @@ -2454,8 +2454,8 @@ float: left; display: none; /* position: absolute; */ /* position: absolute; */ - left: -2px; - top: -20px; + left: 0px; + top: -16px; } .contact-wrapper { float: left; diff --git a/view/theme/diabook-blue/style-profile.css b/view/theme/diabook-blue/style-profile.css index b75ccffb0..528327ac3 100644 --- a/view/theme/diabook-blue/style-profile.css +++ b/view/theme/diabook-blue/style-profile.css @@ -2448,8 +2448,8 @@ float: left; display: none; /* position: absolute; */ /* position: absolute; */ - left: -2px; - top: -20px; + left: 0px; + top: -16px; } .contact-wrapper { float: left; diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css index 21ba66ec7..a5129e957 100644 --- a/view/theme/diabook-blue/style.css +++ b/view/theme/diabook-blue/style.css @@ -2368,8 +2368,8 @@ float: left; display: none; /* position: absolute; */ /* position: absolute; */ - left: -2px; - top: -20px; + left: 0px; + top: -16px; } .contact-wrapper { float: left; diff --git a/view/theme/diabook-red/search_item.tpl b/view/theme/diabook-red/search_item.tpl new file mode 100755 index 000000000..123834064 --- /dev/null +++ b/view/theme/diabook-red/search_item.tpl @@ -0,0 +1,100 @@ +{{ if $item.indent }}{{ else }} +
+ +
+{{ endif }} +
+
+
+
+ + $item.name + + menu + + +
+
+
+ $item.name + - + {{ if $item.plink }}$item.ago{{ else }} $item.ago {{ endif }} + {{ if $item.lock }} - $item.lock {{ endif }} + +
+
+ {{ if $item.title }}

$item.title

{{ endif }} + $item.body +
+
+
+
+
+
+ {{ for $item.tags as $tag }} + $tag + {{ endfor }} +
+
+
+
+ +
+
+ +
+ + + {{ if $item.vote }} + + + {{ endif }} + + {{ if $item.vote.share }} + + {{ endif }} + + + {{ if $item.star }} + + $item.star.do + + {{ endif }} + + {{ if $item.filer }} + + {{ endif }} + + {{ if $item.plink }}$item.plink.title{{ endif }} + + + +
+ +
+ + {{ if $item.drop.dropping }} + + $item.drop.delete + {{ endif }} + {{ if $item.edpost }} + + {{ endif }} +
+
$item.location 
+
+
+
+
+ +
$item.dislike
+
+
+ +
+ $item.comment +
diff --git a/view/theme/diabook-red/style-network.css b/view/theme/diabook-red/style-network.css index 1e10f1216..d90f9189d 100644 --- a/view/theme/diabook-red/style-network.css +++ b/view/theme/diabook-red/style-network.css @@ -2119,7 +2119,7 @@ max-width: 85%; padding: 0px; width: 16px; height: 16px; - top: -20px; left:0px; + top: -16px; left:0px; overflow: hidden; text-indent: 40px; display: none; @@ -2498,8 +2498,8 @@ float: left; display: none; /* position: absolute; */ /* position: absolute; */ - left: -2px; - top: -20px; + left: 0px; + top: -16px; } .contact-wrapper { float: left; diff --git a/view/theme/diabook-red/style-profile.css b/view/theme/diabook-red/style-profile.css index c6ba1e4be..5124ed8c0 100644 --- a/view/theme/diabook-red/style-profile.css +++ b/view/theme/diabook-red/style-profile.css @@ -2091,7 +2091,7 @@ max-width: 85%; padding: 0px; width: 16px; height: 16px; - top: -20px; left:0px; + top: -16px; left:0px; overflow: hidden; text-indent: 40px; display: none; @@ -2470,8 +2470,8 @@ float: left; display: none; /* position: absolute; */ /* position: absolute; */ - left: -2px; - top: -20px; + left: 0px; + top: -16px; } .contact-wrapper { float: left; diff --git a/view/theme/diabook-red/style.css b/view/theme/diabook-red/style.css index 8d4031329..30714649b 100644 --- a/view/theme/diabook-red/style.css +++ b/view/theme/diabook-red/style.css @@ -1216,108 +1216,7 @@ body .pageheader{ width: 775px; } .tread-wrapper a{ - color: #1872A2; -} -/*community-plugin*/ -aside #likes a, a:visited, a:link { - color: red; - text-decoration: none; - cursor: pointer; - -} -aside #likes a:hover{ - text-decoration: underline; - } -.wall-item-photo-menu-button { -display: block; -position: absolute; -background-image: url("../../../view/theme/diabook-red/icons/photo-menu.jpg"); -background-position: top left; -background-repeat: no-repeat; -margin: 0px; -padding: 0px; -width: 16px; -height: 16px; -top: 90px; -left: 17px; -overflow: hidden; -text-indent: 40px; -display: none; -} -.wall-item-name { - color: red; - } -.wall-item-conv a{ - color: black; - } -.wall-item-content-wrapper { -margin-top: 10px; -border: 1px solid #CCC; --moz-border-radius: 3px; -border-radius: 3px; -display: table; -width: 775px; -} -.wall-item-info { -/*display: block; -float: left; -width: 110px; -margin-right: 10px;*/ - display: table-cell; - vertical-align: top; - text-align: left; - width: 80px; -} -.wall-item-content { - font-size: 12.5px; - max-width: 720px; - word-wrap: break-word; - line-height: 1.2; -} -.wrapper-end { - clear: both; -} -.wall-item-photo-wrapper { -margin-top: 10px; -margin-left: 10px; -margin-bottom: 10px; -width: 100px; -} -.wall-item-photo-menu ul { margin:0px; padding: 0px; list-style: none } -.wall-item-photo-menu li a { display: block; padding: 2px; } -.wall-item-photo-menu li a:hover { color: #FFFFFF; background: #3465A4; text-decoration: none; } -.wall-item-wrapper { -margin-left: 10px; -} -.wall-item-title-end { - clear: both; -} - -.wall-item-body { - float: left; - /*width: 450px;*/ - margin-top: 10px; -} - -.wall-item-tools { - clear: both; - background-image: url("head.jpg"); - background-position: 0 -20px; - background-repeat: repeat-x; - padding: 5px 10px 0px; -} -.wall-item-author { - margin-top: 10px; -} -.wall-item-photo-menu { -width: auto; -border: 2px solid #444; -background: white; -position: absolute; -left: 10px; -top: 90px; -display: none; -z-index: 10000; + color: red; } .wall-item-decor { @@ -2136,7 +2035,7 @@ max-width: 85%; padding: 0px; width: 16px; height: 16px; - top: -20px; left:0px; + top: -16px; left:0px; overflow: hidden; text-indent: 40px; display: none; @@ -2506,8 +2405,8 @@ float: left; display: none; /* position: absolute; */ /* position: absolute; */ - left: -2px; - top: -20px; + left: 0px; + top: -16px; } .contact-wrapper { float: left; diff --git a/view/theme/diabook/search_item.tpl b/view/theme/diabook/search_item.tpl new file mode 100755 index 000000000..123834064 --- /dev/null +++ b/view/theme/diabook/search_item.tpl @@ -0,0 +1,100 @@ +{{ if $item.indent }}{{ else }} +
+ +
+{{ endif }} +
+
+
+
+ + $item.name + + menu + + +
+
+
+ $item.name + - + {{ if $item.plink }}$item.ago{{ else }} $item.ago {{ endif }} + {{ if $item.lock }} - $item.lock {{ endif }} + +
+
+ {{ if $item.title }}

$item.title

{{ endif }} + $item.body +
+
+
+
+
+
+ {{ for $item.tags as $tag }} + $tag + {{ endfor }} +
+
+
+
+ +
+
+ +
+ + + {{ if $item.vote }} + + + {{ endif }} + + {{ if $item.vote.share }} + + {{ endif }} + + + {{ if $item.star }} + + $item.star.do + + {{ endif }} + + {{ if $item.filer }} + + {{ endif }} + + {{ if $item.plink }}$item.plink.title{{ endif }} + + + +
+ +
+ + {{ if $item.drop.dropping }} + + $item.drop.delete + {{ endif }} + {{ if $item.edpost }} + + {{ endif }} +
+
$item.location 
+
+
+
+
+ +
$item.dislike
+
+
+ +
+ $item.comment +
diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css index 3042476d8..518e7b88d 100644 --- a/view/theme/diabook/style-network.css +++ b/view/theme/diabook/style-network.css @@ -2041,7 +2041,7 @@ ul.tabs li .active { padding: 0px; width: 16px; height: 16px; - top: -20px; left:0px; + top: -16px; left:0px; overflow: hidden; text-indent: 40px; display: none; @@ -2415,8 +2415,8 @@ float: left; display: none; /* position: absolute; */ /* position: absolute; */ - left: -2px; - top: -20px; + left: 0px; + top: -16px; } .contact-wrapper { float: left; diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css index 5a91e5254..0077510a1 100644 --- a/view/theme/diabook/style-profile.css +++ b/view/theme/diabook/style-profile.css @@ -2035,7 +2035,7 @@ ul.tabs li .active { padding: 0px; width: 16px; height: 16px; - top: -20px; left:0px; + top: -16px; left:0px; overflow: hidden; text-indent: 40px; display: none; @@ -2409,8 +2409,8 @@ float: left; display: none; /* position: absolute; */ /* position: absolute; */ - left: -2px; - top: -20px; + left: 0px; + top: -16px; } .contact-wrapper { float: left; diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index 956667faa..9a51949a0 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -1966,7 +1966,7 @@ ul.tabs li .active { padding: 0px; width: 16px; height: 16px; - top: -20px; left:0px; + top: -16px; left:0px; overflow: hidden; text-indent: 40px; display: none; @@ -2340,8 +2340,8 @@ float: left; display: none; /* position: absolute; */ /* position: absolute; */ - left: -2px; - top: -20px; + left: 0px; + top: -16px; } .contact-wrapper { float: left; From f075e977fe60b5ce4544ceb0ea8bfcf2f108c31f Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sun, 1 Apr 2012 18:12:20 +0200 Subject: [PATCH 03/21] add new messages-layout in diabook --- view/theme/diabook-aerith/mail_conv.tpl | 60 ++++++++++++++++ view/theme/diabook-aerith/mail_display.tpl | 12 ++++ view/theme/diabook-aerith/mail_list.tpl | 8 +++ view/theme/diabook-aerith/message_side.tpl | 10 +++ view/theme/diabook-aerith/style.css | 79 ++++++++++++++++++++++ view/theme/diabook-aerith/theme.php | 2 +- view/theme/diabook-blue/mail_conv.tpl | 60 ++++++++++++++++ view/theme/diabook-blue/mail_display.tpl | 12 ++++ view/theme/diabook-blue/mail_list.tpl | 8 +++ view/theme/diabook-blue/message_side.tpl | 10 +++ view/theme/diabook-blue/photo_view.tpl | 3 +- view/theme/diabook-blue/style.css | 79 ++++++++++++++++++++++ view/theme/diabook-blue/theme.php | 2 +- view/theme/diabook-red/mail_conv.tpl | 60 ++++++++++++++++ view/theme/diabook-red/mail_display.tpl | 12 ++++ view/theme/diabook-red/mail_list.tpl | 8 +++ view/theme/diabook-red/message_side.tpl | 10 +++ view/theme/diabook-red/style.css | 79 ++++++++++++++++++++++ view/theme/diabook-red/theme.php | 2 +- view/theme/diabook/mail_conv.tpl | 60 ++++++++++++++++ view/theme/diabook/mail_display.tpl | 12 ++++ view/theme/diabook/mail_list.tpl | 8 +++ view/theme/diabook/message_side.tpl | 10 +++ view/theme/diabook/style.css | 79 ++++++++++++++++++++++ view/theme/diabook/theme.php | 6 +- 25 files changed, 683 insertions(+), 8 deletions(-) create mode 100755 view/theme/diabook-aerith/mail_conv.tpl create mode 100644 view/theme/diabook-aerith/mail_display.tpl create mode 100644 view/theme/diabook-aerith/mail_list.tpl create mode 100644 view/theme/diabook-aerith/message_side.tpl create mode 100755 view/theme/diabook-blue/mail_conv.tpl create mode 100644 view/theme/diabook-blue/mail_display.tpl create mode 100644 view/theme/diabook-blue/mail_list.tpl create mode 100644 view/theme/diabook-blue/message_side.tpl create mode 100755 view/theme/diabook-red/mail_conv.tpl create mode 100644 view/theme/diabook-red/mail_display.tpl create mode 100644 view/theme/diabook-red/mail_list.tpl create mode 100644 view/theme/diabook-red/message_side.tpl create mode 100755 view/theme/diabook/mail_conv.tpl create mode 100644 view/theme/diabook/mail_display.tpl create mode 100644 view/theme/diabook/mail_list.tpl create mode 100644 view/theme/diabook/message_side.tpl diff --git a/view/theme/diabook-aerith/mail_conv.tpl b/view/theme/diabook-aerith/mail_conv.tpl new file mode 100755 index 000000000..989f17878 --- /dev/null +++ b/view/theme/diabook-aerith/mail_conv.tpl @@ -0,0 +1,60 @@ +
+
+
+ +
+
+ $mail.body +
+
+
+
+
+
+
+
+
+
+
+
+
+ $mail.from_name $mail.date +
+ +
+
+ +
+ $mail.delete +
+ +
+
+
+
+
+ + +{# + + +
+
+ $mail.from_name +
+
+
$mail.from_name
+
$mail.date
+
$mail.subject
+
$mail.body
+
+
+
+
+
+ +#} diff --git a/view/theme/diabook-aerith/mail_display.tpl b/view/theme/diabook-aerith/mail_display.tpl new file mode 100644 index 000000000..8b82e95c6 --- /dev/null +++ b/view/theme/diabook-aerith/mail_display.tpl @@ -0,0 +1,12 @@ +
+ $thread_subject + +
+ +{{ for $mails as $mail }} +
+ {{ inc mail_conv.tpl }}{{endinc}} +
+{{ endfor }} + +{{ inc prv_message.tpl }}{{ endinc }} diff --git a/view/theme/diabook-aerith/mail_list.tpl b/view/theme/diabook-aerith/mail_list.tpl new file mode 100644 index 000000000..6bc6c84f6 --- /dev/null +++ b/view/theme/diabook-aerith/mail_list.tpl @@ -0,0 +1,8 @@ +
+ $subject + $from_name + $date + $count + + +
diff --git a/view/theme/diabook-aerith/message_side.tpl b/view/theme/diabook-aerith/message_side.tpl new file mode 100644 index 000000000..9f1587096 --- /dev/null +++ b/view/theme/diabook-aerith/message_side.tpl @@ -0,0 +1,10 @@ +
+ + +
    + {{ for $tabs as $t }} +
  • $t.label
    • + {{ endfor }} +
+ +
diff --git a/view/theme/diabook-aerith/style.css b/view/theme/diabook-aerith/style.css index be33fd5f2..90cb1d197 100644 --- a/view/theme/diabook-aerith/style.css +++ b/view/theme/diabook-aerith/style.css @@ -566,6 +566,85 @@ header #banner #logo-text { position: absolute; top: 10%; } +/* messages */ +#message-new { + background: #19aeff; + border: 1px solid #005c94; + width: 150px; +} +#message-new a { + color: #ffffff; + text-align: center; + display: block; + font-weight: bold; + padding: 1em 0px; +} +.mail-list-wrapper { + background-color: #f6f7f8; + margin-bottom: 5px; + width: 100%; + height: auto; + overflow: hidden; +} +.mail-list-wrapper span { + display: block; + float: left; + width: 20%; + overflow: hidden; +} +.mail-list-wrapper .mail-subject { + width: 30%; + padding: 4px 0px 0px 4px; +} +.mail-list-wrapper .mail-subject a { + display: block; +} +.mail-list-wrapper .mail-subject.unseen a { + font-weight: bold; +} +.mail-list-wrapper .mail-date { + padding: 4px 4px 0px 4px; +} +.mail-list-wrapper .mail-from { + padding: 4px 4px 0px 4px; +} +.mail-list-wrapper .mail-count { + padding: 4px 4px 0px 4px; + text-align: right; +} +.mail-list-wrapper .mail-delete { + float: right; +} +#mail-display-subject { + background-color: #f6f7f8; + color: #2d2d2d; + margin-bottom: 10px; + width: 100%; + height: auto; + overflow: hidden; +} +#mail-display-subject span { + float: left; + overflow: hidden; + padding: 4px 0px 0px 10px; +} +#mail-display-subject .mail-delete { + float: right; + opacity: 0.5; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +#mail-display-subject:hover .mail-delete { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} /* nav */ nav { width: 80%; diff --git a/view/theme/diabook-aerith/theme.php b/view/theme/diabook-aerith/theme.php index 2b135878a..e9fe8e0f0 100755 --- a/view/theme/diabook-aerith/theme.php +++ b/view/theme/diabook-aerith/theme.php @@ -310,7 +310,7 @@ if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('get_baseurl($ssl_state)."/view/theme/diabook-aerith/js/jquery.cookie.js"; -$a->page['htmlhead'] .= sprintf('', $cookieJS); //js scripts diff --git a/view/theme/diabook-blue/mail_conv.tpl b/view/theme/diabook-blue/mail_conv.tpl new file mode 100755 index 000000000..989f17878 --- /dev/null +++ b/view/theme/diabook-blue/mail_conv.tpl @@ -0,0 +1,60 @@ +
+
+
+ +
+
+ $mail.body +
+
+
+
+
+
+
+
+
+
+
+
+
+ $mail.from_name $mail.date +
+ +
+
+ +
+ $mail.delete +
+ +
+
+
+
+
+ + +{# + + +
+
+ $mail.from_name +
+
+
$mail.from_name
+
$mail.date
+
$mail.subject
+
$mail.body
+
+
+
+
+
+ +#} diff --git a/view/theme/diabook-blue/mail_display.tpl b/view/theme/diabook-blue/mail_display.tpl new file mode 100644 index 000000000..8b82e95c6 --- /dev/null +++ b/view/theme/diabook-blue/mail_display.tpl @@ -0,0 +1,12 @@ +
+ $thread_subject + +
+ +{{ for $mails as $mail }} +
+ {{ inc mail_conv.tpl }}{{endinc}} +
+{{ endfor }} + +{{ inc prv_message.tpl }}{{ endinc }} diff --git a/view/theme/diabook-blue/mail_list.tpl b/view/theme/diabook-blue/mail_list.tpl new file mode 100644 index 000000000..6bc6c84f6 --- /dev/null +++ b/view/theme/diabook-blue/mail_list.tpl @@ -0,0 +1,8 @@ +
+ $subject + $from_name + $date + $count + + +
diff --git a/view/theme/diabook-blue/message_side.tpl b/view/theme/diabook-blue/message_side.tpl new file mode 100644 index 000000000..9f1587096 --- /dev/null +++ b/view/theme/diabook-blue/message_side.tpl @@ -0,0 +1,10 @@ +
+ + +
    + {{ for $tabs as $t }} +
  • $t.label
    • + {{ endfor }} +
+ +
diff --git a/view/theme/diabook-blue/photo_view.tpl b/view/theme/diabook-blue/photo_view.tpl index 511fc73ac..20926656a 100755 --- a/view/theme/diabook-blue/photo_view.tpl +++ b/view/theme/diabook-blue/photo_view.tpl @@ -24,4 +24,5 @@ {{ endif }} {{ if $tags.2 }}{{ endif }} -{{ if $edit }}$edit{{ endif }} \ No newline at end of file +{{ if $edit }}$edit{{ endif }} + diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css index a5129e957..e5b3ebfc1 100644 --- a/view/theme/diabook-blue/style.css +++ b/view/theme/diabook-blue/style.css @@ -551,6 +551,85 @@ header #banner #logo-text { position: absolute; top: 15%; } +/* messages */ +#message-new { + background: #19aeff; + border: 1px solid #005c94; + width: 150px; +} +#message-new a { + color: #ffffff; + text-align: center; + display: block; + font-weight: bold; + padding: 1em 0px; +} +.mail-list-wrapper { + background-color: #f6f7f8; + margin-bottom: 5px; + width: 100%; + height: auto; + overflow: hidden; +} +.mail-list-wrapper span { + display: block; + float: left; + width: 20%; + overflow: hidden; +} +.mail-list-wrapper .mail-subject { + width: 30%; + padding: 4px 0px 0px 4px; +} +.mail-list-wrapper .mail-subject a { + display: block; +} +.mail-list-wrapper .mail-subject.unseen a { + font-weight: bold; +} +.mail-list-wrapper .mail-date { + padding: 4px 4px 0px 4px; +} +.mail-list-wrapper .mail-from { + padding: 4px 4px 0px 4px; +} +.mail-list-wrapper .mail-count { + padding: 4px 4px 0px 4px; + text-align: right; +} +.mail-list-wrapper .mail-delete { + float: right; +} +#mail-display-subject { + background-color: #f6f7f8; + color: #2d2d2d; + margin-bottom: 10px; + width: 100%; + height: auto; + overflow: hidden; +} +#mail-display-subject span { + float: left; + overflow: hidden; + padding: 4px 0px 0px 10px; +} +#mail-display-subject .mail-delete { + float: right; + opacity: 0.5; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +#mail-display-subject:hover .mail-delete { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} /* nav */ nav { width: 80%; diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php index fb6b44a16..3d54ba9ef 100755 --- a/view/theme/diabook-blue/theme.php +++ b/view/theme/diabook-blue/theme.php @@ -310,7 +310,7 @@ if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('get_baseurl($ssl_state)."/view/theme/diabook-blue/js/jquery.cookie.js"; -$a->page['htmlhead'] .= sprintf('', $cookieJS); //js scripts diff --git a/view/theme/diabook-red/mail_conv.tpl b/view/theme/diabook-red/mail_conv.tpl new file mode 100755 index 000000000..989f17878 --- /dev/null +++ b/view/theme/diabook-red/mail_conv.tpl @@ -0,0 +1,60 @@ +
+
+
+ +
+
+ $mail.body +
+
+
+
+
+
+
+
+
+
+
+
+
+ $mail.from_name $mail.date +
+ +
+
+ +
+ $mail.delete +
+ +
+
+
+
+
+ + +{# + + +
+
+ $mail.from_name +
+
+
$mail.from_name
+
$mail.date
+
$mail.subject
+
$mail.body
+
+
+
+
+
+ +#} diff --git a/view/theme/diabook-red/mail_display.tpl b/view/theme/diabook-red/mail_display.tpl new file mode 100644 index 000000000..8b82e95c6 --- /dev/null +++ b/view/theme/diabook-red/mail_display.tpl @@ -0,0 +1,12 @@ +
+ $thread_subject + +
+ +{{ for $mails as $mail }} +
+ {{ inc mail_conv.tpl }}{{endinc}} +
+{{ endfor }} + +{{ inc prv_message.tpl }}{{ endinc }} diff --git a/view/theme/diabook-red/mail_list.tpl b/view/theme/diabook-red/mail_list.tpl new file mode 100644 index 000000000..6bc6c84f6 --- /dev/null +++ b/view/theme/diabook-red/mail_list.tpl @@ -0,0 +1,8 @@ +
+ $subject + $from_name + $date + $count + + +
diff --git a/view/theme/diabook-red/message_side.tpl b/view/theme/diabook-red/message_side.tpl new file mode 100644 index 000000000..9f1587096 --- /dev/null +++ b/view/theme/diabook-red/message_side.tpl @@ -0,0 +1,10 @@ +
+ + +
    + {{ for $tabs as $t }} +
  • $t.label
    • + {{ endfor }} +
+ +
diff --git a/view/theme/diabook-red/style.css b/view/theme/diabook-red/style.css index 30714649b..4376eed07 100644 --- a/view/theme/diabook-red/style.css +++ b/view/theme/diabook-red/style.css @@ -566,6 +566,85 @@ header #banner #logo-text { top: 10%; margin-left: 3px; } +/* messages */ +#message-new { + background: #19aeff; + border: 1px solid #005c94; + width: 150px; +} +#message-new a { + color: #ffffff; + text-align: center; + display: block; + font-weight: bold; + padding: 1em 0px; +} +.mail-list-wrapper { + background-color: #f6f7f8; + margin-bottom: 5px; + width: 100%; + height: auto; + overflow: hidden; +} +.mail-list-wrapper span { + display: block; + float: left; + width: 20%; + overflow: hidden; +} +.mail-list-wrapper .mail-subject { + width: 30%; + padding: 4px 0px 0px 4px; +} +.mail-list-wrapper .mail-subject a { + display: block; +} +.mail-list-wrapper .mail-subject.unseen a { + font-weight: bold; +} +.mail-list-wrapper .mail-date { + padding: 4px 4px 0px 4px; +} +.mail-list-wrapper .mail-from { + padding: 4px 4px 0px 4px; +} +.mail-list-wrapper .mail-count { + padding: 4px 4px 0px 4px; + text-align: right; +} +.mail-list-wrapper .mail-delete { + float: right; +} +#mail-display-subject { + background-color: #f6f7f8; + color: #2d2d2d; + margin-bottom: 10px; + width: 100%; + height: auto; + overflow: hidden; +} +#mail-display-subject span { + float: left; + overflow: hidden; + padding: 4px 0px 0px 10px; +} +#mail-display-subject .mail-delete { + float: right; + opacity: 0.5; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +#mail-display-subject:hover .mail-delete { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} /* nav */ nav { width: 80%; diff --git a/view/theme/diabook-red/theme.php b/view/theme/diabook-red/theme.php index 95af850a2..b091295b7 100755 --- a/view/theme/diabook-red/theme.php +++ b/view/theme/diabook-red/theme.php @@ -311,7 +311,7 @@ if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('get_baseurl($ssl_state)."/view/theme/diabook-red/js/jquery.cookie.js"; -$a->page['htmlhead'] .= sprintf('', $cookieJS); //js scripts diff --git a/view/theme/diabook/mail_conv.tpl b/view/theme/diabook/mail_conv.tpl new file mode 100755 index 000000000..989f17878 --- /dev/null +++ b/view/theme/diabook/mail_conv.tpl @@ -0,0 +1,60 @@ +
+
+
+ +
+
+ $mail.body +
+
+
+
+
+
+
+
+
+
+
+
+
+ $mail.from_name $mail.date +
+ +
+
+ +
+ $mail.delete +
+ +
+
+
+
+
+ + +{# + + +
+
+ $mail.from_name +
+
+
$mail.from_name
+
$mail.date
+
$mail.subject
+
$mail.body
+
+
+
+
+
+ +#} diff --git a/view/theme/diabook/mail_display.tpl b/view/theme/diabook/mail_display.tpl new file mode 100644 index 000000000..8b82e95c6 --- /dev/null +++ b/view/theme/diabook/mail_display.tpl @@ -0,0 +1,12 @@ +
+ $thread_subject + +
+ +{{ for $mails as $mail }} +
+ {{ inc mail_conv.tpl }}{{endinc}} +
+{{ endfor }} + +{{ inc prv_message.tpl }}{{ endinc }} diff --git a/view/theme/diabook/mail_list.tpl b/view/theme/diabook/mail_list.tpl new file mode 100644 index 000000000..6bc6c84f6 --- /dev/null +++ b/view/theme/diabook/mail_list.tpl @@ -0,0 +1,8 @@ +
+ $subject + $from_name + $date + $count + + +
diff --git a/view/theme/diabook/message_side.tpl b/view/theme/diabook/message_side.tpl new file mode 100644 index 000000000..9f1587096 --- /dev/null +++ b/view/theme/diabook/message_side.tpl @@ -0,0 +1,10 @@ +
+ + +
    + {{ for $tabs as $t }} +
  • $t.label
    • + {{ endfor }} +
+ +
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index 9a51949a0..de3ae2150 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -552,6 +552,85 @@ header #banner #logo-text { position: absolute; top: 15%; } +/* messages */ +#message-new { + background: #19aeff; + border: 1px solid #005c94; + width: 150px; +} +#message-new a { + color: #ffffff; + text-align: center; + display: block; + font-weight: bold; + padding: 1em 0px; +} +.mail-list-wrapper { + background-color: #f6f7f8; + margin-bottom: 5px; + width: 100%; + height: auto; + overflow: hidden; +} +.mail-list-wrapper span { + display: block; + float: left; + width: 20%; + overflow: hidden; +} +.mail-list-wrapper .mail-subject { + width: 30%; + padding: 4px 0px 0px 4px; +} +.mail-list-wrapper .mail-subject a { + display: block; +} +.mail-list-wrapper .mail-subject.unseen a { + font-weight: bold; +} +.mail-list-wrapper .mail-date { + padding: 4px 4px 0px 4px; +} +.mail-list-wrapper .mail-from { + padding: 4px 4px 0px 4px; +} +.mail-list-wrapper .mail-count { + padding: 4px 4px 0px 4px; + text-align: right; +} +.mail-list-wrapper .mail-delete { + float: right; +} +#mail-display-subject { + background-color: #f6f7f8; + color: #2d2d2d; + margin-bottom: 10px; + width: 100%; + height: auto; + overflow: hidden; +} +#mail-display-subject span { + float: left; + overflow: hidden; + padding: 4px 0px 0px 10px; +} +#mail-display-subject .mail-delete { + float: right; + opacity: 0.5; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +#mail-display-subject:hover .mail-delete { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} /* nav */ nav { width: 80%; diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index 88944322e..6ac64beda 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -7,9 +7,7 @@ * Author: */ -$a->theme_info = array( - 'extends' => 'duepuntozero', -); + //change css on network and profilepages $cssFile = null; @@ -320,7 +318,7 @@ if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('get_baseurl($ssl_state)."/view/theme/diabook-blue/js/jquery.cookie.js"; -$a->page['htmlhead'] .= sprintf('', $cookieJS); //js scripts From 408de09f725cfee6d5eeac5491222f74ee539b3c Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Mon, 2 Apr 2012 00:05:49 +0200 Subject: [PATCH 04/21] css-fixes --- view/theme/diabook-aerith/style-network.css | 3 +-- view/theme/diabook-aerith/style.css | 5 +++-- view/theme/diabook-blue/style-network.css | 3 +-- view/theme/diabook-blue/style.css | 5 +++-- view/theme/diabook-red/style-network.css | 3 +-- view/theme/diabook-red/style.css | 5 +++-- view/theme/diabook/style.css | 1 + 7 files changed, 13 insertions(+), 12 deletions(-) diff --git a/view/theme/diabook-aerith/style-network.css b/view/theme/diabook-aerith/style-network.css index 3735ed66b..f6c7bc69a 100644 --- a/view/theme/diabook-aerith/style-network.css +++ b/view/theme/diabook-aerith/style-network.css @@ -1451,13 +1451,12 @@ transition: all 0.2s ease-in-out; } .wall-item-comment-wrapper textarea { height: 2.0em; - width: 93%; + width: 100%; font-size: 10px; color: #999999; border: 1px solid #DDD; padding: 0.3em; font-size: 14px; - margin-left: 20px; } .wall-item-comment-wrapper .comment-edit-text-full { font-size: 14px; diff --git a/view/theme/diabook-aerith/style.css b/view/theme/diabook-aerith/style.css index 90cb1d197..796af62ed 100644 --- a/view/theme/diabook-aerith/style.css +++ b/view/theme/diabook-aerith/style.css @@ -568,8 +568,8 @@ header #banner #logo-text { } /* messages */ #message-new { - background: #19aeff; - border: 1px solid #005c94; + background: #3465A4; + border: 1px solid #333; width: 150px; } #message-new a { @@ -578,6 +578,7 @@ header #banner #logo-text { display: block; font-weight: bold; padding: 1em 0px; + text-decoration: none; } .mail-list-wrapper { background-color: #f6f7f8; diff --git a/view/theme/diabook-blue/style-network.css b/view/theme/diabook-blue/style-network.css index 0e779a08b..5d16cde9e 100644 --- a/view/theme/diabook-blue/style-network.css +++ b/view/theme/diabook-blue/style-network.css @@ -1409,13 +1409,12 @@ transition: all 0.2s ease-in-out; } .wall-item-comment-wrapper textarea { height: 2.0em; - width: 93%; + width: 100%; font-size: 10px; color: #999999; border: 1px solid #DDD; padding: 0.3em; font-size: 14px; - margin-left: 20px; } .wall-item-comment-wrapper .comment-edit-text-full { font-size: 14px; diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css index e5b3ebfc1..b4289dc0f 100644 --- a/view/theme/diabook-blue/style.css +++ b/view/theme/diabook-blue/style.css @@ -553,8 +553,8 @@ header #banner #logo-text { } /* messages */ #message-new { - background: #19aeff; - border: 1px solid #005c94; + background: #055580; + border: 1px solid #333; width: 150px; } #message-new a { @@ -563,6 +563,7 @@ header #banner #logo-text { display: block; font-weight: bold; padding: 1em 0px; + text-decoration: none; } .mail-list-wrapper { background-color: #f6f7f8; diff --git a/view/theme/diabook-red/style-network.css b/view/theme/diabook-red/style-network.css index d90f9189d..c7063860f 100644 --- a/view/theme/diabook-red/style-network.css +++ b/view/theme/diabook-red/style-network.css @@ -1447,13 +1447,12 @@ transition: all 0.2s ease-in-out; } .wall-item-comment-wrapper textarea { height: 2.0em; - width: 93%; + width: 100%; font-size: 10px; color: #999999; border: 1px solid #DDD; padding: 0.3em; font-size: 14px; - margin-left: 20px; } .wall-item-comment-wrapper .comment-edit-text-full { font-size: 14px; diff --git a/view/theme/diabook-red/style.css b/view/theme/diabook-red/style.css index 4376eed07..578a5473a 100644 --- a/view/theme/diabook-red/style.css +++ b/view/theme/diabook-red/style.css @@ -568,8 +568,8 @@ header #banner #logo-text { } /* messages */ #message-new { - background: #19aeff; - border: 1px solid #005c94; + background: ; + border: 1px solid #333; width: 150px; } #message-new a { @@ -578,6 +578,7 @@ header #banner #logo-text { display: block; font-weight: bold; padding: 1em 0px; + text-decoration: none; } .mail-list-wrapper { background-color: #f6f7f8; diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index de3ae2150..97a26a41d 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -564,6 +564,7 @@ header #banner #logo-text { display: block; font-weight: bold; padding: 1em 0px; + text-decoration: none; } .mail-list-wrapper { background-color: #f6f7f8; From 00bbb9ad362539cc945254eb66af33e2e470440b Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 1 Apr 2012 15:43:57 -0700 Subject: [PATCH 05/21] slight improvement in handling of plaintext feeds --- boot.php | 2 +- include/items.php | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/boot.php b/boot.php index 683daf401..2f2e28ceb 100755 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1298' ); +define ( 'FRIENDICA_VERSION', '2.3.1299' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1134 ); diff --git a/include/items.php b/include/items.php index 8f8b3ccd0..ee6960534 100755 --- a/include/items.php +++ b/include/items.php @@ -435,8 +435,15 @@ function get_atom_elements($feed,$item) { $res['body'] = @html2bbcode($res['body']); } -// else -// $res['body'] = escape_tags($res['body']); + elseif(! $have_real_body) { + + // it's not one of our messages and it has no tags + // so it's probably just text. We'll escape it just to be safe. + + $res['body'] = escape_tags($res['body']); + } + + // this tag is obsolete but we keep it for really old sites $allow = $item->get_item_tags(NAMESPACE_DFRN,'comment-allow'); if($allow && $allow[0]['data'] == 1) From d0ddd380e7e65cd20e6a85c32085258e1ab69339 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Mon, 2 Apr 2012 00:18:03 +0100 Subject: [PATCH 06/21] Moved Diaspora notes away from top, per user request --- mod/dfrn_request.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index c2d37dac7..5881b7b51 100755 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -664,8 +664,8 @@ function dfrn_request_content(&$a) { else $tpl = get_markup_template('auto_request.tpl'); - $page_desc = sprintf( t('Diaspora members: Please do not use this form. Instead, enter "%s" into your Diaspora search bar.'), - $target_addr) . EOL . EOL; + # $page_desc = sprintf( t('Diaspora members: Please do not use this form. Instead, enter "%s" into your Diaspora search bar.'), + # $target_addr) . EOL . EOL; $page_desc .= t("Please enter your 'Identity Address' from one of the following supported communications networks:"); @@ -699,7 +699,7 @@ function dfrn_request_content(&$a) { '$friendica' => t('Friendica'), '$statusnet' => t('StatusNet/Federated Social Web'), '$diaspora' => t('Diaspora'), - '$diasnote' => t('- please share from your own site as noted above'), + '$diasnote' => sprintf (t(' - please do not use this form. Instead, enter %s into your Diaspora search bar.'),$target_addr), '$your_address' => t('Your Identity Address:'), '$invite_desc' => $invite_desc, '$emailnet' => $emailnet, From f95db4382eb92f0e29ab3cef2f285ea6c20b2912 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 1 Apr 2012 16:21:55 -0700 Subject: [PATCH 07/21] check for style.php existence before inclusion --- mod/view.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mod/view.php b/mod/view.php index 33aa23f44..15b3733b3 100644 --- a/mod/view.php +++ b/mod/view.php @@ -9,7 +9,8 @@ function view_init($a){ if ($a->argc == 4){ $theme = $a->argv[2]; $THEMEPATH = "view/theme/$theme"; - require_once("view/theme/$theme/style.php"); + if(file_exists("view/theme/$theme/style.php")) + require_once("view/theme/$theme/style.php"); } killme(); From 8c9c561f6ca506e8063e438d58853a0ba0ae65e8 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Mon, 2 Apr 2012 00:23:58 +0100 Subject: [PATCH 08/21] New user quick start. --- doc/Home.md | 1 + doc/andfinally.md | 24 ++++++++++++++++++++++++ doc/groupsandpages.md | 11 +++++++++++ doc/guide.md | 13 +++++++++++++ doc/makingnewfriends.md | 11 +++++++++++ doc/network.md | 9 +++++++++ doc/peopleyouknow.md | 11 +++++++++++ 7 files changed, 80 insertions(+) create mode 100644 doc/andfinally.md create mode 100644 doc/groupsandpages.md create mode 100644 doc/guide.md create mode 100644 doc/makingnewfriends.md create mode 100644 doc/network.md create mode 100644 doc/peopleyouknow.md diff --git a/doc/Home.md b/doc/Home.md index 56abe8075..30efc93f7 100755 --- a/doc/Home.md +++ b/doc/Home.md @@ -5,6 +5,7 @@ Friendica Documentation and Resources **Contents** * [Account Basics](help/Account-Basics) +* [New User Quick Start](help/guide) * [Profiles](help/Profiles) * [Connectors](help/Connectors) * [Making Friends](help/Making-Friends) diff --git a/doc/andfinally.md b/doc/andfinally.md new file mode 100644 index 000000000..cd8a6994b --- /dev/null +++ b/doc/andfinally.md @@ -0,0 +1,24 @@ +And that brings the Quick Start to an end. + +Here are some more things to help get you started: + +**Groups** + + +- New Here - a group for people new to Friendica + +- Friendica Support - problems? This is the place to ask. + +- Public Stream - a place to talk about anything to anyone. + +- Let's Talk a group for finding people and groups who share similar interests. + +- Local Friendica a page for local Friendica groups + + +**Documentation** + +- Connecting to more networks +- Help Index + + diff --git a/doc/groupsandpages.md b/doc/groupsandpages.md new file mode 100644 index 000000000..418e682c8 --- /dev/null +++ b/doc/groupsandpages.md @@ -0,0 +1,11 @@ +This is the global directory. If you get lost, you can click this link to bring yourself back here. + +On this page, you'll find a collection of groups, forums and celebrity pages. Groups are not real people. Connecting to them is similar to "liking" something on Facebook, or signing up for a new forum. You don't have to feel awkward about introducing yourself to a new person, because they're not people! + +When you connect to a group, all messages to that group will start appearing in your network tab. You can comment on these posts, or post to the group yourself without ever having to add any of the groups members. This is a great way to make friends dynamically - you'll find people you like and add each other naturally instead of adding random strangers. Simply find a group you're interested in, and connect to it the same way you did with people in the last section. There are a lot of groups, and you're likely to get lost. Remember the link at the top of this page will bring you back here. + +Once you've added some groups, move on to the next section. + + + + diff --git a/doc/guide.md b/doc/guide.md new file mode 100644 index 000000000..178170c4e --- /dev/null +++ b/doc/guide.md @@ -0,0 +1,13 @@ +First things first, let's make sure you're logged in to your account. If you're not already logged in, do so in the frame below. + +Once you've logged in (or if you are already logged in), you'll now be looking at your profile page. + +This is a bit like your Facebook wall. It's where all your status messgages are kept, and where your friends come to post on your wall. To write your status, simply click in the box that says "share". When you do this, the box will expand. You can see some formatting options at the top such as Bold, Italics and Underline, as well as ways to add links and pictures. At the bottom you'll find some more links. You can use these to upload pictures and files from your computer, share websites with a bit of preview text, or embed video and audio files from elsewhere on the web. You can also set your post location here. + +Once you've finished writing your post, click on the padlock icon to select who can see it. If you do not use the padlock icon, your post will be public. This means it will appear to anybody who views your profile, and in the community tab if your site has it enabled, as well as in the network tab of any of your contacts. + +Play around with this a bit, then when you're ready to move on, we'll take a look at the Network Tab + + + + diff --git a/doc/makingnewfriends.md b/doc/makingnewfriends.md new file mode 100644 index 000000000..35befaa36 --- /dev/null +++ b/doc/makingnewfriends.md @@ -0,0 +1,11 @@ +This is your Suggested Friends page. If you get lost, you can click this link to bring yourself back here. + +This is a bit like the Friend Suggestions page of Facebook. Everybody on this list has agreed that they may be suggested as a friend. This means they're unlikely to refuse an introduction you send, and they want to meet new people too! + +See somebody you like the look of? Click the connect button beneath their photograph. This will bring you to the introductions page. Fill in the form as instructed, and add a small note (optional). Now, wait a bit and they'll accept your request - note that these are real people, and it might take a while. Now you've added one, you're probably lost. Click the link at the top of this page to go back to the suggested friends list and add some more. + +Feel uncomfortable adding people you don't know? Don't worry - that's where Groups and Pages come in! + + + + diff --git a/doc/network.md b/doc/network.md new file mode 100644 index 000000000..f445b0055 --- /dev/null +++ b/doc/network.md @@ -0,0 +1,9 @@ +This is your Network Tab. If you get lost, you can click this link to bring yourself back here. + +This is a bit like the Newsfeed at Facebook or the Stream at Diaspora. It's where all the posts from your contacts, groups, and feeds will appear. If you're new, you won't see anything in this page, unless you posted your status in the last step. If you've already added a few friends, you'll be able to see their posts. Here, you can comment, like, or dislike posts, or click on somebody's name to visit their profile page where you can write on their wall. + +Now we need to fill it up, the first step, is to add people you already know from Facebook. + + + + diff --git a/doc/peopleyouknow.md b/doc/peopleyouknow.md new file mode 100644 index 000000000..07a22e58d --- /dev/null +++ b/doc/peopleyouknow.md @@ -0,0 +1,11 @@ +This is your connector settings page. If you get lost, you can click this link to bring yourself back here. + +This is the bit that makes Friendica unique. You can connect to anybody on the internet from your Friendica account using this page! The available connectors varies depending on which plugins you have installed, but for now, we'll walk you through Facebook. If you need help with the rest, you can always ask at Friendica Support or see the instructions here. + +The biggest of them all is Facebook. Fortunately, this connector is really easy. Scroll down the page, and click Facebook Connector Settings. Enter your Facebook user name and password and let the application (the connector) do everything the options suggest. You can fine tune this later, but for now, we'll move on to making new friends. + + + + + + From 8406803473773404b18b95c709da0b8f5da59d3c Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Mon, 2 Apr 2012 00:27:47 +0100 Subject: [PATCH 09/21] modified: mod/newmember.php Add a link to the quick start --- mod/newmember.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mod/newmember.php b/mod/newmember.php index 2ecc89024..683463ecb 100755 --- a/mod/newmember.php +++ b/mod/newmember.php @@ -13,6 +13,8 @@ function newmember_content(&$a) { $o .= '
    '; + $o .= '
  • ' . '' . t('On your Quick Start page - find a brief introduction to your profile and network tabs, connect to Facebook, make some new connections, and find some groups to join.') . '
    • ' . EOL; + $o .= '
  • ' . '' . t('On your Settings page - change your initial password. Also make a note of your Identity Address. This looks just like an email address - and will be useful in making friends on the free social web.') . '
    • ' . EOL; $o .= '
  • ' . '' . t('Review the other settings, particularly the privacy settings. An unpublished directory listing is like having an unlisted phone number. In general, you should probably publish your listing - unless all of your friends and potential friends know exactly how to find you.') . '
    • ' . EOL; From 23dc376364b7d8f8e27e3493fe3edbf5cf768a35 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Mon, 2 Apr 2012 01:29:20 +0200 Subject: [PATCH 10/21] diabook-themes: add link to global dir in "find friends" at right_aside --- view/theme/diabook-aerith/communityhome.tpl | 1 + view/theme/diabook-aerith/fpostit/fpostit.php | 4 ++-- view/theme/diabook-aerith/theme.php | 3 ++- view/theme/diabook-blue/communityhome.tpl | 1 + view/theme/diabook-blue/fpostit/fpostit.php | 4 ++-- view/theme/diabook-blue/theme.php | 3 ++- view/theme/diabook-red/communityhome.tpl | 1 + view/theme/diabook-red/fpostit/fpostit.php | 4 ++-- view/theme/diabook-red/theme.php | 3 ++- view/theme/diabook/communityhome.tpl | 1 + view/theme/diabook/fpostit/fpostit.php | 4 ++-- view/theme/diabook/theme.php | 3 ++- 12 files changed, 20 insertions(+), 12 deletions(-) diff --git a/view/theme/diabook-aerith/communityhome.tpl b/view/theme/diabook-aerith/communityhome.tpl index 917af49f1..c26d02dc6 100755 --- a/view/theme/diabook-aerith/communityhome.tpl +++ b/view/theme/diabook-aerith/communityhome.tpl @@ -34,6 +34,7 @@ {{ if $nv }}

    Find Friends

    $nv.directory.1
    +$nv.global_directory.1
    $nv.match.1
    $nv.suggest.1
    $nv.invite.1 diff --git a/view/theme/diabook-aerith/fpostit/fpostit.php b/view/theme/diabook-aerith/fpostit/fpostit.php index 65c43a2b9..4505c9946 100644 --- a/view/theme/diabook-aerith/fpostit/fpostit.php +++ b/view/theme/diabook-aerith/fpostit/fpostit.php @@ -113,12 +113,12 @@ function showForm($error, $content) { echo <<

    - Friendika Bookmarklet

    + Friendica Bookmarklet
    - Enter the email address of the Friendika Account that you want to cross-post to:(example: user@friendika.org)

    + Enter the email address of the Friendica Account that you want to cross-post to:(example: user@friendica.org)

    Account ID:
    Password:

    diff --git a/view/theme/diabook-aerith/theme.php b/view/theme/diabook-aerith/theme.php index e9fe8e0f0..490010750 100755 --- a/view/theme/diabook-aerith/theme.php +++ b/view/theme/diabook-aerith/theme.php @@ -139,7 +139,8 @@ function diabook_aerith_community_info(){ //nav FIND FRIENDS if(local_user()) { $nv = array(); - $nv['directory'] = Array('directory', t('Directory'), "", ""); + $nv['directory'] = Array('directory', t('Local').' '.t('Directory'), "", ""); + $nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", ""); $nv['match'] = Array('match', t('Similar Interests'), "", ""); $nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", ""); $nv['invite'] = Array('invite', t('Invite Friends'), "", ""); diff --git a/view/theme/diabook-blue/communityhome.tpl b/view/theme/diabook-blue/communityhome.tpl index cff75cd40..3b95b376e 100755 --- a/view/theme/diabook-blue/communityhome.tpl +++ b/view/theme/diabook-blue/communityhome.tpl @@ -34,6 +34,7 @@ {{ if $nv }}

    Find Friends

    $nv.directory.1
    +$nv.global_directory.1
    $nv.match.1
    $nv.suggest.1
    $nv.invite.1 diff --git a/view/theme/diabook-blue/fpostit/fpostit.php b/view/theme/diabook-blue/fpostit/fpostit.php index 65c43a2b9..4505c9946 100644 --- a/view/theme/diabook-blue/fpostit/fpostit.php +++ b/view/theme/diabook-blue/fpostit/fpostit.php @@ -113,12 +113,12 @@ function showForm($error, $content) { echo <<

    - Friendika Bookmarklet

    + Friendica Bookmarklet
    - Enter the email address of the Friendika Account that you want to cross-post to:(example: user@friendika.org)

    + Enter the email address of the Friendica Account that you want to cross-post to:(example: user@friendica.org)

    Account ID:
    Password:

    diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php index 3d54ba9ef..891c13cbf 100755 --- a/view/theme/diabook-blue/theme.php +++ b/view/theme/diabook-blue/theme.php @@ -139,7 +139,8 @@ function diabook_blue_community_info(){ //nav FIND FRIENDS if(local_user()) { $nv = array(); - $nv['directory'] = Array('directory', t('Directory'), "", ""); + $nv['directory'] = Array('directory', t('Local').' '.t('Directory'), "", ""); + $nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", ""); $nv['match'] = Array('match', t('Similar Interests'), "", ""); $nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", ""); $nv['invite'] = Array('invite', t('Invite Friends'), "", ""); diff --git a/view/theme/diabook-red/communityhome.tpl b/view/theme/diabook-red/communityhome.tpl index 326c766b2..91935a9d3 100755 --- a/view/theme/diabook-red/communityhome.tpl +++ b/view/theme/diabook-red/communityhome.tpl @@ -34,6 +34,7 @@ {{ if $nv }}

    Find Friends

    $nv.directory.1
    +$nv.global_directory.1
    $nv.match.1
    $nv.suggest.1
    $nv.invite.1 diff --git a/view/theme/diabook-red/fpostit/fpostit.php b/view/theme/diabook-red/fpostit/fpostit.php index 65c43a2b9..4505c9946 100644 --- a/view/theme/diabook-red/fpostit/fpostit.php +++ b/view/theme/diabook-red/fpostit/fpostit.php @@ -113,12 +113,12 @@ function showForm($error, $content) { echo <<

    - Friendika Bookmarklet

    + Friendica Bookmarklet
    - Enter the email address of the Friendika Account that you want to cross-post to:(example: user@friendika.org)

    + Enter the email address of the Friendica Account that you want to cross-post to:(example: user@friendica.org)

    Account ID:
    Password:

    diff --git a/view/theme/diabook-red/theme.php b/view/theme/diabook-red/theme.php index b091295b7..44a76a5e4 100755 --- a/view/theme/diabook-red/theme.php +++ b/view/theme/diabook-red/theme.php @@ -139,7 +139,8 @@ function diabook_red_community_info(){ //nav FIND FRIENDS if(local_user()) { $nv = array(); - $nv['directory'] = Array('directory', t('Directory'), "", ""); + $nv['directory'] = Array('directory', t('Local').' '.t('Directory'), "", ""); + $nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", ""); $nv['match'] = Array('match', t('Similar Interests'), "", ""); $nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", ""); $nv['invite'] = Array('invite', t('Invite Friends'), "", ""); diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl index 91871a7b9..d344cad31 100755 --- a/view/theme/diabook/communityhome.tpl +++ b/view/theme/diabook/communityhome.tpl @@ -34,6 +34,7 @@ {{ if $nv }}

    Find Friends

    $nv.directory.1
    +$nv.global_directory.1
    $nv.match.1
    $nv.suggest.1
    $nv.invite.1 diff --git a/view/theme/diabook/fpostit/fpostit.php b/view/theme/diabook/fpostit/fpostit.php index 65c43a2b9..4505c9946 100644 --- a/view/theme/diabook/fpostit/fpostit.php +++ b/view/theme/diabook/fpostit/fpostit.php @@ -113,12 +113,12 @@ function showForm($error, $content) { echo <<

    - Friendika Bookmarklet

    + Friendica Bookmarklet
    - Enter the email address of the Friendika Account that you want to cross-post to:(example: user@friendika.org)

    + Enter the email address of the Friendica Account that you want to cross-post to:(example: user@friendica.org)

    Account ID:
    Password:

    diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index 6ac64beda..d6ee57316 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -143,7 +143,8 @@ function diabook_community_info(){ //right_aside FIND FRIENDS if(local_user()) { $nv = array(); - $nv['directory'] = Array('directory', t('Directory'), "", ""); + $nv['directory'] = Array('directory', t('Local').' '.t('Directory'), "", ""); + $nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", ""); $nv['match'] = Array('match', t('Similar Interests'), "", ""); $nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", ""); $nv['invite'] = Array('invite', t('Invite Friends'), "", ""); From 1457d6e90f36a6a7bb07df3579b6e5c0475b121d Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Mon, 2 Apr 2012 01:26:45 +0100 Subject: [PATCH 11/21] Modified peopleyouknow to handle sites without Facebook better --- doc/peopleyouknow.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/peopleyouknow.md b/doc/peopleyouknow.md index 07a22e58d..143c49217 100644 --- a/doc/peopleyouknow.md +++ b/doc/peopleyouknow.md @@ -1,8 +1,10 @@ This is your connector settings page. If you get lost, you can click this link to bring yourself back here. -This is the bit that makes Friendica unique. You can connect to anybody on the internet from your Friendica account using this page! The available connectors varies depending on which plugins you have installed, but for now, we'll walk you through Facebook. If you need help with the rest, you can always ask at Friendica Support or see the instructions here. +This is the bit that makes Friendica unique. You can connect to anybody on the internet from your Friendica account using this page! The available connectors varies depending on which plugins you have installed, but for now, we'll walk you through Facebook. Note that not all servers have the Facebook connector installed. If you can't find it in the list below, don't worry, we'll look at ways of connecting to more people in the following pages. -The biggest of them all is Facebook. Fortunately, this connector is really easy. Scroll down the page, and click Facebook Connector Settings. Enter your Facebook user name and password and let the application (the connector) do everything the options suggest. You can fine tune this later, but for now, we'll move on to making new friends. +The biggest of all social networks is Facebook. Fortunately, this connector is really easy. Scroll down the page, and click Facebook Connector Settings. Enter your Facebook user name and password and let the application (the connector) do everything the options suggest. You can fine tune this or experiment with the other connectors too. If you need help, you can always ask at Friendica Support or see the instructions here. + +When you're ready, we can move on to making new friends. From 581b54c974a9b9a050a8a0b9a17a19bd41b1f2f5 Mon Sep 17 00:00:00 2001 From: Michael Johnston Date: Sun, 1 Apr 2012 21:28:31 -0400 Subject: [PATCH 12/21] allow users to set categories on their posts --- boot.php | 5 ++ include/contact_widgets.php | 28 ++++++++ include/conversation.php | 2 + include/text.php | 112 ++++++++++++++++++++++++++++++ mod/editpost.php | 2 + mod/item.php | 30 ++++++-- mod/profile.php | 21 +++++- view/categories_widget.tpl | 13 ++++ view/jot.tpl | 1 + view/theme/darkzero/style.css | 8 ++- view/theme/duepuntozero/style.css | 22 +++--- 11 files changed, 226 insertions(+), 18 deletions(-) create mode 100755 view/categories_widget.tpl diff --git a/boot.php b/boot.php index 2f2e28ceb..c2690f6ef 100755 --- a/boot.php +++ b/boot.php @@ -293,6 +293,8 @@ class App { public $nav_sel; + public $category; + private $scheme; private $hostname; private $baseurl; @@ -377,6 +379,9 @@ class App { $this->argc = count($this->argv); if((array_key_exists('0',$this->argv)) && strlen($this->argv[0])) { $this->module = str_replace(".", "_", $this->argv[0]); + if(array_key_exists('2',$this->argv)) { + $this->category = $this->argv[2]; + } } else { $this->argc = 1; diff --git a/include/contact_widgets.php b/include/contact_widgets.php index 7346b95af..e0f37f078 100755 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -103,3 +103,31 @@ function fileas_widget($baseurl,$selected = '') { )); } +function categories_widget($baseurl,$selected = '') { + $a = get_app(); + + $saved = get_pconfig($a->profile['profile_uid'],'system','filetags'); + if(! strlen($saved)) + return; + + $matches = false; + $terms = array(); + $cnt = preg_match_all('/<(.*?)>/',$saved,$matches,PREG_SET_ORDER); + if($cnt) { + foreach($matches as $mtch) { + $unescaped = xmlify(file_tag_decode($mtch[1])); + $terms[] = array('name' => $unescaped,'selected' => (($selected == $unescaped) ? 'selected' : '')); + } + } + + return replace_macros(get_markup_template('categories_widget.tpl'),array( + '$title' => t('Categories'), + '$desc' => '', + '$sel_all' => (($selected == '') ? 'selected' : ''), + '$all' => t('Everything'), + '$terms' => $terms, + '$base' => $baseurl, + + )); +} + diff --git a/include/conversation.php b/include/conversation.php index 5a922b2b5..df92a40ed 100755 --- a/include/conversation.php +++ b/include/conversation.php @@ -974,6 +974,8 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { '$shortnoloc' => t('clear location'), '$title' => "", '$placeholdertitle' => t('Set title'), + '$category' => "", + '$placeholdercategory' => t('Categories (comma-separated list)'), '$wait' => t('Please wait'), '$permset' => t('Permission settings'), '$shortpermset' => t('permissions'), diff --git a/include/text.php b/include/text.php index 191f4fca8..f204e3f9b 100644 --- a/include/text.php +++ b/include/text.php @@ -1314,6 +1314,118 @@ function file_tag_file_query($table,$s,$type = 'file') { return " AND " . (($table) ? dbesc($table) . '.' : '') . "file regexp '" . dbesc($str) . "' "; } +// ex. given music,video return
    - {{ 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']) ); From b5d57d5313b61842a72f0e2ad002cf633aa72dd7 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Mon, 2 Apr 2012 17:17:14 +0200 Subject: [PATCH 19/21] 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(-) 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 From 076b1b374b864a4d45add31c72e447495dbe0339 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Mon, 2 Apr 2012 18:16:58 +0200 Subject: [PATCH 20/21] 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(-) 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; - + $.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; - + $.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; - + $.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: */ From 6dfd55668f39d2cfb27d468cc982471abaad5165 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Mon, 2 Apr 2012 20:30:27 +0200 Subject: [PATCH 21/21] 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(-) 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 }}