aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/diabook
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-03-08 20:38:54 -0500
committerSimon L'nu <simon.lnu@gmail.com>2012-03-08 20:38:54 -0500
commit8d19baadffaf38a563a3ad1052180bcb142eb564 (patch)
tree7bf5b508932af73bf153b1cf026d3c0c247d7e67 /view/theme/diabook
parentb584b263234515a1059c8b5541bbfed9bc4bfcba (diff)
parentb86a08166cf0db891392b2877c290231a3143238 (diff)
downloadvolse-hubzilla-8d19baadffaf38a563a3ad1052180bcb142eb564.tar.gz
volse-hubzilla-8d19baadffaf38a563a3ad1052180bcb142eb564.tar.bz2
volse-hubzilla-8d19baadffaf38a563a3ad1052180bcb142eb564.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: theme info file for testbubble catalan translation revup add theme diabook-blue, fix css * master:
Diffstat (limited to 'view/theme/diabook')
-rw-r--r--view/theme/diabook/comment_item.tpl35
-rw-r--r--view/theme/diabook/nav.tpl7
-rw-r--r--view/theme/diabook/style.css23
3 files changed, 59 insertions, 6 deletions
diff --git a/view/theme/diabook/comment_item.tpl b/view/theme/diabook/comment_item.tpl
new file mode 100644
index 000000000..85176732b
--- /dev/null
+++ b/view/theme/diabook/comment_item.tpl
@@ -0,0 +1,35 @@
+ <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/nav.tpl b/view/theme/diabook/nav.tpl
index aa72c4a5e..a098ae8b7 100644
--- a/view/theme/diabook/nav.tpl
+++ b/view/theme/diabook/nav.tpl
@@ -1,7 +1,4 @@
<header>
-
-
-
<div id="site-location">$sitelocation</div>
<div id="banner">$banner</div>
</header>
@@ -76,7 +73,7 @@
<li><a class="$nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a></li>
- <li><a class="$nav.search.2" href="friendica" title="About" >About</a></li>
+ <li><a class="$nav.search.2" href="friendica" title="Site Info / Impressum" >Info/Impressum</a></li>
{{ if $nav.settings }}<li><a class="menu-sep $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }}
{{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }}
@@ -144,7 +141,7 @@
<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="Fehlerreport für das Theme diaBook erstellen"/></a></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>
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index 1722588ba..768ce1370 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -548,7 +548,8 @@ header #banner #logo-img {
}
header #banner #logo-text {
font-size: 22px;
-
+ position: absolute;
+ top: 15%;
}
/* nav */
nav {
@@ -1058,6 +1059,10 @@ section {
padding: 3px;
color: #333333;
}
+
+#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
+ margin-bottom: 10px;
+ }
/* wall item */
.tread-wrapper {
border-bottom: 1px solid #D2D2D2;
@@ -1939,6 +1944,9 @@ box-shadow: 1px 1px 5px 0;
#group-members-end {
clear: both;
}
+#group-edit-desc {
+ margin-top: 15px;
+}
/*
#group-separator,
@@ -2146,11 +2154,24 @@ a.mail-list-link {
#photo-photo {
float: left;
}
+#photo-like-div .wall-item-like-buttons {
+ float: left;
+ margin-right: 10px;
+ }
+.wall-item-like-buttons .icon.like {
+float: left;
+}
#photo-photo-end {
clear: both;
}
+.tabs .comment-wwedit-wrapper {
+ display: block;
+ margin-top: 30px;
+ margin-left: 50px;
+ }
+
.profile-match-photo {
float: left;
text-align: center;