commits page

diff --git a/app/assets/stylesheets/projects.css.scss b/app/assets/stylesheets/projects.css.scss
index e5184a7..418a6e8 100644 (file)
--- a/app/assets/stylesheets/projects.css.scss
+++ b/app/assets/stylesheets/projects.css.scss
@@ -102,54 +102,6 @@ table.round-borders {
   float:left;
 }
 
-.day-commits-table {
-  @include round-borders-all(4px);
-  padding: 4px 0px;
-  margin-bottom:10px;
-  display:block;
-  width:100%;
-  background: #E6F1F6;
-
-  .day-header {
-    padding:10px;
-    h3 {
-      margin:0px;
-    }
-  }
-
-  ul {
-    display:block;
-    list-style:none;
-    margin:0px;
-    padding:0px;
-
-    li.commit {
-      display:list-item;
-      padding:8px;
-      margin:0px;
-      background: #F7FBFC;
-      border-top: 1px solid #E2EAEE;
-
-      &:first-child {
-        border-top: 1px solid #E2EAEE;
-      }
-      &:nth-child(2n+1) {
-        background: white;
-      }
-
-      a.button {
-        width:85px;
-        padding:10px;
-        margin:0px;
-        float:right;
-      }
-      p {
-        margin-bottom: 3px;
-        font-size: 13px;
-      }
-    }
-  }
-}
 @mixin panel-color {
   background: #111 !important;
   background: -webkit-gradient(linear,left top,left bottom,from(#333),to(#111)) !important;

diff --git a/app/views/commits/_commits.html.haml b/app/views/commits/_commits.html.haml
index 9982306..36225d3 100644 (file)
--- a/app/views/commits/_commits.html.haml
+++ b/app/views/commits/_commits.html.haml
@@ -1,22 +1,25 @@
 - @commits.group_by { |c| c.committed_date.to_date }.each do |day, commits|
-  .day-commits-table
-    .day-header
+  %div{ :class => "commits-date ui-box ui-box-small ui-box-big" }
+    .day-commits-table
       %h3= day.stamp("28 Aug, 2010")
-    %ul
-      - commits.each do |commit|
-        %li{ :class => "commit", :url => project_commit_path(@project, :id => commit.id) }
-          - if commit.author.email
-            = image_tag gravatar_icon(commit.author.email), :class => "left", :width => 40, :style => "padding-right:5px;"
-          - else
-            = image_tag "no_avatar.png", :class => "left", :width => 40, :style => "padding-right:5px;"
-          %p
-            %strong
-              = truncate(commit.safe_message, :length => 60)
-            = link_to "Browse Code", tree_project_path(@project, :commit_id => commit.id), :class => "lite_button", :style => "float:right"
-            = link_to truncate(commit.id.to_s, :length => 16), project_commit_path(@project, :id => commit.id), :class => "lite_button", :style => "width:120px;float:right"
-          %span
-            %span.author
-              = commit.author
-            = time_ago_in_words(commit.committed_date)
-            ago
+      .data
+        - commits.each do |commit|
+          %a{ :class => "commit", :href => project_commit_path(@project, :id => commit.id) }
+            %span.commit-info
+              %data.commit-button
+                = truncate(commit.id.to_s, :length => 16)
+                %i
+              %data.commit-browse{ :onclick => "location.href='#{tree_project_path(@project, :commit_id => commit.id)}';return false;"}
+                Browse Code
+            - if commit.author.email
+              = image_tag gravatar_icon(commit.author.email), :class => "left", :width => 40, :style => "padding-right:5px;"
+            - else
+              = image_tag "no_avatar.png", :class => "left", :width => 40, :style => "padding-right:5px;"
+            %span.commit-title
+              %strong
+                = truncate(commit.safe_message, :length => 60)
+            %span.commit-author
+              %strong= commit.author
+              = time_ago_in_words(commit.committed_date)
+              ago
 = more_commits_link if @commits.size > 99

diff --git a/app/views/commits/index.html.haml b/app/views/commits/index.html.haml
index 452e13f..92a382a 100644 (file)
--- a/app/views/commits/index.html.haml
+++ b/app/views/commits/index.html.haml
@@ -1,3 +1,4 @@
+- content_for(:body_class, "project-page commits-page")
 %div
   %h3
     .left

diff --git a/app/views/layouts/project.html.haml b/app/views/layouts/project.html.haml
index acf57bd..619952f 100644 (file)
--- a/app/views/layouts/project.html.haml
+++ b/app/views/layouts/project.html.haml
@@ -10,7 +10,7 @@
     = javascript_tag do
       REQ_URI = "#{request.env["REQUEST_URI"]}";
       REQ_REFFER = "#{request.env["HTTP_REFERER"]}";
-  %body.project-page
+  %body{ :class => content_for?(:body_class) ? yield(:body_class) : 'project-page', :id => yield(:boyd_id)}
     #container
       = render :partial => "layouts/flash"
       = render :partial => "layouts/head_panel"
@@ -19,25 +19,25 @@
           .fixed
             %input.git-url.text{:id => "", :name => "", :readonly => "", :type => "text", :value => @project.url_to_repo}
               %aside
-                = link_to image_tag("home.png", :width => 20), project_path(@project), :class => current_page?(:controller => "projects", :action => "show", :id => @project) ? "current" : nil
+                = link_to "History", project_path(@project), :class => current_page?(:controller => "projects", :action => "show", :id => @project) ? "current" : nil
                 = link_to "Tree", tree_project_path(@project), :class => current_page?(:controller => "projects", :action => "tree", :id => @project) ? "current" : nil
                 = link_to "Commits", project_commits_path(@project), :class => current_page?(:controller => "commits", :action => "index", :project_id => @project) ? "current" : nil
                 = link_to team_project_path(@project), :class => (current_page?(:controller => "projects", :action => "team", :id => @project) || controller.controller_name == "team_members") ? "current" : nil do
                   Team
                   - if @project.users_projects.count > 0
-                    %span{ :class => "top_menu_count" }= @project.users_projects.count
+                    %span{ :class => "number" }= @project.users_projects.count
                 = link_to  project_issues_path(@project), :class => (controller.controller_name == "issues") ? "current" : nil do
                   Issues
                   - if @project.issues.opened.count > 0
-                    %span{ :class => "top_menu_count" }= @project.issues.opened.count
+                    %span{ :class => "number" }= @project.issues.opened.count
                 = link_to wall_project_path(@project), :class => current_page?(:controller => "projects", :action => "wall", :id => @project) ? "current" : nil do
                   Wall
                   - if @project.common_notes.count > 0
-                    %span{ :class => "top_menu_count" }= @project.common_notes.count
+                    %span{ :class => "number" }= @project.common_notes.count
                 = link_to project_snippets_path(@project), :class => (controller.controller_name == "snippets") ? "current" : nil do
                   Snippets
                   - if @project.snippets.count > 0
-                    %span{ :class => "top_menu_count" }= @project.snippets.non_expired.count
+                    %span{ :class => "number" }= @project.snippets.non_expired.count
                 - if @commit
                   = link_to truncate(commit_name(@project,@commit), :length => 15), project_commit_path(@project, :id => @commit.id), :class => current_page?(:controller => "commits", :action => "show", :project_id => @project, :id => @commit.id) ? "current" : nil