Merge https://github.com/friendica/friendica into pull
This commit is contained in:
friendica
commit
3b47626c15
54 changed files with 3067 additions and 11 deletions
35
view/theme/diabook/comment_item.tpl
Normal file
35
view/theme/diabook/comment_item.tpl
Normal file
|
|
@ -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>
|
||||
BIN
view/theme/diabook/icons/bluebug.png
Normal file
BIN
view/theme/diabook/icons/bluebug.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1 KiB |
BIN
view/theme/diabook/icons/lupe.png
Executable file
BIN
view/theme/diabook/icons/lupe.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 697 B |
|
|
@ -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 }}
|
||||
|
|
@ -119,7 +116,8 @@
|
|||
<li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
|
||||
{{ endfor }}
|
||||
|
||||
{{ if $nav.notifications }}<li><a class="menu-sep $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }}
|
||||
{{ if $nav.profiles }}<li><a class="menu-sep $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.3</a></li>{{ endif }}
|
||||
{{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }}
|
||||
{{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a></li>{{ endif }}
|
||||
{{ if $nav.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a></li>{{ endif }}
|
||||
</ul>
|
||||
|
|
@ -141,6 +139,11 @@
|
|||
</nav>
|
||||
|
||||
|
||||
<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>
|
||||
|
||||
|
||||
|
||||
<ul id="nav-notifications-template" style="display:none;" rel="template">
|
||||
<li class="{4}"><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
|
||||
|
|
|
|||
64
view/theme/diabook/profile_vcard.tpl
Normal file
64
view/theme/diabook/profile_vcard.tpl
Normal file
|
|
@ -0,0 +1,64 @@
|
|||
<div class="vcard">
|
||||
|
||||
<div class="tool">
|
||||
<div class="fn label">$profile.name</div>
|
||||
{{ if $profile.edit }}
|
||||
<div class="action">
|
||||
<a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="$profile.edit.3"><span>$profile.edit.1</span></a>
|
||||
<ul id="profiles-menu" class="menu-popup">
|
||||
{{ for $profile.menu.entries as $e }}
|
||||
<li>
|
||||
<a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
|
||||
</li>
|
||||
{{ endfor }}
|
||||
<li><a href="profile_photo" >$profile.menu.chg_photo</a></li>
|
||||
<li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
|
||||
<li><a href="profiles" >$profile.edit.3</a></li>
|
||||
|
||||
</ul>
|
||||
</div>
|
||||
{{ endif }}
|
||||
</div>
|
||||
|
||||
|
||||
{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
|
||||
<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
|
||||
|
||||
|
||||
|
||||
{{ if $location }}
|
||||
<dl class="location"><dt class="location-label">$location</dt><br>
|
||||
<dd class="adr">
|
||||
{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
|
||||
<span class="city-state-zip">
|
||||
<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
|
||||
<span class="region">$profile.region</span>
|
||||
<span class="postal-code">$profile.postal-code</span>
|
||||
</span>
|
||||
{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
|
||||
</dd>
|
||||
</dl>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
|
||||
|
||||
{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
|
||||
|
||||
{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">♥</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
|
||||
|
||||
{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
|
||||
|
||||
{{ inc diaspora_vcard.tpl }}{{ endinc }}
|
||||
|
||||
<div id="profile-extra-links">
|
||||
<ul>
|
||||
{{ if $connect }}
|
||||
<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
|
||||
{{ endif }}
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
$contact_block
|
||||
|
||||
|
||||
|
|
@ -214,6 +214,17 @@
|
|||
padding: 1px;
|
||||
}
|
||||
|
||||
.icon.border.camera{
|
||||
background-image: url("../../../view/theme/diabook/icons/camera.png");
|
||||
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
|
||||
}
|
||||
|
||||
.icon.border.link{
|
||||
background-image: url("../../../view/theme/diabook/icons/weblink.png");
|
||||
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
|
||||
margin-left: 10px;
|
||||
}
|
||||
|
||||
.icon.text {
|
||||
text-indent: 0px;
|
||||
}
|
||||
|
|
@ -537,7 +548,8 @@ header #banner #logo-img {
|
|||
}
|
||||
header #banner #logo-text {
|
||||
font-size: 22px;
|
||||
|
||||
position: absolute;
|
||||
top: 15%;
|
||||
}
|
||||
/* nav */
|
||||
nav {
|
||||
|
|
@ -615,13 +627,21 @@ nav #logo-text {
|
|||
}
|
||||
nav .nav-menu-search {
|
||||
position: relative;
|
||||
|
||||
|
||||
margin: 3px 17px;
|
||||
margin-right: 0px;
|
||||
height: 17px;
|
||||
width: 205px;
|
||||
width: 180px;
|
||||
|
||||
}
|
||||
|
||||
nav #search-box #search-text {
|
||||
background-image: url('icons/lupe.png');
|
||||
background-repeat:no-repeat;
|
||||
padding-left:20px;
|
||||
}
|
||||
|
||||
|
||||
nav .nav-menu-icon {
|
||||
position: relative;
|
||||
height: 22px;
|
||||
|
|
@ -871,14 +891,14 @@ aside .vcard dl {
|
|||
aside .vcard dt {
|
||||
float: left;
|
||||
margin-left: 0px;
|
||||
width: 35%;
|
||||
/*width: 35%;*/
|
||||
text-align: right;
|
||||
color: #999999;
|
||||
}
|
||||
aside .vcard dd {
|
||||
float: left;
|
||||
margin-left: 4px;
|
||||
width: 60%;
|
||||
margin-left: 5px;
|
||||
/*width: 60%;*/
|
||||
}
|
||||
aside #profile-extra-links ul {
|
||||
padding: 0px;
|
||||
|
|
@ -1016,6 +1036,12 @@ section {
|
|||
width: 800px;
|
||||
padding: 0px 0px 0px 12px;
|
||||
}
|
||||
.pager {
|
||||
padding: 10px;
|
||||
text-align: center;
|
||||
font-size: 1.0em;
|
||||
}
|
||||
|
||||
.tabs {
|
||||
|
||||
background-position: 0 -20px;
|
||||
|
|
@ -1033,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;
|
||||
|
|
@ -1914,6 +1944,9 @@ box-shadow: 1px 1px 5px 0;
|
|||
#group-members-end {
|
||||
clear: both;
|
||||
}
|
||||
#group-edit-desc {
|
||||
margin-top: 15px;
|
||||
}
|
||||
|
||||
/*
|
||||
#group-separator,
|
||||
|
|
@ -2121,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;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue