clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'pull'

This commit is contained in:
friendica 2012-03-21 21:43:10 -07:00
parent f1bbe03df1 294d39f96f
commit ec890f3ce2
14 changed files with 65 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
view/theme/diabook-blue/icons/head.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 383 B

7
view/theme/diabook-blue/photo_album.tpl
View File

@ -1,7 +0,0 @@
<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
View File

@ -1,7 +0,0 @@
<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>

15
view/theme/diabook-blue/style.css
View File

@ -2411,21 +2411,22 @@ float: left;
-moz-box-shadow: 0 0 5px #888; -moz-box-shadow: 0 0 5px #888;
-webkit-box-shadow: 0 0 5px #888; -webkit-box-shadow: 0 0 5px #888;
box-shadow: 0 0 5px #888; box-shadow: 0 0 5px #888;
background-color: #EEE; background-color: #000;
-webkit-border-radius: 5px; -webkit-border-radius: 5px;
-moz-border-radius: 5px; -moz-border-radius: 5px;
border-radius: 5px; border-radius: 5px;
padding-bottom: 20px; padding-bottom: 20px;
position: relative; position: relative;
margin: 0 10px 10px 0; margin: 0 10px 10px 0;
overflow: hidden; width: 200px; height: 140px;
float: left; overflow: hidden;
position: relative;
} }
.photo-top-album-name { .photo-top-album-name {
position: absolute; width: 100%;
bottom: 0; position: absolute;
padding: 0 5px; bottom: 0px;
padding-left: 3px;
background-color: #EEE;
} }
.photo-top-album-link{ .photo-top-album-link{
color: #1872A2; color: #1872A2;

BIN
view/theme/diabook/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/icons/events.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 663 B

BIN
view/theme/diabook/icons/head.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 383 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 722 B

BIN
view/theme/diabook/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/icons/notes.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 739 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 710 B

12
view/theme/diabook/profile_side.tpl
View File

@ -7,12 +7,12 @@
</div> </div>
<ul id="profile-side-menu" class="menu-profile-side"> <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-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"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.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"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.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"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.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"><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 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"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</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> </ul>
</div> </div>

66
view/theme/diabook/style.css
View File

@ -881,22 +881,47 @@ ul.menu-popup .empty {
text-decoration: none; text-decoration: none;
} }
.menu-profile-side{ .menu-profile-side{
list-style: none; list-style: none;
padding-left: 16px; padding-left: 0px;
min-height: 16px; min-height: 0px;
} }
.menu-profile-list{ .menu-profile-list{
height: auto; height: auto;
overflow: auto; overflow: auto;
padding-top: 3px; padding-top: 3px;
padding-bottom: 3px; padding-bottom: 3px;
padding-left: 16px;
min-height: 16px;
list-style: none;
} }
.menu-profile-list:hover{ .menu-profile-list:hover{
background: #EEE; background: #EEE;
} }
.menu-profile-list-item{
padding-left: 5px;
}
.menu-profile-list-item:hover{ .menu-profile-list-item:hover{
text-decoration: none; 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 */
aside { aside {
@ -2348,7 +2373,13 @@ float: left;
.contact-details { .contact-details {
color: #999999; color: #999999;
} }
#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{ #side-bar-photos-albums{
margin-top: 15px; margin-top: 15px;
} }
@ -2362,39 +2393,40 @@ float: left;
-moz-box-shadow: 0 0 5px #888; -moz-box-shadow: 0 0 5px #888;
-webkit-box-shadow: 0 0 5px #888; -webkit-box-shadow: 0 0 5px #888;
box-shadow: 0 0 5px #888; box-shadow: 0 0 5px #888;
background-color: #EEE; background-color: #000;
-webkit-border-radius: 5px; -webkit-border-radius: 5px;
-moz-border-radius: 5px; -moz-border-radius: 5px;
border-radius: 5px; border-radius: 5px;
padding-bottom: 20px; padding-bottom: 20px;
position: relative; position: relative;
margin: 0 10px 10px 0; margin: 0 10px 10px 0;
width: 200px; height: 140px;
overflow: hidden;
} }
/*
.photo-top-album-name { .photo-top-album-name {
position: absolute; position: absolute;
bottom: 0; bottom: 0;
padding: 0 5px; padding: 0 5px;
} }*/
.photo-top-album-link{
color: #1872A2;
}
/*.photo-top-image-wrapper { /*.photo-top-image-wrapper {
position: relative; position: relative;
float: left; float: left;
margin-top: 15px; margin-top: 15px;
margin-right: 15px; margin-right: 15px;
width: 200px; height: 200px; width: 200px; height: 200px;
overflow: hidden;
} }*/
.photo-top-album-name { .photo-top-album-name {
width: 100%; width: 100%;
min-height: 2em;
position: absolute; position: absolute;
bottom: 0px; bottom: 0px;
padding: 0px 3px; padding-left: 3px;
padding-top: 0.5em; background-color: #EEE;
background-color: rgb(255, 255, 255); }
}*/ .photo-top-album-link{
color: #3465A4;
}
#photo-top-end { #photo-top-end {
clear: both; clear: both;
} }

4
view/theme/diabook/theme.php
View File

@ -1,8 +1,8 @@
<?php <?php
/* /*
* Name: Diabook-blue * Name: Diabook
* Description: Diabook-blue: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
* Version: * Version:
* Author: * Author:
*/ */