nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4217 from svbergerem/4041-loading-indicator

Browse source 
Add loading indicator on tag pages, remove second one from profile page

Conflicts:
	Changelog.md
This commit is contained in:
Jonne Haß 2013-06-14 18:23:39 +02:00
commit ed36786edc
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -23,6 +23,7 @@
* Remove alpha branding [#4196](https://github.com/diaspora/diaspora/issues/4196) * Remove alpha branding [#4196](https://github.com/diaspora/diaspora/issues/4196)
* Fix dynamic loading of asset_sync * Fix dynamic loading of asset_sync
* Fix login for short passwords [#4123](https://github.com/diaspora/diaspora/issues/4123) * Fix login for short passwords [#4123](https://github.com/diaspora/diaspora/issues/4123)
* Add loading indicator on tag pages, remove the second one from the profile page [#4041](https://github.com/diaspora/diaspora/issues/4041)
## Features ## Features

1
app/views/people/show.html.haml
View file

@ -35,7 +35,6 @@
= t('.ignoring', :name => @person.first_name) = t('.ignoring', :name => @person.first_name)
#paginate #paginate
%span.loader.hidden
%a{:id=>"back-to-top", :title=>"#{t('layouts.application.back_to_top')}", :href=>"#"} %a{:id=>"back-to-top", :title=>"#{t('layouts.application.back_to_top')}", :href=>"#"}
⇧ ⇧

3
app/views/tags/show.haml
View file

@ -41,6 +41,7 @@
#main_stream.stream #main_stream.stream
#paginate #paginate
%span.loader.hidden
%a{:id=>"back-to-top", :title=>"#{t('layouts.application.back_to_top')}", :href=>"#"} %a{:id=>"back-to-top", :title=>"#{t('layouts.application.back_to_top')}", :href=>"#"}
⇧ ⇧