Mercurial > hg > soundsoftware-site
changeset 133:1890a968b404 cannam-pre-20110113-merge
* Show Public or Private next to my projects; fix ordering of my projects so as to retain hierarchy
| author | Chris Cannam <chris.cannam@soundsoftware.ac.uk> |
|---|---|
| date | Tue, 18 Jan 2011 17:22:18 +0000 |
| parents | ab611b7c7ecc |
| children | c7d72c765cc6 |
| files | app/controllers/projects_controller.rb app/helpers/projects_helper.rb config/locales/en-GB.yml config/locales/en.yml public/themes/soundsoftware/stylesheets/application.css |
| diffstat | 5 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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? }
--- 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 << "<li class='#{classes}'><div class='#{classes}'>" + - 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 << " <span class='public'>" << l("field_is_public") << "</span>" + else + s << " <span class='private'>" << l("field_is_private") << "</span>" + end s << "<div class='wiki description'>#{textilizable(project.short_description, :project => project)}</div>" unless project.description.blank? s << "</div>\n" ancestors << project
--- 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
--- 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
--- 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; }