Merge branch 'pull'
This commit is contained in:
friendica
commit
a02ffbcc86
10 changed files with 157 additions and 86 deletions
|
|
@ -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>
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 501 B |
|
|
@ -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>
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
66
view/theme/diabook-blue/theme.php
Executable file
66
view/theme/diabook-blue/theme.php
Executable file
|
|
@ -0,0 +1,66 @@
|
|||
<?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;
|
||||
|
|
@ -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>
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 501 B |
|
|
@ -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>
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
66
view/theme/diabook/theme.php
Executable file
66
view/theme/diabook/theme.php
Executable file
|
|
@ -0,0 +1,66 @@
|
|||
<?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;
|
||||
Loading…
Reference in a new issue