aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortomtom84 <63dc41d76451@ba77e90e49a6.anonbox.net>2012-03-09 04:24:59 -0800
committertomtom84 <63dc41d76451@ba77e90e49a6.anonbox.net>2012-03-09 04:24:59 -0800
commit68541b5dd2f5f83a02133406538b33a17c422e87 (patch)
tree13eba1b0b4313123b25df20ff4ea2905348c29d5
parent42d622d6bfb5768205573cb6b149340d28f46886 (diff)
parent9f441731af6929272b27ad9097235aab82f25b29 (diff)
downloadvolse-hubzilla-68541b5dd2f5f83a02133406538b33a17c422e87.tar.gz
volse-hubzilla-68541b5dd2f5f83a02133406538b33a17c422e87.tar.bz2
volse-hubzilla-68541b5dd2f5f83a02133406538b33a17c422e87.zip
Merge pull request #115 from tomtom84/master
fixes in diabook-derivates
-rw-r--r--view/theme/diabook-blue/comment_item.tpl35
-rw-r--r--view/theme/diabook-blue/nav.tpl4
-rw-r--r--view/theme/diabook-blue/style.css16
-rw-r--r--view/theme/diabook/comment_item.tpl35
-rw-r--r--view/theme/diabook/nav.tpl4
-rw-r--r--view/theme/diabook/style.css15
6 files changed, 23 insertions, 86 deletions
diff --git a/view/theme/diabook-blue/comment_item.tpl b/view/theme/diabook-blue/comment_item.tpl
deleted file mode 100644
index 85176732b..000000000
--- a/view/theme/diabook-blue/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-blue/nav.tpl b/view/theme/diabook-blue/nav.tpl
index d0ff06673..289581c36 100644
--- a/view/theme/diabook-blue/nav.tpl
+++ b/view/theme/diabook-blue/nav.tpl
@@ -140,8 +140,8 @@
<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-blue/style.css b/view/theme/diabook-blue/style.css
index 5b7a3f3d6..7f5fe1fec 100644
--- a/view/theme/diabook-blue/style.css
+++ b/view/theme/diabook-blue/style.css
@@ -515,7 +515,7 @@ header {
top: 0px;
margin: 0px;
padding: 0px;
- width: 20%;
+ width: 22%;
height: 32px;
background: #1872a2;
background-color: #1872a2;
@@ -529,8 +529,9 @@ header #site-location {
}
header #banner {
overflow: hidden;
- text-align: center;
- width: 100%;
+ text-align: banner;
+ width: 82%;
+ margin-left: 25%;
}
header #banner a,
header #banner a:active,
@@ -556,12 +557,12 @@ nav {
width: 80%;
height: 32px;
position: fixed;
- left: 20%;
+ left: 22%;
top: 0px;
padding: 0px;
background: #1872a2;
- color: #1872a2;
- z-index: 100;
+ color: #ffffff;
+ z-index: 99;
border-bottom: 1px;
border-bottom-color: black;
border-bottom-style: inset;
@@ -1036,6 +1037,9 @@ section {
width: 800px;
padding: 0px 0px 0px 12px;
}
+#contact-edit-end {
+ margin-top: 140%;
+ }
.pager {
padding: 10px;
text-align: center;
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/nav.tpl b/view/theme/diabook/nav.tpl
index a098ae8b7..174312d2d 100644
--- a/view/theme/diabook/nav.tpl
+++ b/view/theme/diabook/nav.tpl
@@ -140,8 +140,8 @@
<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 bccfea149..6e3909ab4 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -515,7 +515,7 @@ header {
top: 0px;
margin: 0px;
padding: 0px;
- width: 20%;
+ width: 22%;
height: 32px;
background: #000;
z-index: 100;
@@ -528,8 +528,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,
@@ -555,12 +556,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);
@@ -1035,12 +1036,14 @@ section {
width: 800px;
padding: 0px 0px 0px 12px;
}
+#contact-edit-end {
+ margin-top: 140%;
+ }
.pager {
padding: 10px;
text-align: center;
font-size: 1.0em;
}
-
.tabs {
background-position: 0 -20px;