meurio_ui 1.3.4 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b210e19b183d0e0e70fe0fc38f305f81f4a160e6
-  data.tar.gz: 7bc698c2075c30614e215a4b0911161d3199095f
+  metadata.gz: da94e3f7fac7d2410f80b8435dcb0266c96396c3
+  data.tar.gz: 53f03de2db494952f023c0bf6979af82bf6fe03d
 SHA512:
-  metadata.gz: b178162b71677bd9ff14d3221dd2c3a603413a0aa9ba53db6b4b316ce3702923cfe093fe6c331d967e768247cabed193d10abe3c3c5791aae44144046ad73520
-  data.tar.gz: ede00e490608cd5ad0071bffe0ecac82515a54e54bcd100c302191856a5f4acd3e712f40186ea3c068470343ba76e7c3e9d0833793b60d1e341382e15509bb40
+  metadata.gz: 92ca8c94a3afc635ca018802cdd7e62fd5ead7bc4d5622585ea8c2d17b0dc7ac9608ca7284cb1c4e0e65f3a8941cdedf541bae8d79cc3e48da6cb10d2556b942
+  data.tar.gz: 58fbd236b303ac26ce70d63aebddd2dc8f33036ac5d14cb66c855bb50f8ec9785ca74debabb8167aef8317d500edc26ac10279e9a162bd42a45c58a1fcd94b43

data/app/assets/javascripts/meurio_ui.js

@@ -1,6 +1,5 @@
 $(function(){
-  $('header.meurio_header .meurio_apps').hover(function(e){ $('.other_apps').toggle(); e.stopPropagation(); return false; });
-
-  $('header.meurio_header .icon-triangle-down').click(function(e){ $('.current_user_links').toggle(); e.stopPropagation(); return false; });
+  $('.meurio_header .meurio_apps').hover(function(e){ $('.other_apps').toggle(); e.stopPropagation(); return false; });
+  $('.meurio_header .icon-triangle-down').click(function(e){ $('.current_user_links').toggle(); e.stopPropagation(); return false; });
   $(document).click(function(){ $('.current_user_links').hide(); });  
 });

data/app/assets/stylesheets/meurio_ui/meurio_header.css.sass

@@ -1,4 +1,4 @@
-header.meurio_header
+.meurio_header
   font-size: 14px
   .row
     overflow: visible

data/app/views/meurio_ui/meurio_header.html.slim

@@ -1,8 +1,8 @@
-header.meurio_header
+.meurio_header
   .meurio_logo_and_user_menu
     .row
-      .meurio_logo= link_to image_tag('meurio.png'), 'http://meurio.org.br/'
-      - if @app == :pdp or @app == :mr20
+      .meurio_logo= link_to image_tag('mrui_meurio.png'), 'http://meurio.org.br/'
+      - if @app == :pdp or @app == :mr20 or @app == :accounts
         .user_menu
           - if current_user.present?
             .current_user
@@ -13,6 +13,7 @@ header.meurio_header
             .current_user_links
               = link_to "Ver perfil", "http://meurio.org.br/users/#{current_user.id}"
               = link_to "Editar perfil", "http://accounts.meurio.org.br/users/#{current_user.id}/edit"
+              = link_to "Sair", "http://accounts.meurio.org.br/logout"
               = yield :current_user_links
           - else
             = link_to 'Entrar', "http://accounts.meurio.org.br/?redirect_url=#{request.url}", class: :hollow_btn      
@@ -26,27 +27,27 @@ header.meurio_header
             - if @app == :mr20
               span Aplicativos
             - else
-              = image_tag("#{@app}.png")
+              = image_tag("mrui_#{@app}.png")
               span= application_name(@app)
           span.icon-arrow-box
         .other_apps
           = link_to('http://meurio.org.br/', class: :meurio_app) do
-            = image_tag('mr20.png')
+            = image_tag('mrui_mr20.png')
             span= application_name(:mr20)
           = link_to('http://paneladepressao.meurio.org.br/', class: :meurio_app) do
-            = image_tag('pdp.png')
+            = image_tag('mrui_pdp.png')
             span= application_name(:pdp)
           = link_to('http://imagine.meurio.org.br/', class: :meurio_app) do
-            = image_tag('imagine.png')
+            = image_tag('mrui_imagine.png')
             span= application_name(:imagine)
           = link_to('https://apoie.meurio.org.br/', class: :meurio_app) do
-            = image_tag('apoie.png')
+            = image_tag('mrui_apoie.png')
             span= application_name(:apoie)
           = link_to('http://deolho.meurio.org.br/', class: :meurio_app) do
-            = image_tag('deolho.png')
+            = image_tag('mrui_deolho.png')
             span= application_name(:deolho)
           = link_to('http://deguarda.meurio.org.br/', class: :meurio_app) do
-            = image_tag("deguarda.png")
+            = image_tag("mrui_deguarda.png")
             span= application_name(:deguarda)
       .application_menu= yield :application_menu
       .clear

data/lib/meurio_ui/version.rb

@@ -1,5 +1,5 @@
 module MeurioUi
   module Rails
-    VERSION = "1.3.4"
+    VERSION = "1.3.5"
   end
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: meurio_ui
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors:
 - Nícolas Iensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-28 00:00:00.000000000 Z
+date: 2013-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Meu Rio UI is a Rails engine that provides user interface components
@@ -46,20 +46,20 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- app/assets/images/apoie.png
-- app/assets/images/deguarda.png
-- app/assets/images/deolho.png
-- app/assets/images/eventos.png
-- app/assets/images/imagine.png
-- app/assets/images/meurio.png
-- app/assets/images/mr20.png
-- app/assets/images/multitude.png
-- app/assets/images/pdp.png
+- app/assets/images/mrui_apoie.png
+- app/assets/images/mrui_deguarda.png
+- app/assets/images/mrui_deolho.png
+- app/assets/images/mrui_eventos.png
+- app/assets/images/mrui_imagine.png
+- app/assets/images/mrui_meurio.png
+- app/assets/images/mrui_mr20.png
+- app/assets/images/mrui_multitude.png
+- app/assets/images/mrui_pdp.png
 - app/assets/javascripts/meurio_ui.js
 - app/assets/stylesheets/meurio_ui.css.sass
 - app/assets/stylesheets/meurio_ui/colors.css.sass
@@ -81,17 +81,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: Default UI elements for Meu Rio projects