Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-11 09:02:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote branch 'upstream/master'

Browse source
This commit is contained in:
zottel 2012-03-23 13:29:02 +01:00
commit 14f81eca00
5 changed files with 4953 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
view/theme/diabook/communityhome.tpl
View file

@ -4,6 +4,7 @@
<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; color:#000;" title="Let's talk" target="blank">Let's talk</a><br>
<a href="http://kakste.com/profile/newhere" title="#NewHere" style="margin-left: 10px; color:#000;" target="blank">NewHere</a>
{{ endif }}
{{ if $lastusers_title }}
<h3>$lastusers_title</h3>
<div class='items-wrapper'>

2461
view/theme/diabook/style-network.css Normal file
View file

File diff suppressed because it is too large Load diff

2461
view/theme/diabook/style-profile.css Normal file
View file

File diff suppressed because it is too large Load diff

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

@ -102,7 +102,6 @@
.icon.recycle { background-image: url("../../../view/theme/diabook/icons/recycle.png");}
.icon.remote-link { background-image: url("../../../view/theme/diabook/icons/remote.png");}
.icon.tagged { background-image: url("../../../view/theme/diabook/icons/tagged.png");}
.icon.file-as { background-image: url("../../../view/theme/diabook/icons/file_as.png");}
.star-item.icon.unstarred { background-image: url("../../../view/theme/diabook/icons/unstarred.png");}
.star-item.icon.starred { background-image: url("../../../view/theme/diabook/icons/starred.png");}
.icon.link { background-image: url("../../../view/theme/diabook/icons/link.png");}
@ -385,7 +384,7 @@
.hide-comments-outer {
margin-left: 80px;
margin-bottom: 5px;
width: 484px;
width: 684px;
border-bottom: 1px solid #BDCDD4;
border-top: 1px solid #BDCDD4;
@ -928,8 +927,8 @@ ul.menu-popup .empty {
aside {
display: table-cell;
vertical-align: top;
width: 160px;
padding: 0px 10px 0px 10px;
width: 180px;
padding: 0px 10px 0px 20px;
border-right: 1px solid #D2D2D2;
float: left;
/* background: #F1F1F1; */
@ -988,13 +987,13 @@ aside #profiles-menu {
width: 20em;
}
aside #search-text {
width: 150px;
width: 173px;
}
aside #side-follow-url {
width: 150px;
width: 173px;
}
aside #side-peoplefind-url {
width: 150px;
width: 173px;
}
#contact-block {
overflow: auto;
@ -1096,7 +1095,7 @@ aside #side-peoplefind-url {
section {
display: table-cell;
vertical-align: top;
width: auto;
width: 800px;
padding: 0px 0px 0px 12px;
}
@ -1145,31 +1144,13 @@ body .pageheader{
#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
margin-bottom: 10px;
}
right_aside {
display: table-cell;
vertical-align: top;
width: 160px;
padding-right: 10px;
/*border-left: 1px solid #D2D2D2;*/
/* background: #F1F1F1; */
}
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px;
margin-top:30px;}
right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }
right_aside .directory-photo { margin: 0px; }
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
right_aside .items-wrapper{ overflow: auto; width: 100%; border-bottom: 1px solid #D2D2D2;}
/* wall item */
.tread-wrapper {
border-bottom: 1px solid #D2D2D2;
position: relative;
padding: 5px;
margin-bottom: 0px;
width: 575px;
width: 775px;
}
.wall-item-decor {
position: absolute;
@ -1180,7 +1161,7 @@ right_aside .items-wrapper{ overflow: auto; width: 100%; border-bottom: 1px soli
.wall-item-container {
display: table;
width: 580px;
width: 780px;
}
@ -1293,7 +1274,7 @@ right_aside .items-wrapper{ overflow: auto; width: 100%; border-bottom: 1px soli
margin-top: 5px;
margin-bottom: 5px;
margin-left: 80px;
width: 500px;
width: 700px;
border-bottom: 1px solid hsl(198, 21%, 79%);
}
.wall-item-container.comment .contact-photo {
@ -1468,7 +1449,7 @@ right_aside .items-wrapper{ overflow: auto; width: 100%; border-bottom: 1px soli
display: none;
}
#jot {
width: 585px;
width: 785px;
margin: 0px 2em 20px 0px;
}
#profile-jot-form #profile-jot-text {
@ -1485,7 +1466,7 @@ right_aside .items-wrapper{ overflow: auto; width: 100%; border-bottom: 1px soli
padding: 0px;
height: 40px;
overflow: none;
width: 583px;
width: 783px;
background-color: #fff;
border-bottom: 2px solid #9eabb0;
}
@ -1574,7 +1555,7 @@ right_aside .items-wrapper{ overflow: auto; width: 100%; border-bottom: 1px soli
font-weight: normal;
}
#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{
width: 585px;
width: 785px;
height: 100px;
}
#jot #jot-title:hover {
@ -1609,12 +1590,12 @@ right_aside .items-wrapper{ overflow: auto; width: 100%; border-bottom: 1px soli
}
#profile-jot-wrapper{
margin: 0 2em 20px 0;
width: 585px;
width: 785px;
}
#profile-jot-submit-wrapper {
margin-bottom: 50px;
width: 585px;
width: 785px;
}
#profile-jot-submit {

15
view/theme/diabook/theme.php
View file

@ -274,9 +274,24 @@ if($is_url = preg_match ("/\bprofile\b/i", $_SERVER['REQUEST_URI'])) {
}
//change css on network and profilepages
$cssFile = null;
if($is_url = preg_match ("/\bnetwork\b/i", $_SERVER['REQUEST_URI'])) {
$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook/style-network.css";
}
if($is_url = preg_match ("/\bprofile\b/i", $_SERVER['REQUEST_URI'])) {
$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook/style-profile.css";
}
//js scripts
$a->page['htmlhead'] .= <<< EOT
<link rel="stylesheet" type="text/css" href="$cssFile" />
<script>
//contacts