Help message for wiki, styled projects page
This commit is contained in:
Dmitriy Zaporozhets
parent
ce8eba8913
commit
1c22d4f50f
|
|
@ -9,17 +9,19 @@ var MergeRequest = {
|
|||
$(this).parent().addClass("active");
|
||||
});
|
||||
|
||||
$(".tabs a.merge-notes-tab").live("click", function() {
|
||||
$(".tabs a.merge-notes-tab").live("click", function(e) {
|
||||
$(".merge-request-diffs").hide();
|
||||
$(".merge-request-notes").show();
|
||||
e.preventDefault();
|
||||
});
|
||||
|
||||
$(".tabs a.merge-diffs-tab").live("click", function() {
|
||||
$(".tabs a.merge-diffs-tab").live("click", function(e) {
|
||||
if(!MergeRequest.diffs_loaded) {
|
||||
MergeRequest.loadDiff();
|
||||
}
|
||||
$(".merge-request-notes").hide();
|
||||
$(".merge-request-diffs").show();
|
||||
e.preventDefault();
|
||||
});
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -253,14 +253,12 @@ img.lil_av {
|
|||
}
|
||||
|
||||
.widget {
|
||||
@include shade;
|
||||
padding:20px;
|
||||
margin-bottom:20px;
|
||||
background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #fff), to(#f1f1f1));
|
||||
background-image: -webkit-linear-gradient(#fff 6.6%, #f1f1f1);
|
||||
background-image: -moz-linear-gradient(#fff 6.6%, #f1f1f1);
|
||||
background-image: -o-linear-gradient(#fff 6.6%, #f1f1f1);
|
||||
border: 1px solid #DDD;
|
||||
border-radius: 5px;
|
||||
background:#fafafa;
|
||||
|
||||
.link_holder {
|
||||
background:#eee;
|
||||
|
|
@ -304,6 +302,9 @@ img.lil_av {
|
|||
.row_title {
|
||||
font-weight:bold;
|
||||
color:#444;
|
||||
&:hover {
|
||||
text-decoration:underline;
|
||||
}
|
||||
}
|
||||
|
||||
li, .wll {
|
||||
|
|
@ -345,10 +346,6 @@ img.lil_av {
|
|||
@include shade;
|
||||
}
|
||||
|
||||
.well.padded {
|
||||
padding:29px;
|
||||
}
|
||||
|
||||
.download_repo_link {
|
||||
background: url("images.png") no-repeat 0 -48px;
|
||||
padding-left:20px;
|
||||
|
|
@ -369,3 +366,7 @@ table a code {
|
|||
top: -2px;
|
||||
margin-right: 3px;
|
||||
}
|
||||
|
||||
.span12 hr{
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* Login Page */
|
||||
body.login-page{
|
||||
padding-top: 10%;
|
||||
background:$style_color;
|
||||
background:#f1f1f1;
|
||||
}
|
||||
|
||||
.login-box{
|
||||
|
|
|
|||
|
|
@ -222,6 +222,33 @@ input.git_clone_url {
|
|||
background:#fff !important;
|
||||
}
|
||||
|
||||
.span12 hr{
|
||||
margin-top: 2px;
|
||||
.project_tile {
|
||||
@include shade;
|
||||
@include round-borders-all(4px);
|
||||
margin-bottom:20px;
|
||||
width:338px;
|
||||
float:left;
|
||||
margin-left:20px;
|
||||
border: 1px solid #DDD;
|
||||
padding-bottom:20px;
|
||||
|
||||
.title {
|
||||
background:#f5f5f5;
|
||||
padding: 5px 10px 2px 20px;
|
||||
border-bottom: 1px solid #DDD;
|
||||
margin-bottom: 15px;
|
||||
|
||||
h3 {
|
||||
&:hover {
|
||||
text-decoration: underline;
|
||||
}
|
||||
}
|
||||
}
|
||||
.data {
|
||||
margin: 0 20px;
|
||||
}
|
||||
.buttons {
|
||||
margin: 0 20px;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
%tr
|
||||
%td
|
||||
%a{:href => project_deploy_key_path(key.project, key)}
|
||||
= key.title
|
||||
%strong= key.title
|
||||
%td
|
||||
%span.update-author
|
||||
Added
|
||||
= time_ago_in_words(key.created_at)
|
||||
ago
|
||||
%td
|
||||
= link_to 'Remove', project_deploy_key_path(key.project, key), :confirm => 'Are you sure?', :method => :delete, :class => "danger btn delete-key small"
|
||||
= link_to 'Remove', project_deploy_key_path(key.project, key), :confirm => 'Are you sure?', :method => :delete, :class => "danger btn delete-key small right"
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
.widget
|
||||
You can create at least
|
||||
= current_user.projects_limit
|
||||
projects. Click on button to add a new one
|
||||
projects. Click on link below to add a new one
|
||||
.link_holder
|
||||
= link_to new_project_path, :class => "" do
|
||||
New Project »
|
||||
|
|
|
|||
|
|
@ -1,11 +1,13 @@
|
|||
- @projects.in_groups_of(2, false) do |projects|
|
||||
.row
|
||||
- projects.each_with_index do |project, i|
|
||||
%div.span5.well.padded
|
||||
%div.project_tile
|
||||
.title
|
||||
= link_to project_path(project) do
|
||||
%h3= truncate(project.name, :length => 28)
|
||||
.data
|
||||
%p
|
||||
%input{ :value => project.url_to_repo, :class => ['git-url', 'one_click_select', 'text', 'project_list_url'], :readonly => 'readonly' }
|
||||
|
||||
.buttons
|
||||
%a.btn.info{:href => tree_project_ref_path(project, project.root_ref)} Browse code
|
||||
%a.btn{:href => project_commits_path(project)} Commits
|
||||
|
|
|
|||
|
|
@ -6,6 +6,12 @@
|
|||
- @wiki.errors.full_messages.each do |msg|
|
||||
%li= msg
|
||||
|
||||
.alert-message.block-message.warning
|
||||
%p
|
||||
Wiki content is parsed with #{link_to "Markdown", "http://en.wikipedia.org/wiki/Markdown"}.
|
||||
%br
|
||||
To add link to new page you can just type
|
||||
%code [Link Title](page-slug)
|
||||
.clearfix
|
||||
= f.label :title
|
||||
.input= f.text_field :title, :class => :xxlarge
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
%h1 Editing page
|
||||
|
||||
%h3 Editing page
|
||||
%hr
|
||||
= render 'form'
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
%h2 Versions
|
||||
%h3 Versions
|
||||
%table
|
||||
%thead
|
||||
%tr
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
%h3
|
||||
= @wiki.title
|
||||
= link_to edit_project_wiki_path(@project, @wiki), :class => "right btn small" do
|
||||
Edit
|
||||
%span.right
|
||||
- if can? current_user, :write_wiki, @project
|
||||
= link_to history_project_wiki_path(@project, @wiki), :class => "right btn small" do
|
||||
= link_to history_project_wiki_path(@project, @wiki), :class => "btn small" do
|
||||
History
|
||||
= link_to edit_project_wiki_path(@project, @wiki), :class => "btn small" do
|
||||
Edit
|
||||
%hr
|
||||
|
||||
= markdown_to_html @wiki.content
|
||||
|
|
|
|||
Loading…
Reference in a new issue