From a07107707116c51b389b841239c1d034d1ca245e Mon Sep 17 00:00:00 2001 From: Vokhmin Alexey V Date: Fri, 28 Nov 2014 02:13:09 +0300 Subject: [PATCH] #369: cleanup --- app/views/projects/issues/_header.html.slim | 57 --------------------- app/views/projects/issues/show.html.slim | 15 ------ 2 files changed, 72 deletions(-) delete mode 100644 app/views/projects/issues/_header.html.slim diff --git a/app/views/projects/issues/_header.html.slim b/app/views/projects/issues/_header.html.slim deleted file mode 100644 index 52248d647..000000000 --- a/app/views/projects/issues/_header.html.slim +++ /dev/null @@ -1,57 +0,0 @@ - -h3 - = @issue.title -.panel.panel-default - .panel-body - .pull-left.roffset5 - = image_tag(avatar_url(@issue.user, :medium), alt: 'avatar') if @issue.user - - if can? :update, @issue - .pull-right - a href='#' - i.fa.fa-edit ng-click='edit = true' - .pull-left - - if @issue.user - strong - => link_to(@issue.user.fullname, user_path(@issue.user)) - = datetime_moment @issue.created_at, tag: :span - .clearfix - div ng-hide='edit' - = markdown @issue.body - .clearfix - - .clearfix - .offset20 ng-show='edit' - = simple_form_for @issue, url: [@project, @issue], html: { method: :put } do |f| - = f.input :title - = f.input :body, as: :text - => f.button :submit, t('layout.update') - a href='#' ng-click='edit = false' - = t('layout.issues.cancel_button') - - -.panel.panel-default - .panel-body - .image - =image_tag(avatar_url(@issue.user, :medium), alt: 'avatar') if @issue.user - .created - = datetime_moment @issue.created_at, tag: :span - - if @issue.user - span= t('layout.by') - span.name=link_to(@issue.user.fullname, user_path(@issue.user)) - .text.issue_title - h3.issue_title=@issue.title - .both - #assigned-container.assigned-header - =render 'projects/issues/user_container', user: @issue.assignee - =render 'projects/issues/assigned_popup' - .both - .fulltext.view.issue_body.formatted.cm-s-default.md_and_cm=markdown @issue.body -.both -br -/ - if can? :update, @issue -/ =link_to t('layout.edit'), '#', id: 'edit_issue_content', class: 'button' -/ =form_for :issue, url: [@project, @issue], method: :put, html: { class: 'edit_form issue', style: 'display:none;' } do |f| -/ =render 'projects/issues/title_body', f: f, id: 'update' -/ =f.submit t('layout.update'), id: 'update_issue_content' -/ =link_to t('layout.issues.cancel_button'), '#', id: 'cancel_edit_issue_content', class: 'button' -/ br diff --git a/app/views/projects/issues/show.html.slim b/app/views/projects/issues/show.html.slim index 52fc84604..891a205ea 100644 --- a/app/views/projects/issues/show.html.slim +++ b/app/views/projects/issues/show.html.slim @@ -1,21 +1,6 @@ -set_meta_tags title: [title_object(@project), @issue.title] - render 'submenu' - render 'manage_sidebar' -/ -content_for :right_nopadding do -/ dummy - -/ .container.col-md-offset-1.col-md-10 -/ == render 'header' -/ == render 'status' - -/ == render "projects/comments/list", list: @issue.comments, project: @project, commentable: @issue -/ br -/ == render "projects/comments/add", project: @project, commentable: @issue if current_user - -/ =hidden_field_tag :preview_url, project_md_preview_path(@project) - - - == render 'projects/comments/markdown_help' .container ng-controller = 'IssueController as issueCtrl' ng-cloak = true .row