diff options
| author | friendica <info@friendica.com> | 2014-01-06 02:37:06 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-01-06 02:37:06 -0800 |
| commit | 196b3022bd8759428d04d8d3bcf10c27d7c3b329 (patch) | |
| tree | ba785f204e8616af5751d7303d3357c75b9d30bc /view/tpl | |
| parent | 0c85c9748096d625ae9baa29fb9aad48bab3a208 (diff) | |
| parent | ae8a30273a6b787985d06fa776d1726d4427f9be (diff) | |
| download | volse-hubzilla-196b3022bd8759428d04d8d3bcf10c27d7c3b329.tar.gz volse-hubzilla-196b3022bd8759428d04d8d3bcf10c27d7c3b329.tar.bz2 volse-hubzilla-196b3022bd8759428d04d8d3bcf10c27d7c3b329.zip | |
Merge branch 'master' into movejs
Conflicts:
version.inc
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/conv_item.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/jot-header.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/msg-header.tpl | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 4108108b2..50a243ff4 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -72,10 +72,10 @@ <i class="icon-retweet item-tool" title="{{$item.share.0}}" onclick="jotShare({{$item.id}}); return false"></i> {{/if}} {{if $item.plink}} - <i class="icon-external-link item-tool" onclick="window.location.href='{{$item.plink.href}}'; return false;" title="{{$item.plink.title}}"></i> + <a href="{{$item.plink.href}}" title="{{$item.plink.title}}" ><i class="icon-external-link item-tool"></i></a> {{/if}} {{if $item.edpost}} - <i class="editpost icon-pencil item-tool" onclick="window.location.href='{{$item.edpost.0}}'; return false;" title="{{$item.edpost.1}}"></i> + <a href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"><i class="editpost icon-pencil item-tool"></i></a> {{/if}} {{if $item.star}} <i id="starred-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="star-item item-tool {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></i> diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 75239c179..37fa3d069 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -103,7 +103,7 @@ function enableOnUser(){ } </script> -<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.js" ></script> +<script type="text/javascript" src="{{$baseurl}}/view/js/ajaxupload.js" ></script> <script> var ispublic = '{{$ispublic}}'; diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl index 79f9e23c1..b6cff7c74 100755 --- a/view/tpl/msg-header.tpl +++ b/view/tpl/msg-header.tpl @@ -45,7 +45,7 @@ else </script> -<script type="text/javascript" src="js/ajaxupload.js" ></script> +<script type="text/javascript" src="view/js/ajaxupload.js" ></script> <script> $(document).ready(function() { var uploader = new window.AjaxUpload( |