Fixed widget counts, improved styles
This commit is contained in:
parent
fa7bd43ab9
commit
3f91da6816
|
@ -268,6 +268,7 @@ img.lil_av {
|
||||||
|
|
||||||
|
|
||||||
.ui-box {
|
.ui-box {
|
||||||
|
|
||||||
margin-bottom: 40px;
|
margin-bottom: 40px;
|
||||||
@include round-borders-all(4px);
|
@include round-borders-all(4px);
|
||||||
border-color:#ddd;
|
border-color:#ddd;
|
||||||
|
@ -322,3 +323,7 @@ img.lil_av {
|
||||||
width:20px;
|
width:20px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.borders {
|
||||||
|
border: 1px solid #ccc;
|
||||||
|
}
|
||||||
|
|
|
@ -1,7 +1,12 @@
|
||||||
%a.update-item{:href => project_deploy_key_path(key.project, key)}
|
%tr
|
||||||
%span.update-title
|
%td
|
||||||
|
%a{:href => project_deploy_key_path(key.project, key)}
|
||||||
= key.title
|
= key.title
|
||||||
|
%td
|
||||||
%span.update-author
|
%span.update-author
|
||||||
Added
|
Added
|
||||||
= time_ago_in_words(key.created_at)
|
= time_ago_in_words(key.created_at)
|
||||||
ago
|
ago
|
||||||
|
%td
|
||||||
|
= link_to 'Remove', project_deploy_key_path(key.project, key), :confirm => 'Are you sure?', :method => :delete, :class => "danger btn delete-key small"
|
||||||
|
|
||||||
|
|
|
@ -5,6 +5,6 @@
|
||||||
= link_to new_project_deploy_key_path(@project), :class => "btn small", :title => "New Deploy Key" do
|
= link_to new_project_deploy_key_path(@project), :class => "btn small", :title => "New Deploy Key" do
|
||||||
Add Deploy Key
|
Add Deploy Key
|
||||||
|
|
||||||
%ul.unstyled
|
%table.zebra-striped.borders
|
||||||
- @keys.each do |key|
|
- @keys.each do |key|
|
||||||
%li= render(:partial => 'show', :locals => {:key => key})
|
= render(:partial => 'show', :locals => {:key => key})
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
= render "repositories/head"
|
= render "repositories/head"
|
||||||
|
|
||||||
%h2 New Deploy key
|
%h3 New Deploy key
|
||||||
|
%hr
|
||||||
|
|
||||||
= render 'form'
|
= render 'form'
|
||||||
|
|
|
@ -6,13 +6,17 @@
|
||||||
= link_to new_project_hook_path(@project), :class => "btn small", :title => "New Web Hook" do
|
= link_to new_project_hook_path(@project), :class => "btn small", :title => "New Web Hook" do
|
||||||
Add Post Receive Hook
|
Add Post Receive Hook
|
||||||
|
|
||||||
%ul.unstyled
|
%table.zebra-striped.borders
|
||||||
- @hooks.each do |hook|
|
- @hooks.each do |hook|
|
||||||
%li.wll
|
%tr
|
||||||
|
%td
|
||||||
= link_to project_hook_path(@project, hook) do
|
= link_to project_hook_path(@project, hook) do
|
||||||
= hook.url
|
= hook.url
|
||||||
|
%td
|
||||||
|
= link_to 'Remove', project_hook_path(@project, hook), :confirm => 'Are you sure?', :method => :delete, :class => "danger btn small"
|
||||||
|
|
||||||
.alert-message.block-message.info
|
|
||||||
|
.alert-message.block-message
|
||||||
We send some data with POST request when someone makes git push
|
We send some data with POST request when someone makes git push
|
||||||
|
|
||||||
.well= render "data_ex"
|
.well= render "data_ex"
|
||||||
|
|
|
@ -4,10 +4,9 @@
|
||||||
%ul
|
%ul
|
||||||
- @hook.errors.full_messages.each do |msg|
|
- @hook.errors.full_messages.each do |msg|
|
||||||
%li= msg
|
%li= msg
|
||||||
|
.clearfix
|
||||||
= f.label :url, "URL:"
|
= f.label :url, "URL:"
|
||||||
= f.text_field :url, :class => "text_field"
|
.input= f.text_field :url, :class => "text_field"
|
||||||
.clear
|
.actions
|
||||||
%br
|
= f.submit "Save", :class => "btn"
|
||||||
.merge-tabs
|
|
||||||
= f.submit "Save", :class => "grey-button"
|
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,13 @@
|
||||||
%li.wll
|
%tr
|
||||||
|
%td
|
||||||
= link_to key_path(key) do
|
= link_to key_path(key) do
|
||||||
%p
|
%p
|
||||||
%strong= key.title
|
%strong= key.title
|
||||||
|
%td
|
||||||
%span.right.cgray
|
%span.right.cgray
|
||||||
Added
|
Added
|
||||||
= time_ago_in_words(key.created_at)
|
= time_ago_in_words(key.created_at)
|
||||||
ago
|
ago
|
||||||
|
%td
|
||||||
|
= link_to 'Remove', key, :confirm => 'Are you sure?', :method => :delete, :class => "btn small danger delete-key right"
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,6 @@
|
||||||
|
|
||||||
%hr
|
%hr
|
||||||
|
|
||||||
%div#keys-table
|
%table#keys-table.zebra-striped.borders
|
||||||
%ul.unstyled
|
|
||||||
- @keys.each do |key|
|
- @keys.each do |key|
|
||||||
= render(:partial => 'show', :locals => {:key => key})
|
= render(:partial => 'show', :locals => {:key => key})
|
||||||
|
|
|
@ -2,9 +2,10 @@
|
||||||
%hr
|
%hr
|
||||||
= form_for @user, :url => profile_password_path, :method => :put do |f|
|
= form_for @user, :url => profile_password_path, :method => :put do |f|
|
||||||
.data
|
.data
|
||||||
|
.alert-message.block-message.warning
|
||||||
%p After successfull password update you will be redirected to login page where you should login with new password
|
%p After successfull password update you will be redirected to login page where you should login with new password
|
||||||
-if @user.errors.any?
|
-if @user.errors.any?
|
||||||
#error_explanation
|
.alert-message.block-message.error
|
||||||
%ul
|
%ul
|
||||||
- @user.errors.full_messages.each do |msg|
|
- @user.errors.full_messages.each do |msg|
|
||||||
%li= msg
|
%li= msg
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
= f.label :default_branch, "Default Branch"
|
= f.label :default_branch, "Default Branch"
|
||||||
.input= f.select(:default_branch, @project.heads.map(&:name), {}, :style => "width:210px;")
|
.input= f.select(:default_branch, @project.heads.map(&:name), {}, :style => "width:210px;")
|
||||||
|
|
||||||
.well
|
.alert-message.block-message.warning
|
||||||
%h5 Features
|
%h5 Features
|
||||||
|
|
||||||
.clearfix
|
.clearfix
|
||||||
|
|
|
@ -1,13 +1,14 @@
|
||||||
= render "project_head"
|
= render "project_head"
|
||||||
- unless @notes.empty?
|
- unless @notes.empty?
|
||||||
%div.update-data.ui-box.ui-box-small
|
%table.zebra-striped.borders
|
||||||
.data
|
|
||||||
- @notes.each do |note|
|
- @notes.each do |note|
|
||||||
%a.update-item{:href => note.attachment.url}
|
%tr
|
||||||
|
%td
|
||||||
|
%a{:href => note.attachment.url}
|
||||||
= image_tag gravatar_icon(note.author_email), :class => "left", :width => 16
|
= image_tag gravatar_icon(note.author_email), :class => "left", :width => 16
|
||||||
%span.update-title{:style => "margin-bottom:0px;"}
|
|
||||||
= note.attachment_identifier
|
= note.attachment_identifier
|
||||||
%span.update-author.right
|
%td
|
||||||
Added
|
Added
|
||||||
= time_ago_in_words(note.created_at)
|
= time_ago_in_words(note.created_at)
|
||||||
ago
|
ago
|
||||||
|
|
|
@ -1,13 +1,15 @@
|
||||||
- commit = update
|
- commit = update
|
||||||
.wll
|
%tr
|
||||||
|
%td
|
||||||
= link_to project_commits_path(@project, :ref => commit.head.name) do
|
= link_to project_commits_path(@project, :ref => commit.head.name) do
|
||||||
%p
|
%strong
|
||||||
%strong.label
|
|
||||||
= commit.head.name
|
= commit.head.name
|
||||||
%br
|
%td
|
||||||
|
%div
|
||||||
%code= commit.id.to_s[0..10]
|
%code= commit.id.to_s[0..10]
|
||||||
= image_tag gravatar_icon(commit.author_email), :class => "", :width => 16
|
= image_tag gravatar_icon(commit.author_email), :class => "", :width => 16
|
||||||
= truncate(commit.safe_message, :length => 40)
|
= truncate(commit.safe_message, :length => 40)
|
||||||
|
%td
|
||||||
%span.right.cgray
|
%span.right.cgray
|
||||||
= time_ago_in_words(commit.committed_date)
|
= time_ago_in_words(commit.committed_date)
|
||||||
ago
|
ago
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
= render "repositories/branches_head"
|
= render "repositories/branches_head"
|
||||||
- unless @branches.empty?
|
- unless @branches.empty?
|
||||||
%table
|
%table.zebra-striped.borders
|
||||||
%thead
|
%thead
|
||||||
%tr
|
%tr
|
||||||
%th Name
|
%th Name
|
||||||
|
|
|
@ -24,11 +24,10 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
.ui-box
|
%h5.cgray
|
||||||
%h5.cgray
|
Recently updated branches
|
||||||
Recent Branches
|
|
||||||
|
|
||||||
%ul.unstyled
|
%table.zebra-striped.borders
|
||||||
- @activities.each do |update|
|
- @activities.each do |update|
|
||||||
= render "repositories/feed", :update => update, :project => @project
|
= render "repositories/feed", :update => update, :project => @project
|
||||||
|
|
||||||
|
|
|
@ -1,17 +1,19 @@
|
||||||
= render "head"
|
= render "head"
|
||||||
- unless @tags.empty?
|
- unless @tags.empty?
|
||||||
%ul.unstyled
|
%table.zebra-striped.borders
|
||||||
- @tags.each do |tag|
|
- @tags.each do |tag|
|
||||||
%li.wll
|
%tr
|
||||||
.span3.right
|
%td
|
||||||
- if can? current_user, :download_code, @project
|
|
||||||
= link_to "Download", archive_project_repository_path(@project, :ref => tag.name), :class => "btn small"
|
|
||||||
= link_to "Commits", project_commits_path(@project, :ref => tag.name), :class => "btn small"
|
|
||||||
|
|
||||||
= tag.name
|
= tag.name
|
||||||
%code= tag.commit.id.to_s[0..10]
|
%code= tag.commit.id.to_s[0..10]
|
||||||
%span.update-author.right
|
%span.update-author.right
|
||||||
= time_ago_in_words(tag.commit.committed_date)
|
= time_ago_in_words(tag.commit.committed_date)
|
||||||
ago
|
ago
|
||||||
|
|
||||||
|
%td
|
||||||
|
- if can? current_user, :download_code, @project
|
||||||
|
= link_to "Download", archive_project_repository_path(@project, :ref => tag.name), :class => "btn small"
|
||||||
|
= link_to "Commits", project_commits_path(@project, :ref => tag.name), :class => "btn small"
|
||||||
|
|
||||||
- else
|
- else
|
||||||
%h3 No tags
|
%h3 No tags
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
%li.entry
|
%tr
|
||||||
|
%td
|
||||||
%a{:href => project_snippet_path(snippet.project, snippet)}
|
%a{:href => project_snippet_path(snippet.project, snippet)}
|
||||||
%p
|
|
||||||
%strong
|
|
||||||
= truncate(snippet.title, :length => 60)
|
= truncate(snippet.title, :length => 60)
|
||||||
%span.right.cgray
|
%span.right.cgray
|
||||||
= snippet.file_name
|
= snippet.file_name
|
||||||
|
|
|
@ -9,4 +9,4 @@
|
||||||
To add new snippet - click on button.
|
To add new snippet - click on button.
|
||||||
|
|
||||||
- unless @snippets.fresh.empty?
|
- unless @snippets.fresh.empty?
|
||||||
%ul.unstyled= render @snippets.fresh
|
%table.zebra-striped.borders= render @snippets.fresh
|
||||||
|
|
|
@ -12,8 +12,8 @@
|
||||||
= link_to team_project_path(@project), :class => "" do
|
= link_to team_project_path(@project), :class => "" do
|
||||||
← To team list
|
← To team list
|
||||||
|
|
||||||
%hr
|
%br
|
||||||
%table.no-borders
|
%table.zebra-striped.borders
|
||||||
%tr
|
%tr
|
||||||
%td Name
|
%td Name
|
||||||
%td= user.name
|
%td= user.name
|
||||||
|
|
|
@ -11,14 +11,14 @@
|
||||||
%p
|
%p
|
||||||
- if @project.issues_enabled
|
- if @project.issues_enabled
|
||||||
Assigned issues:
|
Assigned issues:
|
||||||
= current_user.assigned_issues.count
|
= current_user.assigned_issues.opened.count
|
||||||
%br
|
%br
|
||||||
- if @project.merge_requests_enabled
|
- if @project.merge_requests_enabled
|
||||||
Assigned merge request:
|
Assigned merge request:
|
||||||
= current_user.assigned_merge_requests.count
|
= current_user.assigned_merge_requests.opened.count
|
||||||
%br
|
%br
|
||||||
Your merge requests:
|
Your merge requests:
|
||||||
= current_user.assigned_merge_requests.count
|
= current_user.assigned_merge_requests.opened.count
|
||||||
.link_holder
|
.link_holder
|
||||||
= link_to project_team_member_path(@project, member), :title => current_user.name do
|
= link_to project_team_member_path(@project, member), :title => current_user.name do
|
||||||
= "Access: #{member.project_access_human} »"
|
= "Access: #{member.project_access_human} »"
|
||||||
|
|
Loading…
Reference in New Issue