aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/diabook-aerith
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-04-01 15:44:27 -0700
committerfriendica <info@friendica.com>2012-04-01 15:44:27 -0700
commit2589feef70cdc7d98f61a25035be82713ff93725 (patch)
tree4ca5c8b9f42079a557cebb93d4074695e89b19bd /view/theme/diabook-aerith
parent00bbb9ad362539cc945254eb66af33e2e470440b (diff)
parent408de09f725cfee6d5eeac5491222f74ee539b3c (diff)
downloadvolse-hubzilla-2589feef70cdc7d98f61a25035be82713ff93725.tar.gz
volse-hubzilla-2589feef70cdc7d98f61a25035be82713ff93725.tar.bz2
volse-hubzilla-2589feef70cdc7d98f61a25035be82713ff93725.zip
Merge branch 'pull'
Diffstat (limited to 'view/theme/diabook-aerith')
-rwxr-xr-xview/theme/diabook-aerith/mail_conv.tpl60
-rw-r--r--view/theme/diabook-aerith/mail_display.tpl12
-rw-r--r--view/theme/diabook-aerith/mail_list.tpl8
-rw-r--r--view/theme/diabook-aerith/message_side.tpl10
-rwxr-xr-xview/theme/diabook-aerith/search_item.tpl100
-rw-r--r--view/theme/diabook-aerith/style-network.css9
-rw-r--r--view/theme/diabook-aerith/style-profile.css6
-rw-r--r--view/theme/diabook-aerith/style.css174
-rwxr-xr-xview/theme/diabook-aerith/theme.php2
9 files changed, 282 insertions, 99 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/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 }}
+<div class="wall-item-decor">
+ <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
+</div>
+{{ endif }}
+<div class="wall-item-container $item.indent">
+ <div class="wall-item-item">
+ <div class="wall-item-info">
+ <div class="contact-photo-wrapper"
+ onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
+ onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
+ <a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
+ <img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
+ </a>
+ <a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
+ <ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
+ $item.item_photo_menu
+ </ul>
+
+ </div>
+ </div>
+ <div class="wall-item-actions-author">
+ <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a>
+ <span class="wall-item-ago">-
+ {{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
+ {{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
+ </span>
+ </div>
+ <div class="wall-item-content">
+ {{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
+ $item.body
+ </div>
+ </div>
+ <div class="wall-item-bottom">
+ <div class="wall-item-links">
+ </div>
+ <div class="wall-item-tags">
+ {{ for $item.tags as $tag }}
+ <span class='tag'>$tag</span>
+ {{ endfor }}
+ </div>
+ </div>
+ <div class="wall-item-bottom">
+ <div class="">
+
+ </div>
+ <div class="wall-item-actions">
+
+ <div class="wall-item-actions-social">
+
+
+ {{ if $item.vote }}
+ <a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
+ <a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
+ {{ endif }}
+
+ {{ if $item.vote.share }}
+ <a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
+ {{ endif }}
+
+
+ {{ if $item.star }}
+ <a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle">
+ <img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a>
+ <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
+ {{ endif }}
+
+ {{ if $item.filer }}
+ <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
+ {{ endif }}
+
+ {{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
+
+
+
+ </div>
+
+ <div class="wall-item-actions-tools">
+
+ {{ if $item.drop.dropping }}
+ <input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
+ <a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
+ {{ endif }}
+ {{ if $item.edpost }}
+ <a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
+ {{ endif }}
+ </div>
+ <div class="wall-item-location">$item.location&nbsp;</div>
+ </div>
+ </div>
+ <div class="wall-item-bottom">
+ <div class="wall-item-links"></div>
+ <div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
+ <div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
+ </div>
+</div>
+
+<div class="wall-item-comment-wrapper" >
+ $item.comment
+</div>
diff --git a/view/theme/diabook-aerith/style-network.css b/view/theme/diabook-aerith/style-network.css
index bcba4c3be..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;
@@ -2122,7 +2121,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 +2500,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..796af62ed 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 <http://kirgroup.com/profile/fabrixxm>
* Additional Changes: Michael Vogel <icarus@dabo.de>
**/
@@ -566,6 +566,86 @@ header #banner #logo-text {
position: absolute;
top: 10%;
}
+/* messages */
+#message-new {
+ background: #3465A4;
+ border: 1px solid #333;
+ width: 150px;
+}
+#message-new a {
+ color: #ffffff;
+ text-align: center;
+ display: block;
+ font-weight: bold;
+ padding: 1em 0px;
+ text-decoration: none;
+}
+.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%;
@@ -1233,92 +1313,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 +2130,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 +2500,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/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