project alert/error messages
This commit is contained in:
Dmitriy Zaporozhets
parent
b7614c714e
commit
ccfae82723
10 changed files with 101 additions and 63 deletions
|
|
@ -588,3 +588,7 @@ tr.line_notes_row {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
.new-project-hodler {
|
||||
padding:20px;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -712,8 +712,8 @@ body, button, input, select, textarea {
|
|||
.errors_holder {
|
||||
background:#D30;
|
||||
color:#fff;
|
||||
border:1px solid $lite_border_color;
|
||||
@include round-borders-all(4px);
|
||||
border:1px solid #a30;
|
||||
padding:5px;
|
||||
list-style:none;
|
||||
font-weight: bold;
|
||||
|
|
@ -723,3 +723,33 @@ body, button, input, select, textarea {
|
|||
padding:10px;
|
||||
}
|
||||
}
|
||||
|
||||
.notice_holder {
|
||||
background:#DDF4FB;
|
||||
color:#444;
|
||||
border:1px solid #C6EDF9;
|
||||
@include round-borders-all(4px);
|
||||
padding:5px;
|
||||
list-style:none;
|
||||
font-weight: bold;
|
||||
text-shadow: 0 -1px 0 rgba(255, 255, 255, 0.25);
|
||||
|
||||
li {
|
||||
padding:10px;
|
||||
}
|
||||
}
|
||||
|
||||
.alert_holder {
|
||||
background:#FDF5D9;
|
||||
color:#444;
|
||||
border:1px solid #FCEEC1;
|
||||
@include round-borders-all(4px);
|
||||
padding:5px;
|
||||
list-style:none;
|
||||
font-weight: bold;
|
||||
text-shadow: 0 -1px 0 rgba(255, 255, 255, 0.25);
|
||||
|
||||
li {
|
||||
padding:10px;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -74,9 +74,9 @@ class Repository
|
|||
end
|
||||
|
||||
def repo_exists?
|
||||
repo && !repo.branches.empty?
|
||||
@repo_exists ||= (repo && !repo.branches.empty?)
|
||||
rescue
|
||||
false
|
||||
@repo_exists = false
|
||||
end
|
||||
|
||||
def tags
|
||||
|
|
|
|||
|
|
@ -26,18 +26,19 @@
|
|||
= link_to project_path(@project), :class => project_tab_class do
|
||||
Project
|
||||
|
||||
= link_to "Repository", project_repository_path(@project), :class => repository_tab_class
|
||||
= link_to "Tree", tree_project_ref_path(@project, @project.root_ref), :class => tree_tab_class
|
||||
= link_to "Commits", project_commits_path(@project), :class => (controller.controller_name == "commits") ? "current" : nil
|
||||
= link_to "Network", graph_project_path(@project), :class => current_page?(:controller => "projects", :action => "graph", :id => @project) ? "current" : nil
|
||||
= link_to project_issues_filter_path(@project), :class => (controller.controller_name == "issues") ? "current" : nil do
|
||||
Issues
|
||||
= link_to wall_project_path(@project), :class => current_page?(:controller => "projects", :action => "wall", :id => @project) ? "current" : nil do
|
||||
Wall
|
||||
- if @project.common_notes.today.count > 0
|
||||
%span{ :class => "number" }= @project.common_notes.today.count
|
||||
= link_to project_merge_requests_path(@project), :class => (controller.controller_name == "merge_requests") ? "current" : nil do
|
||||
Requests
|
||||
- if @project.repo_exists?
|
||||
= link_to "Repository", project_repository_path(@project), :class => repository_tab_class
|
||||
= link_to "Tree", tree_project_ref_path(@project, @project.root_ref), :class => tree_tab_class
|
||||
= link_to "Commits", project_commits_path(@project), :class => (controller.controller_name == "commits") ? "current" : nil
|
||||
= link_to "Network", graph_project_path(@project), :class => current_page?(:controller => "projects", :action => "graph", :id => @project) ? "current" : nil
|
||||
= link_to project_issues_filter_path(@project), :class => (controller.controller_name == "issues") ? "current" : nil do
|
||||
Issues
|
||||
= link_to wall_project_path(@project), :class => current_page?(:controller => "projects", :action => "wall", :id => @project) ? "current" : nil do
|
||||
Wall
|
||||
- if @project.common_notes.today.count > 0
|
||||
%span{ :class => "number" }= @project.common_notes.today.count
|
||||
= link_to project_merge_requests_path(@project), :class => (controller.controller_name == "merge_requests") ? "current" : nil do
|
||||
Requests
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -6,13 +6,9 @@
|
|||
= @project.name
|
||||
.clear
|
||||
- if @project.errors.any?
|
||||
#error_explanation
|
||||
%h2
|
||||
= pluralize(@project.errors.count, "error")
|
||||
prohibited this project from being saved:
|
||||
%ul
|
||||
- @project.errors.full_messages.each do |msg|
|
||||
%li= msg
|
||||
%ul.errors_holder
|
||||
- @project.errors.full_messages.each do |msg|
|
||||
%li= msg
|
||||
%table
|
||||
%tr
|
||||
%td= f.label :name
|
||||
|
|
|
|||
|
|
@ -1,39 +0,0 @@
|
|||
<% bash_lexer = Pygments::Lexer[:bash] %>
|
||||
<div class="">
|
||||
<div class="git-empty">
|
||||
<h2>Git global setup:</h2>
|
||||
<% setup_str = <<eos
|
||||
git config --global user.name "#{current_user.name}"
|
||||
git config --global user.email "#{current_user.email}"
|
||||
eos
|
||||
%>
|
||||
<%= raw bash_lexer.highlight(setup_str) %>
|
||||
<br />
|
||||
<br />
|
||||
<h2>Next steps:</h2>
|
||||
<% repo_setup_str = <<eos
|
||||
mkdir #{@project.path}
|
||||
cd #{@project.path}
|
||||
git init
|
||||
touch README
|
||||
git add README
|
||||
git commit -m 'first commit'
|
||||
git remote add origin #{@project.url_to_repo}
|
||||
git push -u origin master
|
||||
eos
|
||||
%>
|
||||
<%= raw bash_lexer.highlight(repo_setup_str) %>
|
||||
|
||||
<br /><br />
|
||||
<h2>Existing Git Repo?</h2>
|
||||
<% exist_repo_setup_str = <<eos
|
||||
cd existing_git_repo
|
||||
git remote add origin #{@project.url_to_repo}
|
||||
git push -u origin master
|
||||
eos
|
||||
%>
|
||||
<%= raw bash_lexer.highlight(exist_repo_setup_str) %>
|
||||
|
||||
<br/>
|
||||
</div>
|
||||
</div>
|
||||
39
app/views/projects/empty.html.haml
Normal file
39
app/views/projects/empty.html.haml
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
- if current_user.require_ssh_key?
|
||||
%ul.errors_holder
|
||||
%li You have no ssh keys added yo tour profile.
|
||||
%li You wont be able to pull/push repository.
|
||||
%li Visit profile → keys and add public key of every machine you want to use for work with gitlabhq.
|
||||
|
||||
|
||||
%ul.alert_holder
|
||||
%li You should push repository to proceed.
|
||||
%li After push you will be able to browse code, commits etc.
|
||||
|
||||
- bash_lexer = Pygments::Lexer[:bash]
|
||||
%div.git-empty
|
||||
%h3 Git global setup:
|
||||
- setup_str = ["git config --global user.name \"#{current_user.name}\"",
|
||||
"git config --global user.email \"#{current_user.email}\""].join("\n")
|
||||
= raw bash_lexer.highlight(setup_str)
|
||||
|
||||
%br
|
||||
%br
|
||||
%h3 Create Repository
|
||||
- repo_setup_str = ["mkdir #{@project.path}",
|
||||
"cd #{@project.path}",
|
||||
"git init",
|
||||
"touch README",
|
||||
"git add README",
|
||||
"git commit -m 'first commit'",
|
||||
"git remote add origin #{@project.url_to_repo}",
|
||||
"git push -u origin master"].join("\n")
|
||||
|
||||
= raw bash_lexer.highlight(repo_setup_str)
|
||||
|
||||
%br
|
||||
%br
|
||||
%h3 Existing Git Repo?
|
||||
- exist_repo_setup_str = ["cd existing_git_repo",
|
||||
"git remote add origin #{@project.url_to_repo}",
|
||||
"git push -u origin master"].join("\n")
|
||||
= raw bash_lexer.highlight(exist_repo_setup_str)
|
||||
|
|
@ -12,6 +12,7 @@
|
|||
= time_ago_in_words(note.created_at)
|
||||
ago
|
||||
- else
|
||||
%h3 All files attached to project wall, issues etc will be displayed here
|
||||
.notice_holder
|
||||
%li All files attached to project wall, issues etc will be displayed here
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -4,3 +4,9 @@
|
|||
%div{ :class => "update-data ui-box ui-box-small ui-box-big" }
|
||||
.data
|
||||
= render @snippets.fresh
|
||||
- else
|
||||
.notice_holder
|
||||
%li Snippets do not exist yet.
|
||||
- if can? current_user, :write_snippet, @project
|
||||
%li You can add a new one by clicking on plus icon
|
||||
|
||||
|
|
|
|||
|
|
@ -20,6 +20,6 @@ test:
|
|||
|
||||
production:
|
||||
adapter: sqlite3
|
||||
database: db/production.sqlite3
|
||||
database: db/development.sqlite3
|
||||
pool: 5
|
||||
timeout: 5000
|
||||
|
|
|
|||
Loading…
Reference in a new issue