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.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 @@ +
+
$new.label
+ + + +
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.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 @@ +
+
$new.label
+ + + +
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 }}
$tags.3
{{ 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.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 @@ +
+
$new.label
+ + + +
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.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 @@ +
+
$new.label
+ + + +
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