Conflicts: app/views/layouts/application.html.haml app/views/shared/_publisher.haml app/views/shared/_sub_header.haml app/views/users/edit.html.haml config/deploy_config.yml config/routes.rb
30 lines
758 B
Text
30 lines
758 B
Text
-# Copyright (c) 2010, Diaspora Inc. This file is
|
|
-# licensed under the Affero General Public License version 3. See
|
|
-# the COPYRIGHT file.
|
|
|
|
:javascript
|
|
$("#settings_nav li > a").click( function() {
|
|
var target = "#"+$(this).attr('class');
|
|
if( !$(target).is(":visible") ) {
|
|
$(".settings_pane").fadeOut(200, function() {
|
|
$(target).delay(200).fadeIn(200);
|
|
});
|
|
}
|
|
});
|
|
|
|
|
|
- content_for :publish do
|
|
%h1="#{t('.editing_profile')}"
|
|
|
|
- content_for :left_pane do
|
|
%ul#settings_nav
|
|
%li=link_to 'Profile', '#', :class => 'profile'
|
|
%li=link_to 'Services', '#', :class => 'services'
|
|
|
|
#profile.settings_pane{:style=>"display:block;"}
|
|
= render 'users/profile'
|
|
|
|
#services.settings_pane
|
|
= render 'users/services'
|
|
|
|
|