Help message for wiki, styled projects page

Dmitriy Zaporozhets
1 parent ce8eba89
Showing 11 changed files with 71 additions and 32 deletions Show diff stats
app/assets/javascripts/merge_requests.js
app/assets/stylesheets/common.scss
app/assets/stylesheets/login.scss
app/assets/stylesheets/projects.css.scss
app/views/deploy_keys/_show.html.haml
app/views/layouts/_projects_side.html.haml
app/views/projects/_tile.html.haml
app/views/wikis/_form.html.haml
app/views/wikis/edit.html.haml
app/views/wikis/history.html.haml
app/views/wikis/show.html.haml
@@ -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;
+}
 /* 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;
+  }
 }
+
 %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 » 
 - @projects.in_groups_of(2, false) do |projects|
   .row
     - projects.each_with_index do |project, i|
-      %div.span5.well.padded
-        = link_to project_path(project) do
-          %h3= truncate(project.name, :length => 28)
-        %p
-          %input{ :value => project.url_to_repo, :class => ['git-url', 'one_click_select', 'text', 'project_list_url'], :readonly => 'readonly' }
-
-        %a.btn.info{:href => tree_project_ref_path(project, project.root_ref)} Browse code
-        %a.btn{:href => project_commits_path(project)} Commits
+      %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
-%h1 Editing page
-
+%h3 Editing page
+%hr
 = render 'form'
-%h2 Versions
+%h3 Versions
 %table
   %thead
     %tr
 %h3
   = @wiki.title
-  = link_to edit_project_wiki_path(@project, @wiki), :class => "right btn small" do
-    Edit
-  - if can? current_user, :write_wiki, @project
-    = link_to history_project_wiki_path(@project, @wiki), :class => "right btn small" do
-      History
+  %span.right
+    - if can? current_user, :write_wiki, @project
+      = 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
...	...	@@ -9,17 +9,19 @@ var MergeRequest = {
9	9	$(this).parent().addClass("active");
10	10	});
11	11
12		- $(".tabs a.merge-notes-tab").live("click", function() {
	12	+ $(".tabs a.merge-notes-tab").live("click", function(e) {
13	13	$(".merge-request-diffs").hide();
14	14	$(".merge-request-notes").show();
	15	+ e.preventDefault();
15	16	});
16	17
17		- $(".tabs a.merge-diffs-tab").live("click", function() {
	18	+ $(".tabs a.merge-diffs-tab").live("click", function(e) {
18	19	if(!MergeRequest.diffs_loaded) {
19	20	MergeRequest.loadDiff();
20	21	}
21	22	$(".merge-request-notes").hide();
22	23	$(".merge-request-diffs").show();
	24	+ e.preventDefault();
23	25	});
24	26	},
25	27
...	...
...	...	@@ -253,14 +253,12 @@ img.lil_av {
253	253	}
254	254
255	255	.widget {
	256	+ @include shade;
256	257	padding:20px;
257	258	margin-bottom:20px;
258		- background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #fff), to(#f1f1f1));
259		- background-image: -webkit-linear-gradient(#fff 6.6%, #f1f1f1);
260		- background-image: -moz-linear-gradient(#fff 6.6%, #f1f1f1);
261		- background-image: -o-linear-gradient(#fff 6.6%, #f1f1f1);
262	259	border: 1px solid #DDD;
263	260	border-radius: 5px;
	261	+ background:#fafafa;
264	262
265	263	.link_holder {
266	264	background:#eee;
...	...	@@ -304,6 +302,9 @@ img.lil_av {
304	302	.row_title {
305	303	font-weight:bold;
306	304	color:#444;
	305	+ &:hover {
	306	+ text-decoration:underline;
	307	+ }
307	308	}
308	309
309	310	li, .wll {
...	...	@@ -345,10 +346,6 @@ img.lil_av {
345	346	@include shade;
346	347	}
347	348
348		-.well.padded {
349		- padding:29px;
350		-}
351		-
352	349	.download_repo_link {
353	350	background: url("images.png") no-repeat 0 -48px;
354	351	padding-left:20px;
...	...	@@ -369,3 +366,7 @@ table a code {
369	366	top: -2px;
370	367	margin-right: 3px;
371	368	}
	369	+
	370	+.span12 hr{
	371	+ margin-top: 5px;
	372	+}
...	...
1	1	/* Login Page */
2	2	body.login-page{
3	3	padding-top: 10%;
4		- background:$style_color;
	4	+ background:#f1f1f1;
5	5	}
6	6
7	7	.login-box{
...	...
...	...	@@ -222,6 +222,33 @@ input.git_clone_url {
222	222	background:#fff !important;
223	223	}
224	224
225		-.span12 hr{
226		- margin-top: 2px;
	225	+.project_tile {
	226	+ @include shade;
	227	+ @include round-borders-all(4px);
	228	+ margin-bottom:20px;
	229	+ width:338px;
	230	+ float:left;
	231	+ margin-left:20px;
	232	+ border: 1px solid #DDD;
	233	+ padding-bottom:20px;
	234	+
	235	+ .title {
	236	+ background:#f5f5f5;
	237	+ padding: 5px 10px 2px 20px;
	238	+ border-bottom: 1px solid #DDD;
	239	+ margin-bottom: 15px;
	240	+
	241	+ h3 {
	242	+ &:hover {
	243	+ text-decoration: underline;
	244	+ }
	245	+ }
	246	+ }
	247	+ .data {
	248	+ margin: 0 20px;
	249	+ }
	250	+ .buttons {
	251	+ margin: 0 20px;
	252	+ }
227	253	}
	254	+
...	...
1	1	%tr
2	2	%td
3	3	%a{:href => project_deploy_key_path(key.project, key)}
4		- = key.title
	4	+ %strong= key.title
5	5	%td
6	6	%span.update-author
7	7	Added
8	8	= time_ago_in_words(key.created_at)
9	9	ago
10	10	%td
11		- = link_to 'Remove', project_deploy_key_path(key.project, key), :confirm => 'Are you sure?', :method => :delete, :class => "danger btn delete-key small"
	11	+ = link_to 'Remove', project_deploy_key_path(key.project, key), :confirm => 'Are you sure?', :method => :delete, :class => "danger btn delete-key small right"
12	12
...	...
...	...	@@ -3,7 +3,7 @@
3	3	.widget
4	4	You can create at least
5	5	= current_user.projects_limit
6		- projects. Click on button to add a new one
	6	+ projects. Click on link below to add a new one
7	7	.link_holder
8	8	= link_to new_project_path, :class => "" do
9	9	New Project »
...	...
1	1	- @projects.in_groups_of(2, false) do \|projects\|
2	2	.row
3	3	- projects.each_with_index do \|project, i\|
4		- %div.span5.well.padded
5		- = link_to project_path(project) do
6		- %h3= truncate(project.name, :length => 28)
7		- %p
8		- %input{ :value => project.url_to_repo, :class => ['git-url', 'one_click_select', 'text', 'project_list_url'], :readonly => 'readonly' }
9		-
10		- %a.btn.info{:href => tree_project_ref_path(project, project.root_ref)} Browse code
11		- %a.btn{:href => project_commits_path(project)} Commits
	4	+ %div.project_tile
	5	+ .title
	6	+ = link_to project_path(project) do
	7	+ %h3= truncate(project.name, :length => 28)
	8	+ .data
	9	+ %p
	10	+ %input{ :value => project.url_to_repo, :class => ['git-url', 'one_click_select', 'text', 'project_list_url'], :readonly => 'readonly' }
	11	+ .buttons
	12	+ %a.btn.info{:href => tree_project_ref_path(project, project.root_ref)} Browse code
	13	+ %a.btn{:href => project_commits_path(project)} Commits
...	...
...	...	@@ -6,6 +6,12 @@
6	6	- @wiki.errors.full_messages.each do \|msg\|
7	7	%li= msg
8	8
	9	+ .alert-message.block-message.warning
	10	+ %p
	11	+ Wiki content is parsed with #{link_to "Markdown", "http://en.wikipedia.org/wiki/Markdown"}.
	12	+ %br
	13	+ To add link to new page you can just type
	14	+ %code [Link Title](page-slug)
9	15	.clearfix
10	16	= f.label :title
11	17	.input= f.text_field :title, :class => :xxlarge
...	...
1		-%h1 Editing page
2		-
	1	+%h3 Editing page
	2	+%hr
3	3	= render 'form'
...	...
1	1	%h3
2	2	= @wiki.title
3		- = link_to edit_project_wiki_path(@project, @wiki), :class => "right btn small" do
4		- Edit
5		- - if can? current_user, :write_wiki, @project
6		- = link_to history_project_wiki_path(@project, @wiki), :class => "right btn small" do
7		- History
	3	+ %span.right
	4	+ - if can? current_user, :write_wiki, @project
	5	+ = link_to history_project_wiki_path(@project, @wiki), :class => "btn small" do
	6	+ History
	7	+ = link_to edit_project_wiki_path(@project, @wiki), :class => "btn small" do
	8	+ Edit
8	9	%hr
9	10
10	11	= markdown_to_html @wiki.content
...	...