Merge branch 'release/0.14.8'

app/assets/stylesheets/web/activity_lines/lider/application.css.sass

@@ -1,5 +1,6 @@
 @import 'bootstrap-sprockets'
 @import 'bootstrap'
+@import 'font-awesome'
 
 $persic_color: #fac416
 $contest_color: #ffae00

app/controllers/web/activity_lines/lider/ya_lider/application_controller.rb

@@ -0,0 +1,2 @@
+class Web::ActivityLines::Lider::YaLider::ApplicationController < Web::ActivityLines::Lider::ApplicationController
+end

app/controllers/web/activity_lines/lider/ya_lider/stages_controller.rb

@@ -0,0 +1,14 @@
+class Web::ActivityLines::Lider::YaLider::StagesController < Web::ActivityLines::Lider::YaLider::ApplicationController
+  def show
+    stage = ActivityLines::Lider::YaLider::Stage.find(params[:id])
+    @contest = stage.contest.decorate
+    @stage = stage.decorate
+    @current_participants = if params[:search].present?
+                              ::ActivityLines::Lider::YaLider::Participant.where(
+                                id: (stage.participants.search_everywhere(params[:search]).map(&:id) & stage.current_participants.map(&:id))).decorate
+                            else
+                              stage.current_participants
+                            end
+
+  end
+end

app/decorators/activity_lines/lider/ya_lider/participant_decorator.rb

@@ -34,4 +34,5 @@ def contest_attributes
   end
 
   delegate :municipality, to: :user
+  delegate :short_name, to: :user
 end

app/views/layouts/web/activity_lines/lider/application.html.haml

@@ -9,4 +9,4 @@
         %h2= yield :header
         = yield
 
-      = render 'layouts/web/shared/footer'
+      = render 'layouts/web/activity_lines/lider/shared/footer'

app/views/layouts/web/activity_lines/lider/shared/_footer.html.haml

@@ -0,0 +1,19 @@
+%footer
+  %br
+    .row
+      .col-md-1.logo
+        = link_to "http://ulmic.ru" do
+          = image_tag 'apps/logo-mic-square.png'
+      .col-md-4
+        &copy
+        = copyright_notice_year_range 2013
+        = t('organization.short_name')
+        %br
+        = link_to 'http://ulmic.ru', 'http://ulmic.ru', target: '_blank'
+        %br
+        = link_to t('ul_lider.application.developers'), 'https://github.com/ulmic', target: '_blank'
+        %br
+        = link_to t('ul_lider.application.github_link'), 'https://github.com/ulmic/ul-lider', target: '_blank'
+      .col-md-3.col-md-offset-3
+        = link_to configus.it_projects.ul_lider.chrome_extension.url, target: "_blank" do
+          = image_tag 'activity_lines/lider/ya_lider/availale_in_chrome_web_store.png', class: :store_logo

app/views/web/activity_lines/lider/ya_lider/participants/_list.html.haml

@@ -0,0 +1,9 @@
+- model_class = ActivityLines::Lider::YaLider::Participant
+%table.table.table-striped.table-condensed.table-hover
+  %tbody
+    - activity_lines_lider_ya_lider_participants.each do |participant|
+      %tr.link{ data: { href: admin_activity_lines_lider_ya_lider_participant_path(participant) }, class: state_color(participant) }
+        %td{ width: '67px' }
+          = image_tag participant.small_avatar
+        %td
+          = participant.short_name

app/views/web/activity_lines/lider/ya_lider/stages/show.html.haml

@@ -0,0 +1,6 @@
+- title @stage.full_title
+.page-header
+  %h1
+    = @stage.full_title
+.row
+  = render 'web/activity_lines/lider/ya_lider/participants/list', activity_lines_lider_ya_lider_participants: @current_participants, for_partial: :stage_show

app/views/web/activity_lines/lider/ya_liders/show.html.haml

@@ -1,4 +1,4 @@
-- title t('contest.full_name')
+- title @contest.full_title
 - content_for :meta do
   %meta{ property: 'og:description', content: "#{t('contest.full_name')}" }
   %meta{ name:'description', content: "#{t('contest.full_name')}" }
@@ -52,11 +52,11 @@
       Организаторы конкурса
     Организаторами XIV конкурса «Я-лидер» выступают:
     %br
-    = link_to t('contest.organization_short_title'), configus.host, target: '_blank'
+    = link_to t('organization.title'), configus.host, target: '_blank'
     %br
-    = link_to t('contest.partners.new_civilization_short_title'), configus.sites.ulnc, target: '_blank'
+    = link_to t('ul_lider.contest.partners.new_civilization_short_title'), configus.sites.ulnc, target: '_blank'
     %br
-    = link_to t('contest.partners.ministry_of_education'), configus.sites.ministry_of_edu, target: '_blank'
+    = link_to t('ul_lider.contest.partners.ministry_of_education'), configus.sites.ministry_of_edu, target: '_blank'
 .row.plaha
   .col-md-6.text.left
     .title
@@ -78,7 +78,7 @@
 .row
   .social_buttons
     %span
-      = t('.share_us')
+      = t('helpers.share_us')
     %br
     = render 'web/activity_lines/lider/ya_liders/shared/social_buttons'
 

config/locales/ru/helpers.yml

@@ -18,6 +18,7 @@ ru:
     view_all: посмотреть всех
     contacts: Контакты
     share: Поделиться
+    share_us: Расскажите о нас
     download: Скачать
     search: Найти
     found: Найденные

config/locales/ru/ul_lider.yml

@@ -0,0 +1,9 @@
+ru:
+  ul_lider:
+    contest:
+      partners:
+        new_civilization_short_title: Новая цивилизация
+        ministry_of_education: Министерство образования Ульяновской области
+    application:
+      developers: Разработчики ИТ-проектов МИЦ
+      github_link: Этот проект на Github

config/routes.rb

@@ -52,6 +52,9 @@
       end
       namespace :lider do
         resources :ya_liders, only: :show
+        namespace :ya_lider do
+          resources :stages, only: :show
+        end
       end
     end
     namespace :admin do

test/controllers/web/activity_lines/lider/ya_lider/application_controller_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class Web::ActivityLines::Lider::YaLider::ApplicationControllerTest < ActionController::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

test/controllers/web/activity_lines/lider/ya_lider/stages_controller_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class Web::ActivityLines::Lider::YaLider::StagesControllerTest < ActionController::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end