diff options
25 files changed, 683 insertions, 8 deletions
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 @@ +<div class="wall-item-container $item.indent"> + <div class="wall-item-item"> + <div class="wall-item-info"> + <div class="contact-photo-wrapper" + <a href="$mail.profile_url" target="redir" title="$mail.from_name" class="contact-photo-link" id="wall-item-photo-link-$mail.id"> + <img src="$mail.from_photo" class="contact-photo$mail.sparkle" id="wall-item-photo-$mail.id" alt="$mail.from_name" /> + </a> + </div> + </div> + <div class="wall-item-content"> + $mail.body + </div> + </div> + <div class="wall-item-bottom"> + <div class="wall-item-links"> + </div> + <div class="wall-item-tags"> + </div> + </div> + <div class="wall-item-bottom"> + <div class=""> + </div> + <div class="wall-item-actions"> + <div class="wall-item-actions-author"> + <a href="$mail.from_url" target="redir" class="wall-item-name-link"><span class="wall-item-name$mail.sparkle">$mail.from_name</span></a> <span class="wall-item-ago">$mail.date</span> + </div> + + <div class="wall-item-actions-social"> + </div> + + <div class="wall-item-actions-tools"> + <a href="message/drop/$mail.id" onclick="return confirmDelete();" class="icon delete s16" title="$mail.delete">$mail.delete</a> + </div> + + </div> + </div> + <div class="wall-item-bottom"> + </div> +</div> + + +{# + + +<div class="mail-conv-outside-wrapper"> + <div class="mail-conv-sender" > + <a href="$mail.from_url" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo$mail.sparkle" src="$mail.from_photo" heigth="80" width="80" alt="$mail.from_name" /></a> + </div> + <div class="mail-conv-detail" > + <div class="mail-conv-sender-name" >$mail.from_name</div> + <div class="mail-conv-date">$mail.date</div> + <div class="mail-conv-subject">$mail.subject</div> + <div class="mail-conv-body">$mail.body</div> + <div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$mail.id" ><a href="message/drop/$mail.id" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="$mail.delete" id="mail-conv-delete-icon-$mail.id" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div> + <div class="mail-conv-outside-wrapper-end"></div> +</div> +</div> +<hr class="mail-conv-break" /> + +#} 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 @@ +<div id="mail-display-subject"> + <span class="{{if $thread_seen}}seen{{else}}unseen{{endif}}">$thread_subject</span> + <a href="message/dropconv/$thread_id" onclick="return confirmDelete();" title="$delete" class="mail-delete icon s22 delete"></a> +</div> + +{{ for $mails as $mail }} + <div id="tread-wrapper-$mail.id" class="tread-wrapper"> + {{ inc mail_conv.tpl }}{{endinc}} + </div> +{{ 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 @@ +<div class="mail-list-wrapper"> + <span class="mail-subject {{if $seen}}seen{{else}}unseen{{endif}}"><a href="message/$id" class="mail-link">$subject</a></span> + <span class="mail-from">$from_name</span> + <span class="mail-date">$date</span> + <span class="mail-count">$count</span> + + <a href="message/dropconv/$id" onclick="return confirmDelete();" title="$delete" class="mail-delete icon s22 delete"></a> +</div> 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 @@ +<div id="message-sidebar" class="widget"> + <div id="message-new" class="{{ if $new.sel }}selected{{ endif }}"><a href="$new.url">$new.label</a> </div> + + <ul class="message-ul"> + {{ for $tabs as $t }} + <li class="tool {{ if $t.sel }}selected{{ endif }}"><a href="$t.url" class="message-link">$t.label</a></li> + {{ endfor }} + </ul> + +</div> 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('<link rel="stylesheet" //load jquery.cookie.js $cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/js/jquery.cookie.js"; -$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" />', $cookieJS); +$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $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 @@ +<div class="wall-item-container $item.indent"> + <div class="wall-item-item"> + <div class="wall-item-info"> + <div class="contact-photo-wrapper" + <a href="$mail.profile_url" target="redir" title="$mail.from_name" class="contact-photo-link" id="wall-item-photo-link-$mail.id"> + <img src="$mail.from_photo" class="contact-photo$mail.sparkle" id="wall-item-photo-$mail.id" alt="$mail.from_name" /> + </a> + </div> + </div> + <div class="wall-item-content"> + $mail.body + </div> + </div> + <div class="wall-item-bottom"> + <div class="wall-item-links"> + </div> + <div class="wall-item-tags"> + </div> + </div> + <div class="wall-item-bottom"> + <div class=""> + </div> + <div class="wall-item-actions"> + <div class="wall-item-actions-author"> + <a href="$mail.from_url" target="redir" class="wall-item-name-link"><span class="wall-item-name$mail.sparkle">$mail.from_name</span></a> <span class="wall-item-ago">$mail.date</span> + </div> + + <div class="wall-item-actions-social"> + </div> + + <div class="wall-item-actions-tools"> + <a href="message/drop/$mail.id" onclick="return confirmDelete();" class="icon delete s16" title="$mail.delete">$mail.delete</a> + </div> + + </div> + </div> + <div class="wall-item-bottom"> + </div> +</div> + + +{# + + +<div class="mail-conv-outside-wrapper"> + <div class="mail-conv-sender" > + <a href="$mail.from_url" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo$mail.sparkle" src="$mail.from_photo" heigth="80" width="80" alt="$mail.from_name" /></a> + </div> + <div class="mail-conv-detail" > + <div class="mail-conv-sender-name" >$mail.from_name</div> + <div class="mail-conv-date">$mail.date</div> + <div class="mail-conv-subject">$mail.subject</div> + <div class="mail-conv-body">$mail.body</div> + <div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$mail.id" ><a href="message/drop/$mail.id" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="$mail.delete" id="mail-conv-delete-icon-$mail.id" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div> + <div class="mail-conv-outside-wrapper-end"></div> +</div> +</div> +<hr class="mail-conv-break" /> + +#} 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 @@ +<div id="mail-display-subject"> + <span class="{{if $thread_seen}}seen{{else}}unseen{{endif}}">$thread_subject</span> + <a href="message/dropconv/$thread_id" onclick="return confirmDelete();" title="$delete" class="mail-delete icon s22 delete"></a> +</div> + +{{ for $mails as $mail }} + <div id="tread-wrapper-$mail.id" class="tread-wrapper"> + {{ inc mail_conv.tpl }}{{endinc}} + </div> +{{ 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 @@ +<div class="mail-list-wrapper"> + <span class="mail-subject {{if $seen}}seen{{else}}unseen{{endif}}"><a href="message/$id" class="mail-link">$subject</a></span> + <span class="mail-from">$from_name</span> + <span class="mail-date">$date</span> + <span class="mail-count">$count</span> + + <a href="message/dropconv/$id" onclick="return confirmDelete();" title="$delete" class="mail-delete icon s22 delete"></a> +</div> 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 @@ +<div id="message-sidebar" class="widget"> + <div id="message-new" class="{{ if $new.sel }}selected{{ endif }}"><a href="$new.url">$new.label</a> </div> + + <ul class="message-ul"> + {{ for $tabs as $t }} + <li class="tool {{ if $t.sel }}selected{{ endif }}"><a href="$t.url" class="message-link">$t.label</a></li> + {{ endfor }} + </ul> + +</div> 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 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ 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('<link rel="stylesheet" //load jquery.cookie.js $cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/js/jquery.cookie.js"; -$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" />', $cookieJS); +$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $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 @@ +<div class="wall-item-container $item.indent"> + <div class="wall-item-item"> + <div class="wall-item-info"> + <div class="contact-photo-wrapper" + <a href="$mail.profile_url" target="redir" title="$mail.from_name" class="contact-photo-link" id="wall-item-photo-link-$mail.id"> + <img src="$mail.from_photo" class="contact-photo$mail.sparkle" id="wall-item-photo-$mail.id" alt="$mail.from_name" /> + </a> + </div> + </div> + <div class="wall-item-content"> + $mail.body + </div> + </div> + <div class="wall-item-bottom"> + <div class="wall-item-links"> + </div> + <div class="wall-item-tags"> + </div> + </div> + <div class="wall-item-bottom"> + <div class=""> + </div> + <div class="wall-item-actions"> + <div class="wall-item-actions-author"> + <a href="$mail.from_url" target="redir" class="wall-item-name-link"><span class="wall-item-name$mail.sparkle">$mail.from_name</span></a> <span class="wall-item-ago">$mail.date</span> + </div> + + <div class="wall-item-actions-social"> + </div> + + <div class="wall-item-actions-tools"> + <a href="message/drop/$mail.id" onclick="return confirmDelete();" class="icon delete s16" title="$mail.delete">$mail.delete</a> + </div> + + </div> + </div> + <div class="wall-item-bottom"> + </div> +</div> + + +{# + + +<div class="mail-conv-outside-wrapper"> + <div class="mail-conv-sender" > + <a href="$mail.from_url" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo$mail.sparkle" src="$mail.from_photo" heigth="80" width="80" alt="$mail.from_name" /></a> + </div> + <div class="mail-conv-detail" > + <div class="mail-conv-sender-name" >$mail.from_name</div> + <div class="mail-conv-date">$mail.date</div> + <div class="mail-conv-subject">$mail.subject</div> + <div class="mail-conv-body">$mail.body</div> + <div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$mail.id" ><a href="message/drop/$mail.id" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="$mail.delete" id="mail-conv-delete-icon-$mail.id" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div> + <div class="mail-conv-outside-wrapper-end"></div> +</div> +</div> +<hr class="mail-conv-break" /> + +#} 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 @@ +<div id="mail-display-subject"> + <span class="{{if $thread_seen}}seen{{else}}unseen{{endif}}">$thread_subject</span> + <a href="message/dropconv/$thread_id" onclick="return confirmDelete();" title="$delete" class="mail-delete icon s22 delete"></a> +</div> + +{{ for $mails as $mail }} + <div id="tread-wrapper-$mail.id" class="tread-wrapper"> + {{ inc mail_conv.tpl }}{{endinc}} + </div> +{{ 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 @@ +<div class="mail-list-wrapper"> + <span class="mail-subject {{if $seen}}seen{{else}}unseen{{endif}}"><a href="message/$id" class="mail-link">$subject</a></span> + <span class="mail-from">$from_name</span> + <span class="mail-date">$date</span> + <span class="mail-count">$count</span> + + <a href="message/dropconv/$id" onclick="return confirmDelete();" title="$delete" class="mail-delete icon s22 delete"></a> +</div> 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 @@ +<div id="message-sidebar" class="widget"> + <div id="message-new" class="{{ if $new.sel }}selected{{ endif }}"><a href="$new.url">$new.label</a> </div> + + <ul class="message-ul"> + {{ for $tabs as $t }} + <li class="tool {{ if $t.sel }}selected{{ endif }}"><a href="$t.url" class="message-link">$t.label</a></li> + {{ endfor }} + </ul> + +</div> 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('<link rel="stylesheet" //load jquery.cookie.js $cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/js/jquery.cookie.js"; -$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" />', $cookieJS); +$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $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 @@ +<div class="wall-item-container $item.indent"> + <div class="wall-item-item"> + <div class="wall-item-info"> + <div class="contact-photo-wrapper" + <a href="$mail.profile_url" target="redir" title="$mail.from_name" class="contact-photo-link" id="wall-item-photo-link-$mail.id"> + <img src="$mail.from_photo" class="contact-photo$mail.sparkle" id="wall-item-photo-$mail.id" alt="$mail.from_name" /> + </a> + </div> + </div> + <div class="wall-item-content"> + $mail.body + </div> + </div> + <div class="wall-item-bottom"> + <div class="wall-item-links"> + </div> + <div class="wall-item-tags"> + </div> + </div> + <div class="wall-item-bottom"> + <div class=""> + </div> + <div class="wall-item-actions"> + <div class="wall-item-actions-author"> + <a href="$mail.from_url" target="redir" class="wall-item-name-link"><span class="wall-item-name$mail.sparkle">$mail.from_name</span></a> <span class="wall-item-ago">$mail.date</span> + </div> + + <div class="wall-item-actions-social"> + </div> + + <div class="wall-item-actions-tools"> + <a href="message/drop/$mail.id" onclick="return confirmDelete();" class="icon delete s16" title="$mail.delete">$mail.delete</a> + </div> + + </div> + </div> + <div class="wall-item-bottom"> + </div> +</div> + + +{# + + +<div class="mail-conv-outside-wrapper"> + <div class="mail-conv-sender" > + <a href="$mail.from_url" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo$mail.sparkle" src="$mail.from_photo" heigth="80" width="80" alt="$mail.from_name" /></a> + </div> + <div class="mail-conv-detail" > + <div class="mail-conv-sender-name" >$mail.from_name</div> + <div class="mail-conv-date">$mail.date</div> + <div class="mail-conv-subject">$mail.subject</div> + <div class="mail-conv-body">$mail.body</div> + <div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$mail.id" ><a href="message/drop/$mail.id" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="$mail.delete" id="mail-conv-delete-icon-$mail.id" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div> + <div class="mail-conv-outside-wrapper-end"></div> +</div> +</div> +<hr class="mail-conv-break" /> + +#} 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 @@ +<div id="mail-display-subject"> + <span class="{{if $thread_seen}}seen{{else}}unseen{{endif}}">$thread_subject</span> + <a href="message/dropconv/$thread_id" onclick="return confirmDelete();" title="$delete" class="mail-delete icon s22 delete"></a> +</div> + +{{ for $mails as $mail }} + <div id="tread-wrapper-$mail.id" class="tread-wrapper"> + {{ inc mail_conv.tpl }}{{endinc}} + </div> +{{ 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 @@ +<div class="mail-list-wrapper"> + <span class="mail-subject {{if $seen}}seen{{else}}unseen{{endif}}"><a href="message/$id" class="mail-link">$subject</a></span> + <span class="mail-from">$from_name</span> + <span class="mail-date">$date</span> + <span class="mail-count">$count</span> + + <a href="message/dropconv/$id" onclick="return confirmDelete();" title="$delete" class="mail-delete icon s22 delete"></a> +</div> 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 @@ +<div id="message-sidebar" class="widget"> + <div id="message-new" class="{{ if $new.sel }}selected{{ endif }}"><a href="$new.url">$new.label</a> </div> + + <ul class="message-ul"> + {{ for $tabs as $t }} + <li class="tool {{ if $t.sel }}selected{{ endif }}"><a href="$t.url" class="message-link">$t.label</a></li> + {{ endfor }} + </ul> + +</div> 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('<link rel="stylesheet" //load jquery.cookie.js $cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/js/jquery.cookie.js"; -$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" />', $cookieJS); +$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $cookieJS); //js scripts |