aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/diabook-red
diff options
context:
space:
mode:
Diffstat (limited to 'view/theme/diabook-red')
-rwxr-xr-xview/theme/diabook-red/communityhome.tpl1
-rw-r--r--view/theme/diabook-red/fpostit/fpostit.php4
-rwxr-xr-xview/theme/diabook-red/jot.tpl2
-rwxr-xr-xview/theme/diabook-red/mail_conv.tpl60
-rw-r--r--view/theme/diabook-red/mail_display.tpl12
-rw-r--r--view/theme/diabook-red/mail_list.tpl8
-rw-r--r--view/theme/diabook-red/message_side.tpl10
-rw-r--r--view/theme/diabook-red/profile_vcard.tpl4
-rwxr-xr-xview/theme/diabook-red/search_item.tpl100
-rw-r--r--view/theme/diabook-red/style-network.css26
-rw-r--r--view/theme/diabook-red/style-profile.css24
-rw-r--r--view/theme/diabook-red/style-settings.css6
-rw-r--r--view/theme/diabook-red/style.css206
-rwxr-xr-xview/theme/diabook-red/theme.php80
-rw-r--r--view/theme/diabook-red/wallwall_item.tpl4
15 files changed, 377 insertions, 170 deletions
diff --git a/view/theme/diabook-red/communityhome.tpl b/view/theme/diabook-red/communityhome.tpl
index 326c766b2..91935a9d3 100755
--- a/view/theme/diabook-red/communityhome.tpl
+++ b/view/theme/diabook-red/communityhome.tpl
@@ -34,6 +34,7 @@
{{ if $nv }}
<h3>Find Friends<a id="close_friends_icon" onClick="close_friends()" class="icon close_box" title="close"></a></h3>
<a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br>
+<a class="$nv.global_directory.2" href="$nv.global_directory.0" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_directory.1</a><br>
<a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br>
<a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a><br>
<a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nv.invite.3" >$nv.invite.1</a>
diff --git a/view/theme/diabook-red/fpostit/fpostit.php b/view/theme/diabook-red/fpostit/fpostit.php
index 65c43a2b9..4505c9946 100644
--- a/view/theme/diabook-red/fpostit/fpostit.php
+++ b/view/theme/diabook-red/fpostit/fpostit.php
@@ -113,12 +113,12 @@ function showForm($error, $content) {
echo <<<EOF
<div class='wrap1'>
<h2><img class='logo' src='friendika-32.png' align='middle';/>
- Friendika Bookmarklet</h2>
+ Friendica Bookmarklet</h2>
</div>
<div class="wrap2">
<form method="post" action="{$_SERVER['PHP_SELF']}">
- Enter the email address of the Friendika Account that you want to cross-post to:(example: user@friendika.org)<br /><br />
+ Enter the email address of the Friendica Account that you want to cross-post to:(example: user@friendica.org)<br /><br />
Account ID: <input type="text" name="friendika_acct_name" value="{$username_cookie}" size="50"/><br />
Password: <input type="password" name="friendika_password" value="{$password_cookie}" size="50"/><br />
<textarea name="content" id="content" rows="6" cols="70">{$content}</textarea><br />
diff --git a/view/theme/diabook-red/jot.tpl b/view/theme/diabook-red/jot.tpl
index 9aef99787..bd43994b5 100755
--- a/view/theme/diabook-red/jot.tpl
+++ b/view/theme/diabook-red/jot.tpl
@@ -2,7 +2,6 @@
<div id="profile-jot-wrapper" >
<div id="profile-jot-banner-wrapper">
<div id="profile-jot-desc" >&nbsp;</div>
- <div id="character-counter" class="grey"></div>
</div>
<div id="profile-jot-banner-end"></div>
@@ -15,6 +14,7 @@
<input type="hidden" name="post_id" value="$post_id" />
<input type="hidden" name="preview" id="jot-preview" value="0" />
<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
+ <div id="character-counter" class="grey"></div>
<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
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/profile_vcard.tpl b/view/theme/diabook-red/profile_vcard.tpl
index 918cfc97c..e28ec2909 100644
--- a/view/theme/diabook-red/profile_vcard.tpl
+++ b/view/theme/diabook-red/profile_vcard.tpl
@@ -21,9 +21,9 @@
</div>
- {{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
- <div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
+ <div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
+ {{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
{{ if $location }}
diff --git a/view/theme/diabook-red/search_item.tpl b/view/theme/diabook-red/search_item.tpl
new file mode 100755
index 000000000..123834064
--- /dev/null
+++ b/view/theme/diabook-red/search_item.tpl
@@ -0,0 +1,100 @@
+{{ if $item.indent }}{{ else }}
+<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-red/style-network.css b/view/theme/diabook-red/style-network.css
index 1e10f1216..bbd4ceeee 100644
--- a/view/theme/diabook-red/style-network.css
+++ b/view/theme/diabook-red/style-network.css
@@ -1198,10 +1198,14 @@ section {
body .pageheader{
text-align: center;
- margin-top: 25px;
- font-size: 0px;
+ font-size: 20px;
+ margin-bottom: 20px;
+ margin-top: 0px;
+ max-width: 575px;
+ }
+.qcomment{
+ max-width: 122px;
}
-
#id_username {
width: 173px;
}
@@ -1253,7 +1257,7 @@ right_aside {
/* background: #F1F1F1; */
}
right_aside a{color: red;}
-right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px;
+right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px;
margin-top:30px;}
right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }
right_aside .directory-photo { margin: 0px; }
@@ -1447,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;
@@ -1610,6 +1613,11 @@ transition: all 0.2s ease-in-out;
padding: 0.3em;
margin-bottom: 10px;
}
+.grey
+{
+ display: inline;
+ float: right;
+ }
#jot #jot-tools {
margin: 0px;
padding: 0px;
@@ -2119,7 +2127,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 +2506,8 @@ float: left;
display: none;
/* position: absolute; */
/* position: absolute; */
- left: -2px;
- top: -20px;
+ left: 0px;
+ top: -16px;
}
.contact-wrapper {
float: left;
diff --git a/view/theme/diabook-red/style-profile.css b/view/theme/diabook-red/style-profile.css
index c6ba1e4be..74217acf3 100644
--- a/view/theme/diabook-red/style-profile.css
+++ b/view/theme/diabook-red/style-profile.css
@@ -1176,10 +1176,14 @@ section {
body .pageheader{
text-align: center;
- margin-top: 25px;
- font-size: 0px;
+ font-size: 20px;
+ margin-bottom: 20px;
+ margin-top: 0px;
+ max-width: 575px;
+ }
+.qcomment{
+ max-width: 122px;
}
-
#id_username {
width: 173px;
}
@@ -1231,7 +1235,7 @@ right_aside {
/* background: #F1F1F1; */
}
right_aside a{color: red;}
-right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px;
+right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px;
margin-top:30px;}
right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }
right_aside .directory-photo { margin: 0px; }
@@ -1583,6 +1587,11 @@ transition: all 0.2s ease-in-out;
padding: 0.3em;
margin-bottom: 10px;
}
+.grey
+{
+ display: inline;
+ float: right;
+ }
#jot #jot-tools {
margin: 0px;
padding: 0px;
@@ -2057,6 +2066,7 @@ box-shadow: 2px 2px 5px 0px #000000;
margin: 2px 5px 2px 5px;
max-height: 85%;
max-width: 85%;
+border-radius: 10px;
}
.lframe {
float: left;
@@ -2091,7 +2101,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 +2480,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-settings.css b/view/theme/diabook-red/style-settings.css
index 9407c68f9..43bb3d037 100644
--- a/view/theme/diabook-red/style-settings.css
+++ b/view/theme/diabook-red/style-settings.css
@@ -1173,8 +1173,10 @@ section {
body .pageheader{
text-align: center;
- margin-top: 25px;
- font-size: 0px;
+ font-size: 20px;
+ margin-bottom: 20px;
+ margin-top: 0px;
+ max-width: 575px;
}
#id_username {
diff --git a/view/theme/diabook-red/style.css b/view/theme/diabook-red/style.css
index 8d4031329..16c8fe6c5 100644
--- a/view/theme/diabook-red/style.css
+++ b/view/theme/diabook-red/style.css
@@ -566,6 +566,86 @@ header #banner #logo-text {
top: 10%;
margin-left: 3px;
}
+/* messages */
+#message-new {
+ background: ;
+ 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%;
@@ -981,6 +1061,7 @@ aside {
float: left;
/* background: #F1F1F1; */
}
+aside #page-sidebar{display: none;}
aside .vcard .fn {
font-size: 18px;
font-weight: bold;
@@ -1163,10 +1244,14 @@ section {
}
body .pageheader{
text-align: center;
- margin-top: 25px;
- font-size: 0px;
+ font-size: 20px;
+ margin-bottom: 20px;
+ margin-top: 0px;
+ max-width: 575px;
+ }
+.qcomment{
+ max-width: 122px;
}
-
#id_username {
width: 173px;
}
@@ -1216,108 +1301,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 {
@@ -1629,6 +1613,11 @@ z-index: 10000;
padding: 0.3em;
margin-bottom: 10px;
}
+.grey
+{
+ display: inline;
+ float: right;
+ }
#jot #jot-tools {
margin: 0px;
padding: 0px;
@@ -2102,6 +2091,7 @@ box-shadow: 2px 2px 5px 0px #000000;
margin: 2px 5px 2px 5px;
max-height: 85%;
max-width: 85%;
+border-radius: 10px;
}
.lframe {
float: left;
@@ -2136,7 +2126,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 +2496,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/theme.php b/view/theme/diabook-red/theme.php
index 95af850a2..a6b2ea823 100755
--- a/view/theme/diabook-red/theme.php
+++ b/view/theme/diabook-red/theme.php
@@ -3,7 +3,7 @@
/*
* Name: Diabook-red
* Description: Diabook-red: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version:
+ * Version: (Version: 1.011)
* Author:
*/
@@ -139,7 +139,8 @@ function diabook_red_community_info(){
//nav FIND FRIENDS
if(local_user()) {
$nv = array();
- $nv['directory'] = Array('directory', t('Directory'), "", "");
+ $nv['directory'] = Array('directory', t('Local').' '.t('Directory'), "", "");
+ $nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", "");
$nv['match'] = Array('match', t('Similar Interests'), "", "");
$nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
$nv['invite'] = Array('invite', t('Invite Friends'), "", "");
@@ -163,7 +164,8 @@ function diabook_red_community_info(){
$pagelist = array();
$contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
- WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d",
+ WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
+ ORDER BY `name` ASC",
intval($a->user['uid'])
);
@@ -311,61 +313,63 @@ 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
-$a->page['htmlhead'] .= <<< EOT
+$a->page['htmlhead'] .= '
<script>
$(function() {
- $('a.lightbox').fancybox(); // Select all links with lightbox class
-
+ $("a.lightbox").fancybox(); // Select all links with lightbox class
});
+
+ </script>';
-</script>
+if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
+$a->page['htmlhead'] .= '
<script>
$("right_aside").ready(function(){
- if($.cookie('close_pages') == '1')
+ if($.cookie("close_pages") == "1")
{
document.getElementById( "close_pages" ).style.display = "none";
};
- if($.cookie('close_helpers') == '1')
+ if($.cookie("close_helpers") == "1")
{
document.getElementById( "close_helpers" ).style.display = "none";
};
- if($.cookie('close_services') == '1')
+ if($.cookie("close_services") == "1")
{
document.getElementById( "close_services" ).style.display = "none";
};
- if($.cookie('close_friends') == '1')
+ if($.cookie("close_friends") == "1")
{
document.getElementById( "close_friends" ).style.display = "none";
};
- if($.cookie('close_postit') == '1')
+ if($.cookie("close_postit") == "1")
{
document.getElementById( "close_postit" ).style.display = "none";
};
- if($.cookie('close_lastusers') == '1')
+ if($.cookie("close_lastusers") == "1")
{
document.getElementById( "close_lastusers" ).style.display = "none";
};
- if($.cookie('close_lastphotos') == '1')
+ if($.cookie("close_lastphotos") == "1")
{
document.getElementById( "close_lastphotos" ).style.display = "none";
};
- if($.cookie('close_lastlikes') == '1')
+ if($.cookie("close_lastlikes") == "1")
{
document.getElementById( "close_lastlikes" ).style.display = "none";
};}
@@ -374,57 +378,55 @@ $("right_aside").ready(function(){
function close_pages(){
document.getElementById( "close_pages" ).style.display = "none";
- $.cookie('close_pages','1', { expires: 365, path: '/' });
+ $.cookie("close_pages","1", { expires: 365, path: "/" });
};
function close_helpers(){
document.getElementById( "close_helpers" ).style.display = "none";
- $.cookie('close_helpers','1', { expires: 365, path: '/' });
+ $.cookie("close_helpers","1", { expires: 365, path: "/" });
};
function close_services(){
document.getElementById( "close_services" ).style.display = "none";
- $.cookie('close_services','1', { expires: 365, path: '/' });
+ $.cookie("close_services","1", { expires: 365, path: "/" });
};
function close_friends(){
document.getElementById( "close_friends" ).style.display = "none";
- $.cookie('close_friends','1', { expires: 365, path: '/' });
+ $.cookie("close_friends","1", { expires: 365, path: "/" });
};
function close_postit(){
document.getElementById( "close_postit" ).style.display = "none";
- $.cookie('close_postit','1', { expires: 365, path: '/' });
+ $.cookie("close_postit","1", { expires: 365, path: "/" });
};
function close_lastusers(){
document.getElementById( "close_lastusers" ).style.display = "none";
- $.cookie('close_lastusers','1', { expires: 365, path: '/' });
+ $.cookie("close_lastusers","1", { expires: 365, path: "/" });
};
function close_lastphotos(){
document.getElementById( "close_lastphotos" ).style.display = "none";
- $.cookie('close_lastphotos','1', { expires: 365, path: '/' });
+ $.cookie("close_lastphotos","1", { expires: 365, path: "/" });
};
function close_lastlikes(){
document.getElementById( "close_lastlikes" ).style.display = "none";
- $.cookie('close_lastlikes','1', { expires: 365, path: '/' });
+ $.cookie("close_lastlikes","1", { expires: 365, path: "/" });
};
-
-function restore_boxes(){
- $.cookie('close_pages','2', { expires: 365, path: '/' });
- $.cookie('close_helpers','2', { expires: 365, path: '/' });
- $.cookie('close_services','2', { expires: 365, path: '/' });
- $.cookie('close_friends','2', { expires: 365, path: '/' });
- $.cookie('close_postit','2', { expires: 365, path: '/' });
- $.cookie('close_lastusers','2', { expires: 365, path: '/' });
- $.cookie('close_lastphotos','2', { expires: 365, path: '/' });
- $.cookie('close_lastlikes','2', { expires: 365, path: '/' });
- alert('Right-hand column was restored. Please refresh your browser');
- };
-</script>
-
-EOT;
+
+function restore_boxes(){
+ $.cookie("close_pages","2", { expires: 365, path: "/" });
+ $.cookie("close_helpers","2", { expires: 365, path: "/" });
+ $.cookie("close_services","2", { expires: 365, path: "/" });
+ $.cookie("close_friends","2", { expires: 365, path: "/" });
+ $.cookie("close_postit","2", { expires: 365, path: "/" });
+ $.cookie("close_lastusers","2", { expires: 365, path: "/" });
+ $.cookie("close_lastphotos","2", { expires: 365, path: "/" });
+ $.cookie("close_lastlikes","2", { expires: 365, path: "/" });
+ alert("Right-hand column was restored. Please refresh your browser");
+ };
+</script>';}
diff --git a/view/theme/diabook-red/wallwall_item.tpl b/view/theme/diabook-red/wallwall_item.tpl
index c5b6b36b5..bee75ad99 100644
--- a/view/theme/diabook-red/wallwall_item.tpl
+++ b/view/theme/diabook-red/wallwall_item.tpl
@@ -71,6 +71,10 @@
<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 }}