diff --git a/Gemfile b/Gemfile index 66efe5bb4..fc26d9d02 100644 --- a/Gemfile +++ b/Gemfile @@ -67,7 +67,7 @@ gem 'deep_cloneable', '~> 2.1.1' gem 'digidoc_client', '~> 0.2.1' # epp + repp client -gem 'depp', github: 'domify/depp', ref: '592e57a6965be64ad4215334464d6dd690410583' +gem 'depp', github: 'domify/depp', ref: '800ab30dcb6dae33095bcb9df47b4e0a390891a3' # gem 'depp', path: '~/projects/depp' gem 'epp', '~> 1.4.2', github: 'gitlabeu/epp' diff --git a/Gemfile.lock b/Gemfile.lock index 6f6bbc6e2..40dce6b12 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -10,8 +10,8 @@ GIT GIT remote: git://github.com/domify/depp.git - revision: 592e57a6965be64ad4215334464d6dd690410583 - ref: 592e57a6965be64ad4215334464d6dd690410583 + revision: 800ab30dcb6dae33095bcb9df47b4e0a390891a3 + ref: 800ab30dcb6dae33095bcb9df47b4e0a390891a3 specs: depp (0.0.2) coderay (>= 1.1.0) diff --git a/app/assets/stylesheets/registrar.sass b/app/assets/stylesheets/registrar.sass index a7504f5f0..93b89bae2 100644 --- a/app/assets/stylesheets/registrar.sass +++ b/app/assets/stylesheets/registrar.sass @@ -107,6 +107,11 @@ sub .app-nav padding-top: 7px +.public-nav + font-weight: bold + li.active a + color: black !important + .general-tab padding-top: 30px padding-right: 20px diff --git a/app/views/layouts/depp/application.haml b/app/views/layouts/depp/application.haml index c28f83a1e..dc85ab661 100644 --- a/app/views/layouts/depp/application.haml +++ b/app/views/layouts/depp/application.haml @@ -27,7 +27,7 @@ %small{style: 'color: #0074B3;'}= unstable_env - if current_user .navbar-collapse.collapse - %ul.nav.navbar-nav + %ul.nav.navbar-nav.public-nav - if can? :show, Invoice - active_class = ['registrar/invoices'].include?(params[:controller]) ? 'active' :nil %li{class: active_class}= link_to t('invoices'), main_app.registrar_invoices_path diff --git a/app/views/layouts/login_registrar.haml b/app/views/layouts/login_registrar.haml deleted file mode 100644 index 2b75dcc5f..000000000 --- a/app/views/layouts/login_registrar.haml +++ /dev/null @@ -1,27 +0,0 @@ -!!! -%html{:lang => I18n.locale.to_s} - %head - %meta{:charset => "utf-8"}/ - %meta{:content => "IE=edge", "http-equiv" => "X-UA-Compatible"}/ - %meta{:content => "width=device-width, initial-scale=1", :name => "viewport"}/ - %meta{:content => "EIS Registrar portal", :name => "description"}/ - %meta{:content => "Gitlab Ltd", :name => "author"}/ - = csrf_meta_tags - = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true - = stylesheet_link_tag 'login', media: 'all', 'data-turbolinks-track' => true - = favicon_link_tag 'favicon.ico' - %title EIS Registrar - Log In - %body{:style => env_style} - .container - .form-signin - - display = (flash.empty?) ? 'none' : 'block' - #flash{style: "display: #{display};"} - - type = (flash[:notice]) ? 'bg-success' : 'bg-danger' - .alert{class: type}= flash[:notice] || flash[:alert] - %h2.form-signin-heading.text-center Eesti Interneti SA - %hr - / TODO: Refactor this when ID card login is done - = button_to 'ID card (user1)', 'sessions', - class: 'btn btn-lg btn-primary btn-block', name: 'user1' - = button_to 'ID card (user2)', 'sessions', - class: 'btn btn-lg btn-primary btn-block', name: 'user2'