User profile restyle. Feed(Atom) links for commits & issues

Dmitriy Zaporozhets
1 parent 54fb0f85
Showing 16 changed files with 147 additions and 92 deletions Show diff stats
app/assets/images/rss_icon_gray.png
app/assets/stylesheets/application.css
app/assets/stylesheets/projects.css.scss
app/controllers/keys_controller.rb
app/models/user.rb
app/views/commits/index.html.haml
app/views/issues/index.html.haml
app/views/keys/_show.html.haml
app/views/keys/create.js.haml
app/views/keys/index.html.haml
app/views/keys/show.html.haml
app/views/layouts/_head_panel.html.erb
app/views/layouts/_middle_panel.html.haml
app/views/profile/password.html.haml
app/views/profile/show.html.haml
spec/requests/keys_spec.rb
@@ -40,6 +40,9 @@
 .append-bottom-10 {
   margin-bottom:10px;
 }
+.append-bottom-20 {
+  margin-bottom:20px;
+}
 .prepend-top-10 {
   margin-top:10px;
 }
@@ -639,3 +639,11 @@ h4.middle-panel {
   background: #4A2;
   color: white;
 }
+
+.rss-icon { 
+  margin:0 15px;
+  padding:5px;
+  border:1px solid #ccc;
+  border-radius:3px;
+  float:left;
+}
@@ -6,6 +6,10 @@ class KeysController &lt; ApplicationController
     @keys = current_user.keys.all
   end
+  def show
+    @key = current_user.keys.find(params[:id])
+  end
+
   def new
     @key = current_user.keys.new
@@ -46,6 +46,10 @@ class User &lt; ActiveRecord::Base
     admin
   end
+  def require_ssh_key?
+    keys.count == 0
+  end
+
   def can_create_project?
     projects_limit >= my_own_projects.count
   end
 - content_for(:body_class, "project-page commits-page")
+- if current_user.private_token   
+  = content_for :rss_icon do 
+    .rss-icon
+      = link_to project_commits_path(@project, :atom, { :private_token => current_user.private_token, :ref => @ref }) do 
+        = image_tag "rss_icon_gray.png", :width => 16, :title => "feed"
--#%a.right.button{:href => "#"} Download
--#-if can? current_user, :admin_project, @project
-  %a.right.button.blue{:href => "#"} EDIT
 - if params[:path]
   %h2.icon
     %span
+- if current_user.private_token   
+  = content_for :rss_icon do 
+    .rss-icon
+      = link_to project_issues_path(@project, :atom, { :private_token => current_user.private_token }) do 
+        = image_tag "rss_icon_gray.png", :width => 16, :title => "feed"
+
 %div#issues-table-holder
   %table.round-borders#issues-table
     %thead
-%tr
-  %td= truncate key.title, :lenght => 12
-  %td= truncate key.key, :lenght => 1114
-  %td= link_to 'Cancel', key, :confirm => 'Are you sure?', :method => :delete, :class => "grey-button negative delete-key", :id => "destroy_key_#{key.id}", :remote => true
+%a.update-item{:href => key_path(key)}
+  %span.update-title
+    = key.title
+  %span.update-author
+    Added
+    = time_ago_in_words(key.created_at)
+    ago
 - if @key.valid?
   :plain
     $("#new_key_dialog").dialog("close");
-    $("#keys-table").append("#{escape_javascript(render(:partial => 'show', :locals => {:key => @key} ))}");
+    $("#keys-table .data").append("#{escape_javascript(render(:partial => 'show', :locals => {:key => @key} ))}");
     $("#no_ssh_key_defined").hide();
 - else
   :plain
-%div#new-key-holder
+%h2.icon
+  %span>
+  SSH Keys
+%div#new-key-holder.right
   = link_to "Add new", new_key_path, :remote => true, :class => "grey-button"
 %br
-%table.round-borders#keys-table
-  %tr
-    %th title
-    %th key
-    %th Actions
-  - @keys.each do |key|
-    = render(:partial => 'show', :locals => {:key => key})
+%div#keys-table{ :class => "update-data ui-box ui-box-small ui-box-big" }
+  .data
+    - @keys.each do |key|
+      = render(:partial => 'show', :locals => {:key => key})
 :javascript
   $('.delete-key').live('ajax:success', function() {
-    $(this).closest('tr').fadeOut(); });
+    $(this).closest('.update-item').fadeOut(); });
@@ -0,0 +1,10 @@
+.ui-box.width-100p
+  %h3= @key.title
+  .data
+    %pre= @key.key
+    .clear
+  .buttons
+    = link_to 'Remove', @key, :confirm => 'Are you sure?', :method => :delete, :class => "red-button delete-key right"
+    .clear
+
+
@@ -47,7 +47,7 @@
   <% end %>
 <% end %>
-<% if current_user.keys.all.empty? %>
+<% if current_user.require_ssh_key? %>
   <div id="no_ssh_key_defined" class="big-message error">
     <p>No SSH Key is defined. You won't be able to use any Git command!. Click <%=link_to( 'here', keys_path ) %> to add one!
   </div>
 %h4.middle-panel 
-  .project_name= truncate @project.name, :length => 20
+  .project_name
+    = truncate @project.name, :length => 20
   .git_url_wrapper
     %input.git-url.text{:id => "", :name => "", :readonly => "", :type => "text", :value => @project.url_to_repo, :class => "one_click_select"}
+  = yield :rss_icon
+
   - if @project.repo_exists?
     .right= render :partial => "projects/refs", :locals => { :destination => controller.controller_name == "commits" ? "commits" : "tree" }
-%p Note: after success password update you will be redirected to login page where you should login with new password
-= form_for @user, :url => profile_password_path, :method => :put do |f|
-  -if @user.errors.any?
-    #error_explanation
-      %h2= "#{pluralize(@user.errors.count, "error")} prohibited this password from being saved:"
-      %ul
-        - @user.errors.full_messages.each do |msg|
-          %li= msg
+.ui-box.width-100p.append-bottom-20
+  %h3 Password
+  = form_for @user, :url => profile_password_path, :method => :put do |f|
+    .data
+      %p After successfull password update you will be redirected to login page where you should login with new password
+      -if @user.errors.any?
+        #error_explanation
+          %ul
+            - @user.errors.full_messages.each do |msg|
+              %li= msg
-  .form-row
-    = f.label :password
-    %br
-    = f.password_field :password
-  .form-row
-    = f.label :password_confirmation
-    %br
-    = f.password_field :password_confirmation
-  .actions
-    = f.submit 'Save', :class => "grey-button"
+      .form-row
+        = f.label :password
+        %br
+        = f.password_field :password
+      .form-row
+        = f.label :password_confirmation
+        %br
+        = f.password_field :password_confirmation
+    .buttons
+      = f.submit 'Save', :class => "grey-button"
+.clear
-%br
-%br
-%br
-
-= form_for @user, :url => profile_reset_private_token_path, :method => :put do |f|
-  %p
-    Current private token:
-    - if current_user.private_token
-      %strong
-        = current_user.private_token
-      %em.cred
-        keep it in secret!
-    - else
-      %strong don`t have
-  .actions
-    - if current_user.private_token
-      = f.submit 'Reset', :confirm => "Are you sure?", :class => "grey-button"
-    - else
-      = f.submit 'Generate', :class => "grey-button"
+.ui-box.width-100p
+  %h3 
+    Private token
+    %em.cred.right
+      keep it in secret!
+  = form_for @user, :url => profile_reset_private_token_path, :method => :put do |f|
+    .data
+      %p Private token used to access application resources without authentication.
+      %p For example its required to access commits feed.
+      %hr
+      %p.cgray
+        - if current_user.private_token
+          = text_field_tag "token", current_user.private_token
+        - else
+          You don`t have one yet. Click generate to fix it.
+    .buttons
+      - if current_user.private_token
+        = f.submit 'Reset', :confirm => "Are you sure?", :class => "grey-button"
+      - else
+        = f.submit 'Generate', :class => "positive-button"
-%h2.icon
-  %span>
-  = @user.name
+.ui-box.width-100p
+  %h3= @user.name
+  = form_for @user, :url => profile_edit_path, :method => :put do |f|
+    .data
+      -if @user.errors.any?
+        #error_explanation
+          %ul
+            - @user.errors.full_messages.each do |msg|
+              %li= msg
-.clear
-
-= form_for @user, :url => profile_edit_path, :method => :put do |f|
-  -if @user.errors.any?
-    #error_explanation
-      %ul
-        - @user.errors.full_messages.each do |msg|
-          %li= msg
-
-  .form-row
-    = f.label :name
-    %br
-    = f.text_field :name
-  .form-row
-    = f.label :email
-    %br
-    = f.text_field :email
-  .form-row
-    = f.label :skype
-    %br
-    = f.text_field :skype
-  .form-row
-    = f.label :linkedin
-    %br
-    = f.text_field :linkedin
-  .form-row
-    = f.label :twitter
-    %br
-    = f.text_field :twitter
-  .actions
-    = f.submit 'Save', :class => "grey-button"
+      .form-row
+        = f.label :name
+        %br
+        = f.text_field :name
+      .form-row
+        = f.label :email
+        %br
+        = f.text_field :email
+      .form-row
+        = f.label :skype
+        %br
+        = f.text_field :skype
+      .form-row
+        = f.label :linkedin
+        %br
+        = f.text_field :linkedin
+      .form-row
+        = f.label :twitter
+        %br
+        = f.text_field :twitter
+    .buttons
+      = f.submit 'Save', :class => "grey-button"
@@ -16,9 +16,11 @@ describe &quot;Issues&quot; do
     it { should have_content(@key.title) }
     describe "Destroy" do
+      before { visit key_path(@key) }
+
       it "should remove entry" do
         expect {
-          click_link "destroy_key_#{@key.id}"
+          click_link "Remove"
         }.to change { @user.keys.count }.by(-1)
       end
     end
@@ -47,8 +49,17 @@ describe &quot;Issues&quot; do
         page.should_not have_content("Add new public key")
         page.should have_content "laptop"
-        page.should have_content "publickey234="
       end
     end
   end
+
+  describe "Show page" do 
+    before do
+      @key = Factory :key, :user => @user
+      visit key_path(@key) 
+    end
+    
+    it { page.should have_content @key.title }
+    it { page.should have_content @key.key[0..10] }
+  end
 end
	@@ -639,3 +639,11 @@ h4.middle-panel {		@@ -639,3 +639,11 @@ h4.middle-panel {
639	background: #4A2;	639	background: #4A2;
640	color: white;	640	color: white;
641	}	641	}
		642	+
		643	+.rss-icon {
		644	+ margin:0 15px;
		645	+ padding:5px;
		646	+ border:1px solid #ccc;
		647	+ border-radius:3px;
		648	+ float:left;
		649	+}
		1	+- if current_user.private_token
		2	+ = content_for :rss_icon do
		3	+ .rss-icon
		4	+ = link_to project_issues_path(@project, :atom, { :private_token => current_user.private_token }) do
		5	+ = image_tag "rss_icon_gray.png", :width => 16, :title => "feed"
		6	+
1	%div#issues-table-holder	7	%div#issues-table-holder
2	%table.round-borders#issues-table	8	%table.round-borders#issues-table
3	%thead	9	%thead
1	-%tr
2	- %td= truncate key.title, :lenght => 12
3	- %td= truncate key.key, :lenght => 1114
4	- %td= link_to 'Cancel', key, :confirm => 'Are you sure?', :method => :delete, :class => "grey-button negative delete-key", :id => "destroy_key_#{key.id}", :remote => true	1	+%a.update-item{:href => key_path(key)}
		2	+ %span.update-title
		3	+ = key.title
		4	+ %span.update-author
		5	+ Added
		6	+ = time_ago_in_words(key.created_at)
		7	+ ago
1	- if @key.valid?	1	- if @key.valid?
2	:plain	2	:plain
3	$("#new_key_dialog").dialog("close");	3	$("#new_key_dialog").dialog("close");
4	- $("#keys-table").append("#{escape_javascript(render(:partial => 'show', :locals => {:key => @key} ))}");	4	+ $("#keys-table .data").append("#{escape_javascript(render(:partial => 'show', :locals => {:key => @key} ))}");
5	$("#no_ssh_key_defined").hide();	5	$("#no_ssh_key_defined").hide();
6	- else	6	- else
7	:plain	7	:plain
@@ -0,0 +1,10 @@		@@ -0,0 +1,10 @@
	1	+.ui-box.width-100p
	2	+ %h3= @key.title
	3	+ .data
	4	+ %pre= @key.key
	5	+ .clear
	6	+ .buttons
	7	+ = link_to 'Remove', @key, :confirm => 'Are you sure?', :method => :delete, :class => "red-button delete-key right"
	8	+ .clear
	9	+
	10	+
	@@ -47,7 +47,7 @@		@@ -47,7 +47,7 @@
47	<% end %>	47	<% end %>
48	<% end %>	48	<% end %>
49		49
50	-<% if current_user.keys.all.empty? %>	50	+<% if current_user.require_ssh_key? %>
51	<div id="no_ssh_key_defined" class="big-message error">	51	<div id="no_ssh_key_defined" class="big-message error">
52	<p>No SSH Key is defined. You won't be able to use any Git command!. Click <%=link_to( 'here', keys_path ) %> to add one!	52	<p>No SSH Key is defined. You won't be able to use any Git command!. Click <%=link_to( 'here', keys_path ) %> to add one!
53	</div>	53	</div>
1	-%p Note: after success password update you will be redirected to login page where you should login with new password
2	-= form_for @user, :url => profile_password_path, :method => :put do \|f\|
3	- -if @user.errors.any?
4	- #error_explanation
5	- %h2= "#{pluralize(@user.errors.count, "error")} prohibited this password from being saved:"
6	- %ul
7	- - @user.errors.full_messages.each do \|msg\|
8	- %li= msg	1	+.ui-box.width-100p.append-bottom-20
		2	+ %h3 Password
		3	+ = form_for @user, :url => profile_password_path, :method => :put do \|f\|
		4	+ .data
		5	+ %p After successfull password update you will be redirected to login page where you should login with new password
		6	+ -if @user.errors.any?
		7	+ #error_explanation
		8	+ %ul
		9	+ - @user.errors.full_messages.each do \|msg\|
		10	+ %li= msg
9		11
10	- .form-row
11	- = f.label :password
12	- %br
13	- = f.password_field :password
14	- .form-row
15	- = f.label :password_confirmation
16	- %br
17	- = f.password_field :password_confirmation
18	- .actions
19	- = f.submit 'Save', :class => "grey-button"	12	+ .form-row
		13	+ = f.label :password
		14	+ %br
		15	+ = f.password_field :password
		16	+ .form-row
		17	+ = f.label :password_confirmation
		18	+ %br
		19	+ = f.password_field :password_confirmation
		20	+ .buttons
		21	+ = f.submit 'Save', :class => "grey-button"
		22	+.clear
20		23
21	-%br
22	-%br
23	-%br
24	-
25	-= form_for @user, :url => profile_reset_private_token_path, :method => :put do \|f\|
26	- %p
27	- Current private token:
28	- - if current_user.private_token
29	- %strong
30	- = current_user.private_token
31	- %em.cred
32	- keep it in secret!
33	- - else
34	- %strong don`t have
35	- .actions
36	- - if current_user.private_token
37	- = f.submit 'Reset', :confirm => "Are you sure?", :class => "grey-button"
38	- - else
39	- = f.submit 'Generate', :class => "grey-button"	24	+.ui-box.width-100p
		25	+ %h3
		26	+ Private token
		27	+ %em.cred.right
		28	+ keep it in secret!
		29	+ = form_for @user, :url => profile_reset_private_token_path, :method => :put do \|f\|
		30	+ .data
		31	+ %p Private token used to access application resources without authentication.
		32	+ %p For example its required to access commits feed.
		33	+ %hr
		34	+ %p.cgray
		35	+ - if current_user.private_token
		36	+ = text_field_tag "token", current_user.private_token
		37	+ - else
		38	+ You don`t have one yet. Click generate to fix it.
		39	+ .buttons
		40	+ - if current_user.private_token
		41	+ = f.submit 'Reset', :confirm => "Are you sure?", :class => "grey-button"
		42	+ - else
		43	+ = f.submit 'Generate', :class => "positive-button"
40		44
1	-%h2.icon
2	- %span>
3	- = @user.name	1	+.ui-box.width-100p
		2	+ %h3= @user.name
		3	+ = form_for @user, :url => profile_edit_path, :method => :put do \|f\|
		4	+ .data
		5	+ -if @user.errors.any?
		6	+ #error_explanation
		7	+ %ul
		8	+ - @user.errors.full_messages.each do \|msg\|
		9	+ %li= msg
4		10
5	-.clear
6	-
7	-= form_for @user, :url => profile_edit_path, :method => :put do \|f\|
8	- -if @user.errors.any?
9	- #error_explanation
10	- %ul
11	- - @user.errors.full_messages.each do \|msg\|
12	- %li= msg
13	-
14	- .form-row
15	- = f.label :name
16	- %br
17	- = f.text_field :name
18	- .form-row
19	- = f.label :email
20	- %br
21	- = f.text_field :email
22	- .form-row
23	- = f.label :skype
24	- %br
25	- = f.text_field :skype
26	- .form-row
27	- = f.label :linkedin
28	- %br
29	- = f.text_field :linkedin
30	- .form-row
31	- = f.label :twitter
32	- %br
33	- = f.text_field :twitter
34	- .actions
35	- = f.submit 'Save', :class => "grey-button"	11	+ .form-row
		12	+ = f.label :name
		13	+ %br
		14	+ = f.text_field :name
		15	+ .form-row
		16	+ = f.label :email
		17	+ %br
		18	+ = f.text_field :email
		19	+ .form-row
		20	+ = f.label :skype
		21	+ %br
		22	+ = f.text_field :skype
		23	+ .form-row
		24	+ = f.label :linkedin
		25	+ %br
		26	+ = f.text_field :linkedin
		27	+ .form-row
		28	+ = f.label :twitter
		29	+ %br
		30	+ = f.text_field :twitter
		31	+ .buttons
		32	+ = f.submit 'Save', :class => "grey-button"
36		33