aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/diabook
diff options
context:
space:
mode:
Diffstat (limited to 'view/theme/diabook')
-rw-r--r--view/theme/diabook/comment_item.tpl35
-rwxr-xr-xview/theme/diabook/icons/notifications.pngbin758 -> 714 bytes
-rwxr-xr-xview/theme/diabook/icons/starred.pngbin1617 -> 501 bytes
-rw-r--r--view/theme/diabook/nav.tpl6
-rw-r--r--view/theme/diabook/style.css25
-rwxr-xr-xview/theme/diabook/theme.php67
-rw-r--r--view/theme/diabook/wall_item.tpl8
-rw-r--r--view/theme/diabook/wallwall_item.tpl7
8 files changed, 105 insertions, 43 deletions
diff --git a/view/theme/diabook/comment_item.tpl b/view/theme/diabook/comment_item.tpl
deleted file mode 100644
index 85176732b..000000000
--- a/view/theme/diabook/comment_item.tpl
+++ /dev/null
@@ -1,35 +0,0 @@
- <div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
- <form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
- <input type="hidden" name="type" value="$type" />
- <input type="hidden" name="profile_uid" value="$profile_uid" />
- <input type="hidden" name="parent" value="$parent" />
- <input type="hidden" name="return" value="$return_path" />
- <input type="hidden" name="jsreload" value="$jsreload" />
- <input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
-
- <div class="comment-edit-photo" id="comment-edit-photo-$id" >
- <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
- </div>
- <div class="comment-edit-photo-end"></div>
- <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
-
- {{ if $qcomment }}
- <ul class="qcomment-wrapper">
- {{ for $qcomment as $qc }}
- <li class="fakelink qcomment"
- onclick="commentInsert(this,$id); return false;">$qc</li>
- {{ endfor }}
- </ul>
- {{ endif }}
-
- <div class="comment-edit-text-end"></div>
- <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;">
- <input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
- <span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
- <div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
- </div>
-
- <div class="comment-edit-end"></div>
- </form>
-
- </div>
diff --git a/view/theme/diabook/icons/notifications.png b/view/theme/diabook/icons/notifications.png
index 5bdc34f76..270997740 100755
--- a/view/theme/diabook/icons/notifications.png
+++ b/view/theme/diabook/icons/notifications.png
Binary files differ
diff --git a/view/theme/diabook/icons/starred.png b/view/theme/diabook/icons/starred.png
index 72a49c157..2b82dfca3 100755
--- a/view/theme/diabook/icons/starred.png
+++ b/view/theme/diabook/icons/starred.png
Binary files differ
diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl
index a098ae8b7..8b32ebe6c 100644
--- a/view/theme/diabook/nav.tpl
+++ b/view/theme/diabook/nav.tpl
@@ -26,6 +26,7 @@
<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li>
</ul>
</li>
+
{{ endif }}
{{ if $nav.messages }}
@@ -140,8 +141,9 @@
<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook/icons/scroll_top.png" title="scroll to top"></a></div>
-<div style="position: fixed; bottom: 5px; left: 25px;">$langselector</div>
-<div style="position: fixed; bottom: 25px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>
+<div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div>
+<div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>
+
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index ce3307645..c9be0111d 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -518,7 +518,7 @@ header {
top: 0px;
margin: 0px;
padding: 0px;
- width: 20%;
+ width: 22%;
height: 32px;
background: #000;
z-index: 100;
@@ -531,8 +531,9 @@ header #site-location {
}
header #banner {
overflow: hidden;
- text-align: center;
- width: 100%;
+ text-align: left;
+ width: 82%%;
+ margin-left: 25%;
}
header #banner a,
header #banner a:active,
@@ -558,12 +559,12 @@ nav {
width: 80%;
height: 32px;
position: fixed;
- left: 20%;
+ left: 22%;
top: 0px;
padding: 0px;
background: #000;
color: #ffffff;
- z-index: 100;
+ z-index: 99;
-webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
-moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
@@ -1038,12 +1039,24 @@ section {
width: 800px;
padding: 0px 0px 0px 12px;
}
+#id_username {
+ width: 173px;
+ }
+#id_password {
+ width: 173px;
+ }
+#id_openid_url {
+ width: 173px;
+ }
+#contact-edit-end {
+
+ }
.pager {
padding: 10px;
text-align: center;
font-size: 1.0em;
+ margin-top: 140%;
}
-
.tabs {
background-position: 0 -20px;
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
new file mode 100755
index 000000000..5a1828ad7
--- /dev/null
+++ b/view/theme/diabook/theme.php
@@ -0,0 +1,67 @@
+<?php
+
+/*
+ * Name: Diabook
+ * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
+ * Version:
+ * Author:
+ */
+
+$a->theme_info = array(
+ 'extends' => 'diabook',
+);
+
+$a->page['htmlhead'] .= <<< EOT
+<script>
+
+//contacts
+$('html').click(function() {
+ $('#nav-contacts-linkmenu').removeClass('selected');
+ document.getElementById( "nav-contacts-menu" ).style.display = "none";
+ });
+
+ $('#nav-contacts-linkmenu').click(function(event){
+ event.stopPropagation();
+ });
+
+//messages
+$('html').click(function() {
+ $('#nav-messages-linkmenu').removeClass('selected');
+ document.getElementById( "nav-messages-menu" ).style.display = "none";
+ });
+
+ $('#nav-messages-linkmenu').click(function(event){
+ event.stopPropagation();
+ });
+
+//notifications
+$('html').click(function() {
+ $('#nav-notifications-linkmenu').removeClass('selected');
+ document.getElementById( "nav-notifications-menu" ).style.display = "none";
+ });
+
+ $('#nav-notifications-linkmenu').click(function(event){
+ event.stopPropagation();
+ });
+
+//usermenu
+$('html').click(function() {
+ $('#nav-user-linkmenu').removeClass('selected');
+ document.getElementById( "nav-user-menu" ).style.display = "none";
+ });
+
+ $('#nav-user-linkmenu').click(function(event){
+ event.stopPropagation();
+ });
+
+ //settingsmenu
+ $('html').click(function() {
+ $('#nav-site-linkmenu').removeClass('selected');
+ document.getElementById( "nav-site-menu" ).style.display = "none";
+ });
+
+ $('#nav-site-linkmenu').click(function(event){
+ event.stopPropagation();
+ });
+</script>
+EOT;
diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl
index 8c892fd2a..6cbab0a71 100644
--- a/view/theme/diabook/wall_item.tpl
+++ b/view/theme/diabook/wall_item.tpl
@@ -46,6 +46,10 @@
</div>
<div class="wall-item-actions">
+<<<<<<< HEAD:view/theme/diabook/wall_item.tpl
+=======
+
+>>>>>>> upstream/master:view/theme/diabook/wall_item.tpl
<div class="wall-item-actions-social">
@@ -81,7 +85,11 @@
<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
{{ endif }}
</div>
+<<<<<<< HEAD:view/theme/diabook/wall_item.tpl
<div class="wall-item-location">$item.location&nbsp;</div>
+=======
+ <div class="wall-item-location">$item.location&nbsp;</div>
+>>>>>>> upstream/master:view/theme/diabook/wall_item.tpl
</div>
</div>
<div class="wall-item-bottom">
diff --git a/view/theme/diabook/wallwall_item.tpl b/view/theme/diabook/wallwall_item.tpl
index 3b103745b..4f0a2e25f 100644
--- a/view/theme/diabook/wallwall_item.tpl
+++ b/view/theme/diabook/wallwall_item.tpl
@@ -52,6 +52,10 @@
</div>
<div class="wall-item-actions">
+<<<<<<< HEAD:view/theme/diabook/wallwall_item.tpl
+=======
+
+>>>>>>> upstream/master:view/theme/diabook/wallwall_item.tpl
<div class="wall-item-actions-social">
@@ -88,7 +92,10 @@
{{ endif }}
</div>
<div class="wall-item-location">$item.location&nbsp;</div>
+<<<<<<< HEAD:view/theme/diabook/wallwall_item.tpl
+=======
+>>>>>>> upstream/master:view/theme/diabook/wallwall_item.tpl
</div>
</div>
<div class="wall-item-bottom">