Merge branch '194-project_submenu' into 193-new_design_for_wiki

app/views/layouts/application.html.haml

@@ -9,7 +9,7 @@
     = csrf_meta_tag
 
   %body
-    .wrap
+    .wrap.columns
       %header
         .left
         .middle

app/views/projects/_submenu.html.haml

@@ -0,0 +1,14 @@
+- content_for :sub_menu do
+  - act = action_name.to_sym
+  - contr = controller_name.to_sym
+  .left
+    = @project.name
+  %nav
+    %ul
+      %li= link_to t("project_menu.project"), project_path(@project), {:class => (act == :show && contr == :projects) ? 'active' : ''}
+      %li= link_to t("project_menu.commits"), commits_path(@project), {:class => (act == :index && contr == :commits) ? 'active' : ''}
+      %li= link_to t("project_menu.builds"), project_build_lists_path(@project), {:class => (act == :index && contr == :builds) ? 'active' : ''}
+      %li= link_to t("project_menu.tracker"), project_issues_path(@project), {:class => (act == :index && contr == :issues) ? 'active' : ''}
+      %li= link_to t("project_menu.wiki"), project_wiki_index_path(@project), {:class => (act == :index && contr == :wiki) ? 'active' : ''}
+      %li= link_to t("project_menu.readme"), "#" #pending
+      %li= link_to t("project_menu.settings"), edit_project_path(@project), {:class => (act == :edit && contr == :projects) ? 'active' : ''}

config/locales/menu.en.yml

@@ -19,3 +19,11 @@ en:
     contacts: Contacts
     tos: Terms Of Service
     security: Security
+  project_menu:
+    project: Project
+    commits: Commits
+    builds: Builds
+    tracker: Tracker
+    wiki: Wiki
+    readme: Readme
+    settings: Settings

config/locales/menu.ru.yml

@@ -19,3 +19,11 @@ ru:
     contacts: Контакты
     tos: Условия использования
     security: Безопасность
+  project_menu:
+    project: Проект
+    commits: Коммиты
+    builds: Сборки
+    tracker: Трекер
+    wiki: Wiki
+    readme: Readme
+    settings: Настройки