Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-23 08:40:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix /display bug; oembed audio bug; other tweaks

Browse source
This commit is contained in:
Zach Prezkuta 2012-07-31 18:53:18 -06:00
parent b522ffeea5
commit 885bb50f0d
15 changed files with 45 additions and 3681 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
mod/display.php
View file

@ -16,15 +16,7 @@ function display_content(&$a) {
$o = '<div id="live-display"></div>' . "\r\n"; $o = '<div id="live-display"></div>' . "\r\n";
$a->page['htmlhead'] .= <<<EOT $a->page['htmlhead'] .= get_markup_template('display-head.tpl');
<script>
$(document).ready(function() {
$(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
// make auto-complete work in more places
$(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl");
});
</script>
EOT;
$nick = (($a->argc > 1) ? $a->argv[1] : ''); $nick = (($a->argc > 1) ? $a->argv[1] : '');

8
view/display-head.tpl Normal file
View file

@ -0,0 +1,8 @@
<script>
$(document).ready(function() {
$(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
// make auto-complete work in more places
$(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl");
});
</script>

4
view/theme/frost-mobile/display-head.tpl Normal file
View file

@ -0,0 +1,4 @@
<script>
window.autoCompleteType = 'display-head';
</script>

7
view/theme/frost-mobile/js/theme.js
View file

@ -93,6 +93,13 @@ $j(document).ready(function() {
$j('#drop-' + id).removeClass('icon');$j('#drop-' + id).removeClass('drophide'); $j('#drop-' + id).addClass('iconspacer');} $j('#drop-' + id).removeClass('icon');$j('#drop-' + id).removeClass('drophide'); $j('#drop-' + id).addClass('iconspacer');}
);*/ );*/
if(window.autoCompleteType == "display-head") {
//$j(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
// make auto-complete work in more places
//$j(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl");
$j(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
}
if(window.aclType == "event_head") { if(window.aclType == "event_head") {
$j('#events-calendar').fullCalendar({ $j('#events-calendar').fullCalendar({
events: baseurl + '/events/json/', events: baseurl + '/events/json/',

2
view/theme/frost-mobile/js/theme.min.js vendored
View file

File diff suppressed because one or more lines are too long

6
view/theme/frost-mobile/style.css
View file

@ -3462,7 +3462,7 @@ aside input[type='text'] {
background-image: url('../../../images/icons.png'); background-image: url('../../../images/icons.png');
} }
.article { background-position: 0px 0px;} .article { background-position: 0px 0px;}
.audio { display: none; background-position: -16px 0px;} .icon.audio { display: none; background-position: -16px 0px;}
.block { background-position: -32px 0px;} .block { background-position: -32px 0px;}
/*.drop { background-position: -48px 0px;} /*.drop { background-position: -48px 0px;}
.drophide { background-position: -64px 0px;}*/ .drophide { background-position: -64px 0px;}*/
@ -3635,9 +3635,9 @@ aside input[type='text'] {
margin: 20px 10px 0 0; margin: 20px 10px 0 0;
visibility: none; visibility: none;
} }
[class^="comment-edit-bb-end"] { /*[class^="comment-edit-bb-end"] {
clear: both; clear: both;
} }*/
.editicon { .editicon {
display: inline-block; display: inline-block;
background-size: 100% 100%; background-size: 100% 100%;

2
view/theme/frost-mobile/wall_item.tpl
View file

@ -51,7 +51,7 @@
</div> </div>
{{ endif }} {{ endif }}
{{ if $item.plink }} {{ if $item.plink }}
<!--<div class="wall-item-links-wrapper">--><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="wall-item-links-wrapper icon remote-link$item.sparkle"></a><!--</div>--> <!--<div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="wall-item-links-wrapper icon remote-link$item.sparkle"></a></div>-->
{{ endif }} {{ endif }}
{{ if $item.edpost }} {{ if $item.edpost }}
<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a> <a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>

4
view/theme/frost-mobile/wallwall_item.tpl
View file

@ -78,9 +78,9 @@
<div class="wall-item-like $item.indent" id="wall-item-like-$item.id">$item.like</div> <div class="wall-item-like $item.indent" id="wall-item-like-$item.id">$item.like</div>
<div class="wall-item-dislike $item.indent" id="wall-item-dislike-$item.id">$item.dislike</div> <div class="wall-item-dislike $item.indent" id="wall-item-dislike-$item.id">$item.dislike</div>
<div class="wall-item-comment-separator"></div> <div class="wall-item-comment-separator"></div>
<!-- <div class="wall-item-comment-wrapper">--> <!--<div class="wall-item-comment-wrapper">-->
$item.comment $item.comment
<!-- </div>--> <!--</div>-->
<!--<div class="wall-item-outside-wrapper-end$item.indent" ></div>--> <!--<div class="wall-item-outside-wrapper-end$item.indent" ></div>-->
<!--</div>--> <!--</div>-->

4
view/theme/frost/display-head.tpl Normal file
View file

@ -0,0 +1,4 @@
<script>
window.autoCompleteType = 'display-head';
</script>

7
view/theme/frost/js/theme.js
View file

@ -78,6 +78,13 @@ $j(document).ready(function() {
return false; return false;
});*/ });*/
if(window.autoCompleteType == "display-head") {
//$j(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
// make auto-complete work in more places
//$j(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl");
$j(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
}
if(window.aclType == "event_head") { if(window.aclType == "event_head") {
$j('#events-calendar').fullCalendar({ $j('#events-calendar').fullCalendar({
events: baseurl + '/events/json/', events: baseurl + '/events/json/',

2
view/theme/frost/js/theme.min.js vendored
View file

File diff suppressed because one or more lines are too long

4
view/theme/frost/style.css
View file

@ -3525,9 +3525,9 @@ aside input[type='text'] {
margin: 10px 10px 0 0; margin: 10px 10px 0 0;
visibility: none; visibility: none;
} }
[class^="comment-edit-bb-end"] { /*[class^="comment-edit-bb-end"] {
clear: both; clear: both;
} }*/
.editicon { .editicon {
display: inline-block; display: inline-block;
/* background-image: url(bbedit.png); /* background-image: url(bbedit.png);

3658
view/theme/frost/style.css.orig
View file

File diff suppressed because it is too large Load diff

4
view/theme/frost/wall_item.tpl
View file

@ -71,9 +71,9 @@
<!--<div class="wall-item-wrapper-end"></div>--> <!--<div class="wall-item-wrapper-end"></div>-->
<div class="wall-item-like $item.indent" id="wall-item-like-$item.id">$item.like</div> <div class="wall-item-like $item.indent" id="wall-item-like-$item.id">$item.like</div>
<div class="wall-item-dislike $item.indent" id="wall-item-dislike-$item.id">$item.dislike</div> <div class="wall-item-dislike $item.indent" id="wall-item-dislike-$item.id">$item.dislike</div>
<!-- <div class="wall-item-comment-wrapper" >--> <!--<div class="wall-item-comment-wrapper" >-->
$item.comment $item.comment
<!-- </div>--> <!--</div>-->
<!--<div class="wall-item-outside-wrapper-end$item.indent" ></div>--> <!--<div class="wall-item-outside-wrapper-end$item.indent" ></div>-->
<!--</div>--> <!--</div>-->

4
view/theme/frost/wallwall_item.tpl
View file

@ -77,9 +77,9 @@
<div class="wall-item-like $item.indent" id="wall-item-like-$item.id">$item.like</div> <div class="wall-item-like $item.indent" id="wall-item-like-$item.id">$item.like</div>
<div class="wall-item-dislike $item.indent" id="wall-item-dislike-$item.id">$item.dislike</div> <div class="wall-item-dislike $item.indent" id="wall-item-dislike-$item.id">$item.dislike</div>
<div class="wall-item-comment-separator"></div> <div class="wall-item-comment-separator"></div>
<!-- <div class="wall-item-comment-wrapper">--> <!--<div class="wall-item-comment-wrapper">-->
$item.comment $item.comment
<!-- </div>--> <!--</div>-->
<!--<div class="wall-item-outside-wrapper-end$item.indent" ></div>--> <!--<div class="wall-item-outside-wrapper-end$item.indent" ></div>-->
<!--</div>--> <!--</div>-->