deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

remove fluiod layout

Browse source
This commit is contained in:
gitlabhq 2011-11-11 11:35:51 -05:00
parent c092f3972a
commit 49b2fb24bc
6 changed files with 7 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/controllers/application_controller.rb
View file

@ -1,9 +1,6 @@
class ApplicationController < ActionController::Base
before_filter :authenticate_user!
before_filter :view_style
protect_from_forgery
helper_method :abilities, :can?
rescue_from Gitosis::AccessDenied do |exception|
@ -76,20 +73,6 @@ class ApplicationController < ActionController::Base
redirect_to @project unless @project.repo_exists?
end
def view_style
if params[:view_style] == "collapsed"
cookies[:view_style] = "collapsed"
elsif params[:view_style] == "fluid"
cookies[:view_style] = "fluid"
end
@view_mode = if cookies[:view_style] == "fluid"
:fluid
else
:collapsed
end
end
def respond_with_notes
if params[:last_id] && params[:first_id]
@notes = @notes.where("id >= ?", params[:first_id])

4
app/helpers/application_helper.rb
View file

@ -7,7 +7,7 @@ module ApplicationHelper
end
def fixed_mode?
@view_mode == :fluid
true
end
def body_class(default_class = nil)
@ -15,7 +15,7 @@ module ApplicationHelper
default_class :
content_for(:body_class)
[main, @view_mode].join(" ")
[main, "collapsed"].join(" ")
end
def commit_name(project, commit)

4
app/views/layouts/_head_panel.html.erb
View file

@ -11,10 +11,8 @@
<div class="account-links">
<%= link_to profile_path, :class => "username" do %>
<%#= current_user.name %>
Your profile
My profile
<% end %>
<%= link_to "Fluid layout", url_for( :view_style => 'fluid' ) unless cookies[:view_style] == "fluid"%>
<%= link_to "Fixed layout", url_for( :view_style => 'collapsed' ) if cookies[:view_style] == "fluid"%>
<%= link_to 'Logout', destroy_user_session_path, :class => "logout", :method => :delete %>
</div>
</div><!-- .account-box -->

2
app/views/projects/_recent_commits.html.haml
View file

@ -22,7 +22,7 @@
- else
= image_tag "no_avatar.png", :class => "left", :width => 40, :style => "padding-right:5px;"
.title
%p= link_to truncate(commit.safe_message, :length => fixed_mode? ? 40 : 100), project_commit_path(@project, :id => commit.id)
%p= link_to truncate(commit.safe_message, :length => 40), project_commit_path(@project, :id => commit.id)
%span
%span.author

4
app/views/projects/_recent_messages.html.haml
View file

@ -7,14 +7,14 @@
%thead
%th
%div{ :class => "recent_message_parent"}
= link_to(truncate(dashboard_feed_title(parent), :length => fixed_mode? ? 40 : 100 ), dashboard_feed_path(@project, parent))
= link_to(truncate(dashboard_feed_title(parent), :length => 40 ), dashboard_feed_path(@project, parent))
- notes.sort {|x,y| y.updated_at <=> x.updated_at }.each do |note|
%tr
%td
%div.message
= image_tag gravatar_icon(note.author_email), :class => "left", :width => 40, :style => "padding-right:5px;"
%div.title
= link_to markdown(truncate(note.note, :length => fixed_mode? ? 40 : 100)), dashboard_feed_path(@project, parent) + "#note_#{note.id}"
= link_to markdown(truncate(note.note, :length => 40)), dashboard_feed_path(@project, parent) + "#note_#{note.id}"
- if note.attachment.url
%br
Attachment:

2
app/views/projects/_tree_item.html.haml
View file

@ -12,7 +12,7 @@
= time_ago_in_words(content_commit.committed_date)
ago
%td.commit
= link_to truncate(content_commit.safe_message, :length => fixed_mode? ? 40 : 80), project_commit_path(@project, content_commit), :class => "tree-commit-link"
= link_to truncate(content_commit.safe_message, :length => 40), project_commit_path(@project, content_commit), :class => "tree-commit-link"
- tm = @project.team_member_by_name_or_email(content_commit.author_email, content_commit.author_name)
- if tm
= link_to "[#{tm.user_name}]", project_team_member_path(@project, tm)