keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #137 from tomtom84/master

Browse source 
fixes in diabook-derivates
This commit is contained in:
tomtom84 2012-03-15 19:55:10 -07:00
commit 0b509fd763
15 changed files with 86 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
view/theme/diabook-blue/icons/com_side.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 680 B

BIN
view/theme/diabook-blue/icons/events.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 663 B

BIN
view/theme/diabook-blue/icons/home.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 722 B

BIN
view/theme/diabook-blue/icons/mess_side.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 664 B

BIN
view/theme/diabook-blue/icons/notes.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 739 B

BIN
view/theme/diabook-blue/icons/pubgroups.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 710 B

7
view/theme/diabook-blue/photo_album.tpl Executable file
View file

@ -0,0 +1,7 @@
<div class="photo-album-image-wrapper" id="photo-album-image-wrapper-$id">
<a href="$imgsrc" rel="gallery" class="fancy-album" id="photo-album-photo-link-$id" title="$phototitle">
<img src="$imgsrc" alt="$imgalt" title="$phototitle" class="photo-album-photo lframe resize" id="photo-album-photo-$id" />
<p class='caption'>$desc</p>
</a>
</div>
<div class="photo-album-image-wrapper-end"></div>

7
view/theme/diabook-blue/photo_top.tpl Executable file
View file

@ -0,0 +1,7 @@
<div class="photo-top-image-wrapper lframe" id="photo-top-image-wrapper-$id">
<a href="$photo.src" rel="$photo.album.name" class="fancy-album" id="photo-top-photo-link-$photo.id" title="$photo.title">
<img src="$photo.src" alt="$photo.alt" title="$photo.title" class="photo-top-album-img" id="photo-top-photo-$photo.id" />
</a>
<div class="photo-top-album-name"><a href="$photo.album.link" class="photo-top-album-link" title="$photo.album.alt" >$photo.album.name</a></div>
</div>

2
view/theme/diabook-blue/photo_view.tpl
View file

@ -12,7 +12,7 @@
<div id="photo-photo">
{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
<a href="$photo.href" class="lightbox" title="$photo.title"><img src="$photo.src" /></a>
<a href="$photo.href" class="fancy-photo" title="$photo.title"><img src="$photo.src" /></a>
{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
</div>

12
view/theme/diabook-blue/profile_side.tpl
View file

@ -7,12 +7,12 @@
</div>
<ul id="profile-side-menu" class="menu-profile-side">
<li id="profile-side-status" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li>
<li id="profile-side-photos" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li>
<li id="profile-side-events" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li>
<li id="profile-side-notes" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li>
<li id="profile-side-foren" class="menu-profile-list"><a class="menu-profile-list-item" href="http://dir.friendika.com/directory/forum" target="blanc">Public Groups</a></li>
<li id="profile-side-foren" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li>
<li id="profile-side-status" class="menu-profile-list home"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li>
<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li>
<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li>
<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li>
<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="http://dir.friendika.com/directory/forum" target="blanc">Public Groups</a></li>
<li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li>
</ul>
</div>

50
view/theme/diabook-blue/style.css
View file

@ -891,22 +891,47 @@ ul.menu-popup .empty {
text-decoration: none;
}
.menu-profile-side{
list-style: none;
padding-left: 16px;
min-height: 16px;
list-style: none;
padding-left: 0px;
min-height: 0px;
}
.menu-profile-list{
height: auto;
overflow: auto;
padding-top: 3px;
padding-bottom: 3px;
padding-left: 16px;
min-height: 16px;
list-style: none;
}
.menu-profile-list:hover{
background: #EEE;
}
.menu-profile-list-item{
padding-left: 5px;
}
.menu-profile-list-item:hover{
text-decoration: none;
}
/*http://prothemedesign.com/circular-icons/*/
.menu-profile-list.home{
background: url("../../../view/theme/diabook-blue/icons/home.png") no-repeat;
}
.menu-profile-list.photos{
background: url("../../../view/theme/diabook-blue/icons/mess_side.png") no-repeat;
}
.menu-profile-list.events{
background: url("../../../view/theme/diabook-blue/icons/events.png") no-repeat;
}
.menu-profile-list.notes{
background: url("../../../view/theme/diabook-blue/icons/notes.png") no-repeat;
}
.menu-profile-list.foren{
background: url("../../../view/theme/diabook-blue/icons/pubgroups.png") no-repeat;
}
.menu-profile-list.com_side{
background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat;
}
/* aside */
aside {
display: table-cell;
@ -1066,6 +1091,16 @@ aside #side-peoplefind-url {
min-height: 16px;
list-style: none;
}
#side-bar-photos-albums li{
list-style-type: disc;
}
#side-bar-photos-albums ul li{
margin-left: 30px;
padding-left: 0px;
}
#side-bar-photos-albums ul li a{
color: #1872A2;
}
.widget .tool.selected {
background: url("../../../view/theme/diabook-blue/icons/selected.png") no-repeat left center;
}
@ -2207,6 +2242,9 @@ a.mail-list-link {
.calendar {
font-family: Courier, monospace;
}
.calendar.eventcal a {
color: #1872A2;
}
.today {
font-weight: bold;
color: #FF0000;
@ -2380,6 +2418,9 @@ float: left;
padding-bottom: 20px;
position: relative;
margin: 0 10px 10px 0;
overflow: hidden;
float: left;
position: relative;
}
.photo-top-album-name {
position: absolute;
@ -2388,6 +2429,9 @@ float: left;
}
.photo-top-album-link{
color: #1872A2;
}
.photo-top-album-img{
}
/*.photo-top-image-wrapper {
position: relative;

13
view/theme/diabook-blue/theme.php
View file

@ -11,10 +11,10 @@ $a->theme_info = array(
'extends' => 'diabook',
);
//fancybox: provide $photo.href to photo_top.tpl to img in org. scale
//profile_side
$nav['usermenu']=array();
$userinfo = null;
@ -110,10 +110,15 @@ $('html').click(function() {
event.stopPropagation();
});
$(function() {
$('a.lightbox').fancybox(); // Select all links with lightbox class
$(document).ready(function() {
$("a.fancy-photo").fancybox(); // Select all links with lightbox class
$("a.fancy-album").fancybox();
});
</script>
EOT;

7
view/theme/diabook/style.css
View file

@ -485,9 +485,6 @@ code {
#sidebar-group-list .tool:hover {
background: #EEE;
}
#sidebar-pages-list .tool:hover {
background: #EEE;
}
.tool .label {
float: left;
}
@ -1337,14 +1334,14 @@ body .pageheader{
}
.tag {
/*background: url("../../../images/tag_b.png") repeat-x center left;*/
color: #999;
color: #3465A4;
padding-left: 3px;
font-size: 12px;
}
.tag a {
padding-right: 5px;
/*background: url("../../../images/tag.png") no-repeat center right;*/
color: #999;
color: #3465A4;
}
.wwto {
position: absolute !important;

7
view/theme/diabook/wall_item.tpl
View file

@ -13,8 +13,7 @@
<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
</a>
<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu"
id="wall-item-photo-menu-button-$item.id">menu</a>
<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
$item.item_photo_menu
</ul>
@ -22,8 +21,7 @@ id="wall-item-photo-menu-button-$item.id">menu</a>
</div>
</div>
<div class="wall-item-actions-author">
<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span
class="wall-item-name$item.sparkle">$item.name</span></a>
<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a>
<span class="wall-item-ago">-
{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
@ -97,4 +95,3 @@ class="wall-item-name$item.sparkle">$item.name</span></a>
<div class="wall-item-comment-wrapper" >
$item.comment
</div>

9
view/theme/diabook/wallwall_item.tpl
View file

@ -18,8 +18,7 @@
<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
</a>
<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu"
id="wall-item-photo-menu-button-$item.id">menu</a>
<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
$item.item_photo_menu
</ul>
@ -27,10 +26,8 @@ id="wall-item-photo-menu-button-$item.id">menu</a>
</div>
</div>
<div class="wall-item-actions-author">
<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span
class="wall-item-name$item.sparkle">$item.name</span></a>
$item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle"
id="wall-item-ownername-$item.id">$item.owner_name</span></a>
<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a>
$item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a>
$item.vwall <span class="wall-item-ago">- &nbsp;
{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}