Merge https://github.com/friendica/friendica into pull
This commit is contained in:
friendica
commit
4cd3d5cd02
Binary file not shown.
|
Before Width: | Height: | Size: 391 B After Width: | Height: | Size: 834 B |
Binary file not shown.
|
Before Width: | Height: | Size: 429 B After Width: | Height: | Size: 715 B |
|
|
@ -8,10 +8,11 @@
|
|||
|
||||
<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-profile" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.profile.0">$ps.usermenu.profile.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>
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -461,7 +461,7 @@ code {
|
|||
}
|
||||
#panel {
|
||||
position: absolute;
|
||||
width: 10em;
|
||||
width: 12em;
|
||||
background: #ffffff;
|
||||
color: #2d2d2d;
|
||||
margin: 0px;
|
||||
|
|
@ -780,8 +780,6 @@ ul.menu-popup {
|
|||
margin: 0px;
|
||||
padding: 0px;
|
||||
list-style: none;
|
||||
border: 1px solid #364e59;
|
||||
border-top-color: transparent;
|
||||
z-index: 100000;
|
||||
-webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
|
||||
-moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
|
||||
|
|
@ -1922,7 +1920,7 @@ max-width: 85%;
|
|||
}
|
||||
.lframe {
|
||||
float: left;
|
||||
margin: 0px 10px 10px 0px;
|
||||
/*margin: 0px 10px 10px 0px;*/
|
||||
}
|
||||
/* profile match wrapper */
|
||||
.profile-match-wrapper {
|
||||
|
|
@ -2362,8 +2360,36 @@ float: left;
|
|||
.contact-details {
|
||||
color: #999999;
|
||||
}
|
||||
|
||||
.photo-top-image-wrapper {
|
||||
#side-bar-photos-albums{
|
||||
margin-top: 15px;
|
||||
}
|
||||
.photo-top-photo, .photo-album-photo {
|
||||
-webkit-border-radius: 5px 5px 0 0;
|
||||
-moz-border-radius: 5px 5px 0 0;
|
||||
border-radius: 5px 5px 0 0;
|
||||
}
|
||||
.photo-album-image-wrapper, .photo-top-image-wrapper {
|
||||
float: left;
|
||||
-moz-box-shadow: 0 0 5px #888;
|
||||
-webkit-box-shadow: 0 0 5px #888;
|
||||
box-shadow: 0 0 5px #888;
|
||||
background-color: #EEE;
|
||||
-webkit-border-radius: 5px;
|
||||
-moz-border-radius: 5px;
|
||||
border-radius: 5px;
|
||||
padding-bottom: 20px;
|
||||
position: relative;
|
||||
margin: 0 10px 10px 0;
|
||||
}
|
||||
.photo-top-album-name {
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
padding: 0 5px;
|
||||
}
|
||||
.photo-top-album-link{
|
||||
color: #1872A2;
|
||||
}
|
||||
/*.photo-top-image-wrapper {
|
||||
position: relative;
|
||||
float: left;
|
||||
margin-top: 15px;
|
||||
|
|
@ -2379,7 +2405,7 @@ float: left;
|
|||
padding: 0px 3px;
|
||||
padding-top: 0.5em;
|
||||
background-color: rgb(255, 255, 255);
|
||||
}
|
||||
}*/
|
||||
#photo-top-end {
|
||||
clear: both;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ $ps['usermenu'][profile] = Array('profile/' . $a->user['nickname']. '?tab=profil
|
|||
$ps['usermenu'][photos] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos'));
|
||||
$ps['usermenu'][events] = Array('events/', t('Events'), "", t('Your events'));
|
||||
$ps['usermenu'][notes] = Array('notes/', t('Personal notes'), "", t('Your personal photos'));
|
||||
|
||||
$ps['usermenu'][community] = Array('community/', t('Community'), "", "");
|
||||
|
||||
if($is_url = preg_match ("/\bnetwork\b/i", $_SERVER['REQUEST_URI'])) {
|
||||
$tpl = get_markup_template('profile_side.tpl');
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 391 B After Width: | Height: | Size: 834 B |
Binary file not shown.
|
Before Width: | Height: | Size: 429 B After Width: | Height: | Size: 715 B |
|
|
@ -8,10 +8,11 @@
|
|||
|
||||
<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-profile" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.profile.0">$ps.usermenu.profile.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>
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -462,7 +462,7 @@ code {
|
|||
}
|
||||
#panel {
|
||||
position: absolute;
|
||||
width: 10em;
|
||||
width: 12em;
|
||||
background: #ffffff;
|
||||
color: #2d2d2d;
|
||||
margin: 0px;
|
||||
|
|
@ -769,8 +769,6 @@ ul.menu-popup {
|
|||
margin: 0px;
|
||||
padding: 0px;
|
||||
list-style: none;
|
||||
border: 1px solid #364e59;
|
||||
border-top-color: transparent;
|
||||
z-index: 100000;
|
||||
-webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
|
||||
-moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
|
||||
|
|
@ -1904,7 +1902,6 @@ ul.tabs li .active {
|
|||
/* photo */
|
||||
.lframe {
|
||||
float: left;
|
||||
margin: 0px 10px 10px 0px;
|
||||
}
|
||||
/* profile match wrapper */
|
||||
.profile-match-wrapper {
|
||||
|
|
@ -2352,7 +2349,36 @@ float: left;
|
|||
color: #999999;
|
||||
}
|
||||
|
||||
.photo-top-image-wrapper {
|
||||
#side-bar-photos-albums{
|
||||
margin-top: 15px;
|
||||
}
|
||||
.photo-top-photo, .photo-album-photo {
|
||||
-webkit-border-radius: 5px 5px 0 0;
|
||||
-moz-border-radius: 5px 5px 0 0;
|
||||
border-radius: 5px 5px 0 0;
|
||||
}
|
||||
.photo-album-image-wrapper, .photo-top-image-wrapper {
|
||||
float: left;
|
||||
-moz-box-shadow: 0 0 5px #888;
|
||||
-webkit-box-shadow: 0 0 5px #888;
|
||||
box-shadow: 0 0 5px #888;
|
||||
background-color: #EEE;
|
||||
-webkit-border-radius: 5px;
|
||||
-moz-border-radius: 5px;
|
||||
border-radius: 5px;
|
||||
padding-bottom: 20px;
|
||||
position: relative;
|
||||
margin: 0 10px 10px 0;
|
||||
}
|
||||
.photo-top-album-name {
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
padding: 0 5px;
|
||||
}
|
||||
.photo-top-album-link{
|
||||
color: #1872A2;
|
||||
}
|
||||
/*.photo-top-image-wrapper {
|
||||
position: relative;
|
||||
float: left;
|
||||
margin-top: 15px;
|
||||
|
|
@ -2368,7 +2394,7 @@ float: left;
|
|||
padding: 0px 3px;
|
||||
padding-top: 0.5em;
|
||||
background-color: rgb(255, 255, 255);
|
||||
}
|
||||
}*/
|
||||
#photo-top-end {
|
||||
clear: both;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?php
|
||||
|
||||
/*
|
||||
* Name: Diabook
|
||||
* Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
|
||||
* Name: Diabook-blue
|
||||
* Description: Diabook-blue: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
|
||||
* Version:
|
||||
* Author:
|
||||
*/
|
||||
|
|
@ -34,7 +34,7 @@ $ps['usermenu'][profile] = Array('profile/' . $a->user['nickname']. '?tab=profil
|
|||
$ps['usermenu'][photos] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos'));
|
||||
$ps['usermenu'][events] = Array('events/', t('Events'), "", t('Your events'));
|
||||
$ps['usermenu'][notes] = Array('notes/', t('Personal notes'), "", t('Your personal photos'));
|
||||
|
||||
$ps['usermenu'][community] = Array('community/', t('Community'), "", "");
|
||||
|
||||
if($is_url = preg_match ("/\bnetwork\b/i", $_SERVER['REQUEST_URI'])) {
|
||||
$tpl = get_markup_template('profile_side.tpl');
|
||||
|
|
@ -46,8 +46,7 @@ $a->page['aside'] .= replace_macros($tpl, array(
|
|||
}
|
||||
}
|
||||
|
||||
//js script
|
||||
|
||||
//js scripts
|
||||
$a->page['htmlhead'] .= <<< EOT
|
||||
|
||||
<script>
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user