From 434115577153257b5a935efaa606f18df79ae0d6 Mon Sep 17 00:00:00 2001 From: "konstantin.grabar" Date: Wed, 2 Nov 2011 16:39:04 +0400 Subject: [PATCH] [refs #2161] Change private users and personal repos menus --- app/controllers/privates_controller.rb | 2 +- app/views/private_users/index.html.haml | 6 +++--- config/locales/ru.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/privates_controller.rb b/app/controllers/privates_controller.rb index 41896a90d..a722eaa5c 100644 --- a/app/controllers/privates_controller.rb +++ b/app/controllers/privates_controller.rb @@ -5,7 +5,7 @@ class PrivatesController < ApplicationController before_filter :authenticate def show - file_name = "#{APP_CONFIG['root_path']}/platforms/#{params[:platform_name]}/repository/#{params[:file_path]}" + file_name = "#{APP_CONFIG['root_path']}/platforms/#{params[:platform_name]}/#{params[:file_path]}" if File.directory?(file_name) || !File.exists?(file_name) render :file => "#{Rails.root}/public/404.html", :layout => false, :status => 404 diff --git a/app/views/private_users/index.html.haml b/app/views/private_users/index.html.haml index 72d64b630..5a095a58b 100644 --- a/app/views/private_users/index.html.haml +++ b/app/views/private_users/index.html.haml @@ -1,9 +1,9 @@ .block .secondary-navigation %ul.wat-cf - %li.first=# link_to t("layout.repositories.list"), platform_path(@platform) + "#repositories" - %li=# link_to t("layout.repositories.new"), new_platform_repository_path(@platform) - %li.active=# link_to t("layout.repositories.show"), platform_repository_path(@platform, @repository) + %li.first= link_to t("layout.personal_repositories.show"), personal_repository_path(current_user.personal_repository) + %li= link_to t("layout.personal_repositories.settings"), settings_personal_repository_path(current_user.personal_repository) + %li.active= link_to t("layout.personal_repositories.private_users"), platform_private_users_path(current_user.personal_platform) if current_user.personal_platform.hidden? .content .inner %p diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 983d9d217..9470f3d31 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -119,7 +119,7 @@ ru: visibility: Видимость platform_type: Тип платформы distrib_type: Тип дистрибутива - private_users: Пользователи приватного репозитория + private_users: Данные для доступа confirm_clone: Клонировать? clone: Клонировать