remove fluiod layout
This commit is contained in:
parent
c092f3972a
commit
49b2fb24bc
6 changed files with 7 additions and 26 deletions
|
@ -1,9 +1,6 @@
|
||||||
class ApplicationController < ActionController::Base
|
class ApplicationController < ActionController::Base
|
||||||
before_filter :authenticate_user!
|
before_filter :authenticate_user!
|
||||||
before_filter :view_style
|
|
||||||
|
|
||||||
protect_from_forgery
|
protect_from_forgery
|
||||||
|
|
||||||
helper_method :abilities, :can?
|
helper_method :abilities, :can?
|
||||||
|
|
||||||
rescue_from Gitosis::AccessDenied do |exception|
|
rescue_from Gitosis::AccessDenied do |exception|
|
||||||
|
@ -76,20 +73,6 @@ class ApplicationController < ActionController::Base
|
||||||
redirect_to @project unless @project.repo_exists?
|
redirect_to @project unless @project.repo_exists?
|
||||||
end
|
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
|
def respond_with_notes
|
||||||
if params[:last_id] && params[:first_id]
|
if params[:last_id] && params[:first_id]
|
||||||
@notes = @notes.where("id >= ?", params[:first_id])
|
@notes = @notes.where("id >= ?", params[:first_id])
|
||||||
|
|
|
@ -7,7 +7,7 @@ module ApplicationHelper
|
||||||
end
|
end
|
||||||
|
|
||||||
def fixed_mode?
|
def fixed_mode?
|
||||||
@view_mode == :fluid
|
true
|
||||||
end
|
end
|
||||||
|
|
||||||
def body_class(default_class = nil)
|
def body_class(default_class = nil)
|
||||||
|
@ -15,7 +15,7 @@ module ApplicationHelper
|
||||||
default_class :
|
default_class :
|
||||||
content_for(:body_class)
|
content_for(:body_class)
|
||||||
|
|
||||||
[main, @view_mode].join(" ")
|
[main, "collapsed"].join(" ")
|
||||||
end
|
end
|
||||||
|
|
||||||
def commit_name(project, commit)
|
def commit_name(project, commit)
|
||||||
|
|
|
@ -11,10 +11,8 @@
|
||||||
<div class="account-links">
|
<div class="account-links">
|
||||||
<%= link_to profile_path, :class => "username" do %>
|
<%= link_to profile_path, :class => "username" do %>
|
||||||
<%#= current_user.name %>
|
<%#= current_user.name %>
|
||||||
Your profile
|
My profile
|
||||||
<% end %>
|
<% 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 %>
|
<%= link_to 'Logout', destroy_user_session_path, :class => "logout", :method => :delete %>
|
||||||
</div>
|
</div>
|
||||||
</div><!-- .account-box -->
|
</div><!-- .account-box -->
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
- else
|
- else
|
||||||
= image_tag "no_avatar.png", :class => "left", :width => 40, :style => "padding-right:5px;"
|
= image_tag "no_avatar.png", :class => "left", :width => 40, :style => "padding-right:5px;"
|
||||||
.title
|
.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
|
||||||
%span.author
|
%span.author
|
||||||
|
|
|
@ -7,14 +7,14 @@
|
||||||
%thead
|
%thead
|
||||||
%th
|
%th
|
||||||
%div{ :class => "recent_message_parent"}
|
%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|
|
- notes.sort {|x,y| y.updated_at <=> x.updated_at }.each do |note|
|
||||||
%tr
|
%tr
|
||||||
%td
|
%td
|
||||||
%div.message
|
%div.message
|
||||||
= image_tag gravatar_icon(note.author_email), :class => "left", :width => 40, :style => "padding-right:5px;"
|
= image_tag gravatar_icon(note.author_email), :class => "left", :width => 40, :style => "padding-right:5px;"
|
||||||
%div.title
|
%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
|
- if note.attachment.url
|
||||||
%br
|
%br
|
||||||
Attachment:
|
Attachment:
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
= time_ago_in_words(content_commit.committed_date)
|
= time_ago_in_words(content_commit.committed_date)
|
||||||
ago
|
ago
|
||||||
%td.commit
|
%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)
|
- tm = @project.team_member_by_name_or_email(content_commit.author_email, content_commit.author_name)
|
||||||
- if tm
|
- if tm
|
||||||
= link_to "[#{tm.user_name}]", project_team_member_path(@project, tm)
|
= link_to "[#{tm.user_name}]", project_team_member_path(@project, tm)
|
||||||
|
|
Loading…
Reference in a new issue