Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:OpenMandrivaSoftware/rosa-build

This commit is contained in:
Wedge 2018-09-03 23:18:14 +03:00
parent 0e664e802f 2caf502f2a
commit 092dc59806
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/layouts/application.html.slim
View File

@ -14,7 +14,7 @@ html
link href='https://fonts.googleapis.com/css?family=Montserrat' rel='stylesheet' type='text/css' link href='https://fonts.googleapis.com/css?family=Montserrat' rel='stylesheet' type='text/css'
== stylesheet_link_tag 'new_application', cache: 'application' == stylesheet_link_tag 'new_application', cache: 'application'
body[ ng-app='RosaABF' ng-controller='RosaABFController' ng-strict-di='' class="hamburg" body[ ng-app='RosaABF' ng-controller='RosaABFController' ng-strict-di='' class="hamburger"
ng-init="init('#{I18n.locale}', #{!!current_user.try(:sound_notifications)})" ng-cloak="true"] ng-init="init('#{I18n.locale}', #{!!current_user.try(:sound_notifications)})" ng-cloak="true"]
.page-wrapper ng-class="{'open': toggle}" .page-wrapper ng-class="{'open': toggle}"
.sidebar-wrapper .sidebar-wrapper
@ -45,4 +45,4 @@ html
== yield :additional_scripts if content_for?(:additional_scripts) == yield :additional_scripts if content_for?(:additional_scripts)
- if I18n.locale == :ru - if I18n.locale == :ru
== javascript_include_tag 'moment/ru.js', cache: 'moment' == javascript_include_tag 'moment/ru.js', cache: 'moment'
== javascript_include_tag 'angular-locale_ru-ru', cache: 'angular-locale' == javascript_include_tag 'angular-locale_ru-ru', cache: 'angular-locale'

6
app/views/layouts/menu/_new_top.html.slim
View File

@ -15,6 +15,10 @@ li.sidebar-list
a href="http://repoclosure.openmandriva.org" a href="http://repoclosure.openmandriva.org"
| Repoclosure | Repoclosure
span.menu-icon.fa.fa-circle-o span.menu-icon.fa.fa-circle-o
li.sidebar-list
a href="https://abf.openmandriva.org/massbuild"
| Mass build status
span.menu-icon.fa.fa-circle-o
- if current_user.try(:admin?) - if current_user.try(:admin?)
li.sidebar-list li.sidebar-list
a href=admin_users_path a href=admin_users_path
@ -47,4 +51,4 @@ li.sidebar-list
li.sidebar-list li.sidebar-list
a href=new_user_session_path a href=new_user_session_path
= t('layout.devise.shared_links.sign_in') = t('layout.devise.shared_links.sign_in')
span.menu-icon.fa.fa-user span.menu-icon.fa.fa-user