Merge branch 'pull'
This commit is contained in:
friendica
commit
d5a31e5791
25 changed files with 355 additions and 116 deletions
|
|
@ -18,14 +18,14 @@
|
|||
{{ if $lastusers_title }}
|
||||
<h3>Connectable Services<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="close"></a></h3>
|
||||
<div id="right_service_icons" style="margin-left: 16px; margin-top: 5px;">
|
||||
<a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook-blue/icons/facebook.png" title="Facebook"></a>
|
||||
<a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook-blue/icons/StatusNet.png?" title="StatusNet"></a>
|
||||
<a href="$url/settings/connectors"><img alt="LiveJournal" src="view/theme/diabook-blue/icons/livejournal.png?" title="LiveJournal"></a>
|
||||
<a href="$url/settings/connectors"><img alt="Posterous" src="view/theme/diabook-blue/icons/posterous.png?" title="Posterous"></a>
|
||||
<a href="$url/settings/connectors"><img alt="Tumblr" src="view/theme/diabook-blue/icons/tumblr.png?" title="Tumblr"></a>
|
||||
<a href="$url/settings/connectors"><img alt="Twitter" src="view/theme/diabook-blue/icons/twitter.png?" title="Twitter"></a>
|
||||
<a href="$url/settings/connectors"><img alt="WordPress" src="view/theme/diabook-blue/icons/wordpress.png?" title="WordPress"></a>
|
||||
<a href="$url/settings/connectors"><img alt="E-Mail" src="view/theme/diabook-blue/icons/email.png?" title="E-Mail"></a>
|
||||
<a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook-aerith/icons/facebook.png" title="Facebook"></a>
|
||||
<a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook-aerith/icons/StatusNet.png?" title="StatusNet"></a>
|
||||
<a href="$url/settings/connectors"><img alt="LiveJournal" src="view/theme/diabook-aerith/icons/livejournal.png?" title="LiveJournal"></a>
|
||||
<a href="$url/settings/connectors"><img alt="Posterous" src="view/theme/diabook-aerith/icons/posterous.png?" title="Posterous"></a>
|
||||
<a href="$url/settings/connectors"><img alt="Tumblr" src="view/theme/diabook-aerith/icons/tumblr.png?" title="Tumblr"></a>
|
||||
<a href="$url/settings/connectors"><img alt="Twitter" src="view/theme/diabook-aerith/icons/twitter.png?" title="Twitter"></a>
|
||||
<a href="$url/settings/connectors"><img alt="WordPress" src="view/theme/diabook-aerith/icons/wordpress.png?" title="WordPress"></a>
|
||||
<a href="$url/settings/connectors"><img alt="E-Mail" src="view/theme/diabook-aerith/icons/email.png?" title="E-Mail"></a>
|
||||
</div>
|
||||
{{ endif }}
|
||||
</div>
|
||||
|
|
|
|||
BIN
view/theme/diabook-aerith/icons/photo-menu.jpg
Executable file
BIN
view/theme/diabook-aerith/icons/photo-menu.jpg
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 459 B |
|
|
@ -21,26 +21,26 @@
|
|||
|
||||
<div id="profile-jot-submit-wrapper" class="jothidden">
|
||||
|
||||
<div id="profile-upload-wrapper" style="/*display: $visitor;*/" >
|
||||
<div id="profile-upload-wrapper" style="display: $visitor;" >
|
||||
<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="camera" title="$upload"></a></div>
|
||||
</div>
|
||||
<div id="profile-attach-wrapper" style="/*display: $visitor;*/" >
|
||||
<div id="profile-attach-wrapper" style="display: $visitor;" >
|
||||
<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="attach" title="$attach"></a></div>
|
||||
</div>
|
||||
|
||||
<div id="profile-link-wrapper" style="/*display: $visitor;*/" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
|
||||
<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
|
||||
<a id="profile-link" class="weblink" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
|
||||
</div>
|
||||
<div id="profile-video-wrapper" style="/*display: $visitor;*/" >
|
||||
<div id="profile-video-wrapper" style="display: $visitor;" >
|
||||
<a id="profile-video" class="video2" title="$video" onclick="jotVideoURL();return false;"></a>
|
||||
</div>
|
||||
<div id="profile-audio-wrapper" style="/*display: $visitor;*/" >
|
||||
<a id="profile-audio" class="audio2" title="$audio" onclick="jotAudioURL();return false;"></a>
|
||||
</div>
|
||||
<div id="profile-location-wrapper" style="/*display: $visitor;*/" >
|
||||
<div id="profile-location-wrapper" style="display: $visitor;" >
|
||||
<a id="profile-location" class="globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
|
||||
</div>
|
||||
<div id="profile-nolocation-wrapper" style="/*display: none;*/" >
|
||||
<div id="profile-nolocation-wrapper" style="display: none;" >
|
||||
<a id="profile-nolocation" class="noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -135,9 +135,9 @@
|
|||
</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; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook-aerith/icons/scroll_top.png" title="scroll to top"></a></div>
|
||||
<div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div>
|
||||
<div style="position: fixed; bottom: 23px; 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>
|
||||
<div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook-aerith/icons/bluebug.png" title="report bugs for the theme diabook-aerith"/></a></div>
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -492,7 +492,7 @@ code {
|
|||
float: right;
|
||||
}
|
||||
.tool a {
|
||||
color: ##3F8FBA;
|
||||
color: #3465A4;
|
||||
}
|
||||
.tool a:hover {
|
||||
text-decoration: none;
|
||||
|
|
@ -912,6 +912,10 @@ ul.menu-popup .empty {
|
|||
/*profile_side*/
|
||||
#profile_side {
|
||||
margin-bottom: 30px;
|
||||
|
||||
}
|
||||
#profile_side a{
|
||||
color: #333;
|
||||
}
|
||||
#ps-usericon{
|
||||
height: 25px
|
||||
|
|
@ -1282,7 +1286,8 @@ right_aside .icon {width: 10px; height: 10px;}
|
|||
-ms-transition: all 0.2s ease-in-out;
|
||||
transition: all 0.2s ease-in-out;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* wall item */
|
||||
.tread-wrapper {
|
||||
border-bottom: 1px solid #D2D2D2;
|
||||
|
|
|
|||
|
|
@ -1053,6 +1053,16 @@ aside #side-peoplefind-url {
|
|||
overflow: auto;
|
||||
height: auto;
|
||||
}
|
||||
aside #likes a, a:visited, a:link {
|
||||
color: #3465A4;
|
||||
text-decoration: none;
|
||||
cursor: pointer;
|
||||
|
||||
}
|
||||
aside #likes a:hover{
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
#contact-block .contact-block-h4 {
|
||||
float: left;
|
||||
margin: 5px 0px;
|
||||
|
|
@ -1223,6 +1233,91 @@ body .pageheader{
|
|||
.tread-wrapper a{
|
||||
color: #3465A4;
|
||||
}
|
||||
.wall-item-photo-menu-button {
|
||||
display: block;
|
||||
position: absolute;
|
||||
background-image: url("../../../view/theme/diabook-aerith/icons/photo-menu.jpg");
|
||||
background-position: top left;
|
||||
background-repeat: no-repeat;
|
||||
margin: 0px;
|
||||
padding: 0px;
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
top: 90px;
|
||||
left: 17px;
|
||||
overflow: hidden;
|
||||
text-indent: 40px;
|
||||
display: none;
|
||||
}
|
||||
.wall-item-content-wrapper {
|
||||
margin-top: 10px;
|
||||
border: 1px solid #CCC;
|
||||
-moz-border-radius: 3px;
|
||||
border-radius: 3px;
|
||||
display: table;
|
||||
width: 775px;
|
||||
}
|
||||
.wall-item-info {
|
||||
/*display: block;
|
||||
float: left;
|
||||
width: 110px;
|
||||
margin-right: 10px;*/
|
||||
display: table-cell;
|
||||
vertical-align: top;
|
||||
text-align: left;
|
||||
width: 80px;
|
||||
}
|
||||
.wall-item-content {
|
||||
font-size: 12.5px;
|
||||
max-width: 720px;
|
||||
word-wrap: break-word;
|
||||
line-height: 1.2;
|
||||
}
|
||||
.wrapper-end {
|
||||
clear: both;
|
||||
}
|
||||
.wall-item-photo-wrapper {
|
||||
margin-top: 10px;
|
||||
margin-left: 10px;
|
||||
margin-bottom: 10px;
|
||||
width: 100px;
|
||||
}
|
||||
.wall-item-photo-menu ul { margin:0px; padding: 0px; list-style: none }
|
||||
.wall-item-photo-menu li a { display: block; padding: 2px; }
|
||||
.wall-item-photo-menu li a:hover { color: #FFFFFF; background: #3465A4; text-decoration: none; }
|
||||
.wall-item-wrapper {
|
||||
margin-left: 10px;
|
||||
}
|
||||
.wall-item-title-end {
|
||||
clear: both;
|
||||
}
|
||||
|
||||
.wall-item-body {
|
||||
float: left;
|
||||
/*width: 450px;*/
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
.wall-item-tools {
|
||||
clear: both;
|
||||
background-image: url("head.jpg");
|
||||
background-position: 0 -20px;
|
||||
background-repeat: repeat-x;
|
||||
padding: 5px 10px 0px;
|
||||
}
|
||||
.wall-item-author {
|
||||
margin-top: 10px;
|
||||
}
|
||||
.wall-item-photo-menu {
|
||||
width: auto;
|
||||
border: 2px solid #444;
|
||||
background: white;
|
||||
position: absolute;
|
||||
left: 10px;
|
||||
top: 90px;
|
||||
display: none;
|
||||
z-index: 10000;
|
||||
}
|
||||
|
||||
.wall-item-decor {
|
||||
position: absolute;
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ $cssFile = null;
|
|||
/**
|
||||
* prints last community activity
|
||||
*/
|
||||
function diabook_blue_community_info(){
|
||||
function diabook_aerith_community_info(){
|
||||
$a = get_app();
|
||||
//right_aside at networkpages
|
||||
|
||||
|
|
@ -234,7 +234,7 @@ if ($a->argv[0] === "network" && local_user()){
|
|||
|
||||
if($ccCookie != "8") {
|
||||
// COMMUNITY
|
||||
diabook_blue_community_info();
|
||||
diabook_aerith_community_info();
|
||||
|
||||
// CUSTOM CSS
|
||||
$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-network.css";
|
||||
|
|
@ -247,7 +247,7 @@ if ($a->argv[0] === "network" && local_user()){
|
|||
if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
|
||||
if($ccCookie != "8") {
|
||||
// COMMUNITY
|
||||
diabook_blue_community_info();
|
||||
diabook_aerith_community_info();
|
||||
|
||||
// CUSTOM CSS
|
||||
$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-profile.css";
|
||||
|
|
|
|||
|
|
@ -21,23 +21,23 @@
|
|||
|
||||
<div id="profile-jot-submit-wrapper" class="jothidden">
|
||||
|
||||
<div id="profile-upload-wrapper" style="/*display: $visitor;*/" >
|
||||
<div id="profile-upload-wrapper" style="display: $visitor;" >
|
||||
<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="camera" title="$upload"></a></div>
|
||||
</div>
|
||||
<div id="profile-attach-wrapper" style="/*display: $visitor;*/" >
|
||||
<div id="profile-attach-wrapper" style="display: $visitor;" >
|
||||
<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="attach" title="$attach"></a></div>
|
||||
</div>
|
||||
|
||||
<div id="profile-link-wrapper" style="/*display: $visitor;*/" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
|
||||
<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
|
||||
<a id="profile-link" class="weblink" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
|
||||
</div>
|
||||
<div id="profile-video-wrapper" style="/*display: $visitor;*/" >
|
||||
<div id="profile-video-wrapper" style="display: $visitor;" >
|
||||
<a id="profile-video" class="video2" title="$video" onclick="jotVideoURL();return false;"></a>
|
||||
</div>
|
||||
<div id="profile-audio-wrapper" style="/*display: $visitor;*/" >
|
||||
<div id="profile-audio-wrapper" style="display: $visitor;" >
|
||||
<a id="profile-audio" class="audio2" title="$audio" onclick="jotAudioURL();return false;"></a>
|
||||
</div>
|
||||
<div id="profile-location-wrapper" style="/*display: $visitor;*/" >
|
||||
<div id="profile-location-wrapper" style="display: $visitor;" >
|
||||
<a id="profile-location" class="globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
|
||||
</div>
|
||||
<div id="profile-nolocation-wrapper" style="/*display: none;*/" >
|
||||
|
|
|
|||
|
|
@ -1226,6 +1226,7 @@ right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow:
|
|||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||
right_aside .icon {width: 10px; height: 10px;}
|
||||
.close_box {
|
||||
background-image: url("../../../view/theme/diabook-blue/icons/close_box.png");
|
||||
|
|
|
|||
|
|
@ -1225,6 +1225,7 @@ right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow:
|
|||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||
right_aside .icon {width: 10px; height: 10px;}
|
||||
.close_box {
|
||||
background-image: url("../../../view/theme/diabook-blue/icons/close_box.png");
|
||||
|
|
|
|||
|
|
@ -18,14 +18,14 @@
|
|||
{{ if $lastusers_title }}
|
||||
<h3>Connectable Services<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="close"></a></h3>
|
||||
<div id="right_service_icons" style="margin-left: 16px; margin-top: 5px;">
|
||||
<a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook-blue/icons/facebook.png" title="Facebook"></a>
|
||||
<a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook-blue/icons/StatusNet.png?" title="StatusNet"></a>
|
||||
<a href="$url/settings/connectors"><img alt="LiveJournal" src="view/theme/diabook-blue/icons/livejournal.png?" title="LiveJournal"></a>
|
||||
<a href="$url/settings/connectors"><img alt="Posterous" src="view/theme/diabook-blue/icons/posterous.png?" title="Posterous"></a>
|
||||
<a href="$url/settings/connectors"><img alt="Tumblr" src="view/theme/diabook-blue/icons/tumblr.png?" title="Tumblr"></a>
|
||||
<a href="$url/settings/connectors"><img alt="Twitter" src="view/theme/diabook-blue/icons/twitter.png?" title="Twitter"></a>
|
||||
<a href="$url/settings/connectors"><img alt="WordPress" src="view/theme/diabook-blue/icons/wordpress.png?" title="WordPress"></a>
|
||||
<a href="$url/settings/connectors"><img alt="E-Mail" src="view/theme/diabook-blue/icons/email.png?" title="E-Mail"></a>
|
||||
<a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook-red/icons/facebook.png" title="Facebook"></a>
|
||||
<a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook-red/icons/StatusNet.png?" title="StatusNet"></a>
|
||||
<a href="$url/settings/connectors"><img alt="LiveJournal" src="view/theme/diabook-red/icons/livejournal.png?" title="LiveJournal"></a>
|
||||
<a href="$url/settings/connectors"><img alt="Posterous" src="view/theme/diabook-red/icons/posterous.png?" title="Posterous"></a>
|
||||
<a href="$url/settings/connectors"><img alt="Tumblr" src="view/theme/diabook-red/icons/tumblr.png?" title="Tumblr"></a>
|
||||
<a href="$url/settings/connectors"><img alt="Twitter" src="view/theme/diabook-red/icons/twitter.png?" title="Twitter"></a>
|
||||
<a href="$url/settings/connectors"><img alt="WordPress" src="view/theme/diabook-red/icons/wordpress.png?" title="WordPress"></a>
|
||||
<a href="$url/settings/connectors"><img alt="E-Mail" src="view/theme/diabook-red/icons/email.png?" title="E-Mail"></a>
|
||||
</div>
|
||||
{{ endif }}
|
||||
</div>
|
||||
|
|
|
|||
BIN
view/theme/diabook-red/icons/photo-menu.jpg
Executable file
BIN
view/theme/diabook-red/icons/photo-menu.jpg
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 459 B |
|
|
@ -21,23 +21,23 @@
|
|||
|
||||
<div id="profile-jot-submit-wrapper" class="jothidden">
|
||||
|
||||
<div id="profile-upload-wrapper" style="/*display: $visitor;*/" >
|
||||
<div id="profile-upload-wrapper" style="display: $visitor;" >
|
||||
<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="camera" title="$upload"></a></div>
|
||||
</div>
|
||||
<div id="profile-attach-wrapper" style="/*display: $visitor;*/" >
|
||||
<div id="profile-attach-wrapper" style="display: $visitor;" >
|
||||
<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="attach" title="$attach"></a></div>
|
||||
</div>
|
||||
|
||||
<div id="profile-link-wrapper" style="/*display: $visitor;*/" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
|
||||
<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
|
||||
<a id="profile-link" class="weblink" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
|
||||
</div>
|
||||
<div id="profile-video-wrapper" style="/*display: $visitor;*/" >
|
||||
<div id="profile-video-wrapper" style="display: $visitor;" >
|
||||
<a id="profile-video" class="video2" title="$video" onclick="jotVideoURL();return false;"></a>
|
||||
</div>
|
||||
<div id="profile-audio-wrapper" style="/*display: $visitor;*/" >
|
||||
<div id="profile-audio-wrapper" style="display: $visitor;" >
|
||||
<a id="profile-audio" class="audio2" title="$audio" onclick="jotAudioURL();return false;"></a>
|
||||
</div>
|
||||
<div id="profile-location-wrapper" style="/*display: $visitor;*/" >
|
||||
<div id="profile-location-wrapper" style="display: $visitor;" >
|
||||
<a id="profile-location" class="globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
|
||||
</div>
|
||||
<div id="profile-nolocation-wrapper" style="/*display: none;*/" >
|
||||
|
|
|
|||
|
|
@ -135,9 +135,9 @@
|
|||
</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; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook-red/icons/scroll_top.png" title="scroll to top"></a></div>
|
||||
<div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div>
|
||||
<div style="position: fixed; bottom: 23px; 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>
|
||||
<div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook-red/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -439,7 +439,7 @@ a:hover {
|
|||
clear: both;
|
||||
}
|
||||
.fakelink {
|
||||
color: #1872A2;
|
||||
color: #333
|
||||
/* color: #3e3e8c; */
|
||||
text-decoration: none;
|
||||
cursor: pointer;
|
||||
|
|
@ -912,6 +912,10 @@ ul.menu-popup .empty {
|
|||
/*profile_side*/
|
||||
#profile_side {
|
||||
margin-bottom: 30px;
|
||||
|
||||
}
|
||||
#profile_side a{
|
||||
color: #333;
|
||||
}
|
||||
#ps-usericon{
|
||||
height: 25px
|
||||
|
|
@ -1289,7 +1293,7 @@ transition: all 0.2s ease-in-out;
|
|||
width: 575px;
|
||||
}
|
||||
.tread-wrapper a{
|
||||
color: #1872A2;
|
||||
color: red;
|
||||
}
|
||||
|
||||
.wall-item-decor {
|
||||
|
|
|
|||
|
|
@ -440,7 +440,7 @@ a:hover {
|
|||
clear: both;
|
||||
}
|
||||
.fakelink {
|
||||
color: #1872A2;
|
||||
color: #333;
|
||||
/* color: #3e3e8c; */
|
||||
text-decoration: none;
|
||||
cursor: pointer;
|
||||
|
|
@ -1270,7 +1270,7 @@ transition: all 0.2s ease-in-out;
|
|||
width: 575px;
|
||||
}
|
||||
.tread-wrapper a{
|
||||
color: #1872A2;
|
||||
color: red;
|
||||
}
|
||||
|
||||
.wall-item-decor {
|
||||
|
|
|
|||
|
|
@ -404,7 +404,7 @@ h4 {
|
|||
}
|
||||
|
||||
a {
|
||||
color: #333333;
|
||||
color: red;
|
||||
/* color: #3e3e8c; */
|
||||
text-decoration: none;
|
||||
}
|
||||
|
|
@ -437,7 +437,7 @@ a:hover {
|
|||
clear: both;
|
||||
}
|
||||
.fakelink {
|
||||
color: #1872A2;
|
||||
color: red;
|
||||
/* color: #3e3e8c; */
|
||||
text-decoration: none;
|
||||
cursor: pointer;
|
||||
|
|
@ -1218,6 +1218,107 @@ body .pageheader{
|
|||
.tread-wrapper a{
|
||||
color: #1872A2;
|
||||
}
|
||||
/*community-plugin*/
|
||||
aside #likes a, a:visited, a:link {
|
||||
color: red;
|
||||
text-decoration: none;
|
||||
cursor: pointer;
|
||||
|
||||
}
|
||||
aside #likes a:hover{
|
||||
text-decoration: underline;
|
||||
}
|
||||
.wall-item-photo-menu-button {
|
||||
display: block;
|
||||
position: absolute;
|
||||
background-image: url("../../../view/theme/diabook-red/icons/photo-menu.jpg");
|
||||
background-position: top left;
|
||||
background-repeat: no-repeat;
|
||||
margin: 0px;
|
||||
padding: 0px;
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
top: 90px;
|
||||
left: 17px;
|
||||
overflow: hidden;
|
||||
text-indent: 40px;
|
||||
display: none;
|
||||
}
|
||||
.wall-item-name {
|
||||
color: red;
|
||||
}
|
||||
.wall-item-conv a{
|
||||
color: black;
|
||||
}
|
||||
.wall-item-content-wrapper {
|
||||
margin-top: 10px;
|
||||
border: 1px solid #CCC;
|
||||
-moz-border-radius: 3px;
|
||||
border-radius: 3px;
|
||||
display: table;
|
||||
width: 775px;
|
||||
}
|
||||
.wall-item-info {
|
||||
/*display: block;
|
||||
float: left;
|
||||
width: 110px;
|
||||
margin-right: 10px;*/
|
||||
display: table-cell;
|
||||
vertical-align: top;
|
||||
text-align: left;
|
||||
width: 80px;
|
||||
}
|
||||
.wall-item-content {
|
||||
font-size: 12.5px;
|
||||
max-width: 720px;
|
||||
word-wrap: break-word;
|
||||
line-height: 1.2;
|
||||
}
|
||||
.wrapper-end {
|
||||
clear: both;
|
||||
}
|
||||
.wall-item-photo-wrapper {
|
||||
margin-top: 10px;
|
||||
margin-left: 10px;
|
||||
margin-bottom: 10px;
|
||||
width: 100px;
|
||||
}
|
||||
.wall-item-photo-menu ul { margin:0px; padding: 0px; list-style: none }
|
||||
.wall-item-photo-menu li a { display: block; padding: 2px; }
|
||||
.wall-item-photo-menu li a:hover { color: #FFFFFF; background: #3465A4; text-decoration: none; }
|
||||
.wall-item-wrapper {
|
||||
margin-left: 10px;
|
||||
}
|
||||
.wall-item-title-end {
|
||||
clear: both;
|
||||
}
|
||||
|
||||
.wall-item-body {
|
||||
float: left;
|
||||
/*width: 450px;*/
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
.wall-item-tools {
|
||||
clear: both;
|
||||
background-image: url("head.jpg");
|
||||
background-position: 0 -20px;
|
||||
background-repeat: repeat-x;
|
||||
padding: 5px 10px 0px;
|
||||
}
|
||||
.wall-item-author {
|
||||
margin-top: 10px;
|
||||
}
|
||||
.wall-item-photo-menu {
|
||||
width: auto;
|
||||
border: 2px solid #444;
|
||||
background: white;
|
||||
position: absolute;
|
||||
left: 10px;
|
||||
top: 90px;
|
||||
display: none;
|
||||
z-index: 10000;
|
||||
}
|
||||
|
||||
.wall-item-decor {
|
||||
position: absolute;
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ $cssFile = null;
|
|||
/**
|
||||
* prints last community activity
|
||||
*/
|
||||
function diabook_blue_community_info(){
|
||||
function diabook_red_community_info(){
|
||||
$a = get_app();
|
||||
//right_aside at networkpages
|
||||
|
||||
|
|
@ -234,7 +234,7 @@ if ($a->argv[0] === "network" && local_user()){
|
|||
|
||||
if($ccCookie != "8") {
|
||||
// COMMUNITY
|
||||
diabook_blue_community_info();
|
||||
diabook_red_community_info();
|
||||
|
||||
// CUSTOM CSS
|
||||
$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/style-network.css";
|
||||
|
|
@ -247,7 +247,7 @@ if ($a->argv[0] === "network" && local_user()){
|
|||
if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
|
||||
if($ccCookie != "8") {
|
||||
// COMMUNITY
|
||||
diabook_blue_community_info();
|
||||
diabook_red_community_info();
|
||||
|
||||
// CUSTOM CSS
|
||||
$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/style-profile.css";
|
||||
|
|
|
|||
|
|
@ -21,23 +21,23 @@
|
|||
|
||||
<div id="profile-jot-submit-wrapper" class="jothidden">
|
||||
|
||||
<div id="profile-upload-wrapper" style="/*display: $visitor;*/" >
|
||||
<div id="profile-upload-wrapper" style="display: $visitor;" >
|
||||
<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="camera" title="$upload"></a></div>
|
||||
</div>
|
||||
<div id="profile-attach-wrapper" style="/*display: $visitor;*/" >
|
||||
<div id="profile-attach-wrapper" style="display: $visitor;" >
|
||||
<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="attach" title="$attach"></a></div>
|
||||
</div>
|
||||
|
||||
<div id="profile-link-wrapper" style="/*display: $visitor;*/" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
|
||||
<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
|
||||
<a id="profile-link" class="weblink" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
|
||||
</div>
|
||||
<div id="profile-video-wrapper" style="/*display: $visitor;*/" >
|
||||
<div id="profile-video-wrapper" style="display: $visitor;" >
|
||||
<a id="profile-video" class="video2" title="$video" onclick="jotVideoURL();return false;"></a>
|
||||
</div>
|
||||
<div id="profile-audio-wrapper" style="/*display: $visitor;*/" >
|
||||
<div id="profile-audio-wrapper" style="display: $visitor;" >
|
||||
<a id="profile-audio" class="audio2" title="$audio" onclick="jotAudioURL();return false;"></a>
|
||||
</div>
|
||||
<div id="profile-location-wrapper" style="/*display: $visitor;*/" >
|
||||
<div id="profile-location-wrapper" style="display: $visitor;" >
|
||||
<a id="profile-location" class="globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
|
||||
</div>
|
||||
<div id="profile-nolocation-wrapper" style="/*display: none;*/" >
|
||||
|
|
|
|||
|
|
@ -1207,6 +1207,7 @@ right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow:
|
|||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||
right_aside .icon {width: 10px; height: 10px;}
|
||||
.close_box {
|
||||
background-image: url("../../../view/theme/diabook-blue/icons/close_box.png");
|
||||
|
|
|
|||
|
|
@ -1202,6 +1202,7 @@ right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow:
|
|||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||
right_aside .icon {width: 10px; height: 10px;}
|
||||
.close_box {
|
||||
background-image: url("../../../view/theme/diabook-blue/icons/close_box.png");
|
||||
|
|
|
|||
|
|
@ -12,14 +12,15 @@
|
|||
</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>
|
||||
<div class="qcomment-wrapper">
|
||||
<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);">
|
||||
<option value=""></option>
|
||||
{{ for $qcomment as $qc }}
|
||||
<option value="$qc">$qc</option>
|
||||
{{ endfor }}
|
||||
</ul>
|
||||
</select>
|
||||
</div>
|
||||
{{ endif }}
|
||||
|
||||
<div class="comment-edit-text-end"></div>
|
||||
|
|
|
|||
|
|
@ -54,10 +54,14 @@ select {
|
|||
border: 1px #555 dotted;
|
||||
padding: 3px;
|
||||
margin: 2px;
|
||||
color: #eec;
|
||||
background: #2e2f2e;
|
||||
}
|
||||
option {
|
||||
padding: 3px;
|
||||
vertical-align: middle;
|
||||
color: #eec;
|
||||
background: #2e2f2e;
|
||||
}
|
||||
li {
|
||||
padding: 0 0 0 2px;
|
||||
|
|
@ -211,39 +215,51 @@ input[type=submit] {
|
|||
/**
|
||||
* login
|
||||
*/
|
||||
aside .field {
|
||||
overflow: hidden;
|
||||
width: 200px;
|
||||
}
|
||||
#login-extra-links {
|
||||
overflow: auto;
|
||||
padding-top: 140px !important;
|
||||
width: 100%;
|
||||
overflow: auto !important;
|
||||
padding-top: 60px !important;
|
||||
width: 100% !important;
|
||||
}
|
||||
#login-extra-links a {
|
||||
margin-right: 20px;
|
||||
}
|
||||
#login_standard {
|
||||
display: block;
|
||||
float: none;
|
||||
height: 100px;
|
||||
position: absolute;
|
||||
width: 100%;
|
||||
display: block !important;
|
||||
float: none !important;
|
||||
height: 100% !important;
|
||||
position: relative !important;
|
||||
width: 100% !important;
|
||||
}
|
||||
#login_standard .field label {
|
||||
width: 200px;
|
||||
width: 200px !important;
|
||||
}
|
||||
#login_standard input, #login_standard input[type="text"] {
|
||||
margin: 0 0 8px;
|
||||
width: 210px;
|
||||
margin: 0 0 8px !important;
|
||||
width: 210px !important;
|
||||
}
|
||||
#login-submit-wrapper {
|
||||
margin: 0;
|
||||
margin: 0 !important;
|
||||
}
|
||||
#login-submit-button {
|
||||
margin-left: 0px !important;
|
||||
}
|
||||
aside #login_openid {
|
||||
position: relative !important;
|
||||
float: none !important;
|
||||
margin-left: 0px !important;
|
||||
height: auto !important;
|
||||
width: 200px !important;
|
||||
}
|
||||
#login_openid #id_openid_url {
|
||||
width: 200px;
|
||||
width: 180px !important;
|
||||
overflow: hidden !important;
|
||||
}
|
||||
#login_openid label {
|
||||
width: 208px;
|
||||
width: 180px !important;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -525,7 +541,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
|
|||
width: 10em;
|
||||
color: #eec;
|
||||
}
|
||||
nav #user-menu {
|
||||
#user-menu {
|
||||
display: block;
|
||||
width: 75%;
|
||||
margin: 3px 0 0 0;
|
||||
|
|
@ -538,8 +554,12 @@ nav #user-menu {
|
|||
clear: both;
|
||||
top: 4px;
|
||||
left: 10px;
|
||||
padding: 2px;
|
||||
}
|
||||
nav #user-menu-label {
|
||||
#user-menu > a {
|
||||
vertical-align: top;
|
||||
}
|
||||
#user-menu-label {
|
||||
font-size: 12px;
|
||||
padding: 3px 20px 9px 5px;
|
||||
height: 10px;
|
||||
|
|
@ -2874,13 +2894,7 @@ footer {
|
|||
}
|
||||
.qcomment-wrapper {
|
||||
padding: 0px;
|
||||
margin: 2px;
|
||||
list-style-type: none;
|
||||
}
|
||||
.qcomment, .qcomment:hover {
|
||||
display: inline;
|
||||
padding: 5px;
|
||||
margin: 5px;
|
||||
margin: 5px 5px 5px 81%;
|
||||
}
|
||||
.qcomment {
|
||||
opacity: 0.5;
|
||||
|
|
|
|||
|
|
@ -12,14 +12,15 @@
|
|||
</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>
|
||||
<div class="qcomment-wrapper">
|
||||
<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);">
|
||||
<option value=""></option>
|
||||
{{ for $qcomment as $qc }}
|
||||
<option value="$qc">$qc</option>
|
||||
{{ endfor }}
|
||||
</ul>
|
||||
</select>
|
||||
</div>
|
||||
{{ endif }}
|
||||
|
||||
<div class="comment-edit-text-end"></div>
|
||||
|
|
|
|||
|
|
@ -54,10 +54,14 @@ select {
|
|||
border: 1px #555 dotted;
|
||||
padding: 3px;
|
||||
margin: 2px;
|
||||
color: #222;
|
||||
background: #efefef;
|
||||
}
|
||||
option {
|
||||
padding: 3px;
|
||||
vertical-align: middle;
|
||||
color: #222;
|
||||
background: #efefef;
|
||||
}
|
||||
li {
|
||||
padding: 0 0 0 2px;
|
||||
|
|
@ -211,39 +215,51 @@ input[type=submit] {
|
|||
/**
|
||||
* login
|
||||
*/
|
||||
aside .field {
|
||||
overflow: hidden;
|
||||
width: 200px;
|
||||
}
|
||||
#login-extra-links {
|
||||
overflow: auto;
|
||||
padding-top: 140px !important;
|
||||
width: 100%;
|
||||
overflow: auto !important;
|
||||
padding-top: 60px !important;
|
||||
width: 100% !important;
|
||||
}
|
||||
#login-extra-links a {
|
||||
margin-right: 20px;
|
||||
}
|
||||
#login_standard {
|
||||
display: block;
|
||||
float: none;
|
||||
height: 100px;
|
||||
position: absolute;
|
||||
width: 100%;
|
||||
display: block !important;
|
||||
float: none !important;
|
||||
height: 100% !important;
|
||||
position: relative !important;
|
||||
width: 100% !important;
|
||||
}
|
||||
#login_standard .field label {
|
||||
width: 200px;
|
||||
width: 200px !important;
|
||||
}
|
||||
#login_standard input, #login_standard input[type="text"] {
|
||||
margin: 0 0 8px;
|
||||
width: 210px;
|
||||
margin: 0 0 8px !important;
|
||||
width: 210px !important;
|
||||
}
|
||||
#login-submit-wrapper {
|
||||
margin: 0;
|
||||
margin: 0 !important;
|
||||
}
|
||||
#login-submit-button {
|
||||
margin-left: 0px !important;
|
||||
}
|
||||
aside #login_openid {
|
||||
position: relative !important;
|
||||
float: none !important;
|
||||
margin-left: 0px !important;
|
||||
height: auto !important;
|
||||
width: 200px !important;
|
||||
}
|
||||
#login_openid #id_openid_url {
|
||||
width: 200px;
|
||||
width: 180px !important;
|
||||
overflow: hidden !important;
|
||||
}
|
||||
#login_openid label {
|
||||
width: 208px;
|
||||
width: 180px !important;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -525,7 +541,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
|
|||
width: 10em;
|
||||
color: #eec;
|
||||
}
|
||||
nav #user-menu {
|
||||
#user-menu {
|
||||
display: block;
|
||||
width: 75%;
|
||||
margin: 3px 0 0 0;
|
||||
|
|
@ -538,8 +554,12 @@ nav #user-menu {
|
|||
clear: both;
|
||||
top: 4px;
|
||||
left: 10px;
|
||||
padding: 2px;
|
||||
}
|
||||
nav #user-menu-label {
|
||||
#user-menu > a {
|
||||
vertical-align: top;
|
||||
}
|
||||
#user-menu-label {
|
||||
font-size: 12px;
|
||||
padding: 3px 20px 9px 5px;
|
||||
height: 10px;
|
||||
|
|
@ -2874,13 +2894,7 @@ footer {
|
|||
}
|
||||
.qcomment-wrapper {
|
||||
padding: 0px;
|
||||
margin: 2px;
|
||||
list-style-type: none;
|
||||
}
|
||||
.qcomment, .qcomment:hover {
|
||||
display: inline;
|
||||
padding: 5px;
|
||||
margin: 5px;
|
||||
margin: 5px 5px 5px 81%;
|
||||
}
|
||||
.qcomment {
|
||||
opacity: 0.5;
|
||||
|
|
|
|||
Loading…
Reference in a new issue