diff options
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/deploy_keys/_form.html.haml | 22 | ||||
-rw-r--r-- | app/views/deploy_keys/create.js.haml | 9 | ||||
-rw-r--r-- | app/views/deploy_keys/edit.html.haml | 7 | ||||
-rw-r--r-- | app/views/deploy_keys/new.html.haml | 6 | ||||
-rw-r--r-- | app/views/deploy_keys/new.js.haml | 11 | ||||
-rw-r--r-- | app/views/issues/_form.html.haml | 15 | ||||
-rw-r--r-- | app/views/repositories/_head.html.haml | 2 |
7 files changed, 21 insertions, 51 deletions
diff --git a/app/views/deploy_keys/_form.html.haml b/app/views/deploy_keys/_form.html.haml index d3a2682ae3e..04ea30ba202 100644 --- a/app/views/deploy_keys/_form.html.haml +++ b/app/views/deploy_keys/_form.html.haml @@ -1,16 +1,18 @@ %div - = form_for [@project, @key], :url => project_deploy_keys_path, :remote => true do |f| + = form_for [@project, @key], :url => project_deploy_keys_path do |f| -if @key.errors.any? - %ul + %ul.errors_holder - @key.errors.full_messages.each do |msg| %li= msg - - .form-row - = f.label :title - = f.text_field :title, :style => "width:300px" - .form-row - = f.label :key - = f.text_area :key, :style => "width:300px; height:130px" - .form-row + + %table.no-borders + %tr + %td= f.label :title + %td= f.text_field :title, :style => "width:300px" + %tr + %td= f.label :key + %td= f.text_area :key, :style => "width:300px; height:130px" + %br + .merge-tabs = f.submit 'Save', :class => "grey-button" diff --git a/app/views/deploy_keys/create.js.haml b/app/views/deploy_keys/create.js.haml deleted file mode 100644 index 0e8757f880f..00000000000 --- a/app/views/deploy_keys/create.js.haml +++ /dev/null @@ -1,9 +0,0 @@ -- if @key.valid? - :plain - $("#new_key_dialog").dialog("close"); - $("#keys-table .data").append("#{escape_javascript(render(:partial => 'show', :locals => {:key => @key} ))}"); - $("#no_ssh_key_defined").hide(); -- else - :plain - $("#new_key_dialog").empty(); - $("#new_key_dialog").append("#{escape_javascript(render('form'))}"); diff --git a/app/views/deploy_keys/edit.html.haml b/app/views/deploy_keys/edit.html.haml deleted file mode 100644 index 9b1b9aac221..00000000000 --- a/app/views/deploy_keys/edit.html.haml +++ /dev/null @@ -1,7 +0,0 @@ -%h1 Editing key - -= render 'form' - -= link_to 'Show', @key -\| -= link_to 'Back', project_deploy_keys_path diff --git a/app/views/deploy_keys/new.html.haml b/app/views/deploy_keys/new.html.haml index 9be37204567..1e6b7e77144 100644 --- a/app/views/deploy_keys/new.html.haml +++ b/app/views/deploy_keys/new.html.haml @@ -1,5 +1,5 @@ -%h1 New key += render "repositories/head" -= render 'form' +%h2 New Deploy key -= link_to 'Back', project_deploy_keys_path += render 'form' diff --git a/app/views/deploy_keys/new.js.haml b/app/views/deploy_keys/new.js.haml deleted file mode 100644 index 86e9db030c5..00000000000 --- a/app/views/deploy_keys/new.js.haml +++ /dev/null @@ -1,11 +0,0 @@ -:plain - var new_key_dialog = $("<div id='new_key_dialog'></div>"); - new_key_dialog.html("#{escape_javascript(render('form'))}"); - $(new_key_dialog).dialog({ - width: 350, - resizable: false, - draggable: false, - title: "Add new public key", - close: function(event, ui) { $("#new_key_dialog").remove();}, - modal: true - }); diff --git a/app/views/issues/_form.html.haml b/app/views/issues/_form.html.haml index 4a5526341ef..19d185a1456 100644 --- a/app/views/issues/_form.html.haml +++ b/app/views/issues/_form.html.haml @@ -20,18 +20,13 @@ %i %h2= @issue.new_record? ? "New Issue" : "Edit Issue ##{@issue.id}" - %hr - %table.no-borders - -if @issue.errors.any? - %tr - %td{:colspan => 2} - #error_explanation - - @issue.errors.full_messages.each do |msg| - %span= msg - %br - + -if @issue.errors.any? + %ul.errors_holder + - @issue.errors.full_messages.each do |msg| + %li= msg + %table.no-borders %tr %td= f.label :assignee_id %td= f.select(:assignee_id, @project.users.all.collect {|p| [ p.name, p.id ] }, { :include_blank => "Select user" }) diff --git a/app/views/repositories/_head.html.haml b/app/views/repositories/_head.html.haml index 09a85bed591..7b476362bed 100644 --- a/app/views/repositories/_head.html.haml +++ b/app/views/repositories/_head.html.haml @@ -23,6 +23,6 @@ - if current_page?(project_deploy_keys_path(@project)) - if can? current_user, :admin_project, @project - = link_to new_project_deploy_key_path(@project), :class => "add_new", :title => "New Deploy Key", :remote => true do + = link_to new_project_deploy_key_path(@project), :class => "add_new", :title => "New Deploy Key" do = image_tag "add_new.png", :width => 14 |