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

Link to diaspora* admin dashboard

Browse source 
closes #7130
This commit is contained in:
Benjamin Neff 2016-09-30 20:29:25 +02:00 committed by Steffen van Bergerem
parent 471af747b1
commit 1c1c9d6794
No known key found for this signature in database
GPG key ID: 315C9787D548DC6B
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -16,6 +16,7 @@ Note: Although this is a minor release, the configuration file changed because t
* Extract inline JavaScript [#7113](https://github.com/diaspora/diaspora/pull/7113) * Extract inline JavaScript [#7113](https://github.com/diaspora/diaspora/pull/7113)
* Port conversations inbox to backbone.js [#7108](https://github.com/diaspora/diaspora/pull/7108) * Port conversations inbox to backbone.js [#7108](https://github.com/diaspora/diaspora/pull/7108)
* Refactored stream shortcuts for more flexibility [#7127](https://github.com/diaspora/diaspora/pull/7127) * Refactored stream shortcuts for more flexibility [#7127](https://github.com/diaspora/diaspora/pull/7127)
* Link to admin dashboard instead of admin panel from the podmin landing page [#7130](https://github.com/diaspora/diaspora/pull/7130)
## Bug fixes ## Bug fixes
* Post comments no longer get collapsed when interacting with a post [#7040](https://github.com/diaspora/diaspora/pull/7040) * Post comments no longer get collapsed when interacting with a post [#7040](https://github.com/diaspora/diaspora/pull/7040)

2
app/views/home/podmin.haml
View file

@ -32,7 +32,7 @@
= t(".make_yourself_an_admin") = t(".make_yourself_an_admin")
!= t(".make_yourself_an_admin_info", != t(".make_yourself_an_admin_info",
wiki: link_to("diaspora* wiki", "https://wiki.diasporafoundation.org/FAQ_for_pod_maintainers#What_are_roles_and_how_do_I_use_them.3F_.2F_Make_yourself_an_admin"), wiki: link_to("diaspora* wiki", "https://wiki.diasporafoundation.org/FAQ_for_pod_maintainers#What_are_roles_and_how_do_I_use_them.3F_.2F_Make_yourself_an_admin"),
admin_panel: link_to(t(".admin_panel"), "/admin_panel")) admin_dashboard: link_to(t("javascripts.header.admin"), admin_dashboard_path))
.row .row
.col-md-4 .col-md-4

3
config/locales/diaspora/en.yml
View file

@ -541,8 +541,7 @@ en:
contribute: "Contribute" contribute: "Contribute"
configuration_info: "Open %{database_path} and %{diaspora_path} in your favourite text editor and carefully review them, they are extensively commented." configuration_info: "Open %{database_path} and %{diaspora_path} in your favourite text editor and carefully review them, they are extensively commented."
create_an_account_info: "%{sign_up_link} for a new account." create_an_account_info: "%{sign_up_link} for a new account."
make_yourself_an_admin_info: "You can find instructions in the %{wiki}. This should add an “Admin” link to your user menu in the header when you are logged in. It gives you stuff like user search and stats for your pod. For intense detail on the operational aspects of your pod, go to the %{admin_panel}." make_yourself_an_admin_info: "You can find instructions in the %{wiki}. This should add an “%{admin_dashboard}” link to your user menu in the header when you are logged in. It gives you stuff like user search and stats for your pod."
admin_panel: "admin panel"
update_your_pod_info: "You can find %{update_instructions}." update_your_pod_info: "You can find %{update_instructions}."
update_instructions: "update instructions in the diaspora* wiki" update_instructions: "update instructions in the diaspora* wiki"
getting_help_info: "We listed some %{faq} including some additional tips and tricks and solutions for the most common problems. Also feel free to %{irc}." getting_help_info: "We listed some %{faq} including some additional tips and tricks and solutions for the most common problems. Also feel free to %{irc}."