diff options
author | friendica <info@friendica.com> | 2013-07-14 01:23:07 -0700 |
---|---|---|
committer | friendica <info@friendica.com> | 2013-07-14 01:23:07 -0700 |
commit | 5b6294dbc0b444c5120b655bc4876270f2f8822d (patch) | |
tree | 883b85d07345ac91f76da126136dc5a6ff1feb2c /view/tpl | |
parent | 25ed8788e909d176b73bcb04492c2e3edbdaf662 (diff) | |
parent | 873c1f381e039f631a2634de1747ec85a6bad5d6 (diff) | |
download | volse-hubzilla-5b6294dbc0b444c5120b655bc4876270f2f8822d.tar.gz volse-hubzilla-5b6294dbc0b444c5120b655bc4876270f2f8822d.tar.bz2 volse-hubzilla-5b6294dbc0b444c5120b655bc4876270f2f8822d.zip |
Merge https://github.com/friendica/red into zpull
Diffstat (limited to 'view/tpl')
-rwxr-xr-x | view/tpl/conv_frame.tpl | 2 | ||||
-rwxr-xr-x | view/tpl/conv_item.tpl | 2 | ||||
-rwxr-xr-x | view/tpl/jot-header.tpl | 10 | ||||
-rwxr-xr-x | view/tpl/jot.tpl | 2 | ||||
-rwxr-xr-x | view/tpl/like_noshare.tpl | 2 | ||||
-rwxr-xr-x | view/tpl/main_slider.tpl | 2 | ||||
-rwxr-xr-x | view/tpl/nav.tpl | 2 |
7 files changed, 11 insertions, 11 deletions
diff --git a/view/tpl/conv_frame.tpl b/view/tpl/conv_frame.tpl index 81d655be2..359b8e7fc 100755 --- a/view/tpl/conv_frame.tpl +++ b/view/tpl/conv_frame.tpl @@ -15,5 +15,5 @@ <div id="item-delete-selected-end"></div> {{/if}} -<img id="page-spinner" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" /> +<div id="page-spinner"></div> diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index e4178eb39..d678bfbee 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -90,7 +90,7 @@ {{if $item.filer}} <a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon item-tool" title="{{$item.filer}}"></a> {{/if}} - <img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" /> + <div id="like-rotator-{{$item.id}}" class="like-rotator"></div> <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" > {{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{/if}} diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index ae0ccc8e8..dfc707fb5 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -12,9 +12,9 @@ var plaintext = '{{$editselect}}'; function initEditor(cb){ if (editor==false){ - $("#profile-jot-text-loading").show(); + $("#profile-jot-text-loading").spin('small'); if(plaintext == 'none') { - $("#profile-jot-text-loading").hide(); + $("#profile-jot-text-loading").spin(false); $("#profile-jot-text").css({ 'height': 200, 'color': '#000' }); $("#profile-jot-text").contact_autocomplete(baseurl+"/acl"); editor = true; @@ -83,7 +83,7 @@ function initEditor(cb){ ed.onInit.add(function(ed) { ed.pasteAsPlainText = true; - $("#profile-jot-text-loading").hide(); + $("#profile-jot-text-loading").spin(false); $(".jothidden").show(); if (typeof cb!="undefined") cb(); }); @@ -200,12 +200,12 @@ function enableOnUser(){ function jotShare(id) { if ($('#jot-popup').length != 0) $('#jot-popup').show(); - $('#like-rotator-' + id).show(); + $('#like-rotator-' + id).spin('tiny); $.get('{{$baseurl}}/share/' + id, function(data) { if (!editor) $("#profile-jot-text").val(""); initEditor(function(){ addeditortext(data); - $('#like-rotator-' + id).hide(); + $('#like-rotator-' + id).spin(false); $(window).scrollTop(0); }); diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 4f52cff20..f3410c5f4 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -23,9 +23,9 @@ <div id="jot-pagetitle-wrap"><input name="pagetitle" id="jot-pagetitle" type="text" placeholder="{{$placeholdpagetitle}}" value="{{$pagetitle}}" class="jothidden" style="display:none" /></div> {{/if}} <div id="jot-text-wrap"> - <img id="profile-jot-text-loading" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" /> <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{if $content}}{{$content}}{{else}}{{$share}}{{/if}}</textarea> </div> + <div id="profile-jot-text-loading"></div> <div id="profile-jot-submit-wrapper" class="jothidden"> <input type="submit" id="profile-jot-submit" name="submit" value="{{$share}}" /> diff --git a/view/tpl/like_noshare.tpl b/view/tpl/like_noshare.tpl index b8258d64a..261b61815 100755 --- a/view/tpl/like_noshare.tpl +++ b/view/tpl/like_noshare.tpl @@ -6,5 +6,5 @@ <div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$id}}"> <a href="#" class="icon like" title="{{$likethis}}" onclick="dolike({{$id}},'like'); return false"></a> <a href="#" class="icon dislike" title="{{$nolike}}" onclick="dolike({{$id}},'dislike'); return false"></a> - <img id="like-rotator-{{$id}}" class="like-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" /> + <div id="like-rotator-{{$id}}" class="like-rotator"></div> </div> diff --git a/view/tpl/main_slider.tpl b/view/tpl/main_slider.tpl index fe4495f77..8169de6ec 100755 --- a/view/tpl/main_slider.tpl +++ b/view/tpl/main_slider.tpl @@ -26,7 +26,7 @@ return; if((bParam_cmin == old_cmin) && (bParam_cmax == old_cmax)) return; - setTimeout(function() { $("#profile-jot-text-loading").show(); }, 1000 ); + setTimeout(function() { $("#profile-jot-text-loading").spin('small'); }, 1000 ); slideTimer = setTimeout(networkTimerRefresh,2000); } diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 1470d0725..550cda911 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -144,7 +144,7 @@ <input id="nav-search-text" type="text" value="" placeholder="{{$nav.search.1}}" name="search" title="{{$nav.search.3}}" onclick="this.submit();" /> </form> </li> - <img src="images/rotator.gif" id="nav-search-spinner" style="display: none;" alt="{{$pleasewait}}" /> + <div id="nav-search-spinner"></div> </ul> </nav> |