diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index a45f274..1d758a2 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -119,27 +119,25 @@ module ApplicationHelper end def shortcut_header_links - search_link = ( lightbox_link_to content_tag('span', _('Search')), { :controller => 'search', :action => 'popup' }, { :id => 'open_search'} ) - - if logged_in? - [ - ( link_to_homepage 'Photo'+ current_user.login, - current_user.login, :id=>"link_go_home" ), - ( link_to_myprofile( content_tag('span', _('control panel')), {}, nil, { :id => 'link_edit_profile'} ) ), - # O ID icon_accessibility tambem tem que aparcer e testei o link nao ta funcionado. - ( link_to content_tag('span', _('Admin')), { :controller => 'admin_panel' }, :id => 'link_admin_panel' if current_user.person.is_admin?), - ( lightbox_link_to content_tag('span', _('Logout')), { :controller => 'account', :action => 'logout_popup'}, :id => 'link_logout'), - search_link, - ] - else - [ - #( link_to _("%s's home") % @environment.name, { :controller=>"home" }, :id=>"link_to_envhome" ), - ( lightbox_link_to content_tag('span', _('Login')), { :controller => 'account', :action => 'login_popup' }, :id => 'link_login' ), - search_link, - ] - end.join(" ") +# search_link = ( lightbox_link_to content_tag('span', _('Search')), { :controller => 'search', :action => 'popup' }, { :id => 'open_search'} ) +# +# if logged_in? +# [ +# ( link_to_homepage 'Photo'+ current_user.login, +# current_user.login, :id=>"link_go_home" ), +# ( link_to_myprofile( content_tag('span', _('control panel')), {}, nil, { :id => 'link_edit_profile'} ) ), +# ( link_to content_tag('span', _('Admin')), { :controller => 'admin_panel' }, :id => 'link_admin_panel' if current_user.person.is_admin?), +# ( lightbox_link_to content_tag('span', _('Logout')), { :controller => 'account', :action => 'logout_popup'}, :id => 'link_logout'), +# search_link, +# ] +# else +# [ +# ( lightbox_link_to content_tag('span', _('Login')), { :controller => 'account', :action => 'login_popup' }, :id => 'link_login' ), +# search_link, +# ] +# end.join(" ") end def link_if_permitted(link, permission = nil, target = nil) diff --git a/app/helpers/assets_helper.rb b/app/helpers/assets_helper.rb index 6f8a49b..51110a0 100644 --- a/app/helpers/assets_helper.rb +++ b/app/helpers/assets_helper.rb @@ -2,13 +2,13 @@ module AssetsHelper def generate_assets_menu() ' -
  • Blogs
    • -
  • Albuns
    • -
  • Produtos
    • -
  • Empreendimentos
    • -
  • bli 5
    • -
  • bli 6
    • -
  • bli 7
    • +
  • Blogs
    • +
  • Albuns
    • +
  • Produtos
    • +
  • Empreendimentos
    • +
  • Comunidades
    • +
  • bli 6
    • +
  • bli 7
    • ' end diff --git a/app/views/layouts/application.rhtml b/app/views/layouts/application.rhtml index 46915e9..421e1ce 100644 --- a/app/views/layouts/application.rhtml +++ b/app/views/layouts/application.rhtml @@ -75,7 +75,11 @@
    - <%= shortcut_header_links %> + <%= render :file => 'layouts/user_menu' %> + <%= + lightbox_link_to ''+ _('Search'), + { :controller => 'search', :action => 'popup' }, :id => 'open_search' + %>
    diff --git a/app/views/layouts/user_menu.rhtml b/app/views/layouts/user_menu.rhtml new file mode 100644 index 0000000..5e7ed45 --- /dev/null +++ b/app/views/layouts/user_menu.rhtml @@ -0,0 +1,36 @@ +
    + +<% if logged_in? %> + <%= + link_to_homepage ''+ current_user.login() +' Icon-Photo'+ + current_user.login, current_user.login, :id=>'link_go_home', :class => 'user_menu_first_link' + %> + + +<% else %> + +<%= lightbox_link_to ''+ _('Login'), + { :controller => 'account', :action => 'login_popup' }, + :id => 'link_login', :class => 'user_menu_first_link' %> + +<% end %> + +
    diff --git a/app/views/shared/categories_menu.rhtml b/app/views/shared/categories_menu.rhtml index 4b42082..f9ea6f4 100644 --- a/app/views/shared/categories_menu.rhtml +++ b/app/views/shared/categories_menu.rhtml @@ -13,7 +13,7 @@
    -
    +
      <%= generate_assets_menu %>
    diff --git a/public/designs/icons/default/community-HC.gif b/public/designs/icons/default/community-HC.gif new file mode 100644 index 0000000..c9c1a92 Binary files /dev/null and b/public/designs/icons/default/community-HC.gif differ diff --git a/public/designs/icons/default/edit-HC.gif b/public/designs/icons/default/edit-HC.gif new file mode 100644 index 0000000..f2c4a12 Binary files /dev/null and b/public/designs/icons/default/edit-HC.gif differ diff --git a/public/designs/icons/default/enter-HC.gif b/public/designs/icons/default/enter-HC.gif new file mode 100644 index 0000000..ba8dd56 Binary files /dev/null and b/public/designs/icons/default/enter-HC.gif differ diff --git a/public/designs/icons/default/exit-HC.gif b/public/designs/icons/default/exit-HC.gif new file mode 100644 index 0000000..1d5776d Binary files /dev/null and b/public/designs/icons/default/exit-HC.gif differ diff --git a/public/designs/icons/default/search-HC.gif b/public/designs/icons/default/search-HC.gif new file mode 100644 index 0000000..2535a43 Binary files /dev/null and b/public/designs/icons/default/search-HC.gif differ diff --git a/public/designs/icons/default/style.css b/public/designs/icons/default/style.css index d6b97b3..abab4ea 100644 --- a/public/designs/icons/default/style.css +++ b/public/designs/icons/default/style.css @@ -19,8 +19,14 @@ .icon-search { background-image: url(gnome-search.png); } .icon-ok { background-image: url(gtk-ok.png); } .icon-login { background-image: url(key-HC.gif); } -.ico-menu- { background-image: url(menu-without-ico-HC.gif) } -.ico-menu-blog { background-image: url(blog-HC.gif); } -.ico-menu-album { background-image: url(album-HC.gif); } -.ico-menu-product { background-image: url(product-HC.gif); } -.ico-menu-enterprise { background-image: url(enterprise-HC.gif); } +.icon-menu- { background-image: url(menu-without-ico-HC.gif) } +.icon-menu-blog { background-image: url(blog-HC.gif); } +.icon-menu-album { background-image: url(album-HC.gif); } +.icon-menu-product { background-image: url(product-HC.gif); } +.icon-menu-enterprise { background-image: url(enterprise-HC.gif); } +.icon-menu-community { background-image: url(community-HC.gif); } +.icon-menu-ctrl-panel { background-image: url(edit-HC.gif); } +.icon-menu-login { background-image: url(enter-HC.gif); } +.icon-menu-logout { background-image: url(exit-HC.gif); } +.icon-menu-search { background-image: url(search-HC.gif); } + diff --git a/public/images/icons-bar/ico-edit.gif b/public/images/icons-bar/ico-edit.gif deleted file mode 100644 index f2c4a12..0000000 Binary files a/public/images/icons-bar/ico-edit.gif and /dev/null differ diff --git a/public/images/icons-bar/ico-enter.gif b/public/images/icons-bar/ico-enter.gif deleted file mode 100644 index ba8dd56..0000000 Binary files a/public/images/icons-bar/ico-enter.gif and /dev/null differ diff --git a/public/images/icons-bar/ico-exit.gif b/public/images/icons-bar/ico-exit.gif deleted file mode 100644 index 1d5776d..0000000 Binary files a/public/images/icons-bar/ico-exit.gif and /dev/null differ diff --git a/public/images/icons-bar/ico-search.gif b/public/images/icons-bar/ico-search.gif deleted file mode 100644 index 2535a43..0000000 Binary files a/public/images/icons-bar/ico-search.gif and /dev/null differ diff --git a/public/stylesheets/menu.css b/public/stylesheets/menu.css index 40b6ff5..7f16816 100644 --- a/public/stylesheets/menu.css +++ b/public/stylesheets/menu.css @@ -63,59 +63,6 @@ body.category2 .linkSubMenu { background-image: url(/images/borda-esq-aba-verde. body.category3 .linkSubMenu { background-image: url(/images/borda-esq-aba-lilas.gif) } body.category4 .linkSubMenu { background-image: url(/images/borda-esq-aba-vermelho.gif) } -#user_box { - position: absolute; - top: 0px; - right: 0px; -} - -#user_box a:link, -#user_box a:visited { - font-weight: bold; - text-decoration: none; - line-height: 20px; - color: #FFF; - margin-right: 20px; - padding-left: 21px; - opacity: 0.7; - filter: alpha(opacity=70); - display: block; - float: left; - height: 20px; - background-position: 0px 0%; - background-repeat: no-repeat; -} - -#user_box a:hover, -#user_box a:active { - opacity: 1; - filter: alpha(opacity=100); -} - -#user_box a#link_to_envhome { - margin-right: 40px; -} - -#user_box #link_go_home, -#user_box #link_go_home:hover { - position: relative; - padding: 0px; -} -#user_box #link_go_home img { - position: absolute; - top: -1px; - left: -23px; - border: none; -} -.msie #link_go_home img { - top: -1px; -} - -#link_login { background-image: url(/images/icons-bar/ico-enter.gif) } -#open_search { background-image: url(/images/icons-bar/ico-search.gif) } -#link_edit_profile { background-image: url(/images/icons-bar/ico-edit.gif) } -#link_logout { background-image: url(/images/icons-bar/ico-exit.gif) } - #cat_menu { padding: 0px; margin: 0px; @@ -233,17 +180,17 @@ body.category4 #assets_menu_list { background-image: url(/images/top-bar/assets- padding: 0px; overflow: hidden; height: 56px; - width: 170px; - max-width: 165px; + width: 165px; } -#assets_menu li { +.top_extra_menu li { margin: 0px; padding: 1px 0px 0px 0px; list-style: none; } -#assets_menu a { +#user_box a, +.top_extra_menu a { font-size: 12px; font-weight: bold; text-decoration: none; @@ -252,23 +199,33 @@ body.category4 #assets_menu_list { background-image: url(/images/top-bar/assets- padding-left: 0px; height: 18px; } -body.category1 #assets_menu a { color: #FDD79E } -body.category2 #assets_menu a { color: #C4F099 } -body.category3 #assets_menu a { color: #D6BFD3 } -body.category4 #assets_menu a { color: #F79494 } -#assets_menu a:hover { +body.category1 #user_box a, +body.category1 .top_extra_menu a { color: #FDD79E } +body.category2 #user_box a, +body.category2 .top_extra_menu a { color: #C4F099 } +body.category3 #user_box a, +body.category3 .top_extra_menu a { color: #D6BFD3 } +body.category4 #user_box a, +body.category4 .top_extra_menu a { color: #F79494 } +#user_box a:hover, +.top_extra_menu a:hover { background: #3465A4; color: #FFF; } -body.category1 #assets_menu a:hover { background: #F57900; color: #FFF } -body.category2 #assets_menu a:hover { background: #61B60E; color: #FFF } -body.category3 #assets_menu a:hover { background: #75507B; color: #FFF } -body.category4 #assets_menu a:hover { background: #CC0000; color: #FFF } +body.category1 #user_box a:hover, +body.category1 .top_extra_menu a:hover { background: #F57900; color: #FFF } +body.category2 #user_box a:hover, +body.category2 .top_extra_menu a:hover { background: #61B60E; color: #FFF } +body.category3 #user_box a:hover, +body.category3 .top_extra_menu a:hover { background: #75507B; color: #FFF } +body.category4 #user_box a:hover, +body.category4 .top_extra_menu a:hover { background: #CC0000; color: #FFF } -#assets_menu a span { +#user_box a span, +.top_extra_menu a span { display: block; width: 18px; - height: 18px; + height: 100%; float: left; background-repeat: no-repeat; background-position: 50% 50%; @@ -276,9 +233,66 @@ body.category4 #assets_menu a:hover { background: #CC0000; color: #FFF } opacity: 0.7; filter: alpha(opacity=70); } -#assets_menu a:hover span { +#user_box a:hover span, +.top_extra_menu a:hover span { opacity: 1; filter: alpha(opacity=100); } +/* * * User Box * * * * * * * * * * * */ + +#user_box { + position: absolute; + top: 0px; + right: 0px; +} + +#open_search { + float: right; + margin-right: 10px; +} +#user_box #open_search:hover { + background: none; +} + +/* * * User Menu * * * * * * * * * * * */ + +#user_menu { + position: absolute; + top: 0px; + right: 180px; + width: 130px; +} + +.user_menu_first_link { + margin-left: 4px; +} +#user_menu .user_menu_first_link:hover { + background: none; +} + +#user_menu a img { + float: left; + border: none; + margin: -1px 2px 0px 0px; + opacity: 0.7; + filter: alpha(opacity=70); +} +#user_menu a:hover img { + opacity: 1; + filter: alpha(opacity=100); +} + +#user_menu ul { + position: absolute; + top: 21px; + right: 0px; + width: 130px; + max-width: 121px; + padding: 2px 4px 5px 5px; + margin: 0px; + border: 1px solid #FFF; + border-top: none; + background: #2A5896; +} -- libgit2 0.21.2