diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/highlight/white.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/sections/commits.scss | 2 | ||||
| -rw-r--r-- | app/controllers/commits_controller.rb | 2 | ||||
| -rw-r--r-- | app/views/commits/_commit_box.html.haml | 34 | ||||
| -rw-r--r-- | app/views/commits/huge_commit.html.haml | 3 | ||||
| -rw-r--r-- | app/views/commits/show.html.haml | 34 | ||||
| -rw-r--r-- | app/views/devise/sessions/_new_ldap.html.erb | 39 | ||||
| -rw-r--r-- | app/views/devise/sessions/new.html.erb | 41 | ||||
| -rw-r--r-- | app/views/profile/show.html.haml | 2 |
9 files changed, 106 insertions, 55 deletions
diff --git a/app/assets/stylesheets/highlight/white.scss b/app/assets/stylesheets/highlight/white.scss index 2b95d4b5dd1..a08f05bdb54 100644 --- a/app/assets/stylesheets/highlight/white.scss +++ b/app/assets/stylesheets/highlight/white.scss @@ -51,7 +51,7 @@ td.code .highlight { table.highlighttable pre{ padding:0; margin:0; - font-family: 'Menlo', 'Courier New', 'andale mono','lucida console',monospace; + font-family: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono','lucida console',monospace; color: #333; text-align:left; } @@ -61,7 +61,7 @@ table.highlighttable pre{ padding:15px; line-height:2.0; margin:0; - font-family: 'Menlo', 'Courier New', 'andale mono','lucida console',monospace; + font-family: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono','lucida console',monospace; color: #333; text-align:left;} } diff --git a/app/assets/stylesheets/sections/commits.scss b/app/assets/stylesheets/sections/commits.scss index c0a5d708a12..078709e2afc 100644 --- a/app/assets/stylesheets/sections/commits.scss +++ b/app/assets/stylesheets/sections/commits.scss @@ -81,7 +81,7 @@ background:#fff; color:#333; font-size: 12px; - font-family: 'Menlo', 'Courier New', 'andale mono','lucida console',monospace; + font-family: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono','lucida console',monospace; } .diff_file_content_image { background:#eee; diff --git a/app/controllers/commits_controller.rb b/app/controllers/commits_controller.rb index 8a91c28480c..bbf5a672d7f 100644 --- a/app/controllers/commits_controller.rb +++ b/app/controllers/commits_controller.rb @@ -41,6 +41,8 @@ class CommitsController < ApplicationController if @commit.diffs.size > 200 && !params[:force_show_diff] @suppress_diff = true end + rescue Grit::Git::GitTimeout + render "huge_commit" end def compare diff --git a/app/views/commits/_commit_box.html.haml b/app/views/commits/_commit_box.html.haml new file mode 100644 index 00000000000..c821c260f1b --- /dev/null +++ b/app/views/commits/_commit_box.html.haml @@ -0,0 +1,34 @@ +.commit-box{class: @commit.parents.count > 1 ? "merge-commit" : ""} + .commit-head + = link_to "Browse Code »", tree_project_ref_path(@project, @commit.id), :class => "browse-button" + %h3.commit-title + = commit_msg_with_link_to_issues(@project, @commit.title) + - if @commit.description.present? + %pre.commit-description + = commit_msg_with_link_to_issues(@project, @commit.description) + .commit-info + .row + .span4 + = image_tag gravatar_icon(@commit.author_email, 40), :class => "avatar" + .author + %strong= @commit.author_name + authored + %time{title: @commit.authored_date.stamp("Aug 21, 2011 9:23pm")} + #{time_ago_in_words(@commit.authored_date)} ago + - if @commit.different_committer? + .committer + → + %strong= @commit.committer_name + committed + %time{title: @commit.committed_date.stamp("Aug 21, 2011 9:23pm")} + #{time_ago_in_words(@commit.committed_date)} ago + .span7.right + .sha-block + %span.cgray commit + %code= @commit.id + .sha-block + %span.cgray= pluralize(@commit.parents.count, "parent") + - @commit.parents.each do |parent| + = link_to parent.id[0...10], project_commit_path(@project, parent) + + diff --git a/app/views/commits/huge_commit.html.haml b/app/views/commits/huge_commit.html.haml new file mode 100644 index 00000000000..ba97a7c572c --- /dev/null +++ b/app/views/commits/huge_commit.html.haml @@ -0,0 +1,3 @@ += render "commits/commit_box" +.alert-message.block-message.error + %h4 Commit diffs are too big to be displayed diff --git a/app/views/commits/show.html.haml b/app/views/commits/show.html.haml index 0365e6584a8..7119bd04b9e 100644 --- a/app/views/commits/show.html.haml +++ b/app/views/commits/show.html.haml @@ -1,36 +1,4 @@ -.commit-box{class: @commit.parents.count > 1 ? "merge-commit" : ""} - .commit-head - = link_to "Browse Code »", tree_project_ref_path(@project, @commit.id), :class => "browse-button" - %h3.commit-title - = commit_msg_with_link_to_issues(@project, @commit.title) - - if @commit.description.present? - %pre.commit-description - = commit_msg_with_link_to_issues(@project, @commit.description) - .commit-info - .row - .span4 - = image_tag gravatar_icon(@commit.author_email, 40), :class => "avatar" - .author - %strong= @commit.author_name - authored - %time{title: @commit.authored_date.stamp("Aug 21, 2011 9:23pm")} - #{time_ago_in_words(@commit.authored_date)} ago - - if @commit.different_committer? - .committer - → - %strong= @commit.committer_name - committed - %time{title: @commit.committed_date.stamp("Aug 21, 2011 9:23pm")} - #{time_ago_in_words(@commit.committed_date)} ago - .span7.right - .sha-block - %span.cgray commit - %code= @commit.id - .sha-block - %span.cgray= pluralize(@commit.parents.count, "parent") - - @commit.parents.each do |parent| - = link_to parent.id[0...10], project_commit_path(@project, parent) - += render "commits/commit_box" = render "commits/diffs", :diffs => @commit.diffs = render "notes/notes", :tid => @commit.id, :tt => "commit" = render "notes/per_line_form" diff --git a/app/views/devise/sessions/_new_ldap.html.erb b/app/views/devise/sessions/_new_ldap.html.erb new file mode 100644 index 00000000000..35dfaf71409 --- /dev/null +++ b/app/views/devise/sessions/_new_ldap.html.erb @@ -0,0 +1,39 @@ +<%= form_tag(user_omniauth_callback_path(:ldap), :class => "login-box", :id => 'new_ldap_user' ) do %> + <%= image_tag "login-logo.png", :width => "304", :height => "66", :class => "login-logo", :alt => "Login Logo" %> + + <%= text_field_tag :username, nil, {:class => "text top", :placeholder => "LDAP Login"} %> + <%= password_field_tag :password, nil, {:class => "text bottom", :placeholder => "Password"} %> + + <br/> + <%= submit_tag "LDAP Sign in", :class => "primary btn" %> + + <%- if devise_mapping.omniauthable? %> + <%- (resource_class.omniauth_providers - [:ldap]).each do |provider| %> + <hr/> + <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider), :class => "btn primary" %><br /> + <% end -%> + <% end -%> + + <hr/> + <a href="#" id="other_form_toggle" onclick="javascript:$('#new_user').toggle();">Other Sign in</a> + <!-- inline for right now just to illustrate --> + <script type="text/javascript"> + $(function() { + $('#new_user').toggle(); + }); + </script> +<% end %> + + +<%= form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => { :class => "login-box" }) do |f| %> + <%= f.text_field :email, :class => "text top", :placeholder => "Email" %> + <%= f.password_field :password, :class => "text bottom", :placeholder => "Password" %> + + <% if devise_mapping.rememberable? -%> + <div class="clearfix inputs-list"> <label class="checkbox remember_me" for="user_remember_me"><%= f.check_box :remember_me %><span>Remember me</span></label></div> + <% end -%> + <br/> + <%= f.submit "Sign in", :class => "primary btn" %> + <div class="right"> <%= render :partial => "devise/shared/links" %></div> + +<% end %> diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index a2956eb31d9..a03838669cf 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -1,22 +1,27 @@ -<%= form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => { :class => "login-box" }) do |f| %> - <%= image_tag "login-logo.png", :width => "304", :height => "66", :class => "login-logo", :alt => "Login Logo" %> - <%= f.text_field :email, :class => "text top", :placeholder => "Email" %> - <%= f.password_field :password, :class => "text bottom", :placeholder => "Password" %> +<% unless ldap_enable? -%> - <% if devise_mapping.rememberable? -%> - <div class="clearfix inputs-list"> <label class="checkbox remember_me" for="user_remember_me"><%= f.check_box :remember_me %><span>Remember me</span></label></div> - <% end -%> - <br/> - <%= f.submit "Sign in", :class => "primary btn" %> - <div class="right"> <%= render :partial => "devise/shared/links" %></div> + <%= form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => { :class => "login-box" }) do |f| %> + <%= image_tag "login-logo.png", :width => "304", :height => "66", :class => "login-logo", :alt => "Login Logo" %> - <%- if devise_mapping.omniauthable? %> - <%- resource_class.omniauth_providers.each do |provider| %> - <hr/> - <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider), :class => "btn primary" %><br /> + <%= f.text_field :email, :class => "text top", :placeholder => "Email" %> + <%= f.password_field :password, :class => "text bottom", :placeholder => "Password" %> + + <% if devise_mapping.rememberable? -%> + <div class="clearfix inputs-list"> <label class="checkbox remember_me" for="user_remember_me"><%= f.check_box :remember_me %><span>Remember me</span></label></div> + <% end -%> + <br/> + <%= f.submit "Sign in", :class => "primary btn" %> + <div class="right"> <%= render :partial => "devise/shared/links" %></div> + + <%- if devise_mapping.omniauthable? %> + <%- resource_class.omniauth_providers.each do |provider| %> + <hr/> + <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider), :class => "btn primary" %><br /> + <% end -%> <% end -%> - <% end -%> - <% if ldap_enable? -%> - <p><%= link_to "via LDAP", user_omniauth_authorize_path(:ldap)%></p> - <% end -%> + + <% end %> + +<% else %> + <%= render :partial => 'devise/sessions/new_ldap' %> <% end %> diff --git a/app/views/profile/show.html.haml b/app/views/profile/show.html.haml index 5a343c33981..48f9f936c93 100644 --- a/app/views/profile/show.html.haml +++ b/app/views/profile/show.html.haml @@ -61,7 +61,7 @@ %h4 SSH public keys: %small.right - %span= current_user.keys.count + %span= link_to current_user.keys.count, keys_path = link_to "Add Public Key", new_key_path, :class => "btn small right" |