diff options
| author | friendica <info@friendica.com> | 2013-12-11 15:32:25 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-12-11 15:32:25 -0800 |
| commit | c57b6745e8d7222d9cecfb04cd81c9ef7eb25d05 (patch) | |
| tree | cc9eef5ea3c6676cd537f2f89776ab6d3c835db1 /view/tpl | |
| parent | 2c02f57f276658269a6cc2031fb0fc9ac0a9077c (diff) | |
| parent | 06c81e189f031a74c54aa14b1f29c93379e7cf3c (diff) | |
| download | volse-hubzilla-c57b6745e8d7222d9cecfb04cd81c9ef7eb25d05.tar.gz volse-hubzilla-c57b6745e8d7222d9cecfb04cd81c9ef7eb25d05.tar.bz2 volse-hubzilla-c57b6745e8d7222d9cecfb04cd81c9ef7eb25d05.zip | |
Merge https://github.com/friendica/red into zpull
Conflicts:
view/theme/redbasic/css/style.css
Diffstat (limited to 'view/tpl')
| -rw-r--r-- | view/tpl/notes.tpl | 9 | ||||
| -rw-r--r-- | view/tpl/saved_searches.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/search_item.tpl | 8 |
3 files changed, 5 insertions, 14 deletions
diff --git a/view/tpl/notes.tpl b/view/tpl/notes.tpl index 7300779f4..09932e545 100644 --- a/view/tpl/notes.tpl +++ b/view/tpl/notes.tpl @@ -1,13 +1,10 @@ <div class="widget"> <script> -function notePost() { - $('#note-rotator').spin('tiny'); - $.post('notes', { 'note_text' : $('#note-text').val() },function(data) { $('#note-rotator').spin(false); }); -} +$("#note-text").live('input paste',function(e){ + $.post('notes', { 'note_text' : $('#note-text').val() }); +}); </script> <h3>{{$banner}}</h3> <textarea name="note_text" id="note-text">{{$text}}</textarea> -<input type="submit" name="submit" id="note-save" value="{{$save}}" onclick="notePost(); return true;"> -<div id="note-rotator"></div> </div> diff --git a/view/tpl/saved_searches.tpl b/view/tpl/saved_searches.tpl index bdff72ba1..d0f9e2b0e 100644 --- a/view/tpl/saved_searches.tpl +++ b/view/tpl/saved_searches.tpl @@ -5,7 +5,7 @@ <ul id="saved-search-ul"> {{foreach $saved as $search}} <li id="search-term-{{$search.id}}" class="saved-search-li clear"> - <a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="{{$search.dellink}}"><i id="dropicon-saved-search-term-{{$search.id}}" class="icon-remove drop-icons iconspacer savedsearchdrop" ></i></a> + <a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="{{$search.dellink}}"><i id="dropicon-saved-search-term-{{$search.id}}" class="icon-remove drop-icons iconspacer" ></i></a> <a id="saved-search-term-{{$search.id}}" class="savedsearchterm{{if $search.selected}} search-selected{{/if}}" href="{{$search.srchlink}}">{{$search.displayterm}}</a> </li> {{/foreach}} diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index 3018fc747..c5acfa4a4 100755 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -29,13 +29,7 @@ <div class="wall-item-content" id="wall-item-content-{{$item.id}}" > <div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div> <div class="wall-item-title-end"></div> - <div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}} - <div class="body-tag"> - {{foreach $item.tags as $tag}} - <span class='tag'>{{$tag}}</span> - {{/foreach}} - </div> - </div> + <div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}</div> </div> <div class="wall-item-tools" id="wall-item-tools-{{$item.id}}"> <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" > |