This commit is contained in:
pixeldesu 2015-06-08 21:51:46 +02:00
parent 73147c414a
commit 341372d874
8 changed files with 21 additions and 27 deletions

View file

@ -20,9 +20,9 @@
#j2-main-navbar-collapse.collapse.navbar-collapse
- if user_signed_in?
%ul.nav.navbar-nav
= nav_entry "Timeline", root_path
= nav_entry "Inbox", "/inbox", badge: inbox_count
= nav_entry "Discover", discover_path
= nav_entry t('views.navigation.timeline'), root_path
= nav_entry t('views.navigation.inbox'), "/inbox", badge: inbox_count
= nav_entry t('views.navigation.discover'), discover_path
%ul.nav.navbar-nav.navbar-right
- unless @user.nil?
- unless @user == current_user
@ -38,7 +38,7 @@
- else
%ul.nav.navbar-nav.navbar-right
= nav_entry t('views.sessions.create'), new_user_session_path
= nav_entry t('views.actions.new'), new_user_registration_path
= nav_entry t('views.sessions.new'), new_user_registration_path
- if user_signed_in?
= render 'shared/modal_ask_followers'

View file

@ -1,4 +1,4 @@
= nav_entry "Notifications", notifications_path, badge: notification_count, class: 'visible-xs'
= nav_entry t('views.navigation.notifications'), notifications_path, badge: notification_count, class: 'visible-xs'
- notifications = Notification.for(current_user).limit(4)
%li.dropdown.hidden-xs
%a.dropdown-toggle{href: "#", "data-toggle" => "dropdown"}

View file

@ -9,26 +9,26 @@
%li
%a{href: show_user_profile_path(current_user.screen_name)}
%i.fa.fa-fw.fa-user
= t 'views.user.profile.view'
= t('views.navigation.show')
%li
%a{href: edit_user_registration_path}
%i.fa.fa-fw.fa-cog
= t 'views.user.profile.settings'
= t('views.navigation.settings')
%li.divider
- if current_user.admin?
%li
%a{href: rails_admin_path}
%i.fa.fa-fw.fa-cogs
Kontrollzentrum
= t('views.navigation.admin')
%li
%a{href: sidekiq_web_path}
%i.fa.fa-fw.fa-bar-chart
Sidekiq
= t('views.navigation.sidekiq')
- if current_user.mod?
%li
%a{href: moderation_path}
%i.fa.fa-fw.fa-gavel
Moderation Panel
= t('views.navigation.moderation')
%li.divider
%li
%a{href: destroy_user_session_path, data: {method: :delete} }

View file

@ -13,6 +13,7 @@
%link{rel: 'icon', href: '/icon-152.png', sizes: '152x152'}
%link{rel: 'icon', href: '/images/favicon/favicon-32.png', sizes: '32x32'}
%title= yield(:title)
= javascript_include_tag 'i18n', 'data-turbolinks-track' => true
= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true
= javascript_include_tag 'application', 'data-turbolinks-track' => true
- if user_signed_in?

View file

@ -1,9 +1,5 @@
.panel.panel-default.hidden-xs
%img.profile--avatar{src: current_user.profile_picture.url(:large)}
- unless inbox_count.nil?
.profile--panel-badge.panel-badge-info
%i.fa.fa-envelope
= pluralize(inbox_count, 'new question')
.panel-body
- if current_user.display_name.blank?
.profile--displayname

View file

@ -88,16 +88,16 @@
%p= t('views.about.statistics.desc', app_title: APP_CONFIG['site_name'])
.col-md-3.col-sm-6.col-xs-6.statistics
%h2.entry-text#asked-count= Question.count
%h4.entry-subtext Questions
%h4.entry-subtext= t('views.general.question').pluralize(Question.count)
%h2.entry-text#answered-count= Answer.count
%h4.entry-subtext Answers
%h4.entry-subtext= t('views.general.answer').pluralize(Answer.count)
.col-md-3.col-sm-6.col-xs-6.statistics
%h2.entry-text#asked-count= Comment.count
%h4.entry-subtext Comments
%h4.entry-subtext= t('views.general.comment').pluralize(Comment.count)
%h2.entry-text#answered-count= Smile.count + CommentSmile.count
%h4.entry-subtext Smiles
%h4.entry-subtext= t('views.general.smile').pluralize(Smile.count)
.col-md-3.col-sm-12.col-xs-12.users
.entry-text#follower-count= User.count
%h6.entry-subtext Users
%h6.entry-subtext= t('views.general.user').pluralize(User.count)
= render "shared/links"

View file

@ -6,3 +6,4 @@ Rails.application.config.assets.version = '1.0'
# Precompile additional assets.
# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
Rails.application.config.assets.precompile += %w( moderation.js )
Rails.application.config.assets.precompile += %w( i18n.js )

View file

@ -359,15 +359,15 @@ en:
title: "Popular Content"
desc: "Answers with most smiles and most answered questions"
tab:
answers: "Answers"
questions: "Questions"
comments: "Most Comments"
answers: "Most Liked"
questions: "Most Answers"
comments: "Most Controversial"
people:
title: "People"
desc: "Newcomers and people who asked the most questions"
tab:
new: "New Users"
questions: "Most Asked Questions"
questions: "Active Askers"
answers: "Most Answers"
userbox:
new: "registered %{time} ago"
@ -470,7 +470,3 @@ en:
contributor: "Contributor"
blogger: "Blogger"
banned: "Banned"
profile:
view: "View profile"
settings: "Settings"
hello: "Hello world"