# HG changeset patch # User Chris Cannam # Date 1295371338 0 # Node ID 1890a968b40432a00d15b8ab36309c92d1506ede # Parent ab611b7c7ecc7dd7b1ac44026a76a9c0c0b54b9a * Show Public or Private next to my projects; fix ordering of my projects so as to retain hierarchy diff -r ab611b7c7ecc -r 1890a968b404 app/controllers/projects_controller.rb --- a/app/controllers/projects_controller.rb Tue Jan 18 17:02:06 2011 +0000 +++ b/app/controllers/projects_controller.rb Tue Jan 18 17:22:18 2011 +0000 @@ -58,7 +58,7 @@ @offset ||= @project_pages.current.offset @projects = Project.visible.all(:offset => @offset, :limit => @limit, :order => sort_clause) if User.current.logged? - @user_projects = User.current.projects + @user_projects = User.current.projects.sort_by(&:lft) end render :template => 'projects/index.rhtml', :layout => !request.xhr? } diff -r ab611b7c7ecc -r 1890a968b404 app/helpers/projects_helper.rb --- a/app/helpers/projects_helper.rb Tue Jan 18 17:02:06 2011 +0000 +++ b/app/helpers/projects_helper.rb Tue Jan 18 17:22:18 2011 +0000 @@ -121,7 +121,12 @@ classes = (ancestors.empty? ? 'root' : 'child') s << "
  • " + - link_to_project(project, {}, :class => "project #{User.current.member_of?(project) ? 'my-project' : nil}") + link_to_project(project, {}, :class => "project my-project") + if project.is_public? + s << " " << l("field_is_public") << "" + else + s << " " << l("field_is_private") << "" + end s << "
    #{textilizable(project.short_description, :project => project)}
    " unless project.description.blank? s << "
    \n" ancestors << project diff -r ab611b7c7ecc -r 1890a968b404 config/locales/en-GB.yml --- a/config/locales/en-GB.yml Tue Jan 18 17:02:06 2011 +0000 +++ b/config/locales/en-GB.yml Tue Jan 18 17:22:18 2011 +0000 @@ -237,6 +237,7 @@ field_role: Role field_homepage: Homepage field_is_public: Public + field_is_private: Private field_parent: Subproject of field_is_in_roadmap: Issues displayed in roadmap field_login: Login diff -r ab611b7c7ecc -r 1890a968b404 config/locales/en.yml --- a/config/locales/en.yml Tue Jan 18 17:02:06 2011 +0000 +++ b/config/locales/en.yml Tue Jan 18 17:22:18 2011 +0000 @@ -242,6 +242,7 @@ field_role: Role field_homepage: Homepage field_is_public: Public + field_is_private: Private field_parent: Subproject of field_is_in_roadmap: Issues displayed in roadmap field_login: Login diff -r ab611b7c7ecc -r 1890a968b404 public/themes/soundsoftware/stylesheets/application.css --- a/public/themes/soundsoftware/stylesheets/application.css Tue Jan 18 17:02:06 2011 +0000 +++ b/public/themes/soundsoftware/stylesheets/application.css Tue Jan 18 17:22:18 2011 +0000 @@ -76,6 +76,8 @@ table.projects .level2 .firstcol { padding-left: 2em; } table.projects .level3 .firstcol { padding-left: 3em; } +ul.projects .public, ul.projects .private { padding-left: 0.5em; color: #3e442c; font-size: 0.95em } + #top-menu { position: absolute; top: 0; z-index: 1; left: 0px; width: 100%; font-size: 90%; /* height: 2em; */ margin: 0; padding: 0; padding-top: 0.5em; background-color: #3e442c; } #top-menu ul { margin-left: 10px; } #top-menu a { font-weight: bold; }