Browse Source

fix /display bug; oembed audio bug; other tweaks

pull/418/head
Zach Prezkuta 9 years ago
parent
commit
885bb50f0d
15 changed files with 45 additions and 3681 deletions
  1. +1
    -9
      mod/display.php
  2. +8
    -0
      view/display-head.tpl
  3. +4
    -0
      view/theme/frost-mobile/display-head.tpl
  4. +7
    -0
      view/theme/frost-mobile/js/theme.js
  5. +1
    -1
      view/theme/frost-mobile/js/theme.min.js
  6. +3
    -3
      view/theme/frost-mobile/style.css
  7. +1
    -1
      view/theme/frost-mobile/wall_item.tpl
  8. +2
    -2
      view/theme/frost-mobile/wallwall_item.tpl
  9. +4
    -0
      view/theme/frost/display-head.tpl
  10. +7
    -0
      view/theme/frost/js/theme.js
  11. +1
    -1
      view/theme/frost/js/theme.min.js
  12. +2
    -2
      view/theme/frost/style.css
  13. +0
    -3658
      view/theme/frost/style.css.orig
  14. +2
    -2
      view/theme/frost/wall_item.tpl
  15. +2
    -2
      view/theme/frost/wallwall_item.tpl

+ 1
- 9
mod/display.php View File

@ -16,15 +16,7 @@ function display_content(&$a) {
$o = '<div id="live-display"></div>' . "\r\n";
$a->page['htmlhead'] .= <<<EOT
<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;
$a->page['htmlhead'] .= get_markup_template('display-head.tpl');
$nick = (($a->argc > 1) ? $a->argv[1] : '');


+ 8
- 0
view/display-head.tpl 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
- 0
view/theme/frost-mobile/display-head.tpl View File

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

+ 7
- 0
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');}
);*/
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") {
$j('#events-calendar').fullCalendar({
events: baseurl + '/events/json/',


+ 1
- 1
view/theme/frost-mobile/js/theme.min.js
File diff suppressed because it is too large
View File


+ 3
- 3
view/theme/frost-mobile/style.css View File

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


+ 1
- 1
view/theme/frost-mobile/wall_item.tpl View File

@ -51,7 +51,7 @@
</div>
{{ endif }}
{{ 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 }}
{{ if $item.edpost }}
<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>


+ 2
- 2
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-dislike $item.indent" id="wall-item-dislike-$item.id">$item.dislike</div>
<div class="wall-item-comment-separator"></div>
<!-- <div class="wall-item-comment-wrapper">-->
<!--<div class="wall-item-comment-wrapper">-->
$item.comment
<!-- </div>-->
<!--</div>-->
<!--<div class="wall-item-outside-wrapper-end$item.indent" ></div>-->
<!--</div>-->


+ 4
- 0
view/theme/frost/display-head.tpl View File

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

+ 7
- 0
view/theme/frost/js/theme.js View File

@ -78,6 +78,13 @@ $j(document).ready(function() {
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") {
$j('#events-calendar').fullCalendar({
events: baseurl + '/events/json/',


+ 1
- 1
view/theme/frost/js/theme.min.js
File diff suppressed because it is too large
View File


+ 2
- 2
view/theme/frost/style.css View File

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


+ 0
- 3658
view/theme/frost/style.css.orig
File diff suppressed because it is too large
View File


+ 2
- 2
view/theme/frost/wall_item.tpl View File

@ -71,9 +71,9 @@
<!--<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-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
<!-- </div>-->
<!--</div>-->
<!--<div class="wall-item-outside-wrapper-end$item.indent" ></div>-->
<!--</div>-->

+ 2
- 2
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-dislike $item.indent" id="wall-item-dislike-$item.id">$item.dislike</div>
<div class="wall-item-comment-separator"></div>
<!-- <div class="wall-item-comment-wrapper">-->
<!--<div class="wall-item-comment-wrapper">-->
$item.comment
<!-- </div>-->
<!--</div>-->
<!--<div class="wall-item-outside-wrapper-end$item.indent" ></div>-->
<!--</div>-->


Loading…
Cancel
Save