Updated depp

This commit is contained in:
Priit Tark 2015-04-01 13:08:37 +03:00
parent 76063b4196
commit 8448f2f423
5 changed files with 9 additions and 31 deletions

View file

@ -67,7 +67,7 @@ gem 'deep_cloneable', '~> 2.1.1'
gem 'digidoc_client', '~> 0.2.1' gem 'digidoc_client', '~> 0.2.1'
# epp + repp client # epp + repp client
gem 'depp', github: 'domify/depp', ref: '592e57a6965be64ad4215334464d6dd690410583' gem 'depp', github: 'domify/depp', ref: '800ab30dcb6dae33095bcb9df47b4e0a390891a3'
# gem 'depp', path: '~/projects/depp' # gem 'depp', path: '~/projects/depp'
gem 'epp', '~> 1.4.2', github: 'gitlabeu/epp' gem 'epp', '~> 1.4.2', github: 'gitlabeu/epp'

View file

@ -10,8 +10,8 @@ GIT
GIT GIT
remote: git://github.com/domify/depp.git remote: git://github.com/domify/depp.git
revision: 592e57a6965be64ad4215334464d6dd690410583 revision: 800ab30dcb6dae33095bcb9df47b4e0a390891a3
ref: 592e57a6965be64ad4215334464d6dd690410583 ref: 800ab30dcb6dae33095bcb9df47b4e0a390891a3
specs: specs:
depp (0.0.2) depp (0.0.2)
coderay (>= 1.1.0) coderay (>= 1.1.0)

View file

@ -107,6 +107,11 @@ sub
.app-nav .app-nav
padding-top: 7px padding-top: 7px
.public-nav
font-weight: bold
li.active a
color: black !important
.general-tab .general-tab
padding-top: 30px padding-top: 30px
padding-right: 20px padding-right: 20px

View file

@ -27,7 +27,7 @@
%small{style: 'color: #0074B3;'}= unstable_env %small{style: 'color: #0074B3;'}= unstable_env
- if current_user - if current_user
.navbar-collapse.collapse .navbar-collapse.collapse
%ul.nav.navbar-nav %ul.nav.navbar-nav.public-nav
- if can? :show, Invoice - if can? :show, Invoice
- active_class = ['registrar/invoices'].include?(params[:controller]) ? 'active' :nil - active_class = ['registrar/invoices'].include?(params[:controller]) ? 'active' :nil
%li{class: active_class}= link_to t('invoices'), main_app.registrar_invoices_path %li{class: active_class}= link_to t('invoices'), main_app.registrar_invoices_path

View file

@ -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'