Skip to content
Extraits de code Groupes Projets
Valider ac3b2bc9 rédigé par Diaspora Europe's avatar Diaspora Europe
Parcourir les fichiers

pod version in footer and updated link to changelog #3705

parent e5d027e2
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -25,6 +25,7 @@
* Add flash-notice when sending messages to non-contacts. [#3723](https://github.com/diaspora/diaspora/pull/3723)
* Re-add hovercards [#3802](https://github.com/diaspora/diaspora/pull/3802)
* Add images to notifications [#3821](https://github.com/diaspora/diaspora/pull/3821)
* Show pod version in footer and updated the link to the changelog [#3822](https://github.com/diaspora/diaspora/pull/3822)
## Bug Fixes
......
......@@ -7,6 +7,10 @@ module ApplicationHelper
AppConfig.settings.pod_name.present? ? AppConfig.settings.pod_name : "DIASPORA*"
end
def pod_version
AppConfig.version.number.present? ? AppConfig.version.number : ""
end
def how_long_ago(obj)
timeago(obj.created_at)
end
......
......@@ -4,8 +4,8 @@
%li= link_to '@joindiaspora', "http://twitter.com/joindiaspora"
%li= link_to 'github', "https://github.com/diaspora/diaspora"
%li= link_to t('layouts.header.blog'), "http://blog.joindiaspora.com"
%li= link_to t('layouts.application.whats_new'), 'https://github.com/diaspora/diaspora/wiki/Changelog'
%li= link_to t('layouts.application.whats_new'), 'https://github.com/diaspora/diaspora/blob/master/Changelog.md'
%li.separator= "|"
%li= link_to(t('layouts.header.code'), "#{root_path.chomp('/')}/source.tar.gz", {:title => t('layouts.application.source_package')}) unless request.url.match(/joindiaspora.com/)
%li= link_to(t('layouts.header.code')+ " " + pod_version, "#{root_path.chomp('/')}/source.tar.gz", {:title => t('layouts.application.source_package')}) unless request.url.match(/joindiaspora.com/)
%li= link_to(t('layouts.application.toggle'), toggle_mobile_path)
= image_tag 'branding/powered_by_diaspora.png', :height => "11px", :width => "145px"
\ No newline at end of file
= image_tag 'branding/powered_by_diaspora.png', :height => "11px", :width => "145px"
......@@ -101,4 +101,14 @@ describe ApplicationHelper do
AppConfig.settings.pod_name = old_name
end
end
describe '#pod_version' do
it 'displays the supplied pod_version if it is set' do
old_version = AppConfig.version.number.get
AppConfig.version.number = "0.0.1.0"
pod_version.should == "0.0.1.0"
AppConfig.version.number = old_version
end
end
end
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter