diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-31 02:50:36 +0200 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-31 02:50:36 +0200 |
commit | 010a770b3fa15119b40a994fde6ffdde3acf6d2d (patch) | |
tree | d0d90a2aefe78dae9db490f8b5ca168ce4809e28 /app/views/projects | |
parent | 16eb3ac360df60469cc9b1a93870c0273c7fe78f (diff) | |
download | gitlab-ce-010a770b3fa15119b40a994fde6ffdde3acf6d2d.tar.gz |
Migrate forms and inputs pt1
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views/projects')
-rw-r--r-- | app/views/projects/deploy_keys/_form.html.haml | 4 | ||||
-rw-r--r-- | app/views/projects/hooks/index.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/issues/_form.html.haml | 6 | ||||
-rw-r--r-- | app/views/projects/issues/_head.html.haml | 7 | ||||
-rw-r--r-- | app/views/projects/merge_requests/_form.html.haml | 4 | ||||
-rw-r--r-- | app/views/projects/milestones/_form.html.haml | 4 | ||||
-rw-r--r-- | app/views/projects/network/_head.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/new.html.haml | 6 | ||||
-rw-r--r-- | app/views/projects/services/_form.html.haml | 4 | ||||
-rw-r--r-- | app/views/projects/snippets/_form.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/team_members/import.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/wikis/_new.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/wikis/git_access.html.haml | 2 |
13 files changed, 24 insertions, 23 deletions
diff --git a/app/views/projects/deploy_keys/_form.html.haml b/app/views/projects/deploy_keys/_form.html.haml index 388e297255d..5ee4aae54eb 100644 --- a/app/views/projects/deploy_keys/_form.html.haml +++ b/app/views/projects/deploy_keys/_form.html.haml @@ -8,14 +8,14 @@ .form-group = f.label :title - .col-sm-10= f.text_field :title, class: 'input-xlarge' + .col-sm-10= f.text_field :title, class: 'input-lg' .form-group = f.label :key .col-sm-10 %p.light Paste a machine public key here. Read more about how to generate it = link_to "here", help_ssh_path - = f.text_area :key, class: "input-xxlarge thin_area" + = f.text_area :key, class: "input-lg thin_area" .form-actions = f.submit 'Create', class: "btn-create btn" diff --git a/app/views/projects/hooks/index.html.haml b/app/views/projects/hooks/index.html.haml index 5df557add4f..9cfcb20ea8d 100644 --- a/app/views/projects/hooks/index.html.haml +++ b/app/views/projects/hooks/index.html.haml @@ -15,7 +15,7 @@ .form-group = f.label :url, "URL" .col-sm-10 - = f.text_field :url, class: "text_field input-xxlarge input-xpadding", placeholder: 'http://example.com/trigger-ci.json' + = f.text_field :url, class: "text_field input-lg input-xpadding", placeholder: 'http://example.com/trigger-ci.json' = f.submit "Add Web Hook", class: "btn btn-create" .form-group diff --git a/app/views/projects/issues/_form.html.haml b/app/views/projects/issues/_form.html.haml index be237ac245f..c51dbf820e7 100644 --- a/app/views/projects/issues/_form.html.haml +++ b/app/views/projects/issues/_form.html.haml @@ -12,7 +12,7 @@ = f.label :title do %strong= "Subject *" .col-sm-10 - = f.text_field :title, maxlength: 255, class: "input-xxlarge js-gfm-input", autofocus: true, required: true + = f.text_field :title, maxlength: 255, class: "input-lg js-gfm-input", autofocus: true, required: true .context .form-group .issue_assignee.pull-left @@ -37,13 +37,13 @@ %i.icon-tag Labels .col-sm-10 - = f.text_field :label_list, maxlength: 2000, class: "input-xxlarge" + = f.text_field :label_list, maxlength: 2000, class: "input-lg" %p.hint Separate labels with commas. .form-group = f.label :description, "Details" .col-sm-10 - = f.text_area :description, class: "input-xxlarge js-gfm-input", rows: 14 + = f.text_area :description, class: "input-lg js-gfm-input", rows: 14 %p.hint Issues are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}. diff --git a/app/views/projects/issues/_head.html.haml b/app/views/projects/issues/_head.html.haml index a44db78a92b..1c3b39ae9d3 100644 --- a/app/views/projects/issues/_head.html.haml +++ b/app/views/projects/issues/_head.html.haml @@ -17,9 +17,10 @@ %li.pull-right .pull-right + = form_tag project_issues_path(@project), method: :get, id: "issue_search_form", class: 'inline issue-search-form' do + .append-right-10 + = search_field_tag :issue_search, nil, { placeholder: 'Filter by title or description', class: 'form-control issue_search search-text-input' } - if can? current_user, :write_issue, @project - = link_to new_project_issue_path(@project, issue: { assignee_id: params[:assignee_id], milestone_id: params[:milestone_id]}), class: "btn btn-new pull-right", title: "New Issue", id: "new_issue_link" do + = link_to new_project_issue_path(@project, issue: { assignee_id: params[:assignee_id], milestone_id: params[:milestone_id]}), class: "btn btn-new", title: "New Issue", id: "new_issue_link" do %i.icon-plus New Issue - = form_tag project_issues_path(@project), method: :get, id: "issue_search_form", class: 'pull-right issue-search-form' do - = search_field_tag :issue_search, nil, { placeholder: 'Filter by title or description', class: 'input-xpadding issue_search input-xlarge append-right-10 search-text-input' } diff --git a/app/views/projects/merge_requests/_form.html.haml b/app/views/projects/merge_requests/_form.html.haml index a868e964eeb..098596ff845 100644 --- a/app/views/projects/merge_requests/_form.html.haml +++ b/app/views/projects/merge_requests/_form.html.haml @@ -33,7 +33,7 @@ .form-group = f.label :title do %strong= "Title *" - .col-sm-10= f.text_field :title, class: "input-xxlarge pad js-gfm-input", maxlength: 255, rows: 5, required: true + .col-sm-10= f.text_field :title, class: "input-lg pad js-gfm-input", maxlength: 255, rows: 5, required: true .form-group .left = f.label :assignee_id do @@ -48,7 +48,7 @@ .form-group = f.label :description, "Description" .col-sm-10 - = f.text_area :description, class: "input-xxlarge js-gfm-input", rows: 14 + = f.text_area :description, class: "input-lg js-gfm-input", rows: 14 %p.hint Description is parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}. diff --git a/app/views/projects/milestones/_form.html.haml b/app/views/projects/milestones/_form.html.haml index 34f6ca8a4a3..a3dc9d8c9cb 100644 --- a/app/views/projects/milestones/_form.html.haml +++ b/app/views/projects/milestones/_form.html.haml @@ -16,12 +16,12 @@ .form-group = f.label :title, "Title", class: "control-label" .col-sm-10 - = f.text_field :title, maxlength: 255, class: "input-xlarge" + = f.text_field :title, maxlength: 255, class: "input-lg" %p.hint Required .form-group = f.label :description, "Description", class: "control-label" .col-sm-10 - = f.text_area :description, maxlength: 2000, class: "input-xlarge", rows: 10 + = f.text_area :description, maxlength: 2000, class: "input-lg", rows: 10 %p.hint Milestones are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}. .col-md-6 .form-group diff --git a/app/views/projects/network/_head.html.haml b/app/views/projects/network/_head.html.haml index 2f16eaf3104..9d9324c2693 100644 --- a/app/views/projects/network/_head.html.haml +++ b/app/views/projects/network/_head.html.haml @@ -15,7 +15,7 @@ .form-group = label_tag :search , "Looking for commit:", class: 'control-label light' .col-sm-10 - = text_field_tag :extended_sha1, @options[:extended_sha1], placeholder: "Input an extended SHA1 syntax", class: "search-input input-xlarge" + = text_field_tag :extended_sha1, @options[:extended_sha1], placeholder: "Input an extended SHA1 syntax", class: "search-input input-lg" = button_tag type: 'submit', class: 'btn vtop' do %i.icon-search - @options.each do |key, value| diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml index 85328a4599b..2de8a497746 100644 --- a/app/views/projects/new.html.haml +++ b/app/views/projects/new.html.haml @@ -8,7 +8,7 @@ = f.label :name do %strong Project name .col-sm-10 - = f.text_field :name, placeholder: "Example Project", class: "input-xlarge", tabindex: 1, autofocus: true + = f.text_field :name, placeholder: "Example Project", class: "input-lg", tabindex: 1, autofocus: true %span.help-inline = link_to "#", class: 'js-toggle-visibility-link' do %span Customize repository name? @@ -38,7 +38,7 @@ = f.label :import_url do %span Import existing repo .col-sm-10 - = f.text_field :import_url, class: 'input-xlarge', placeholder: 'https://github.com/randx/six.git' + = f.text_field :import_url, class: 'input-lg', placeholder: 'https://github.com/randx/six.git' .light URL must be cloneable .form-group @@ -46,7 +46,7 @@ Description %span.light (optional) .col-sm-10 - = f.text_area :description, placeholder: "Awesome project", class: "input-xlarge", rows: 3, maxlength: 250, tabindex: 3 + = f.text_area :description, placeholder: "Awesome project", class: "input-lg", rows: 3, maxlength: 250, tabindex: 3 = render "visibility_level", f: f, visibility_level: gitlab_config.default_projects_features.visibility_level, can_change_visibility_level: true .form-actions diff --git a/app/views/projects/services/_form.html.haml b/app/views/projects/services/_form.html.haml index f848f500f33..5f5a1bb9b67 100644 --- a/app/views/projects/services/_form.html.haml +++ b/app/views/projects/services/_form.html.haml @@ -32,9 +32,9 @@ = f.label name, class: "control-label" .col-sm-10 - if type == 'text' - = f.text_field name, class: "input-xlarge", placeholder: placeholder + = f.text_field name, class: "input-lg", placeholder: placeholder - elsif type == 'textarea' - = f.text_area name, rows: 5, class: "input-xxlarge", placeholder: placeholder + = f.text_area name, rows: 5, class: "input-lg", placeholder: placeholder - elsif type == 'checkbox' = f.check_box name diff --git a/app/views/projects/snippets/_form.html.haml b/app/views/projects/snippets/_form.html.haml index 62dd43a1e40..b37bee98f3f 100644 --- a/app/views/projects/snippets/_form.html.haml +++ b/app/views/projects/snippets/_form.html.haml @@ -11,7 +11,7 @@ .form-group = f.label :title - .col-sm-10= f.text_field :title, placeholder: "Example Snippet", class: 'input-xlarge', required: true + .col-sm-10= f.text_field :title, placeholder: "Example Snippet", class: 'input-lg', required: true .form-group = f.label "Lifetime" .col-sm-10= f.select :expires_at, lifetime_select_options, {}, {class: 'chosen span2'} diff --git a/app/views/projects/team_members/import.html.haml b/app/views/projects/team_members/import.html.haml index 953fce66ead..ca7b32d987f 100644 --- a/app/views/projects/team_members/import.html.haml +++ b/app/views/projects/team_members/import.html.haml @@ -6,7 +6,7 @@ = form_tag apply_import_project_team_members_path(@project), method: 'post' do .padded = label_tag :source_project_id, "Project" - .col-sm-10= select_tag(:source_project_id, options_from_collection_for_select(current_user.authorized_projects, :id, :name_with_namespace), prompt: "Select project", class: "chosen xxlarge", required: true) + .col-sm-10= select_tag(:source_project_id, options_from_collection_for_select(current_user.authorized_projects, :id, :name_with_namespace), prompt: "Select project", class: "chosen lg", required: true) .form-actions = submit_tag 'Import project members', class: "btn btn-create" diff --git a/app/views/projects/wikis/_new.html.haml b/app/views/projects/wikis/_new.html.haml index 86fbab0a67f..1d3f22b874d 100644 --- a/app/views/projects/wikis/_new.html.haml +++ b/app/views/projects/wikis/_new.html.haml @@ -5,7 +5,7 @@ .modal-body = label_tag :new_wiki_path do %span Page slug - = text_field_tag :new_wiki_path, nil, placeholder: 'how-to-setup', class: 'input-xlarge', required: true, :'data-wikis-path' => project_wikis_path(@project) + = text_field_tag :new_wiki_path, nil, placeholder: 'how-to-setup', class: 'input-lg', required: true, :'data-wikis-path' => project_wikis_path(@project) %p.hint Please don't use spaces and slashes .modal-footer diff --git a/app/views/projects/wikis/git_access.html.haml b/app/views/projects/wikis/git_access.html.haml index 692eda4e535..84ce77d0eeb 100644 --- a/app/views/projects/wikis/git_access.html.haml +++ b/app/views/projects/wikis/git_access.html.haml @@ -7,7 +7,7 @@ .git-clone-holder %button{class: "btn active", :"data-clone" => @gollum_wiki.ssh_url_to_repo} SSH %button{class: "btn", :"data-clone" => @gollum_wiki.http_url_to_repo}= gitlab_config.protocol.upcase - = text_field_tag :project_clone, @gollum_wiki.url_to_repo, class: "one_click_select input-xxlarge", readonly: true + = text_field_tag :project_clone, @gollum_wiki.url_to_repo, class: "one_click_select input-lg", readonly: true .git-empty %fieldset |