Download as
Browse Code »

Commit d29ec9d7730ea2cf07ccc2e9dc07dd20df5c391c

Authored by randx
1 parent c4b77943
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Images refactored, Feed icon replaced, Fixed comment form focus

Showing 18 changed files with 26 additions and 19 deletions   Show diff stats
app/assets/images/Info-UI.PNG
View file @c4b7794

801 Bytes
app/assets/images/Rss-UI.PNG
View file @c4b7794

789 Bytes
app/assets/images/add_comment.png
View file @c4b7794

823 Bytes
app/assets/images/admin.PNG
View file @c4b7794

556 Bytes
app/assets/images/comment_add.png
View file @d29ec9d

778 Bytes | W: | H:

781 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/assets/images/download.png
View file @d29ec9d

599 Bytes | W: | H:

674 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/assets/images/new_project.png
View file @c4b7794

257 Bytes
app/assets/images/rss_ui.png 0 → 100644
View file @d29ec9d

812 Bytes
app/assets/javascripts/note.js
  Diff comments   View file @d29ec9d
... ... @@ -32,9 +32,9 @@ init:
32 32 $("#submit_note").removeAttr("disabled");
33 33 })
34 34  
35   - $("#note_note").live("click", function(){
  35 + $("#note_note").live("focus", function(){
36 36 $(this).css("height", "100px");
37   - $('.attach_holder').show();
  37 + $('.note_advanced_opts').show();
38 38 });
39 39  
40 40 $("#note_attachment").change(function(e){
... ...
app/assets/stylesheets/common.scss
  Diff comments   View file @d29ec9d
... ... @@ -420,6 +420,8 @@ a.project-update.titled {
420 420 cursor: move;
421 421 height: 70%;
422 422 overflow: hidden;
  423 + background:white;
  424 + border: 1px solid $style_color;
423 425 }
424 426  
425 427  
... ... @@ -960,3 +962,10 @@ li.note {
960 962 }
961 963 }
962 964 }
  965 +
  966 +.rss-icon {
  967 + img {
  968 + width:24px;
  969 + vertical-align:top;
  970 + }
  971 +}
... ...
app/controllers/projects_controller.rb
  Diff comments   View file @d29ec9d
... ... @@ -100,7 +100,6 @@ class ProjectsController < ApplicationController
100 100 end
101 101  
102 102 def graph
103   - render_full_content
104 103 @days_json, @commits_json = GraphCommit.to_graph(project)
105 104 end
106 105  
... ...
app/views/commits/_head.html.haml
  Diff comments   View file @d29ec9d
... ... @@ -23,10 +23,9 @@
23 23  
24 24 - if current_page?(project_commits_path(@project)) && current_user.private_token
25 25 %li.right
26   - %span
27   - = link_to project_commits_path(@project, :atom, { :private_token => current_user.private_token, :ref => @ref }), :class => "btn" do
28   - feed
29   - = image_tag "Rss-UI.PNG", :width => 14, :title => "feed"
  26 + %span.rss-icon
  27 + = link_to project_commits_path(@project, :atom, { :private_token => current_user.private_token, :ref => @ref }), :title => "Feed" do
  28 + = image_tag "rss_ui.png", :title => "feed"
30 29  
31 30  
32 31 :javascript
... ...
app/views/issues/_head.html.haml
  Diff comments   View file @d29ec9d
... ... @@ -5,3 +5,7 @@
5 5 %li{:class => "#{'active' if current_page?(project_milestones_path(@project))}"}
6 6 = link_to project_milestones_path(@project), :class => "tab" do
7 7 Milestones
  8 + %li.right
  9 + %span.rss-icon
  10 + = link_to project_issues_path(@project, :atom, { :private_token => current_user.private_token }) do
  11 + = image_tag "rss_ui.png", :title => "feed"
... ...
app/views/issues/index.html.haml
  Diff comments   View file @d29ec9d
... ... @@ -2,10 +2,7 @@
2 2 .issues_content
3 3 %h3
4 4 Issues
5   - %span.rss-icon
6   - = link_to project_issues_path(@project, :atom, { :private_token => current_user.private_token }) do
7   - = image_tag "Rss-UI.PNG", :width => 16, :title => "feed"
8   -
  5 + %small (#{@issues.total_count})
9 6 .right
10 7 .span5
11 8 - if can? current_user, :write_issue, @project
... ...
app/views/notes/_form.html.haml
  Diff comments   View file @d29ec9d
... ... @@ -10,7 +10,7 @@
10 10 = f.text_area :note, :size => 255
11 11 %p.hint Markdown is enabled.
12 12  
13   - .row.note_advanced_opts
  13 + .row.note_advanced_opts.hide
14 14 .span4
15 15 %h5 Notify via email:
16 16 .clearfix
... ...
app/views/projects/graph.html.haml
  Diff comments   View file @d29ec9d
1 1 %h3 Network Graph
2 2 %br
3   -#holder.graph.well
4   -
  3 +#holder.graph
5 4 :javascript
6 5 var chunk1={commits:#{@commits_json}};
7 6 var days=#{@days_json};
... ...
app/views/refs/_tree_file.html.haml
  Diff comments   View file @d29ec9d
... ... @@ -29,7 +29,7 @@
29 29 - else
30 30 %center
31 31 = link_to blob_project_ref_path(@project, @ref, :path => params[:path]) do
32   - %div
  32 + %div.padded
33 33 %br
34 34 = image_tag "download.png", :width => 64
35 35 %h3
... ...
lib/assets/javascripts/branch-graph.js
  Diff comments   View file @d29ec9d
... ... @@ -37,17 +37,17 @@ function branchGraph(holder) {
37 37 r = Raphael("holder", cw, ch),
38 38 top = r.set();
39 39 var cuday = 0, cumonth = "";
40   - r.rect(0, 0, days.length * 20 + 20, 20).attr({fill: "#474D57"});
41   - r.rect(0, 20, days.length * 20 + 20, 20).attr({fill: "#f7f7f7"});
  40 + r.rect(0, 0, days.length * 20 + 80, 30).attr({fill: "#FFF"});
  41 + r.rect(0, 30, days.length * 20 + 80, 20).attr({fill: "#f1f1f1"});
42 42  
43 43 for (mm = 0; mm < days.length; mm++) {
44 44 if(days[mm] != null){
45 45 if(cuday != days[mm][0]){
46   - r.text(10 + mm * 20, 30, days[mm][0]).attr({font: "12px Fontin-Sans, Arial", fill: "#444"});
  46 + r.text(10 + mm * 20, 40, days[mm][0]).attr({font: "14px Fontin-Sans, Arial", fill: "#444"});
47 47 cuday = days[mm][0]
48 48 }
49 49 if(cumonth != days[mm][1]){
50   - r.text(10 + mm * 20, 10, days[mm][1]).attr({font: "12px Fontin-Sans, Arial", fill: "#444"});
  50 + r.text(10 + mm * 20, 15, days[mm][1]).attr({font: "14px Fontin-Sans, Arial", fill: "#474D57"});
51 51 cumonth = days[mm][1]
52 52 }
53 53  
... ...