Better explanation for details page

5 files changed, 39 insertions, 11 deletions

diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss
index 02badc2..97e65a7 100644
--- a/app/assets/stylesheets/main.scss
+++ b/app/assets/stylesheets/main.scss
@@ -179,3 +179,22 @@ h3.error { color: #B94A48; }
   border: 1px solid #DDD;
   @include box-shadow(0 0 0 3px #eee);
 }
+
+form {
+  input[type="email"],
+  input[type="password"],
+  input[type="text"] {
+    border-radius: 0;
+    padding: 5px;
+  }
+}
+
+fieldset {
+  legend {
+    font-size: 18px;
+  }
+}
+
+.lead {
+  font-size: 18px;
+}
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index d9c6626..096dd90 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -11,7 +11,8 @@
     .navbar.navbar-fixed-top.navbar-ci
       .navbar-inner
         .container-fluid
-          %a.brand{:href => "/"} GitLab CI
+          %a.brand{:href => "/"}
+            GitLab CI
           %ul.nav
             - if current_user
               %li
diff --git a/app/views/projects/details.html.haml b/app/views/projects/details.html.haml
index 5603c1f..4c5e59c 100644
--- a/app/views/projects/details.html.haml
+++ b/app/views/projects/details.html.haml
@@ -1,5 +1,5 @@
 %h3
-  Project: #{@project.name} → Integration details
+  Project: #{@project.name} → Details
   - if @project.gitlab_url.present?
     %small= link_to 'View on GitLab', @project.gitlab_url
   .right
@@ -10,29 +10,35 @@
       Edit
 
 
+
+%br
+%p.lead Copy provided setting to you GitLab instance for close integration
+
 %form.form-horizontal
   %fieldset
     %legend
-      As Service
-      %small (GitLab 3.1+)
+      GitLab 3.1+
+      .right
+        Copy to GitLab → Project → Services
 
     .control-group
       = label_tag :url, 'Project URL', class: 'control-label'
       .controls
-        = text_field_tag :url, project_url(@project), class: 'input-xxlarge'
+        = text_field_tag :url, project_url(@project), class: 'input-xxlarge', disabled: true
 
     .control-group
       = label_tag :token, 'Project Token', class: 'control-label'
       .controls
-        = text_field_tag :token, @project.token, class: 'input-xxlarge'
+        = text_field_tag :token, @project.token, class: 'input-xxlarge', disabled: true
 
   %fieldset
     %legend
-      As http hook
-      %small (GitLab 3.0 and earlier)
+      GitLab 3.0 and earlier
+      .right
+        Copy to GitLab → Project → Web Hooks
     .control-group
       = label_tag :hook_url, 'HTTP POST Hook url', class: 'control-label'
       .controls
-        = text_field_tag :url, build_project_url(@project, token: @project.token), class: 'input-xxlarge'
+        = text_field_tag :url, build_project_url(@project, token: @project.token), class: 'input-xxlarge', disabled: true
         %p.hint Copy this link and add to GitLab web hooks
 
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index ee8b5b7..1fa923f 100644
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -1,4 +1,5 @@
-%h3 Editing project
+%h3
+  Project: #{@project.name} → Edit
 = link_to project_path(@project) do
   ← Back to project
 %hr
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
index 7184f19..6ca4c0e 100644
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -5,7 +5,8 @@
   .right
     = link_to details_project_path(@project), class: 'btn btn-small' do
       Details
-    %a.btn.btn-small{href: edit_project_path(@project)}
+
+    = link_to edit_project_path(@project), class: 'btn btn-small' do
       %i.icon-edit.icon-white
       Edit