From ff12637ceb0bb0ff3b769fdb12d7158e7f7a917d Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sun, 1 Apr 2012 16:34:31 +0200 Subject: [PATCH 1/3] 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 0000000000..1238340647 --- /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 bcba4c3be5..3735ed66be 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 9c9f8b4e69..c4f89359a9 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 1802c914d5..be33fd5f2d 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 0000000000..1238340647 --- /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 9737670ec8..0e779a08bb 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 b75ccffb08..528327ac3b 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 21ba66ec71..a5129e9576 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 0000000000..1238340647 --- /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 1e10f1216c..d90f9189d9 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 c6ba1e4be5..5124ed8c0d 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 8d4031329f..30714649bd 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 0000000000..1238340647 --- /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 3042476d80..518e7b88d7 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 5a91e52549..0077510a1d 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 956667faa3..9a51949a0c 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 2/3] 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 0000000000..989f178781 --- /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 0000000000..8b82e95c60 --- /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 0000000000..6bc6c84f60 --- /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 0000000000..9f15870964 --- /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 be33fd5f2d..90cb1d1977 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 2b135878a6..e9fe8e0f0e 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 0000000000..989f178781 --- /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 0000000000..8b82e95c60 --- /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 0000000000..6bc6c84f60 --- /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 0000000000..9f15870964 --- /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 511fc73acb..20926656a6 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 a5129e9576..e5b3ebfc12 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 fb6b44a16b..3d54ba9efc 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 0000000000..989f178781 --- /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 0000000000..8b82e95c60 --- /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 0000000000..6bc6c84f60 --- /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 0000000000..9f15870964 --- /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 30714649bd..4376eed071 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 95af850a21..b091295b7d 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 0000000000..989f178781 --- /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 0000000000..8b82e95c60 --- /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 0000000000..6bc6c84f60 --- /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 0000000000..9f15870964 --- /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 9a51949a0c..de3ae2150e 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 88944322ed..6ac64bedac 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 3/3] 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 3735ed66be..f6c7bc69a0 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 90cb1d1977..796af62eda 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 0e779a08bb..5d16cde9ee 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 e5b3ebfc12..b4289dc0f0 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 d90f9189d9..c7063860f2 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 4376eed071..578a5473a8 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 de3ae2150e..97a26a41d9 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;