meurio_ui 1.3.10 → 1.3.11

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 3d1471e283db7e614fce76627a402415f280fafa
4
- data.tar.gz: 04664a6adf59a48d9b043dbf809937902beb45e6
3
+ metadata.gz: 03f094f660598e892cb4ab6ec26d8d7a1ae82880
4
+ data.tar.gz: 0e36f6491ba5a06a2f05e90c9ea68e497096fdf1
5
5
  SHA512:
6
- metadata.gz: 03f2554ff8e8185b3e5cb3a3d4f6974601c7ce10cee04a03e2feab889a054e8e863cdfbc2d4ff1c9eeffda232e73b83399730e3900b889a081ab4d5e27505011
7
- data.tar.gz: 24b6c9feefa1e993459056be26cf4e09d7b4088e105e3abede3df0e52bc09ae58a9cfe6c38134ab659808921ccd688723be6f7c4bf8a4e9a188979806a5ce724
6
+ metadata.gz: 74fddc3e0c5bc1c6567e62df19074841868e0692294d83a7d7a2391f7a8c5496a7ba37d44a467771cf069a002346f173415da57babf854fa334552264624775a
7
+ data.tar.gz: e41acde4c3078a75a23445d2ddfe24365a1955d297affe346d45c6580afd61dfd8eb74fb7fc0369c36d6ff0867605200ad70140f8e42e31bd2c2e63763339857
data/.gitignore CHANGED
@@ -18,3 +18,4 @@ tmp
18
18
  *.swp
19
19
  *.swo
20
20
  .DS_Store
21
+ lib/01_envvars.rb
Binary file
@@ -14,6 +14,7 @@
14
14
  color: white
15
15
  position: relative
16
16
  font-weight: bold
17
+ float: right
17
18
  .current_user
18
19
  line-height: 35px
19
20
  a
@@ -80,7 +81,7 @@
80
81
  background: white
81
82
  top: 50px
82
83
  z-index: 1000
83
- width: 640px
84
+ width: 750px
84
85
  padding: 2em 1em 1em 1em
85
86
  display: none
86
87
  .meurio_app
@@ -98,6 +99,7 @@
98
99
  img
99
100
  display: inline-block
100
101
  margin-bottom: .5em
102
+ height: 60px
101
103
  &:hover
102
104
  opacity: 0.8
103
105
 
@@ -1,18 +1,18 @@
1
1
  .meurio_header
2
2
  .meurio_logo_and_user_menu
3
3
  .row
4
- .meurio_logo= link_to image_tag('mrui_meurio.png'), 'http://temp.meurio.org.br/'
4
+ .meurio_logo= link_to image_tag('mrui_meurio.png'), ENV['MEURIO_HOST']
5
5
  - if @app == :pdp or @app == :mr20 or @app == :accounts
6
6
  .user_menu
7
7
  - if current_user.present?
8
8
  .current_user
9
- = link_to "http://temp.meurio.org.br/users/#{current_user.id}" do
9
+ = link_to "#{ENV['MEURIO_HOST']}/users/#{current_user.id}" do
10
10
  = image_tag(current_user.avatar_url)
11
11
  = current_user.name
12
12
  = content_tag(:span, nil, class: 'icon-triangle-down')
13
13
  .current_user_links
14
14
  span Conta
15
- = link_to "Ver perfil", "http://temp.meurio.org.br/users/#{current_user.id}"
15
+ = link_to "Ver perfil", "#{ENV['MEURIO_HOST']}/users/#{current_user.id}"
16
16
  = link_to "Editar perfil", "http://accounts.meurio.org.br/users/#{current_user.id}/edit"
17
17
  = link_to "Sair", "http://accounts.meurio.org.br/logout?redirect_url=#{request.url}"
18
18
  - if content_for? :current_user_links
@@ -34,12 +34,15 @@
34
34
  span= application_name(@app)
35
35
  span.icon-arrow-box
36
36
  .other_apps
37
- = link_to('http://temp.meurio.org.br/', class: :meurio_app) do
37
+ = link_to(ENV['MEURIO_HOST'], class: :meurio_app) do
38
38
  = image_tag('mrui_mr20.png')
39
39
  span= application_name(:mr20)
40
40
  = link_to('http://paneladepressao.meurio.org.br/', class: :meurio_app) do
41
41
  = image_tag('mrui_pdp.png')
42
42
  span= application_name(:pdp)
43
+ = link_to('http://verao.meurio.org.br/', class: :meurio_app) do
44
+ = image_tag('mrui_vds.png')
45
+ span= application_name(:vds)
43
46
  = link_to('http://imagine.meurio.org.br/', class: :meurio_app) do
44
47
  = image_tag('mrui_imagine.png')
45
48
  span= application_name(:imagine)
@@ -1,5 +1,5 @@
1
1
  module MeurioUi
2
2
  module Rails
3
- VERSION = "1.3.10"
3
+ VERSION = "1.3.11"
4
4
  end
5
5
  end
@@ -8,12 +8,13 @@ module MeurioUi
8
8
  end
9
9
 
10
10
  def application_name app
11
- return "Meu Rio" if app == :mr20
12
- return "Panela de Pressão" if app == :pdp
13
- return "Imagine" if app == :imagine
14
- return "Faça Acontecer" if app == :apoie
15
- return "De Olho" if app == :deolho
16
- return "De Guarda" if app == :deguarda
11
+ return "Meu Rio" if app == :mr20
12
+ return "Panela de Pressão" if app == :pdp
13
+ return "Verão do Saneamento" if app == :vds
14
+ return "Imagine" if app == :imagine
15
+ return "Faça Acontecer" if app == :apoie
16
+ return "De Olho" if app == :deolho
17
+ return "De Guarda" if app == :deguarda
17
18
  end
18
19
 
19
20
  def meurio_ui_assets
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: meurio_ui
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.10
4
+ version: 1.3.11
5
5
  platform: ruby
6
6
  authors:
7
7
  - Nícolas Iensen
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-12-04 00:00:00.000000000 Z
11
+ date: 2013-12-10 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -60,6 +60,7 @@ files:
60
60
  - app/assets/images/mrui_mr20.png
61
61
  - app/assets/images/mrui_multitude.png
62
62
  - app/assets/images/mrui_pdp.png
63
+ - app/assets/images/mrui_vds.png
63
64
  - app/assets/javascripts/meurio_ui.js
64
65
  - app/assets/stylesheets/meurio_ui.css.sass
65
66
  - app/assets/stylesheets/meurio_ui/colors.css.sass