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

Merge pull request #191 from tomtom84/master 

bug-fixes in diabook-derivates
This commit is contained in:
tomtom84 2012-03-31 02:11:30 -07:00
parent 3d2bcaa5fc 0b41654935
commit ee9a3eb163
17 changed files with 249 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
view/theme/diabook-aerith/icons/photo-menu.jpg Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 459 B

12
view/theme/diabook-aerith/jot.tpl
View File

@ -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>

9
view/theme/diabook-aerith/style-network.css
View File

@ -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;

95
view/theme/diabook-aerith/style.css
View File

@ -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;

8
view/theme/diabook-aerith/theme.php
View File

@ -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";
@ -256,7 +256,7 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
// custom css
if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
//if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
//load jquery.cookie.js
$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/js/jquery.cookie.js";

12
view/theme/diabook-blue/jot.tpl
View File

@ -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;*/" >

1
view/theme/diabook-blue/style-network.css
View File

@ -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");

1
view/theme/diabook-blue/style-profile.css
View File

@ -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");

BIN
view/theme/diabook-red/icons/photo-menu.jpg Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 459 B

12
view/theme/diabook-red/jot.tpl
View File

@ -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;*/" >

8
view/theme/diabook-red/style-network.css
View File

@ -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 {

4
view/theme/diabook-red/style-profile.css
View File

@ -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 {

105
view/theme/diabook-red/style.css
View File

@ -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;

8
view/theme/diabook-red/theme.php
View File

@ -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";
@ -256,7 +256,7 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
// custom css
if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
//if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
//load jquery.cookie.js
$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/js/jquery.cookie.js";

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

@ -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;*/" >

1
view/theme/diabook/style-network.css
View File

@ -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");

1
view/theme/diabook/style-profile.css
View File

@ -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");