gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-13 19:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix the desktop dropdown to not close on click

Browse source
This commit is contained in:
Henne Vogelsang 2013-06-28 00:37:11 +02:00 • committed by Henne Vogelsang
parent ba21da5d72
commit 8286c8130d
2 changed files with 22 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

22
app/views/layouts/_navigation.html.haml
View file

@ -53,10 +53,10 @@
= link_to(admin_conference_events_path(@conference.short_title)) do = link_to(admin_conference_events_path(@conference.short_title)) do
%i.icon-comment %i.icon-comment
Events Events
%li %li
= link_to(admin_conference_schedule_path(@conference.short_title), :target => "_blank") do = link_to(admin_conference_schedule_path(@conference.short_title), :target => "_blank") do
%i.icon-tasks %i.icon-tasks
Schedule Schedule
%ul.nav.hidden-desktop %ul.nav.hidden-desktop
= render 'layouts/user_menu' = render 'layouts/user_menu'
%ul.nav.pull-right.visible-desktop %ul.nav.pull-right.visible-desktop
@ -68,12 +68,22 @@
= render 'layouts/user_menu' = render 'layouts/user_menu'
- else - else
%ul.nav.pull-right %ul.nav.pull-right
- if current_page?(new_registration_path('user'))
%li.active
= link_to(new_registration_path('user')) do
%i.icon-heart
Sign Up
- else
%li
= link_to(new_registration_path('user')) do
%i.icon-heart
Sign Up
%li.dropdown.visible-desktop %li.dropdown.visible-desktop
%a.dropdown-toggle{"data-toggle" => "dropdown", :href => "#"} %a.dropdown-toggle{"data-toggle" => "dropdown", :href => "#"}
%i.icon-user.icon-2x %i.icon-user.icon-2x
Sign In Sign In
%i.icon-angle-down %i.icon-angle-down
.dropdown-menu{:style => "padding: 15px; padding-bottom: 0px;"} .dropdown-menu{:style => "padding: 17px;"}
= form_tag user_session_path do = form_tag user_session_path do
= text_field_tag 'user[email]' = text_field_tag 'user[email]'
= password_field_tag 'user[password]' = password_field_tag 'user[password]'
@ -84,4 +94,4 @@
%br %br
= link_to "Forgot your password?", new_password_path('user') = link_to "Forgot your password?", new_password_path('user')
%li.hidden-desktop %li.hidden-desktop
= link_to('Sign In', new_user_session_path) = link_to('Sign In', new_user_session_path)

6
app/views/layouts/application.html.haml
View file

@ -9,6 +9,12 @@
= stylesheet_link_tag "application" = stylesheet_link_tag "application"
= javascript_include_tag "application" = javascript_include_tag "application"
= csrf_meta_tags = csrf_meta_tags
:javascript
$(function() {
$('.dropdown input, .dropdown label').click(function(e) {
e.stopPropagation();
});
});
= yield(:head) = yield(:head)
%body %body
#wrap #wrap