diff options
| author | jessib <jessib@riseup.net> | 2012-10-31 12:56:18 -0700 |
|---|---|---|
| committer | jessib <jessib@riseup.net> | 2012-10-31 12:56:18 -0700 |
| commit | 73a4e9f06840a85225d93734c1f4fb2ebb3b5a93 (patch) | |
| tree | d754b695fed020a0a24c61f160abf04b8049a882 /app/views | |
| parent | 6eaecdd10be3974871583e1fed8c5d4e7e307bd8 (diff) | |
| parent | fc625a54eb5c54cecb5331811ff482df12b7c059 (diff) | |
Merge branch 'develop' into help_develop
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/home/index.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/_navigation.html.haml | 12 |
2 files changed, 5 insertions, 9 deletions
diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 34fb201..9e68674 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -8,4 +8,4 @@ Try to create a %p See all -= link_to "tickets", tickets_path
\ No newline at end of file += link_to "tickets", tickets_path diff --git a/app/views/layouts/_navigation.html.haml b/app/views/layouts/_navigation.html.haml index 04d2356..b75eed7 100644 --- a/app/views/layouts/_navigation.html.haml +++ b/app/views/layouts/_navigation.html.haml @@ -1,10 +1,6 @@ = link_to "Leap Web", root_path, :class => 'brand' %ul.nav - - if current_user - %li - = link_to t(:logout), logout_path - - else - %li - = link_to t(:login), login_path - %li - = link_to t(:signup), signup_path + // = render '/tickets/nav' + +%ul.nav.pull-right + = render '/sessions/nav' |