Commit 61a2ce41 authored by Dmytro Zaporozhets's avatar Dmytro Zaporozhets

code cleanin

parent 0f627a65
......@@ -73,7 +73,7 @@ class ProjectsController < ApplicationController
end
def files
@notes = @project.notes.where("attachment != 'NULL'").order("created_at DESC")
@notes = @project.notes.where("attachment != 'NULL'").order("created_at DESC").limit(100)
end
def info
......
......@@ -16,12 +16,21 @@ module ProjectsHelper
nil
end
# expires in 360 days
def switch_colorscheme_link(opts)
if cookies[:colorschema].blank?
link_to_function "paint it black!", "$.cookie('colorschema','black', {expires:360}); window.location.reload()", opts
else
link_to_function "paint it white!", "$.cookie('colorschema','', {expires:360}); window.location.reload()", opts
def project_tab_class
[:show, :files, :team, :edit, :update, :info].each do |action|
return "current" if current_page?(:controller => "projects", :action => action, :id => @project)
end
if controller.controller_name == "snippets" ||
controller.controller_name == "team_members"
"current"
end
end
def tree_tab_class
current_page?(:controller => "refs",
:action => "tree",
:project_id => @project,
:id => @ref || @project.root_ref ) ? "current" : nil
end
end
......@@ -23,8 +23,8 @@
.project-sidebar
.fixed
%aside
= link_to "Project", project_path(@project), :class => (current_page?(:controller => "projects", :action => "show", :id => @project) || controller.controller_name == "snippets" || current_page?(:controller => "projects", :action => "team", :id => @project) || controller.controller_name == "team_members" || current_page?(project_path(@project))) ? "current" : nil
= link_to "Tree", tree_project_ref_path(@project, @project.root_ref), :class => current_page?(:controller => "refs", :action => "tree", :project_id => @project, :id => @ref || @project.root_ref ) ? "current" : nil
= link_to "Project", project_path(@project), :class => project_tab_class
= link_to "Tree", tree_project_ref_path(@project, @project.root_ref), :class => tree_tab_class
= link_to "Commits", project_commits_path(@project), :class => current_page?(:controller => "commits", :action => "index", :project_id => @project) ? "current" : nil
= link_to "Network graph", graph_project_path(@project), :class => current_page?(:controller => "projects", :action => "graph", :id => @project) ? "current" : nil
= link_to project_issues_filter_path(@project), :class => (controller.controller_name == "issues") ? "current" : nil do
......
......@@ -64,6 +64,6 @@
:javascript
$(function(){
$('form #project_default_branch').chosen();
$('#project_default_branch').chosen();
})
= render "project_head"
%div{ :class => "update-data ui-box ui-box-small ui-box-big" }
.data
- @notes.each do |note|
%a.update-item{:href => note.attachment.url}
= image_tag gravatar_icon(note.author_email), :class => "left", :width => 16
%span.update-title{:style => "margin-bottom:0px;"}
= note.attachment_identifier
%span.update-author.right
Added
= time_ago_in_words(note.created_at)
ago
- unless @notes.empty?
%div.update-data.ui-box.ui-box-small
.data
- @notes.each do |note|
%a.update-item{:href => note.attachment.url}
= image_tag gravatar_icon(note.author_email), :class => "left", :width => 16
%span.update-title{:style => "margin-bottom:0px;"}
= note.attachment_identifier
%span.update-author.right
Added
= time_ago_in_words(note.created_at)
ago
- else
%h3 All files attached to project wall, issues etc will be displayed here
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment